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 hooking of delay-loaded DLL functions

Browse Source 
Fixes blank intro videos in Midtown Madness 1.
See issue #99.
This commit is contained in:
narzoul 2021-05-18 13:55:49 +02:00
parent f1d8dbd1cb
commit 97f56131ac
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DDrawCompat/Common/Hook.cpp
View File

@ -128,11 +128,12 @@ namespace
void hookFunction(void*& origFuncPtr, void* newFuncPtr, const char* funcName) void hookFunction(void*& origFuncPtr, void* newFuncPtr, const char* funcName)
{ {
BYTE* targetFunc = reinterpret_cast<BYTE*>(origFuncPtr); BYTE* targetFunc = static_cast<BYTE*>(origFuncPtr);
std::ostringstream oss; std::ostringstream oss;
#ifdef DEBUGLOGS #ifdef DEBUGLOGS
oss << Compat::funcPtrToStr(targetFunc) << ' '; oss << Compat::funcPtrToStr(targetFunc) << ' ';
#endif
char origFuncPtrStr[20] = {}; char origFuncPtrStr[20] = {};
if (!funcName) if (!funcName)
@ -142,8 +143,6 @@ namespace
} }
auto prevTargetFunc = targetFunc; auto prevTargetFunc = targetFunc;
#endif
while (true) while (true)
{ {
unsigned instructionSize = 0; unsigned instructionSize = 0;
@ -161,6 +160,11 @@ namespace
{ {
instructionSize = 6; instructionSize = 6;
targetFunc = **reinterpret_cast<BYTE***>(targetFunc + 2); targetFunc = **reinterpret_cast<BYTE***>(targetFunc + 2);
if (Compat::getModuleHandleFromAddress(targetFunc) == Compat::getModuleHandleFromAddress(prevTargetFunc))
{
targetFunc = prevTargetFunc;
break;
}
} }
else else
{ {
@ -168,8 +172,8 @@ namespace
} }
#ifdef DEBUGLOGS #ifdef DEBUGLOGS
oss << Compat::hexDump(prevTargetFunc, instructionSize) << " -> " << Compat::funcPtrToStr(targetFunc) << ' '; oss << Compat::hexDump(prevTargetFunc, instructionSize) << " -> " << Compat::funcPtrToStr(targetFunc) << ' ';
prevTargetFunc = targetFunc;
#endif #endif
prevTargetFunc = targetFunc;
} }
if (Compat::getModuleHandleFromAddress(targetFunc) == Dll::g_currentModule) if (Compat::getModuleHandleFromAddress(targetFunc) == Dll::g_currentModule)