From f051482d699341e8143e5ed8963cdc17f390310f Mon Sep 17 00:00:00 2001 From: Kamil Hornicek Date: Mon, 27 Feb 2012 19:33:15 +0000 Subject: [PATCH] [KERNEL32_WINETEST] Disable tests that would hit asserts due to current work on VM. Requested functionality is missing and will be for some time. svn path=/trunk/; revision=55888 --- rostests/winetests/kernel32/virtual.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/rostests/winetests/kernel32/virtual.c b/rostests/winetests/kernel32/virtual.c index cd5417c6fcd..95f4f18653a 100755 --- a/rostests/winetests/kernel32/virtual.c +++ b/rostests/winetests/kernel32/virtual.c @@ -298,6 +298,8 @@ static void test_VirtualAlloc(void) memset( addr1, 0x55, 20 ); ok( *(DWORD *)addr1 == 0x55555555, "wrong data %x\n", *(DWORD *)addr1 ); + skip("MEM_RESET is not currently supported\n"); +#if 0 addr2 = VirtualAlloc( addr1, 0x1000, MEM_RESET, PAGE_NOACCESS ); ok( addr2 == addr1 || broken( !addr2 && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ "VirtualAlloc failed err %u\n", GetLastError() ); @@ -323,7 +325,7 @@ static void test_VirtualAlloc(void) ok( !addr2, "VirtualAlloc failed\n" ); ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() ); } - +#endif /* invalid protection values */ SetLastError(0xdeadbeef); addr2 = VirtualAlloc(NULL, 0x1000, MEM_RESERVE, 0); @@ -740,6 +742,8 @@ static void test_MapViewOfFile(void) ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); } + skip("MEM_RESET is not currently supported\n"); +#if 0 addr = VirtualAlloc( ptr, MAPPING_SIZE, MEM_RESET, PAGE_READONLY ); ok( addr == ptr || broken(!addr && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ "VirtualAlloc failed with error %u\n", GetLastError() ); @@ -748,6 +752,7 @@ static void test_MapViewOfFile(void) ok( !ret || broken(ret) /* win9x */, "VirtualFree succeeded\n" ); if (!ret) ok( GetLastError() == ERROR_INVALID_PARAMETER, "VirtualFree failed with %u\n", GetLastError() ); +#endif ret = UnmapViewOfFile(ptr2); ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); @@ -1084,6 +1089,8 @@ static void test_IsBadCodePtr(void) static void test_write_watch(void) { + skip("test_write_watch - MEM_WRITE_WATCH is currently not supported\n"); +#if 0 char *base; DWORD ret, size, old_prot; MEMORY_BASIC_INFORMATION info; @@ -1380,6 +1387,7 @@ static void test_write_watch(void) if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); VirtualFree( base, 0, MEM_FREE ); +#endif } START_TEST(virtual)