Rodrigo Rivas Costa : user32: Make DeferWindowPos() fail on invalid window handles.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Apr 11 10:30:31 CDT 2016
Module: wine
Branch: master
Commit: 5e65b65219bd56a5991c2c54df99b524e379846a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e65b65219bd56a5991c2c54df99b524e379846a
Author: Rodrigo Rivas Costa <rodrigorivascosta at gmail.com>
Date: Sat Apr 9 09:09:20 2016 +0300
user32: Make DeferWindowPos() fail on invalid window handles.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/tests/win.c | 35 +++++++++++++++++++++++++++++++++++
dlls/user32/winpos.c | 6 +++++-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 957e8a1d..918e1ef 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -8821,6 +8821,40 @@ static void test_winproc_limit(void)
ok(i == 1, "winproc should be called once (%d)\n", i);
}
+static void test_deferwindowpos(void)
+{
+ HDWP hdwp, hdwp2;
+ BOOL ret;
+
+ hdwp = BeginDeferWindowPos(0);
+ ok(hdwp != NULL, "got %p\n", hdwp);
+
+ ret = EndDeferWindowPos(NULL);
+ ok(!ret, "got %d\n", ret);
+
+ hdwp2 = DeferWindowPos(NULL, NULL, NULL, 0, 0, 10, 10, 0);
+todo_wine
+ ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) ||
+ broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError());
+
+ hdwp2 = DeferWindowPos((HDWP)0xdead, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0);
+todo_wine
+ ok(hdwp2 == NULL && ((GetLastError() == ERROR_INVALID_DWP_HANDLE) ||
+ broken(GetLastError() == ERROR_INVALID_WINDOW_HANDLE) /* before win8 */), "got %p, error %d\n", hdwp2, GetLastError());
+
+ hdwp2 = DeferWindowPos(hdwp, NULL, NULL, 0, 0, 10, 10, 0);
+ ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError());
+
+ hdwp2 = DeferWindowPos(hdwp, GetDesktopWindow(), NULL, 0, 0, 10, 10, 0);
+ ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError());
+
+ hdwp2 = DeferWindowPos(hdwp, (HWND)0xdead, NULL, 0, 0, 10, 10, 0);
+ ok(hdwp2 == NULL && GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "got %p, error %d\n", hdwp2, GetLastError());
+
+ ret = EndDeferWindowPos(hdwp);
+ ok(ret, "got %d\n", ret);
+}
+
START_TEST(win)
{
char **argv;
@@ -8963,6 +8997,7 @@ START_TEST(win)
test_GetMessagePos();
test_activateapp(hwndMain);
test_winproc_handles(argv[0]);
+ test_deferwindowpos();
/* add the tests above this line */
if (hhook) UnhookWindowsHookEx(hhook);
diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c
index f92a3dc..4915aad 100644
--- a/dlls/user32/winpos.c
+++ b/dlls/user32/winpos.c
@@ -2348,7 +2348,11 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter,
hdwp, hwnd, hwndAfter, x, y, cx, cy, flags);
hwnd = WIN_GetFullHandle( hwnd );
- if (is_desktop_window( hwnd )) return 0;
+ if (is_desktop_window( hwnd ) || !IsWindow( hwnd ))
+ {
+ SetLastError( ERROR_INVALID_WINDOW_HANDLE );
+ return 0;
+ }
if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0;
if (pDWP == OBJ_OTHER_PROCESS)
More information about the wine-cvs
mailing list