Revert "user32: SetWindowPos() should check the final window position in screen…

Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE." This reverts commit 38a76ecb. It has no effect, the coordinates are identical either way. Signed-off-by: Alexandre Julliard <julliard@winehq.org>

Revert "user32: SetWindowPos() should check the final window position in screen…
1f170510 · Alexandre Julliard · 540c48b9 · 1f170510
Commit 1f170510 authored May 06, 2018 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

winpos.c dlls/user32/winpos.c +2 -6

No files found.
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -1924,7 +1924,6 @@ static BOOL fixup_flags( WINDOWPOS *winpos )
 {
    HWND parent;
    RECT window_rect;
-    POINT pt;
    WND *wndPtr = WIN_GetPtr( winpos->hwnd );
    BOOL ret = TRUE;
@@ -1956,15 +1955,12 @@ static BOOL fixup_flags( WINDOWPOS *winpos )
        if (!(winpos->flags & SWP_SHOWWINDOW)) winpos->flags |= SWP_NOREDRAW;
    }
-    WIN_GetRectangles( winpos->hwnd, COORDS_SCREEN, &window_rect, NULL );
+    WIN_GetRectangles( winpos->hwnd, COORDS_PARENT, &window_rect, NULL );
    if ((window_rect.right - window_rect.left == winpos->cx) &&
        (window_rect.bottom - window_rect.top == winpos->cy))
        winpos->flags |= SWP_NOSIZE;    /* Already the right size */
-    pt.x = winpos->x;
+    if ((window_rect.left == winpos->x) && (window_rect.top == winpos->y))
-    pt.y = winpos->y;
-    ClientToScreen( parent, &pt );
-    if ((window_rect.left == pt.x) && (window_rect.top == pt.y))
        winpos->flags |= SWP_NOMOVE;    /* Already the right position */
    if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)