diff options
Diffstat (limited to 'overlay')
-rw-r--r-- | overlay/d3d10.cpp | 36 | ||||
-rw-r--r-- | overlay/d3d11.cpp | 36 | ||||
-rw-r--r-- | overlay/d3d9.cpp | 14 | ||||
-rw-r--r-- | overlay/dxgi.cpp | 14 | ||||
-rw-r--r-- | overlay/lib.h | 16 |
5 files changed, 58 insertions, 58 deletions
diff --git a/overlay/d3d10.cpp b/overlay/d3d10.cpp index 0f23fcd02..31b3041f5 100644 --- a/overlay/d3d10.cpp +++ b/overlay/d3d10.cpp @@ -600,7 +600,7 @@ void checkDXGI10Hook(bool preonly) { return; } - if (d3d10->iOffsetAddRef == 0 || d3d10->iOffsetRelease == 0) { + if (d3d10->offsetAddRef == 0 || d3d10->offsetRelease == 0) { return; } @@ -639,7 +639,7 @@ void hookD3D10(HMODULE hD3D10, bool preonly) { if (_wcsicmp(d3d10->wcFileName, modulename) == 0) { unsigned char *raw = (unsigned char *) hD3D10; - HookAddRelease((voidFunc)(raw + d3d10->iOffsetAddRef), (voidFunc)(raw + d3d10->iOffsetRelease)); + HookAddRelease((voidFunc)(raw + d3d10->offsetAddRef), (voidFunc)(raw + d3d10->offsetRelease)); } else if (! preonly) { ods("D3D10: Interface changed, can't rawpatch. Current: %ls ; Previously: %ls", modulename, d3d10->wcFileName); } else { @@ -660,8 +660,8 @@ void PrepareDXGI10(IDXGIAdapter1 *pAdapter, bool initializeDXGIData) { ods("D3D10: Preparing static data for DXGI and D3D10 Injection"); d3d10->wcFileName[0] = 0; - d3d10->iOffsetAddRef = 0; - d3d10->iOffsetRelease = 0; + d3d10->offsetAddRef = 0; + d3d10->offsetRelease = 0; HMODULE hD3D10 = LoadLibrary("D3D10.DLL"); @@ -719,13 +719,13 @@ void PrepareDXGI10(IDXGIAdapter1 *pAdapter, bool initializeDXGIData) { int offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pPresent), dxgi->wcFileName, ARRAY_NUM_ELEMENTS(dxgi->wcFileName), "D3D10", "Present"); if (offset >= 0) { if (initializeDXGIData) { - dxgi->iOffsetPresent = offset; - ods("D3D10: Successfully found Present offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetPresent); + dxgi->offsetPresent = offset; + ods("D3D10: Successfully found Present offset: %ls: %d", dxgi->wcFileName, dxgi->offsetPresent); } else { - if (dxgi->iOffsetPresent == offset) { - ods("D3D10: Successfully verified Present offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetPresent); + if (dxgi->offsetPresent == offset) { + ods("D3D10: Successfully verified Present offset: %ls: %d", dxgi->wcFileName, dxgi->offsetPresent); } else { - ods("D3D10: Failed to verify Present offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->iOffsetPresent); + ods("D3D10: Failed to verify Present offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->offsetPresent); } } } @@ -734,13 +734,13 @@ void PrepareDXGI10(IDXGIAdapter1 *pAdapter, bool initializeDXGIData) { offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pResize), dxgi->wcFileName, ARRAY_NUM_ELEMENTS(dxgi->wcFileName), "D3D10", "ResizeBuffers"); if (offset >= 0) { if (initializeDXGIData) { - dxgi->iOffsetResize = offset; - ods("D3D10: Successfully found ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetResize); + dxgi->offsetResize = offset; + ods("D3D10: Successfully found ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->offsetResize); } else { - if (dxgi->iOffsetResize == offset) { - ods("D3D10: Successfully verified ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetResize); + if (dxgi->offsetResize == offset) { + ods("D3D10: Successfully verified ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->offsetResize); } else { - ods("D3D10: Failed to verify ResizeBuffers offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->iOffsetResize); + ods("D3D10: Failed to verify ResizeBuffers offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->offsetResize); } } } @@ -750,15 +750,15 @@ void PrepareDXGI10(IDXGIAdapter1 *pAdapter, bool initializeDXGIData) { void *pAddRef = (*vtbl)[1]; offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pAddRef), d3d10->wcFileName, ARRAY_NUM_ELEMENTS(d3d10->wcFileName), "D3D10", "AddRef"); if (offset >= 0) { - d3d10->iOffsetAddRef = offset; - ods("D3D10: Successfully found AddRef offset: %ls: %d", d3d10->wcFileName, d3d10->iOffsetAddRef); + d3d10->offsetAddRef = offset; + ods("D3D10: Successfully found AddRef offset: %ls: %d", d3d10->wcFileName, d3d10->offsetAddRef); } void *pRelease = (*vtbl)[2]; offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pRelease), d3d10->wcFileName, ARRAY_NUM_ELEMENTS(d3d10->wcFileName), "D3D10", "Release"); if (offset >= 0) { - d3d10->iOffsetRelease = offset; - ods("D3D10: Successfully found Release offset: %ls: %d", d3d10->wcFileName, d3d10->iOffsetRelease); + d3d10->offsetRelease = offset; + ods("D3D10: Successfully found Release offset: %ls: %d", d3d10->wcFileName, d3d10->offsetRelease); } } diff --git a/overlay/d3d11.cpp b/overlay/d3d11.cpp index 8d0927efa..37ca0c115 100644 --- a/overlay/d3d11.cpp +++ b/overlay/d3d11.cpp @@ -608,7 +608,7 @@ void checkDXGI11Hook(bool preonly) { return; } - if (d3d11->iOffsetAddRef == 0 || d3d11->iOffsetRelease == 0) { + if (d3d11->offsetAddRef == 0 || d3d11->offsetRelease == 0) { return; } @@ -649,7 +649,7 @@ void hookD3D11(HMODULE hD3D11, bool preonly) { if (_wcsicmp(d3d11->wcFileName, modulename) == 0) { unsigned char *raw = (unsigned char *) hD3D11; - HookAddRelease((voidFunc)(raw + d3d11->iOffsetAddRef), (voidFunc)(raw + d3d11->iOffsetRelease)); + HookAddRelease((voidFunc)(raw + d3d11->offsetAddRef), (voidFunc)(raw + d3d11->offsetRelease)); } else if (! preonly) { ods("D3D11: Interface changed, can't rawpatch. Current: %ls ; Previously: %ls", modulename, d3d11->wcFileName); } else { @@ -670,8 +670,8 @@ void PrepareDXGI11(IDXGIAdapter1* pAdapter, bool initializeDXGIData) { ods("D3D11: Preparing static data for DXGI and D3D11 Injection"); d3d11->wcFileName[0] = 0; - d3d11->iOffsetAddRef = 0; - d3d11->iOffsetRelease = 0; + d3d11->offsetAddRef = 0; + d3d11->offsetRelease = 0; HMODULE hD3D11 = LoadLibrary("D3D11.DLL"); @@ -732,13 +732,13 @@ void PrepareDXGI11(IDXGIAdapter1* pAdapter, bool initializeDXGIData) { int offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pPresent), dxgi->wcFileName, ARRAY_NUM_ELEMENTS(dxgi->wcFileName), "D3D11", "Present"); if (offset >= 0) { if (initializeDXGIData) { - dxgi->iOffsetPresent = offset; - ods("D3D11: Successfully found Present offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetPresent); + dxgi->offsetPresent = offset; + ods("D3D11: Successfully found Present offset: %ls: %d", dxgi->wcFileName, dxgi->offsetPresent); } else { - if (dxgi->iOffsetPresent == offset) { - ods("D3D11: Successfully verified Present offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetPresent); + if (dxgi->offsetPresent == offset) { + ods("D3D11: Successfully verified Present offset: %ls: %d", dxgi->wcFileName, dxgi->offsetPresent); } else { - ods("D3D11: Failed to verify Present offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->iOffsetPresent); + ods("D3D11: Failed to verify Present offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->offsetPresent); } } } @@ -747,13 +747,13 @@ void PrepareDXGI11(IDXGIAdapter1* pAdapter, bool initializeDXGIData) { offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pResize), dxgi->wcFileName, ARRAY_NUM_ELEMENTS(dxgi->wcFileName), "D3D11", "ResizeBuffers"); if (offset >= 0) { if (initializeDXGIData) { - dxgi->iOffsetResize = offset; - ods("D3D11: Successfully found ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetResize); + dxgi->offsetResize = offset; + ods("D3D11: Successfully found ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->offsetResize); } else { - if (dxgi->iOffsetResize == offset) { - ods("D3D11: Successfully verified ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->iOffsetResize); + if (dxgi->offsetResize == offset) { + ods("D3D11: Successfully verified ResizeBuffers offset: %ls: %d", dxgi->wcFileName, dxgi->offsetResize); } else { - ods("D3D11: Failed to verify ResizeBuffers offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->iOffsetResize); + ods("D3D11: Failed to verify ResizeBuffers offset for %ls. Found %d, but previously found %d.", dxgi->wcFileName, offset, dxgi->offsetResize); } } } @@ -763,15 +763,15 @@ void PrepareDXGI11(IDXGIAdapter1* pAdapter, bool initializeDXGIData) { void *pAddRef = (*vtbl)[1]; offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pAddRef), d3d11->wcFileName, ARRAY_NUM_ELEMENTS(d3d11->wcFileName), "D3D11", "AddRef"); if (offset >= 0) { - d3d11->iOffsetAddRef = offset; - ods("D3D11: Successfully found AddRef offset: %ls: %d", d3d11->wcFileName, d3d11->iOffsetAddRef); + d3d11->offsetAddRef = offset; + ods("D3D11: Successfully found AddRef offset: %ls: %d", d3d11->wcFileName, d3d11->offsetAddRef); } void *pRelease = (*vtbl)[2]; offset = GetFnOffsetInModule(reinterpret_cast<voidFunc>(pRelease), d3d11->wcFileName, ARRAY_NUM_ELEMENTS(d3d11->wcFileName), "D3D11", "Release"); if (offset >= 0) { - d3d11->iOffsetRelease = offset; - ods("D3D11: Successfully found Release offset: %ls: %d", d3d11->wcFileName, d3d11->iOffsetRelease); + d3d11->offsetRelease = offset; + ods("D3D11: Successfully found Release offset: %ls: %d", d3d11->wcFileName, d3d11->offsetRelease); } } diff --git a/overlay/d3d9.cpp b/overlay/d3d9.cpp index b1964537d..b563dbe6e 100644 --- a/overlay/d3d9.cpp +++ b/overlay/d3d9.cpp @@ -1011,9 +1011,9 @@ static void hookD3D9(HMODULE hD3D, bool preonly) { // The module seems to match the one we prepared d3dd for. unsigned char *raw = (unsigned char *) hD3D; - HookCreateRaw((voidFunc)(raw + d3dd->iOffsetCreate)); - if (d3dd->iOffsetCreateEx) { - HookCreateRawEx((voidFunc)(raw + d3dd->iOffsetCreateEx)); + HookCreateRaw((voidFunc)(raw + d3dd->offsetCreate)); + if (d3dd->offsetCreateEx) { + HookCreateRawEx((voidFunc)(raw + d3dd->offsetCreateEx)); } } else if (! preonly) { @@ -1099,8 +1099,8 @@ extern "C" __declspec(dllexport) void __cdecl PrepareD3D9() { if (off > static_cast<unsigned long>(std::numeric_limits<int>::max())) { ods("D3D9: Internal overlay error: CreateDevice offset is > 2GB, does not fit the current data structure."); } else { - d3dd->iOffsetCreate = static_cast<int>(off); - ods("D3D9: Successfully found prepatch offset: %p %p %p: %d", hD3D, d3dcreate9, pCreate, d3dd->iOffsetCreate); + d3dd->offsetCreate = static_cast<int>(off); + ods("D3D9: Successfully found prepatch offset: %p %p %p: %d", hD3D, d3dcreate9, pCreate, d3dd->offsetCreate); } } id3d9->Release(); @@ -1134,8 +1134,8 @@ extern "C" __declspec(dllexport) void __cdecl PrepareD3D9() { if (off > static_cast<unsigned long>(std::numeric_limits<int>::max())) { ods("D3D9: Internal overlay error: CreateDeviceEx offset is > 2GB, does not fit the current data structure."); } else { - d3dd->iOffsetCreateEx = static_cast<int>(off); - ods("D3D9: Successfully found prepatch ex offset: %p %p %p: %d", hD3D, d3dcreate9ex, pCreateEx, d3dd->iOffsetCreateEx); + d3dd->offsetCreateEx = static_cast<int>(off); + ods("D3D9: Successfully found prepatch ex offset: %p %p %p: %d", hD3D, d3dcreate9ex, pCreateEx, d3dd->offsetCreateEx); } } diff --git a/overlay/dxgi.cpp b/overlay/dxgi.cpp index 58748682c..7c20f40e7 100644 --- a/overlay/dxgi.cpp +++ b/overlay/dxgi.cpp @@ -120,7 +120,7 @@ void checkDXGIHook(bool preonly) { return; } - if (dxgi->iOffsetPresent == 0 || dxgi->iOffsetResize == 0) + if (dxgi->offsetPresent == 0 || dxgi->offsetResize == 0) return; bCheckHookActive = true; @@ -158,8 +158,8 @@ void hookDXGI(HMODULE hDXGI, bool preonly) { // The module seems to match the one we prepared d3dd for. unsigned char *raw = (unsigned char *) hDXGI; - HookPresentRaw((voidFunc)(raw + dxgi->iOffsetPresent)); - HookResizeRaw((voidFunc)(raw + dxgi->iOffsetResize)); + HookPresentRaw((voidFunc)(raw + dxgi->offsetPresent)); + HookResizeRaw((voidFunc)(raw + dxgi->offsetResize)); } else if (! preonly) { ods("DXGI: Interface changed, can't rawpatch. Current: %ls ; Previously: %ls", modulename, dxgi->wcFileName); @@ -184,8 +184,8 @@ extern "C" __declspec(dllexport) void __cdecl PrepareDXGI() { ods("DXGI: Preparing static data for DXGI Injection"); dxgi->wcFileName[0] = 0; - dxgi->iOffsetPresent = 0; - dxgi->iOffsetResize = 0; + dxgi->offsetPresent = 0; + dxgi->offsetResize = 0; // Make sure this is Vista or greater as quite a number of <=WinXP users have fake DX10 libs installed OSVERSIONINFOEXW ovi; @@ -214,9 +214,9 @@ extern "C" __declspec(dllexport) void __cdecl PrepareDXGI() { pFactory->EnumAdapters1(0, &pAdapter); /// Offsets have to be identified and initialized only once. - bool initializeDXGIData = !dxgi->iOffsetPresent && !dxgi->iOffsetResize; + bool initializeDXGIData = !dxgi->offsetPresent && !dxgi->offsetResize; PrepareDXGI10(pAdapter, initializeDXGIData); - initializeDXGIData = !dxgi->iOffsetPresent && !dxgi->iOffsetResize; + initializeDXGIData = !dxgi->offsetPresent && !dxgi->offsetResize; PrepareDXGI11(pAdapter, initializeDXGIData); pFactory->Release(); diff --git a/overlay/lib.h b/overlay/lib.h index 5dde5a46a..a6584e917 100644 --- a/overlay/lib.h +++ b/overlay/lib.h @@ -40,29 +40,29 @@ const int PROCNAMEFILEPATH_EXTENDED_BUFFER_BUFLEN = PROCNAMEFILEPATH_BUFLEN + PR struct Direct3D9Data { /// Filepath of the module the offsets are for. wchar_t wcFileName[MODULEFILEPATH_BUFLEN]; - int iOffsetCreate; - int iOffsetCreateEx; + int offsetCreate; + int offsetCreateEx; }; struct DXGIData { /// Filepath of the module the offsets are for. wchar_t wcFileName[MODULEFILEPATH_BUFLEN]; - int iOffsetPresent; - int iOffsetResize; + int offsetPresent; + int offsetResize; }; struct D3D10Data { /// Filepath of the module the offsets are for. wchar_t wcFileName[MODULEFILEPATH_BUFLEN]; - int iOffsetAddRef; - int iOffsetRelease; + int offsetAddRef; + int offsetRelease; }; struct D3D11Data { /// Filepath of the module the offsets are for. wchar_t wcFileName[MODULEFILEPATH_BUFLEN]; - int iOffsetAddRef; - int iOffsetRelease; + int offsetAddRef; + int offsetRelease; }; struct SharedData { |