[PATCH 0/1] MR8440: ntdll/tests: Tweak mapped file test to better match actual use case.

[Nikolay Sivov (＠nsivov)]

Size is rounded up when committed. Also make it clear that MEM_RESERVE is
important when mapping.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8440

[PATCH 1/1] ntdll/tests: Tweak mapped file test to better match actual use case.

[Nikolay Sivov]

From: Nikolay Sivov <nsivov(a)codeweavers.com>

Size is rounded up when committed. Also make it clear that MEM_RESERVE is
important when mapping.
---
 dlls/ntdll/tests/file.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index a2ccf3f5332..c87038d5ab1 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -6078,8 +6078,12 @@ static void test_file_map_large_size(void)
     status = NtCreateSection(&hmapfile, SECTION_MAP_READ, NULL, NULL, PAGE_READWRITE, SEC_RESERVE, hfile);
     ok(!status, "Failed to create a section %#lx.\n", status);
 
-    size = 0x400 * 4;
+    size = 0x10000;
     addr = 0;
+    status = NtMapViewOfSection(hmapfile, GetCurrentProcess(), &addr, 0, 0, NULL, &size,
+            ViewUnmap, 0, PAGE_READONLY);
+    ok(status == STATUS_INVALID_VIEW_SIZE, "Failed to map the section %#lx.\n", status);
+
     status = NtMapViewOfSection(hmapfile, GetCurrentProcess(), &addr, 0, 0, NULL, &size,
             ViewUnmap, MEM_RESERVE, PAGE_READONLY);
     todo_wine
@@ -6088,12 +6092,20 @@ static void test_file_map_large_size(void)
     ret = GetFileSize(hfile, NULL);
     ok(ret == 0x400, "Unexpected size %lu.\n", ret);
 
-    addr = VirtualAlloc(addr, 0x400 * 2, MEM_COMMIT, PAGE_READWRITE);
-    ok(!!addr, "Failed to resize.\n");
+    addr = VirtualAlloc(addr, 0x500, MEM_COMMIT, PAGE_READONLY);
+    ok(!!addr, "Failed to resize, error %ld.\n", GetLastError());
+
+    ret = GetFileSize(hfile, NULL);
+    todo_wine
+    ok(ret == 0x1000, "Unexpected size %lu.\n", ret);
+
+    addr = VirtualAlloc(addr, 0x1100, MEM_COMMIT, PAGE_READONLY);
+    todo_wine
+    ok(!!addr, "Failed to resize, error %ld.\n", GetLastError());
 
     ret = GetFileSize(hfile, NULL);
     todo_wine
-    ok(ret == 4 * 0x400, "Unexpected size %lu.\n", ret);
+    ok(ret == 0x2000, "Unexpected size %lu.\n", ret);
 
     CloseHandle(hmapfile);
     CloseHandle(hfile);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8440