Skip to content

W
wine-cw
Commit 9f32d6d6 authored by Dylan Smith's avatar Dylan Smith Committed by Alexandre Julliard
Browse files
Options

user32: Prevent resize of minimized windows from SetWindowPos.

parent f35dabad
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 3 deletions
dlls/user32/tests/win.c
View file @ 9f32d6d6
...@@ -4923,7 +4923,7 @@ static void test_ShowWindow(void) ...@@ -4923,7 +4923,7 @@ static void test_ShowWindow(void)
SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER);
ok(ret, "not expected ret: %lu\n", ret); ok(ret, "not expected ret: %lu\n", ret);
GetWindowRect(hwnd, &rc); GetWindowRect(hwnd, &rc);
todo_wine ok(EqualRect(&rc, &rcMinimized), "rects should match\n"); ok(EqualRect(&rc, &rcMinimized), "rects should match\n");
ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd, SW_RESTORE);
ok(ret, "not expected ret: %lu\n", ret); ok(ret, "not expected ret: %lu\n", ret);
......
dlls/user32/winpos.c
View file @ 9f32d6d6
...@@ -1519,8 +1519,16 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS* pWinpos, RECT* pNewWindowRect, RECT ...@@ -1519,8 +1519,16 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS* pWinpos, RECT* pNewWindowRect, RECT
if (!(pWinpos->flags & SWP_NOSIZE)) if (!(pWinpos->flags & SWP_NOSIZE))
{ {
pNewWindowRect->right = pNewWindowRect->left + pWinpos->cx; if (wndPtr->dwStyle & WS_MINIMIZE)
pNewWindowRect->bottom = pNewWindowRect->top + pWinpos->cy; {
pNewWindowRect->right = pNewWindowRect->left + GetSystemMetrics(SM_CXICON);
pNewWindowRect->bottom = pNewWindowRect->top + GetSystemMetrics(SM_CYICON);
}
else
{
pNewWindowRect->right = pNewWindowRect->left + pWinpos->cx;
pNewWindowRect->bottom = pNewWindowRect->top + pWinpos->cy;
}
} }
if (!(pWinpos->flags & SWP_NOMOVE)) if (!(pWinpos->flags & SWP_NOMOVE))
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment