[2/2] user32: Fix error handling in EndDeferWindowPos.

Sebastian Lackner sebastian at fds-team.de
Thu Feb 16 14:59:39 CST 2017


From: Rodrigo Rivas <rodrigorivascosta at gmail.com>

Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
 dlls/user32/tests/win.c |    1 -
 dlls/user32/winpos.c    |    9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 0046c7cf512..70c13705bbd 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -9539,7 +9539,6 @@ todo_wine
     DestroyWindow(hwnd);
 
     ret = EndDeferWindowPos(hdwp);
-todo_wine
     ok(ret, "got %d\n", ret);
 }
 
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index 2fa194fa1c5..d94f5a3fb8e 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -2430,7 +2430,6 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
 {
     DWP *pDWP;
     WINDOWPOS *winpos;
-    BOOL res = TRUE;
     int i;
 
     TRACE("%p\n", hdwp);
@@ -2442,20 +2441,20 @@ BOOL WINAPI EndDeferWindowPos( HDWP hdwp )
         return FALSE;
     }
 
-    for (i = 0, winpos = pDWP->winPos; res && i < pDWP->actualCount; i++, winpos++)
+    for (i = 0, winpos = pDWP->winPos; i < pDWP->actualCount; i++, winpos++)
     {
         TRACE("hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n",
                winpos->hwnd, winpos->hwndInsertAfter, winpos->x, winpos->y,
                winpos->cx, winpos->cy, winpos->flags);
 
         if (WIN_IsCurrentThread( winpos->hwnd ))
-            res = USER_SetWindowPos( winpos );
+            USER_SetWindowPos( winpos );
         else
-            res = SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos );
+            SendMessageW( winpos->hwnd, WM_WINE_SETWINDOWPOS, 0, (LPARAM)winpos );
     }
     HeapFree( GetProcessHeap(), 0, pDWP->winPos );
     HeapFree( GetProcessHeap(), 0, pDWP );
-    return res;
+    return TRUE;
 }
 
 
-- 
2.11.0



More information about the wine-patches mailing list