[PATCH v5 2/6] ntdll/tests: Call NtFreeVirtualMemory instead of VirtualFree

Rémi Bernon rbernon at codeweavers.com
Wed May 29 07:04:40 CDT 2019


Memory allocated with NtAllocateVirtualMemory should be freed with
NtFreeVirtualMemory, for consistency.

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/ntdll/tests/virtual.c | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c
index 63300ac9460..14eafe5cd89 100644
--- a/dlls/ntdll/tests/virtual.c
+++ b/dlls/ntdll/tests/virtual.c
@@ -41,7 +41,12 @@ static void test_AllocateVirtualMemory(void)
                                       MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE);
     todo_wine
     ok(status == STATUS_CONFLICTING_ADDRESSES, "NtAllocateVirtualMemory returned %08x\n", status);
-    if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n");
+    if (status == STATUS_SUCCESS)
+    {
+        size = 0;
+        status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE);
+        ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2);
+    }
 
     /* 21 zero bits is valid */
     size = 0x1000;
@@ -50,7 +55,12 @@ static void test_AllocateVirtualMemory(void)
                                       MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE);
     ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY,
        "NtAllocateVirtualMemory returned %08x\n", status);
-    if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n");
+    if (status == STATUS_SUCCESS)
+    {
+        size = 0;
+        status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE);
+        ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2);
+    }
 
     /* 22 zero bits is invalid */
     size = 0x1000;
@@ -58,7 +68,12 @@ static void test_AllocateVirtualMemory(void)
     status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size,
                                       MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE);
     ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status);
-    if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n");
+    if (status == STATUS_SUCCESS)
+    {
+        size = 0;
+        status = pNtFreeVirtualMemory(GetCurrentProcess(), &addr2, &size, MEM_RELEASE);
+        ok(status == STATUS_SUCCESS, "pNtFreeVirtualMemory return %08x, addr2: %p\n", status, addr2);
+    }
 
     /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */
     size = 0x1000;
-- 
2.20.1




More information about the wine-devel mailing list