[PATCH v2 4/8] ntdll/tests: Add more NtMapViewOfSection tests with zero_bits

[Rémi Bernon]

Signed-off-by: Rémi Bernon 
---
 dlls/ntdll/tests/virtual.c | 89 +++++++++++++++++++++++++-------------
 1 file changed, 60 insertions(+), 29 deletions(-)

diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c
index 2a71a561a90..c02dbd88a54 100644
--- a/dlls/ntdll/tests/virtual.c
+++ b/dlls/ntdll/tests/virtual.c
@@ -197,40 +197,95 @@ static void test_MapViewOfSection(void)
     ok(status == STATUS_SUCCESS, "NtMapViewOfSection returned %08x\n", status);
     ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr);

-    /* for some unknown reason NtMapViewOfSection fails with STATUS_NO_MEMORY when zero_bits != 0 ? */
+    /* 1 zero bits should zero 63-31 upper bits */
     ptr2 = NULL;
     size = 0;
-    zero_bits = 12;
+    zero_bits = 1;
     offset.QuadPart = 0;
     status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
     ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY,
        "NtMapViewOfSection returned %08x\n", status);
     if (status == STATUS_SUCCESS)
     {
+        todo_wine_if((UINT_PTR)ptr2 >> (32 - zero_bits))
+        ok(((UINT_PTR)ptr2 >> (32 - zero_bits)) == 0,
+           "NtMapViewOfSection returned address: %p\n", ptr2);
+
         status = NtUnmapViewOfSection(process, ptr2);
         ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08x\n", status);
     }

+    for (zero_bits = 2; zero_bits <= 20; zero_bits++)
+    {
+        ptr2 = NULL;
+        size = 0;
+        offset.QuadPart = 0;
+        status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
+        ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY,
+           "NtMapViewOfSection with %d zero_bits returned %08x\n", zero_bits, status);
+        if (status == STATUS_SUCCESS)
+        {
+            todo_wine_if((UINT_PTR)ptr2 >> (32 - zero_bits))
+            ok(((UINT_PTR)ptr2 >> (32 - zero_bits)) == 0,
+               "NtMapViewOfSection with %d zero_bits returned address %p\n", zero_bits, ptr2);
+
+            status = NtUnmapViewOfSection(process, ptr2);
+            ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08x\n", status);
+        }
+    }
+
+    /* 21 zero bits never succeeds */
     ptr2 = NULL;
     size = 0;
-    zero_bits = 16;
+    zero_bits = 21;
+    offset.QuadPart = 0;
     status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
     todo_wine
-    ok(status == STATUS_NO_MEMORY, "NtMapViewOfSection returned %08x\n", status);
+    ok(status == STATUS_NO_MEMORY || status == STATUS_INVALID_PARAMETER,
+       "NtMapViewOfSection returned %08x\n", status);
     if (status == STATUS_SUCCESS)
     {
         status = NtUnmapViewOfSection(process, ptr2);
         ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08x\n", status);
     }

-    /* 22 zero bits isn't acceptable */
+    /* 22 zero bits is invalid */
     ptr2 = NULL;
     size = 0;
     zero_bits = 22;
+    offset.QuadPart = 0;
     status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
     ok(status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER,
        "NtMapViewOfSection returned %08x\n", status);

+    /* zero bits > 31 should be considered as bitmask on 64bit and WoW64 */
+    ptr2 = NULL;
+    size = 0;
+    zero_bits = 0x1fffffff;
+    offset.QuadPart = 0;
+    status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
+
+    if (sizeof(void *) == sizeof(int) && (!pIsWow64Process ||
+        !pIsWow64Process(NtCurrentProcess(), &is_wow64) || !is_wow64))
+    {
+        ok(status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %08x\n", status);
+    }
+    else
+    {
+        todo_wine
+        ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY,
+           "NtMapViewOfSection returned %08x\n", status);
+        if (status == STATUS_SUCCESS)
+        {
+            todo_wine_if((UINT_PTR)ptr2 & ~zero_bits)
+            ok(((UINT_PTR)ptr2 & ~zero_bits) == 0,
+               "NtMapViewOfSection returned address %p\n", ptr2);
+
+            status = NtUnmapViewOfSection(process, ptr2);
+            ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08x\n", status);
+        }
+    }
+
     /* mapping at the same page conflicts */
     ptr2 = ptr;
     size = 0;
@@ -273,30 +328,6 @@ static void test_MapViewOfSection(void)
        broken(STATUS_MAPPED_ALIGNMENT) /* w1064v1809 inconsistently returns STATUS_MAPPED_ALIGNMENT or STATUS_INVALID_PARAMETER */,
        "NtMapViewOfSection returned %08x\n", status);

-    ptr2 = (char *)ptr + 0x1000;
-    size = 0;
-    zero_bits = 16;
-    offset.QuadPart = 0;
-    status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
-    ok(status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER,
-       "NtMapViewOfSection returned %08x\n", status);
-
-    ptr2 = (char *)ptr + 0x1001;
-    size = 0;
-    zero_bits = 16;
-    offset.QuadPart = 0;
-    status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
-    ok(status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER,
-       "NtMapViewOfSection returned %08x\n", status);
-
-    ptr2 = (char *)ptr + 0x1000;
-    size = 0;
-    zero_bits = 16;
-    offset.QuadPart = 1;
-    status = NtMapViewOfSection(mapping, process, &ptr2, zero_bits, 0, &offset, &size, 1, 0, PAGE_READWRITE);
-    ok(status == STATUS_INVALID_PARAMETER_4 || status == STATUS_INVALID_PARAMETER,
-       "NtMapViewOfSection returned %08x\n", status);
-
     if (sizeof(void *) == sizeof(int) && (!pIsWow64Process ||
         !pIsWow64Process(NtCurrentProcess(), &is_wow64) || !is_wow64))
     {