Paul Vriens : user32/tests: Fix crash on Win9x/WinMe.

Alexandre Julliard julliard at winehq.org
Mon Feb 8 11:06:06 CST 2010


Module: wine
Branch: master
Commit: 1cbedfb2047d1d3d9728e35ea6616bf674eb739d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1cbedfb2047d1d3d9728e35ea6616bf674eb739d

Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date:   Sun Feb  7 13:33:51 2010 +0100

user32/tests: Fix crash on Win9x/WinMe.

---

 dlls/user32/tests/win.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 86e955c..2799ec8 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 */




More information about the wine-cvs mailing list