lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-06 01:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't skip over hooked programs when doing a ordinals fixup pass

Browse Source
This commit is contained in:
baldurk
2016-10-14 17:24:36 +02:00
parent 42816cdc50
commit c71225e4be
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/win32/win32_hook.cpp
+18 -9
View File
@@ -49,12 +49,15 @@ struct FunctionHook
}
bool operator<(const FunctionHook &h) { return function < h.function; }
bool ApplyHook(void **IATentry)
bool ApplyHook(void **IATentry, bool &already)
{
DWORD oldProtection = PAGE_EXECUTE;
if(*IATentry == hookptr)
return false;
{
already = true;
return true;
}
{
SCOPED_LOCK(installedLock);
@@ -294,9 +297,13 @@ struct CachedHookData
!strcmp(found->function.c_str(), importName) && found->excludeModule != module)
{
SCOPED_LOCK(lock);
bool applied = found->ApplyHook(IATentry);
bool already = false;
bool applied = found->ApplyHook(IATentry, already);
if(!applied)
// if we failed, or if it's already set and we're not doing a missedOrdinals
// second pass, then just bail out immediately as we've already hooked this
// module and there's no point wasting time re-hooking nothing
if(!applied || (already && !missedOrdinals))
{
FreeLibrary(refcountModHandle);
return;
@@ -338,9 +345,13 @@ struct CachedHookData
!strcmp(found->function.c_str(), importName) && found->excludeModule != module)
{
SCOPED_LOCK(lock);
bool applied = found->ApplyHook(IATentry);
bool already = false;
bool applied = found->ApplyHook(IATentry, already);
if(!applied)
// if we failed, or if it's already set and we're not doing a missedOrdinals
// second pass, then just bail out immediately as we've already hooked this
// module and there's no point wasting time re-hooking nothing
if(!applied || (already && !missedOrdinals))
{
FreeLibrary(refcountModHandle);
return;
@@ -584,11 +595,9 @@ void Win32_IAT_EndHooks()
{
// we need to do a second pass now that we know ordinal names to finally hook
// some imports by ordinal only.
s_HookData->missedOrdinals = false;
HookAllModules();
RDCASSERT(!s_HookData->missedOrdinals);
s_HookData->missedOrdinals = false;
}
}