Module: wine Branch: master Commit: 5c1e6cf7cdfd791e3ec98142979a1912b0e7da21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c1e6cf7cdfd791e3ec9814297...
Author: Detlef Riekenberg wine.dev@web.de Date: Tue Nov 13 23:50:13 2012 +0100
kernel32/tests: Fix 32-bit thread test failures on NT 5.x 64bit.
---
dlls/kernel32/tests/thread.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 19726af..76a7a33 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -961,16 +961,19 @@ static void test_SetThreadContext(void) ctx.ContextFlags = CONTEXT_FULL; SetLastError(0xdeadbeef); ret = GetThreadContext( thread, &ctx ); - ok( !ret, "GetThreadContext succeeded\n" ); - ok( GetLastError() == ERROR_GEN_FAILURE || broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ - "wrong error %u\n", GetLastError() ); + ok( (!ret && (GetLastError() == ERROR_GEN_FAILURE)) || + (!ret && broken(GetLastError() == ERROR_INVALID_HANDLE)) || /* win2k */ + broken(ret), /* 32bit application on NT 5.x 64bit */ + "got %d with %u (expected FALSE with ERROR_GEN_FAILURE)\n", + ret, GetLastError() );
SetLastError(0xdeadbeef); ret = SetThreadContext( thread, &ctx ); - ok( !ret, "SetThreadContext succeeded\n" ); - ok( GetLastError() == ERROR_GEN_FAILURE || GetLastError() == ERROR_ACCESS_DENIED || - broken(GetLastError() == ERROR_INVALID_HANDLE), /* win2k */ - "wrong error %u\n", GetLastError() ); + ok( (!ret && ((GetLastError() == ERROR_GEN_FAILURE) || (GetLastError() == ERROR_ACCESS_DENIED))) || + (!ret && broken(GetLastError() == ERROR_INVALID_HANDLE)) || /* win2k */ + broken(ret), /* 32bit application on NT 5.x 64bit */ + "got %d with %u (expected FALSE with ERROR_GEN_FAILURE or ERROR_ACCESS_DENIED)\n", + ret, GetLastError() );
CloseHandle( thread ); }