From 1cbedfb2047d1d3d9728e35ea6616bf674eb739d Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Sun, 7 Feb 2010 13:33:51 +0100 Subject: [PATCH] user32/tests: Fix crash on Win9x/WinMe. --- dlls/user32/tests/win.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 86e955c37e2..2799ec856bc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -448,11 +448,16 @@ static void test_parent_owner(void) ok( ret == desktop, "SetParent return value %p expected %p\n", ret, desktop ); check_parents( test, child, child, 0, 0, hwndMain, test ); - ShowWindow( test, SW_SHOW ); - ret = SetParent( test, test ); - ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); - ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); - check_parents( test, child, child, 0, 0, hwndMain, test ); + if (!is_win9x) + { + ShowWindow( test, SW_SHOW ); + ret = SetParent( test, test ); + ok( ret == NULL, "SetParent return value %p expected %p\n", ret, NULL ); + ok( GetWindowLongA( test, GWL_STYLE ) & WS_VISIBLE, "window is not visible after SetParent\n" ); + check_parents( test, child, child, 0, 0, hwndMain, test ); + } + else + win_skip( "Test crashes on Win9x/WinMe\n" ); DestroyWindow( test ); /* owned popup */ -- 2.11.4.GIT