ChangeSet ID: 21569 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@winehq.org 2005/11/30 06:03:55
Modified files: dlls/user/tests: msg.c dlls/x11drv : winpos.c
Log message: Vitaliy Margolen wine-patch@kievinfo.com ShowWindows(SW_SHOWMAXIMIZED) should ignore WS_MAXIMIZE window state. Change tests accordingly.
Patch: http://cvs.winehq.org/patch.py?id=21569
Old revision New revision Changes Path 1.106 1.107 +3 -3 wine/dlls/user/tests/msg.c 1.142 1.143 +1 -3 wine/dlls/x11drv/winpos.c
Index: wine/dlls/user/tests/msg.c diff -u -p wine/dlls/user/tests/msg.c:1.106 wine/dlls/user/tests/msg.c:1.107 --- wine/dlls/user/tests/msg.c:1.106 30 Nov 2005 12: 3:55 -0000 +++ wine/dlls/user/tests/msg.c 30 Nov 2005 12: 3:55 -0000 @@ -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(); Index: wine/dlls/x11drv/winpos.c diff -u -p wine/dlls/x11drv/winpos.c:1.142 wine/dlls/x11drv/winpos.c:1.143 --- wine/dlls/x11drv/winpos.c:1.142 30 Nov 2005 12: 3:55 -0000 +++ wine/dlls/x11drv/winpos.c 30 Nov 2005 12: 3:55 -0000 @@ -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: