Skip to content

W
wine-cw
Commit e4d7d902 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

kernel32/tests: Fix the write watch tests on Win98 and Win2000.

parent a0c4bfef
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 40 deletions
dlls/kernel32/tests/virtual.c
View file @ e4d7d902
...@@ -754,7 +754,8 @@ static void test_write_watch(void) ...@@ -754,7 +754,8 @@ static void test_write_watch(void)
size = 0x10000; size = 0x10000;
base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE ); base = VirtualAlloc( 0, size, MEM_RESERVE | MEM_COMMIT | MEM_WRITE_WATCH, PAGE_READWRITE );
if (!base && GetLastError() == ERROR_INVALID_PARAMETER) if (!base &&
(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_NOT_SUPPORTED))
{ {
todo_wine win_skip( "MEM_WRITE_WATCH not supported\n" ); todo_wine win_skip( "MEM_WRITE_WATCH not supported\n" );
return; return;
...@@ -770,13 +771,24 @@ static void test_write_watch(void) ...@@ -770,13 +771,24 @@ static void test_write_watch(void)
ok( info.Type == MEM_PRIVATE, "wrong Type 0x%x\n", info.Type ); ok( info.Type == MEM_PRIVATE, "wrong Type 0x%x\n", info.Type );
count = 64; count = 64;
SetLastError( 0xdeadbeef );
ret = pGetWriteWatch( 0, NULL, size, results, &count, &pagesize ); ret = pGetWriteWatch( 0, NULL, size, results, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); ok( GetLastError() == ERROR_INVALID_PARAMETER ||
broken( GetLastError() == 0xdeadbeef ), /* win98 */
"wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
ret = pGetWriteWatch( 0, GetModuleHandle(0), size, results, &count, &pagesize ); ret = pGetWriteWatch( 0, GetModuleHandle(0), size, results, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret ); if (ret)
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); {
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
}
else /* win98 */
{
ok( count == 0, "wrong count %lu\n", count );
}
ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize ); ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); ok( !ret, "GetWriteWatch failed %u\n", GetLastError() );
...@@ -882,47 +894,85 @@ static void test_write_watch(void) ...@@ -882,47 +894,85 @@ static void test_write_watch(void)
/* some invalid parameter tests */ /* some invalid parameter tests */
SetLastError( 0xdeadbeef );
count = 0; count = 0;
ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize ); ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); if (ret)
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); {
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ret = pGetWriteWatch( 0, base, size, results, NULL, &pagesize ); ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
ok( ret == ~0u, "GetWriteWatch failed %u\n", ret );
ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef );
ret = pGetWriteWatch( 0, base, size, results, NULL, &pagesize );
count = 64; ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ret = pGetWriteWatch( 0, base, size, results, &count, NULL ); ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() );
ok( ret == ~0u, "GetWriteWatch failed %u\n", ret );
ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() ); SetLastError( 0xdeadbeef );
count = 64;
count = 64; ret = pGetWriteWatch( 0, base, size, results, &count, NULL );
ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() );
ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
count = 64;
ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_NOACCESS, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
count = 0;
ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
count = 64;
ret = pGetWriteWatch( 0xdeadbeef, base, size, results, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
count = 64;
ret = pGetWriteWatch( 0, base, 0, results, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
ret = pResetWriteWatch( base, 0 );
ok( ret == ~0u, "ResetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );
ret = pResetWriteWatch( GetModuleHandle(0), size );
ok( ret == ~0u, "ResetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
}
else /* win98 is completely different */
{
SetLastError( 0xdeadbeef );
count = 64;
ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize );
ok( ret == ERROR_INVALID_PARAMETER, "GetWriteWatch succeeded %u\n", ret );
ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() );
count = 0; count = 0;
ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize ); ret = pGetWriteWatch( 0, base, size, NULL, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); ok( !ret, "GetWriteWatch failed %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
count = 64; count = 64;
ret = pGetWriteWatch( 0xdeadbeef, base, size, results, &count, &pagesize ); ret = pGetWriteWatch( 0xdeadbeef, base, size, results, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); ok( !ret, "GetWriteWatch failed %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
count = 64; count = 64;
ret = pGetWriteWatch( 0, base, 0, results, &count, &pagesize ); ret = pGetWriteWatch( 0, base, 0, results, &count, &pagesize );
ok( ret == ~0u, "GetWriteWatch failed %u\n", ret ); ok( !ret, "GetWriteWatch failed %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
ret = pResetWriteWatch( base, 0 ); ret = pResetWriteWatch( base, 0 );
ok( ret == ~0u, "ResetWriteWatch failed %u\n", ret ); ok( !ret, "ResetWriteWatch failed %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() );
ret = pResetWriteWatch( GetModuleHandle(0), size ); ret = pResetWriteWatch( GetModuleHandle(0), size );
ok( ret == ~0u, "ResetWriteWatch failed %u\n", ret ); ok( !ret, "ResetWriteWatch failed %u\n", ret );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "wrong error %u\n", GetLastError() ); }
VirtualFree( base, 0, MEM_FREE ); VirtualFree( base, 0, MEM_FREE );
...@@ -968,8 +1018,9 @@ static void test_write_watch(void) ...@@ -968,8 +1018,9 @@ static void test_write_watch(void)
count = 64; count = 64;
ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize ); ret = pGetWriteWatch( 0, base, size, results, &count, &pagesize );
ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); ok( !ret, "GetWriteWatch failed %u\n", GetLastError() );
ok( count == 1, "wrong count %lu\n", count ); ok( count == 1 || broken(count == 0), /* win98 */
ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] ); "wrong count %lu\n", count );
if (count) ok( results[0] == base + 5*pagesize, "wrong result %p\n", results[0] );
VirtualFree( base, 0, MEM_FREE ); VirtualFree( base, 0, MEM_FREE );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment