lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Expand cases where we don't hook an already loaded module

Browse Source 
* Some nv libraries like to do this a *lot* for nvapi.dll.
This commit is contained in:
baldurk
2024-12-03 17:11:21 +00:00
parent d37b0ee00b
commit 61a559a944
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/win32/win32_hook.cpp
+15 -1
View File
@@ -681,7 +681,21 @@ HMODULE WINAPI Hooked_LoadLibraryExW(LPCWSTR lpLibFileName, HANDLE fileHandle, D
dohook = false;
}
if(flags == 0 && GetModuleHandleW(lpLibFileName))
DWORD flagsExcludingSearchOrders = flags;
// if this is a pure "filename.dll" load, don't care about search-order flags since loaded DLLs are
// always returned first regardless of the search order and so we can detect the DLL is already loaded
if(wcschr(lpLibFileName, L'\\') == 0 && wcschr(lpLibFileName, L'/') == 0)
{
flagsExcludingSearchOrders &=
~(LOAD_LIBRARY_SEARCH_APPLICATION_DIR | LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR |
LOAD_LIBRARY_SEARCH_SYSTEM32 | LOAD_LIBRARY_SEARCH_USER_DIRS |
LOAD_WITH_ALTERED_SEARCH_PATH | LOAD_LIBRARY_SAFE_CURRENT_DIRS);
}
// if there are no flags (possibly with search path flags excluded) and we already have the
// library loaded, don't hook anything
if(flagsExcludingSearchOrders == 0 && GetModuleHandleW(lpLibFileName))
dohook = false;
if(flags & (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_DATAFILE_EXCLUSIVE))