ShowWindows(SW_SHOWMAXIMIZED) should ignore WS_MAXIMIZE window state [Bug:1735]

[Vitaliy Margolen]

ChangeLog:
ShowWindows(SW_SHOWMAXIMIZED) should ignore WS_MAXIMIZE window state [Bug:1735]
Change tests accordingly.

 dlls/user/tests/msg.c |    6 +++---
 dlls/x11drv/winpos.c  |    4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)
-------------- next part --------------
871fb8dc4aa114f5bd775c6dbdefab0ed62bec73
diff --git a/dlls/user/tests/msg.c b/dlls/user/tests/msg.c
index d04aeeb..be270e8 100644
--- a/dlls/user/tests/msg.c
+++ b/dlls/user/tests/msg.c
@@ -3081,11 +3081,11 @@ static void test_showwindow(void)
 
     trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for invisible popup window\n");
     ShowWindow(hwnd, SW_SHOWMAXIMIZED);
-    ok_sequence(WmShowMaxPopupResizedSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", TRUE);
+    ok_sequence(WmShowMaxPopupResizedSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE);
     trace("done\n");
 
     GetWindowRect(hwnd, &rc);
-    todo_wine ok( rc.right-rc.left == GetSystemMetrics(SM_CXSCREEN) &&
+    ok( rc.right-rc.left == GetSystemMetrics(SM_CXSCREEN) &&
         rc.bottom-rc.top == GetSystemMetrics(SM_CYSCREEN),
         "Invalid maximized size after ShowWindow (%ld,%ld)-(%ld,%ld)\n",
         rc.left, rc.top, rc.right, rc.bottom);
@@ -3105,7 +3105,7 @@ static void test_showwindow(void)
 
     trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for invisible popup window\n");
     ShowWindow(hwnd, SW_SHOWMAXIMIZED);
-    ok_sequence(WmShowMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", TRUE);
+    ok_sequence(WmShowMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE);
     trace("done\n");
     DestroyWindow(hwnd);
     flush_sequence();
diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index 9eee38a..f09c36c 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -966,9 +966,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c
 
 	case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */
             swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
-            if( !(style & WS_MAXIMIZE) )
-		 swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos );
-            else swp |= SWP_NOSIZE | SWP_NOMOVE;
+            swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos );
             break;
 
 	case SW_SHOWNA: