[prev in list] [next in list] [prev in thread] [next in thread]
List: wine-devel
Subject: Re: [PATCH] ntdll/tests: Don't check the load address in the WoW64 case.
From: "Zebediah Figura (she/her)" <zfigura () codeweavers ! com>
Date: 2020-11-30 16:48:59
Message-ID: 3f22040a-def2-2870-438d-d381b1e7637c () codeweavers ! com
[Download RAW message or body]
[Attachment #2 (multipart/mixed)]
[Attachment #4 (multipart/mixed)]
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@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);
>
>
["OpenPGP_0x0D9D358A07A17840.asc" (application/pgp-keys)]
["OpenPGP_signature.asc" (application/pgp-signature)]
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic