backup/DDrawCompat
1
0
Fork 0
mirror of https://github.com/narzoul/DDrawCompat synced 2024-12-30 08:55:36 +01:00
Code Issues Projects Releases Activity

Fixed compatibility issue with Windows 10 v1903

Browse Source 
See issue #43
This commit is contained in:
narzoul 2019-06-07 21:18:50 +02:00
parent 8e8eeb083a
commit 0f88271668
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
DDrawCompat/Common/Hook.cpp
View File

@ -52,25 +52,9 @@ namespace
} }
auto modules = getProcessModules(GetCurrentProcess()); auto modules = getProcessModules(GetCurrentProcess());
const HMODULE targetModule = GetModuleHandle(moduleName);
for (auto module : modules) for (auto module : modules)
{ {
FARPROC func = Compat::getProcAddressFromIat(module, moduleName, funcName); FARPROC func = Compat::getProcAddressFromIat(module, moduleName, funcName);
if (!func)
{
typedef decltype(GetProcAddress)* GetProcAddressFunc;
static const auto origGetProcAddressFunc = reinterpret_cast<GetProcAddressFunc>(
Compat::getProcAddress(GetModuleHandle("kernel32"), "GetProcAddress"));
auto getProcAddressFunc = reinterpret_cast<GetProcAddressFunc>(
Compat::getProcAddressFromIat(module, "kernel32", "GetProcAddress"));
if (getProcAddressFunc && *getProcAddressFunc != origGetProcAddressFunc)
{
func = getProcAddressFunc(targetModule, funcName);
}
}
if (func) if (func)
{ {
hookFunctions.insert(func); hookFunctions.insert(func);
@ -141,6 +125,13 @@ namespace
std::make_pair(hookedFuncPtr, HookedFunctionInfo{ module, origFuncPtr, newFuncPtr })); std::make_pair(hookedFuncPtr, HookedFunctionInfo{ module, origFuncPtr, newFuncPtr }));
} }
FARPROC origGetProcAddress(HMODULE module, const char* procName)
{
static const auto origGetProcAddressFunc = reinterpret_cast<decltype(&GetProcAddress)>(
Compat::getProcAddress(GetModuleHandle("kernel32"), "GetProcAddress"));
return origGetProcAddressFunc(module, procName);
}
void unhookFunction(const std::map<void*, HookedFunctionInfo>::iterator& hookedFunc) void unhookFunction(const std::map<void*, HookedFunctionInfo>::iterator& hookedFunc)
{ {
DetourTransactionBegin(); DetourTransactionBegin();
@ -275,7 +266,7 @@ namespace Compat
void hookFunction(HMODULE module, const char* funcName, void*& origFuncPtr, void* newFuncPtr) void hookFunction(HMODULE module, const char* funcName, void*& origFuncPtr, void* newFuncPtr)
{ {
FARPROC procAddr = getProcAddress(module, funcName); FARPROC procAddr = origGetProcAddress(module, funcName);
if (!procAddr) if (!procAddr)
{ {
Compat::LogDebug() << "Failed to load the address of a function: " << funcName; Compat::LogDebug() << "Failed to load the address of a function: " << funcName;