On Wed, May 29, 2019 at 03:13:08PM +0200, Rémi Bernon wrote:
Signed-off-by: Rémi Bernon rbernon@codeweavers.com
dlls/ntdll/tests/virtual.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 63300ac9460..f572a116eb9 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -48,7 +48,8 @@ static void test_AllocateVirtualMemory(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 21, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE);
- ok(status == STATUS_SUCCESS || status == STATUS_NO_MEMORY,
- ok((status == STATUS_SUCCESS || status == STATUS_NO_MEMORY) ||
broken(status == STATUS_INVALID_PARAMETER) /* w1064v1809 */,
See my comment about this never succeeding under Windows. Also, I'm not sure that this is really broken. So just accepting STATUS_INVALID_PARAMETER as well as STATUS_NO_MEMORY is fine.
"NtAllocateVirtualMemory returned %08x\n", status); if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n");
@@ -57,7 +58,9 @@ static void test_AllocateVirtualMemory(void) addr2 = NULL; status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 22, &size, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE);
- ok(status == STATUS_INVALID_PARAMETER_3, "NtAllocateVirtualMemory returned %08x\n", status);
- ok(status == STATUS_INVALID_PARAMETER_3 ||
broken(status == STATUS_INVALID_PARAMETER) /* w1064v1809 */,
"NtAllocateVirtualMemory returned %08x\n", status);
Again, I wouldn't describe this as broken behaviour.
if (status == STATUS_SUCCESS) ok(VirtualFree(addr2, 0, MEM_RELEASE), "VirtualFree failed\n"); /* AT_ROUND_TO_PAGE flag is not supported for NtAllocateVirtualMemory */
@@ -66,7 +69,9 @@ static void test_AllocateVirtualMemory(void) status = pNtAllocateVirtualMemory(GetCurrentProcess(), &addr2, 0, &size, MEM_RESERVE | MEM_COMMIT | AT_ROUND_TO_PAGE, PAGE_EXECUTE_READWRITE); todo_wine
- ok(status == STATUS_INVALID_PARAMETER_5, "NtAllocateVirtualMemory returned %08x\n", status);
- ok(status == STATUS_INVALID_PARAMETER_5 ||
broken(status == STATUS_INVALID_PARAMETER) /* w1064v1809 */,
"NtAllocateVirtualMemory returned %08x\n", status);
And again.
Huw.