Francois Gouget : ntdll/tests: Don't check the load address in the WoW64 case.

Alexandre Julliard julliard at winehq.org
Mon Nov 30 16:13:46 CST 2020


Module: wine
Branch: master
Commit: dcdd98f5c16a9be132a42bd4d6d0993451890c50
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=dcdd98f5c16a9be132a42bd4d6d0993451890c50

Author: Francois Gouget <fgouget at free.fr>
Date:   Mon Nov 30 16:19:10 2020 +0100

ntdll/tests: Don't check the load address in the WoW64 case.

It could sometimes be NULL, such as win32k.sys on Win <= 7.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/tests/info.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c
index 5db7a800cbe..4379d8a84c6 100644
--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -490,7 +490,7 @@ static void test_query_module(void)
         const SYSTEM_MODULE *module = &info->Modules[i];
 
         ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
-        ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i);
+        ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
         ok(module->ImageSize, "%u: got 0 size\n", i);
         ok(module->LoadCount, "%u: got 0 load count\n", i);
     }
@@ -516,7 +516,7 @@ static void test_query_module(void)
         const SYSTEM_MODULE *module = &infoex->BaseInfo;
 
         ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex);
-        ok(!!module->ImageBaseAddress, "%u: got NULL address\n", i);
+        ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name);
         ok(module->ImageSize, "%u: got 0 size\n", i);
         ok(module->LoadCount, "%u: got 0 load count\n", i);
 




More information about the wine-cvs mailing list