Eric Pouech : dbghelp: Don't fail on loading 64bit modules on 32bit applications.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1648569fad8637f7901ad412c733d268997914a7
URL:    https://gitlab.winehq.org/wine/wine/-/commit/1648569fad8637f7901ad412c733d26...

Author: Eric Pouech 
Date:   Fri Mar  1 17:16:39 2024 +0100

dbghelp: Don't fail on loading 64bit modules on 32bit applications.

Signed-off-by: Eric Pouech

---

dlls/dbghelp/pe_module.c  | 3 +--
 dlls/dbghelp/tests/path.c | 4 ----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c
index 909ac794c38..06e70c35037 100644
--- a/dlls/dbghelp/pe_module.c
+++ b/dlls/dbghelp/pe_module.c
@@ -268,12 +268,11 @@ BOOL pe_map_file(HANDLE file, struct image_file_map* fmap)
         memcpy(&fmap->u.pe.opt.header32, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header32));
         break;
     case IMAGE_NT_OPTIONAL_HDR64_MAGIC:
-        if (sizeof(void*) == 4) return FALSE;
         fmap->addr_size = 64;
         memcpy(&fmap->u.pe.opt.header64, &nthdr->OptionalHeader, sizeof(fmap->u.pe.opt.header64));
         break;
     default:
-        return FALSE;
+        goto error;
     }

fmap->u.pe.builtin = !memcmp((const IMAGE_DOS_HEADER*)mapping + 1, builtin_signature, sizeof(builtin_signature));
diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c
index 479985d1c7e..9074d42ac94 100644
--- a/dlls/dbghelp/tests/path.c
+++ b/dlls/dbghelp/tests/path.c
@@ -1575,9 +1575,7 @@ static void test_load_modules_path(void)
         ok(ret, "SymInitialize failed: %lu\n", GetLastError());
         make_path(filename, topdir, NULL, L"bar.dll");
         base = SymLoadModuleExW(dummy, NULL, filename, NULL, 0x4000, 0x6666, NULL, 0);
-        todo_wine_if(sizeof(void*) == 4)
         ok(base == 0x4000, "SymLoadModuleExW failed: %lu\n", GetLastError());
-        if (base == 0x4000 && sizeof(void*) != 4) { /* temp */
         im.SizeOfStruct = sizeof(im);
         ret = SymGetModuleInfoW64(dummy, base, &im);
         ok(ret, "SymGetModuleInfow64 failed: %lu\n", GetLastError());
@@ -1610,7 +1608,6 @@ static void test_load_modules_path(void)
         }
         todo_wine
         ok(IsEqualGUID(&im.PdbSig70, &guid1), "Unexpected PDB GUID\n");
-        } /* temp */
         ret = SymCleanup(dummy);
         ok(ret, "SymCleanup failed: %lu\n", GetLastError());
         for (ptr = test->test_files; *ptr; ptr++)
@@ -1638,7 +1635,6 @@ static void test_load_modules_path(void)
         ok(ret, "Couldn't create directory %ls\n", filename);
     }
     ret = RemoveDirectoryW(topdir);
-    todo_wine /* bug in Wine not closing all mappings */
     ok(ret, "Couldn't remove directory\n");
 }