Alexandre Julliard : user32/tests: Fix the winstation tests on NT4.
Alexandre Julliard
julliard at winehq.org
Wed Sep 24 08:49:46 CDT 2008
Module: wine
Branch: master
Commit: 7e1bc58d764404e25e3aafedb27613bf8c2d0fcb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1bc58d764404e25e3aafedb27613bf8c2d0fcb
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Sep 24 14:51:05 2008 +0200
user32/tests: Fix the winstation tests on NT4.
---
dlls/user32/tests/winstation.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/winstation.c b/dlls/user32/tests/winstation.c
index 42f2644..efc122a 100644
--- a/dlls/user32/tests/winstation.c
+++ b/dlls/user32/tests/winstation.c
@@ -122,7 +122,9 @@ static void test_handles(void)
flags = 0;
ok( GetHandleInformation( w1, &flags ), "GetHandleInformation failed\n" );
- ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), "handle %p PROTECT_FROM_CLOSE set\n", w1 );
+ ok( !(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE) ||
+ broken(flags & HANDLE_FLAG_PROTECT_FROM_CLOSE), /* set on nt4 */
+ "handle %p PROTECT_FROM_CLOSE set\n", w1 );
ok( DuplicateHandle( GetCurrentProcess(), w1, GetCurrentProcess(), (PHANDLE)&w2, 0,
TRUE, DUPLICATE_SAME_ACCESS ), "DuplicateHandle failed\n" );
@@ -201,7 +203,11 @@ static void test_handles(void)
ok( GetLastError() == ERROR_BUSY, "bad last error %d\n", GetLastError() );
SetLastError( 0xdeadbeef );
- ok( !CloseHandle(d1), "closing thread desktop handle failed\n" );
+ if (CloseHandle( d1 )) /* succeeds on nt4 */
+ {
+ win_skip( "NT4 desktop handle management is completely different\n" );
+ return;
+ }
ok( GetLastError() == ERROR_INVALID_HANDLE, "bad last error %d\n", GetLastError() );
ok( DuplicateHandle( GetCurrentProcess(), d1, GetCurrentProcess(), (PHANDLE)&d2, 0,
More information about the wine-cvs
mailing list