Eric Pouech : kernelbase: Let GetModuleInformation succeed on 64bit modules in wow64.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 115fbf632a98807062600c83d84b4bd2e41e82ab
URL:    https://gitlab.winehq.org/wine/wine/-/commit/115fbf632a98807062600c83d84b4bd...

Author: Eric Pouech 
Date:   Mon Jan 30 13:45:52 2023 +0100

kernelbase: Let GetModuleInformation succeed on 64bit modules in wow64.

Signed-off-by: Eric Pouech

---

dlls/kernelbase/debug.c       | 15 +++++++++------
 dlls/psapi/tests/psapi_main.c | 15 ---------------
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c
index fa2262daa2c..6d8b9ad4b2c 100644
--- a/dlls/kernelbase/debug.c
+++ b/dlls/kernelbase/debug.c
@@ -1458,7 +1458,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE mod
  */
 BOOL WINAPI GetModuleInformation( HANDLE process, HMODULE module, MODULEINFO *modinfo, DWORD count )
 {
-    BOOL wow64;
+    BOOL wow64, found = FALSE;

if (count < sizeof(MODULEINFO))
     {
@@ -1472,12 +1472,15 @@ BOOL WINAPI GetModuleInformation( HANDLE process, HMODULE module, MODULEINFO *mo
     {
         LDR_DATA_TABLE_ENTRY32 ldr_module32;

-        if (!get_ldr_module32( process, module, &ldr_module32 )) return FALSE;
-        modinfo->lpBaseOfDll = (void *)(DWORD_PTR)ldr_module32.BaseAddress;
-        modinfo->SizeOfImage = ldr_module32.SizeOfImage;
-        modinfo->EntryPoint  = (void *)(DWORD_PTR)ldr_module32.EntryPoint;
+        if (get_ldr_module32( process, module, &ldr_module32 ))
+        {
+            modinfo->lpBaseOfDll = (void *)(DWORD_PTR)ldr_module32.BaseAddress;
+            modinfo->SizeOfImage = ldr_module32.SizeOfImage;
+            modinfo->EntryPoint  = (void *)(DWORD_PTR)ldr_module32.EntryPoint;
+            found = TRUE;
+        }
     }
-    else
+    if (!found)
     {
         LDR_DATA_TABLE_ENTRY ldr_module;

diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c
index 2237bad3665..a106628a9ed 100644
--- a/dlls/psapi/tests/psapi_main.c
+++ b/dlls/psapi/tests/psapi_main.c
@@ -215,10 +215,6 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap
     MODULEINFO info;
     int i, j;
     BOOL ret;
-    BOOL fail, wow64;
-
-    ret = IsWow64Process(proc, &wow64);
-    ok(ret, "IsWow64Process failed: %lu\n", GetLastError());

for (i = 0; i < numsnap; i++)
     {
@@ -231,27 +227,16 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap
         mxsnap[i].num_modules = min(needed, sizeof(mxsnap[i].modules)) / sizeof(HMODULE);
         for (j = 0; j < mxsnap[i].num_modules; j++)
         {
-            /* temporary todo until GetModuleBaseName and friends are fixed */
-            if ((fail = sizeof(void*) == 8 && wow64))
-                switch (mxsnap[i].list)
-                {
-                case LIST_MODULES_32BIT:   fail = FALSE; break;
-                case LIST_MODULES_DEFAULT: fail = j >= 1; break;
-                case LIST_MODULES_ALL:     fail = j >= mxsnap[0].num_modules; break;
-                case LIST_MODULES_64BIT:   break;
-                }
             ret = GetModuleBaseNameA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer));
             ok(ret, "GetModuleBaseName failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]);
             ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer));
             ok(ret, "GetModuleFileNameEx failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]);
             memset(&info, 0, sizeof(info));
             ret = GetModuleInformation(proc, mxsnap[i].modules[j], &info, sizeof(info));
-            todo_wine_if(fail) {
             ok(ret, "GetModuleInformation failed: %lu\n", GetLastError());
             ok(info.lpBaseOfDll == mxsnap[i].modules[j], "expected %p, got %p\n", mxsnap[i].modules[j], info.lpBaseOfDll);
             ok(info.SizeOfImage, "image size was 0\n");
             /* info.EntryPoint to be checked */
-            }
         }
         winetest_pop_context();
     }