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

Avoid hooking ntdll stubs

Browse Source 
Fixes issue #52
This commit is contained in:
narzoul 2020-01-03 00:40:41 +01:00
parent 6f14ddf9ae
commit b898519aa0
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
DDrawCompat/Common/Hook.cpp
View File

@ -84,6 +84,14 @@ namespace
return ntHeaders; return ntHeaders;
} }
HMODULE getModuleHandleFromAddress(void* address)
{
HMODULE module = nullptr;
GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
static_cast<char*>(address), &module);
return module;
}
std::filesystem::path getModulePath(HMODULE module) std::filesystem::path getModulePath(HMODULE module)
{ {
char path[MAX_PATH] = {}; char path[MAX_PATH] = {};
@ -94,9 +102,7 @@ namespace
std::string funcAddrToStr(void* funcPtr) std::string funcAddrToStr(void* funcPtr)
{ {
std::ostringstream oss; std::ostringstream oss;
HMODULE module = nullptr; HMODULE module = getModuleHandleFromAddress(funcPtr);
GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
static_cast<char*>(funcPtr), &module);
oss << getModulePath(module).string() << "+0x" << std::hex << oss << getModulePath(module).string() << "+0x" << std::hex <<
reinterpret_cast<DWORD>(funcPtr) - reinterpret_cast<DWORD>(module); reinterpret_cast<DWORD>(funcPtr) - reinterpret_cast<DWORD>(module);
return oss.str(); return oss.str();
@ -160,10 +166,8 @@ namespace Compat
for (auto hookFunc : hookFunctions) for (auto hookFunc : hookFunctions)
{ {
HMODULE module = nullptr; HMODULE module = getModuleHandleFromAddress(hookFunc);
if (!GetModuleHandleEx( if (!module)
GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
static_cast<LPCSTR>(hookFunc), &module))
{ {
continue; continue;
} }
@ -297,6 +301,18 @@ namespace Compat
} }
} }
// Avoid hooking ntdll stubs (e.g. ntdll/NtdllDialogWndProc_A instead of user32/DefDlgProcA)
if (func && getModuleHandleFromAddress(func) != module &&
0xFF == static_cast<BYTE>(func[0]) &&
0x25 == static_cast<BYTE>(func[1]))
{
FARPROC jmpTarget = **reinterpret_cast<FARPROC**>(func + 2);
if (getModuleHandleFromAddress(jmpTarget) == module)
{
return jmpTarget;
}
}
return reinterpret_cast<FARPROC>(func); return reinterpret_cast<FARPROC>(func);
} }