Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[KERNEL32_WINETEST]

Browse source 
Addendum to 55888:
allow to run MEM_RESET tests in interactive mode.

svn path=/trunk/; revision=55890
This commit is contained in:
Sylvain Petreolle 2012-02-27 20:19:21 +00:00
parent 1efde9717f
commit 64be055c58
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
rostests/winetests/kernel32/virtual.c
View file

@ -298,8 +298,8 @@ static void test_VirtualAlloc(void)
memset( addr1, 0x55, 20 ); memset( addr1, 0x55, 20 );
ok( *(DWORD *)addr1 == 0x55555555, "wrong data %x\n", *(DWORD *)addr1 ); ok( *(DWORD *)addr1 == 0x55555555, "wrong data %x\n", *(DWORD *)addr1 );
skip("MEM_RESET is not currently supported\n"); if(winetest_interactive)
#if 0 {
addr2 = VirtualAlloc( addr1, 0x1000, MEM_RESET, PAGE_NOACCESS ); addr2 = VirtualAlloc( addr1, 0x1000, MEM_RESET, PAGE_NOACCESS );
ok( addr2 == addr1 || broken( !addr2 && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ ok( addr2 == addr1 || broken( !addr2 && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */
"VirtualAlloc failed err %u\n", GetLastError() ); "VirtualAlloc failed err %u\n", GetLastError() );
@ -325,7 +325,10 @@ static void test_VirtualAlloc(void)
ok( !addr2, "VirtualAlloc failed\n" ); ok( !addr2, "VirtualAlloc failed\n" );
ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_ADDRESS, "wrong error %u\n", GetLastError() );
} }
#endif }
else
skip("MEM_RESET is not currently supported\n");
/* invalid protection values */ /* invalid protection values */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
addr2 = VirtualAlloc(NULL, 0x1000, MEM_RESERVE, 0); addr2 = VirtualAlloc(NULL, 0x1000, MEM_RESERVE, 0);
@ -742,8 +745,8 @@ static void test_MapViewOfFile(void)
ok(info.Type == MEM_MAPPED, "Type should have been MEM_MAPPED instead of 0x%x\n", info.Type); 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(winetest_interactive)
#if 0 {
addr = VirtualAlloc( ptr, MAPPING_SIZE, MEM_RESET, PAGE_READONLY ); addr = VirtualAlloc( ptr, MAPPING_SIZE, MEM_RESET, PAGE_READONLY );
ok( addr == ptr || broken(!addr && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */ ok( addr == ptr || broken(!addr && GetLastError() == ERROR_INVALID_PARAMETER), /* win9x */
"VirtualAlloc failed with error %u\n", GetLastError() ); "VirtualAlloc failed with error %u\n", GetLastError() );
@ -752,7 +755,9 @@ static void test_MapViewOfFile(void)
ok( !ret || broken(ret) /* win9x */, "VirtualFree succeeded\n" ); ok( !ret || broken(ret) /* win9x */, "VirtualFree succeeded\n" );
if (!ret) if (!ret)
ok( GetLastError() == ERROR_INVALID_PARAMETER, "VirtualFree failed with %u\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "VirtualFree failed with %u\n", GetLastError() );
#endif }
else
skip("MEM_RESET is not currently supported\n");
ret = UnmapViewOfFile(ptr2); ret = UnmapViewOfFile(ptr2);
ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError()); ok(ret, "UnmapViewOfFile failed with error %d\n", GetLastError());
@ -1089,8 +1094,6 @@ static void test_IsBadCodePtr(void)
static void test_write_watch(void) static void test_write_watch(void)
{ {
skip("test_write_watch - MEM_WRITE_WATCH is currently not supported\n");
#if 0
char *base; char *base;
DWORD ret, size, old_prot; DWORD ret, size, old_prot;
MEMORY_BASIC_INFORMATION info; MEMORY_BASIC_INFORMATION info;
@ -1387,7 +1390,6 @@ static void test_write_watch(void)
if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] );
VirtualFree( base, 0, MEM_FREE ); VirtualFree( base, 0, MEM_FREE );
#endif
} }
START_TEST(virtual) START_TEST(virtual)
@ -1435,5 +1437,8 @@ START_TEST(virtual)
test_IsBadReadPtr(); test_IsBadReadPtr();
test_IsBadWritePtr(); test_IsBadWritePtr();
test_IsBadCodePtr(); test_IsBadCodePtr();
if(winetest_interactive)
test_write_watch(); test_write_watch();
else
skip("test_write_watch - MEM_WRITE_WATCH is currently not supported\n");
} }