reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 20:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ShowWindows(SW_SHOWMAXIMIZED) should ignore WS_MAXIMIZE window

Browse Source 
state. Change tests accordingly.
This commit is contained in:
Vitaliy Margolen 2005-11-30 12:43:50 +01:00 committed by Alexandre Julliard
parent b78784c3f2
commit 93b63566a5
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/user/tests/msg.c
View File

@ -3081,11 +3081,11 @@ static void test_showwindow(void)
trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for invisible popup window\n"); trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for invisible popup window\n");
ShowWindow(hwnd, SW_SHOWMAXIMIZED); ShowWindow(hwnd, SW_SHOWMAXIMIZED);
ok_sequence(WmShowMaxPopupResizedSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", TRUE); ok_sequence(WmShowMaxPopupResizedSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE);
trace("done\n"); trace("done\n");
GetWindowRect(hwnd, &rc); 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), rc.bottom-rc.top == GetSystemMetrics(SM_CYSCREEN),
"Invalid maximized size after ShowWindow (%ld,%ld)-(%ld,%ld)\n", "Invalid maximized size after ShowWindow (%ld,%ld)-(%ld,%ld)\n",
rc.left, rc.top, rc.right, rc.bottom); 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"); trace("calling ShowWindow( SW_SHOWMAXIMIZE ) for invisible popup window\n");
ShowWindow(hwnd, SW_SHOWMAXIMIZED); ShowWindow(hwnd, SW_SHOWMAXIMIZED);
ok_sequence(WmShowMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", TRUE); ok_sequence(WmShowMaxPopupSeq, "ShowWindow(SW_SHOWMAXIMIZED):popup", FALSE);
trace("done\n"); trace("done\n");
DestroyWindow(hwnd); DestroyWindow(hwnd);
flush_sequence(); flush_sequence();

4
dlls/x11drv/winpos.c
View File

@ -966,9 +966,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT cmd )
case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */
swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED;
if( !(style & WS_MAXIMIZE) ) swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos );
swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos );
else swp |= SWP_NOSIZE | SWP_NOMOVE;
break; break;
case SW_SHOWNA: case SW_SHOWNA: