Commit 0e9d85a9d03bcedade35cced63ec6b969ab3451e
2021-02-03T20:59:18
Fix helper function MyEnumProcessModules() Call SetErrorMode(SEM_FAILCRITICALERRORS) prior opening Psapi.dll library to avoid GUI error messages. Close Psapi.dll library via FreeLibrary() if symbol was not retrieved to prevent possible memory leaks. Try to get K32EnumProcessModules symbol from Kernel32.dll library as it is preferred way how to call EnumProcessModules() on Windows 7 and newer versions. If retrieving EnumProcessModules symbol failed with both methods then do not try it again on next MyEnumProcessModules() function call.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/src/dlfcn.c b/src/dlfcn.c
index 33fa325..4e4e10e 100644
--- a/src/dlfcn.c
+++ b/src/dlfcn.c
@@ -199,16 +199,41 @@ static void save_err_ptr_str( const void *ptr, DWORD dwMessageId )
/* Load Psapi.dll at runtime, this avoids linking caveat */
static BOOL MyEnumProcessModules( HANDLE hProcess, HMODULE *lphModule, DWORD cb, LPDWORD lpcbNeeded )
{
- static BOOL (WINAPI *EnumProcessModulesPtr)(HANDLE, HMODULE *, DWORD, LPDWORD);
+ static BOOL (WINAPI *EnumProcessModulesPtr)(HANDLE, HMODULE *, DWORD, LPDWORD) = NULL;
+ static BOOL failed = FALSE;
+ UINT uMode;
HMODULE psapi;
- if( !EnumProcessModulesPtr )
+ if( failed )
+ return FALSE;
+
+ if( EnumProcessModulesPtr == NULL )
{
- psapi = LoadLibraryA( "Psapi.dll" );
- if( psapi )
- EnumProcessModulesPtr = (BOOL (WINAPI *)(HANDLE, HMODULE *, DWORD, LPDWORD)) GetProcAddress( psapi, "EnumProcessModules" );
- if( !EnumProcessModulesPtr )
- return 0;
+ /* Windows 7 and newer versions have K32EnumProcessModules in Kernel32.dll which is always pre-loaded */
+ psapi = GetModuleHandleA( "Kernel32.dll" );
+ if( psapi != NULL )
+ EnumProcessModulesPtr = (BOOL (WINAPI *)(HANDLE, HMODULE *, DWORD, LPDWORD)) GetProcAddress( psapi, "K32EnumProcessModules" );
+
+ /* Windows Vista and older version have EnumProcessModules in Psapi.dll which needs to be loaded */
+ if( EnumProcessModulesPtr == NULL )
+ {
+ /* Do not let Windows display the critical-error-handler message box */
+ uMode = SetErrorMode( SEM_FAILCRITICALERRORS );
+ psapi = LoadLibraryA( "Psapi.dll" );
+ if( psapi != NULL )
+ {
+ EnumProcessModulesPtr = (BOOL (WINAPI *)(HANDLE, HMODULE *, DWORD, LPDWORD)) GetProcAddress( psapi, "EnumProcessModules" );
+ if( EnumProcessModulesPtr == NULL )
+ FreeLibrary( psapi );
+ }
+ SetErrorMode( uMode );
+ }
+
+ if( EnumProcessModulesPtr == NULL )
+ {
+ failed = TRUE;
+ return FALSE;
+ }
}
return EnumProcessModulesPtr( hProcess, lphModule, cb, lpcbNeeded );