Alexandre Julliard : Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE. "

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1f17051028cd721b04f1829922e3525df5cd2308
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1f17051028cd721b04f182992...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Sun May  6 11:09:33 2018 +0200

Revert "user32: SetWindowPos() should check the final window position in screen coords before adding SWP_NOMOVE."

This reverts commit 38a76ecb0386d37d30b06b7947ed52be77ec9f1e.
It has no effect, the coordinates are identical either way.

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/user32/winpos.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index c1b55b5..b4be7f0 100644
--- 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;
-    pt.y = winpos->y;
-    ClientToScreen( parent, &pt );
-    if ((window_rect.left == pt.x) && (window_rect.top == pt.y))
+    if ((window_rect.left == winpos->x) && (window_rect.top == winpos->y))
         winpos->flags |= SWP_NOMOVE;    /* Already the right position */
 
     if ((wndPtr->dwStyle & (WS_POPUP | WS_CHILD)) != WS_CHILD)