[PATCH] ntdll/tests: Don't check the load address in the WoW64 case.
Zebediah Figura (she/her)
zfigura at codeweavers.com
Mon Nov 30 10:48:59 CST 2020
On 11/30/20 9:19 AM, Francois Gouget wrote:
> It could sometimes be NULL, such as win32k.sys on Win <= 7.
>
> Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
> ---
>
> Something like this then?
That seems reasonable to me, yeah.
>
> 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);
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_0x0D9D358A07A17840.asc
Type: application/pgp-keys
Size: 1769 bytes
Desc: not available
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20201130/1e45c492/attachment-0001.key>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20201130/1e45c492/attachment-0001.sig>
More information about the wine-devel
mailing list