Add a test case for Virtual* APIs, fix a few bugs discovered by it.

dlls/kernel/tests/.cvsignore

@@ -21,3 +21,4 @@ process.ok
 profile.ok
 testlist.c
 thread.ok
+virtual.ok

dlls/kernel/tests/Makefile.in

@@ -25,7 +25,8 @@ CTESTS = \
 	pipe.c \
 	process.c \
 	profile.c \
-	thread.c
+	thread.c \
+	virtual.c
 
 @MAKE_TEST_RULES@
 

dlls/kernel/tests/virtual.c

+/*
+ * Unit test suite for Virtual* family of APIs.
+ *
+ * Copyright 2004 Dmitry Timoshkov
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <stdarg.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "winerror.h"
+#include "wine/test.h"
+
+static void test_VirtualAlloc(void)
+{
+    void *addr1, *addr2;
+    DWORD old_prot;
+    MEMORY_BASIC_INFORMATION info;
+
+    SetLastError(0xdeadbeef);
+    addr1 = VirtualAlloc(0, 0, MEM_RESERVE, PAGE_NOACCESS);
+    ok(addr1 == NULL, "VirtualAlloc should fail on zero-sized allocation\n");
+    ok(GetLastError() == ERROR_INVALID_PARAMETER /* NT */ ||
+       GetLastError() == ERROR_NOT_ENOUGH_MEMORY, /* Win9x */
+        "got %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError());
+
+    addr1 = VirtualAlloc(0, 0xFFFC, MEM_RESERVE, PAGE_NOACCESS);
+    ok(addr1 != NULL, "VirtualAlloc failed\n");
+
+    /* test a not committed memory */
+    ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info),
+        "VirtualQuery failed\n");
+    ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1);
+    ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1);
+    ok(info.AllocationProtect == PAGE_NOACCESS, "%lx != PAGE_NOACCESS\n", info.AllocationProtect);
+    ok(info.RegionSize == 0x10000, "%lx != 0x10000\n", info.RegionSize);
+    ok(info.State == MEM_RESERVE, "%lx != MEM_RESERVE\n", info.State);
+    /* NT reports Protect == 0 for a not committed memory block */
+    ok(info.Protect == 0 /* NT */ ||
+       info.Protect == PAGE_NOACCESS, /* Win9x */
+        "%lx != PAGE_NOACCESS\n", info.Protect);
+    ok(info.Type == MEM_PRIVATE, "%lx != MEM_RESERVE\n", info.Type);
+
+    SetLastError(0xdeadbeef);
+    ok(!VirtualProtect(addr1, 0xFFFC, PAGE_READONLY, &old_prot),
+       "VirtualProtect should fail on a not committed memory\n");
+    ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */
+        "got %ld, expected ERROR_INVALID_ADDRESS\n", GetLastError());
+
+    addr2 = VirtualAlloc(addr1, 0x1000, MEM_COMMIT, PAGE_NOACCESS);
+    ok(addr1 == addr2, "VirtualAlloc failed\n");
+
+    /* test a committed memory */
+    ok(VirtualQuery(addr1, &info, sizeof(info)) == sizeof(info),
+        "VirtualQuery failed\n");
+    ok(info.BaseAddress == addr1, "%p != %p\n", info.BaseAddress, addr1);
+    ok(info.AllocationBase == addr1, "%p != %p\n", info.AllocationBase, addr1);
+    ok(info.AllocationProtect == PAGE_NOACCESS, "%lx != PAGE_NOACCESS\n", info.AllocationProtect);
+    ok(info.RegionSize == 0x1000, "%lx != 0x1000\n", info.RegionSize);
+    ok(info.State == MEM_COMMIT, "%lx != MEM_COMMIT\n", info.State);
+    /* this time NT reports PAGE_NOACCESS as well */
+    ok(info.Protect == PAGE_NOACCESS, "%lx != PAGE_NOACCESS\n", info.Protect);
+    ok(info.Type == MEM_PRIVATE, "%lx != MEM_RESERVE\n", info.Type);
+
+    /* this should fail, since not the whole range is committed yet */
+    SetLastError(0xdeadbeef);
+    ok(!VirtualProtect(addr1, 0xFFFC, PAGE_READONLY, &old_prot),
+        "VirtualProtect should fail on a not committed memory\n");
+    ok(GetLastError() == ERROR_INVALID_ADDRESS /* NT */ ||
+       GetLastError() == ERROR_INVALID_PARAMETER, /* Win9x */
+        "got %ld, expected ERROR_INVALID_ADDRESS\n", GetLastError());
+
+    ok(VirtualProtect(addr1, 0x1000, PAGE_READONLY, &old_prot), "VirtualProtect failed\n");
+    ok(old_prot == PAGE_NOACCESS,
+        "wrong old protection: got %04lx instead of PAGE_NOACCESS\n", old_prot);
+
+    ok(VirtualProtect(addr1, 0x1000, PAGE_READWRITE, &old_prot), "VirtualProtect failed\n");
+    ok(old_prot == PAGE_READONLY,
+        "wrong old protection: got %04lx instead of PAGE_READONLY\n", old_prot);
+
+    ok(!VirtualFree(addr1, 0x10000, 0), "VirtualFree should fail with type 0\n");
+    ok(GetLastError() == ERROR_INVALID_PARAMETER,
+        "got %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError());
+
+    ok(VirtualFree(addr1, 0x10000, MEM_DECOMMIT), "VirtualFree failed\n");
+
+    /* if the type is MEM_RELEASE, size must be 0 */
+    ok(!VirtualFree(addr1, 1, MEM_RELEASE), "VirtualFree should fail\n");
+    ok(GetLastError() == ERROR_INVALID_PARAMETER,
+        "got %ld, expected ERROR_INVALID_PARAMETER\n", GetLastError());
+
+    ok(VirtualFree(addr1, 0, MEM_RELEASE), "VirtualFree failed\n");
+}
+
+START_TEST(virtual)
+{
+    test_VirtualAlloc();
+}

dlls/ntdll/virtual.c

@@ -1001,6 +1001,8 @@ NTSTATUS WINAPI NtAllocateVirtualMemory( HANDLE process, PVOID *ret, PVOID addr,
 
     TRACE("%p %08lx %lx %08lx\n", addr, size, type, protect );
 
+    if (!size) return STATUS_INVALID_PARAMETER;
+
     /* Round parameters to a page boundary */
 
     if (size > 0x7fc00000) return STATUS_WORKING_SET_LIMIT_RANGE; /* 2Gb - 4Mb */
@@ -1130,7 +1132,7 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, ULONG *siz
 
     if ((type != MEM_DECOMMIT) && (type != MEM_RELEASE))
     {
-        ERR("called with wrong free type flags (%08lx) !\n", type);
+        WARN("called with wrong free type flags (%08lx) !\n", type);
         return STATUS_INVALID_PARAMETER;
     }
 
@@ -1193,7 +1195,7 @@ NTSTATUS WINAPI NtProtectVirtualMemory( HANDLE process, PVOID *addr_ptr, ULONG *
     VIRTUAL_GetWin32Prot( *p, &prot, NULL );
     for (i = size >> page_shift; i; i--, p++)
     {
-        if (!(*p & VPROT_COMMITTED)) return STATUS_INVALID_PARAMETER;
+        if (!(*p & VPROT_COMMITTED)) return STATUS_NOT_COMMITTED;
     }
 
     if (old_prot) *old_prot = prot;