user32: Fix behavior of GetWindowInfo(0, NULL).

Windows doesn't do a NULL check on the WINDOWINFO pointer. Signed-off-by: Brendan Shanks <bshanks@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Fix behavior of GetWindowInfo(0, NULL).
c8dbb0c4 · Brendan Shanks · Alexandre Julliard · 38dd9faf · c8dbb0c4 · c8dbb0c4
Commit c8dbb0c4 authored Sep 23, 2019 by Brendan Shanks Committed by Alexandre Julliard Sep 24, 2019
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

win.c dlls/user32/tests/win.c +1 -1

win.c dlls/user32/win.c +5 -1

No files found.
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -1007,7 +1007,7 @@ static void test_window_info(const char *hook, HWND hwnd)
    if (0) {    /* crashes on XP, 2003 */
    SetLastError(0xdeadbeef);
    ok(!pGetWindowInfo(0, NULL), "GetWindowInfo should fail\n");
-    todo_wine ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
+    ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE,
       "got error %d expected ERROR_INVALID_WINDOW_HANDLE\n", GetLastError());
    }


--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -3845,9 +3845,13 @@ UINT WINAPI GetWindowModuleFileNameW( HWND hwnd, LPWSTR module, UINT size )
 */
 BOOL WINAPI DECLSPEC_HOTPATCH GetWindowInfo( HWND hwnd, PWINDOWINFO pwi)
 {
+    RECT rcWindow, rcClient;
+
+    if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &rcWindow, &rcClient )) return FALSE;
    if (!pwi) return FALSE;
-    if (!WIN_GetRectangles( hwnd, COORDS_SCREEN, &pwi->rcWindow, &pwi->rcClient )) return FALSE;

+    pwi->rcWindow = rcWindow;
+    pwi->rcClient = rcClient;
    pwi->dwStyle = GetWindowLongW(hwnd, GWL_STYLE);
    pwi->dwExStyle = GetWindowLongW(hwnd, GWL_EXSTYLE);
    pwi->dwWindowStatus = ((GetActiveWindow() == hwnd) ? WS_ACTIVECAPTION : 0);