dbghelp: Use EnumProcessModulesEx().

In order to get 32bit modules for a wow64 process. Signed-off-by: Eric Pouech <eric.pouech@gmail.com>

dbghelp: Use EnumProcessModulesEx().
82e3e014 · Eric Pouech · Alexandre Julliard · 34120921 · 82e3e014
Commit 82e3e014 authored Feb 14, 2023 by Eric Pouech Committed by Alexandre Julliard Feb 15, 2023
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

module.c dlls/dbghelp/module.c +9 -2

No files found.
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -1273,11 +1273,18 @@ BOOL  WINAPI EnumerateLoadedModulesW64(HANDLE hProcess,
    WCHAR       baseW[256], modW[256];
    DWORD       i, sz;
    MODULEINFO  mi;
+    BOOL        wow64;
+    DWORD       filter = LIST_MODULES_DEFAULT;

    hMods = HeapAlloc(GetProcessHeap(), 0, 256 * sizeof(hMods[0]));
    if (!hMods) return FALSE;

-    if (!EnumProcessModules(hProcess, hMods, 256 * sizeof(hMods[0]), &sz))
+    if (sizeof(void*) > sizeof(int) &&
+        IsWow64Process(hProcess, &wow64) &&
+        wow64)
+        filter = LIST_MODULES_32BIT;
+
+    if (!EnumProcessModulesEx(hProcess, hMods, 256 * sizeof(hMods[0]), &sz, filter))
    {
        /* hProcess should also be a valid process handle !! */
        HeapFree(GetProcessHeap(), 0, hMods);
@@ -1286,7 +1293,7 @@ BOOL  WINAPI EnumerateLoadedModulesW64(HANDLE hProcess,
    if (sz > 256 * sizeof(hMods[0]))
    {
        hMods = HeapReAlloc(GetProcessHeap(), 0, hMods, sz);
-        if (!hMods || !EnumProcessModules(hProcess, hMods, sz, &sz))
+        if (!hMods || !EnumProcessModulesEx(hProcess, hMods, sz, &sz, filter))
            return FALSE;
    }
    sz /= sizeof(HMODULE);