wine/dlls/user tests/msg.c win.c

[Alexandre Julliard]

ChangeSet ID:	21568
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/30 06:03:16

Modified files:
    dlls/user/tests: msg.c 
    dlls/user      : win.c

Log message:
    Vitaliy Margolen 
    New maximized visible window should be shown with
    ShowWindow(SW_SHOW).

Patch: http://cvs.winehq.org/patch.py?id=21568

Old revision  New revision  Changes     Path
 1.105         1.106         +1 -1       wine/dlls/user/tests/msg.c
 1.23          1.24          +1 -1       wine/dlls/user/win.c

Index: wine/dlls/user/tests/msg.c
diff -u -p wine/dlls/user/tests/msg.c:1.105 wine/dlls/user/tests/msg.c:1.106
--- wine/dlls/user/tests/msg.c:1.105	30 Nov 2005 12: 3:16 -0000
+++ wine/dlls/user/tests/msg.c	30 Nov 2005 12: 3:16 -0000
@@ -3117,7 +3117,7 @@ static void test_showwindow(void)
     hwnd = CreateWindowExA(0, "TestWindowClass", "Test popup", WS_POPUP | WS_MAXIMIZE | WS_VISIBLE,
                            100, 100, 200, 200, 0, 0, 0, NULL);
     ok (hwnd != 0, "Failed to create popup window\n");
-    ok_sequence(WmCreateMaxPopupSeq, "CreateWindow(WS_MAXIMIZED):popup", TRUE);
+    ok_sequence(WmCreateMaxPopupSeq, "CreateWindow(WS_MAXIMIZED):popup", FALSE);
     trace("done\n");
     DestroyWindow(hwnd);
     flush_sequence();
Index: wine/dlls/user/win.c
diff -u -p wine/dlls/user/win.c:1.23 wine/dlls/user/win.c:1.24
--- wine/dlls/user/win.c:1.23	30 Nov 2005 12: 3:16 -0000
+++ wine/dlls/user/win.c	30 Nov 2005 12: 3:16 -0000
@@ -1068,7 +1068,7 @@ static HWND WIN_CreateWindowEx( CREATEST
     if (cs->style & WS_VISIBLE)
     {
         if (cs->style & WS_MAXIMIZE)
-            sw = SW_SHOWMAXIMIZED;
+            sw = SW_SHOW;
         else if (cs->style & WS_MINIMIZE)
             sw = SW_SHOWMINIMIZED;