comctl32/tests: Restore the cursor position after moving it.

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2016-08-31 11:18:42 +01:00 committed by Alexandre Julliard
parent 53b703d468
commit 31963d7da4
2 changed files with 7 additions and 1 deletions

View File

@ -5765,6 +5765,7 @@ static void test_oneclickactivate(void)
HWND hwnd, fg; HWND hwnd, fg;
RECT rect; RECT rect;
INT r; INT r;
POINT orig_pos;
hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST, hwnd = CreateWindowExA(0, "SysListView32", "foo", WS_VISIBLE|WS_CHILD|LVS_LIST,
10, 10, 100, 200, hwndparent, NULL, NULL, NULL); 10, 10, 100, 200, hwndparent, NULL, NULL, NULL);
@ -5791,6 +5792,7 @@ static void test_oneclickactivate(void)
ok(r == 0, "should not fail\n"); ok(r == 0, "should not fail\n");
GetWindowRect(hwnd, &rect); GetWindowRect(hwnd, &rect);
GetCursorPos(&orig_pos);
SetCursorPos(rect.left+5, rect.top+5); SetCursorPos(rect.left+5, rect.top+5);
flush_events(); flush_events();
r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0); r = SendMessageA(hwnd, WM_MOUSEMOVE, MAKELONG(1, 1), 0);
@ -5810,6 +5812,7 @@ static void test_oneclickactivate(void)
expect(1, r); expect(1, r);
DestroyWindow(hwnd); DestroyWindow(hwnd);
SetCursorPos(orig_pos.x, orig_pos.y);
} }
static void test_callback_mask(void) static void test_callback_mask(void)

View File

@ -152,6 +152,7 @@ static void test_customdraw(void) {
DWORD iterationNumber; DWORD iterationNumber;
WNDCLASSA wc; WNDCLASSA wc;
LRESULT lResult; LRESULT lResult;
POINT orig_pos;
/* Create a class to use the custom draw wndproc */ /* Create a class to use the custom draw wndproc */
wc.style = CS_HREDRAW | CS_VREDRAW; wc.style = CS_HREDRAW | CS_VREDRAW;
@ -166,6 +167,8 @@ static void test_customdraw(void) {
wc.lpfnWndProc = custom_draw_wnd_proc; wc.lpfnWndProc = custom_draw_wnd_proc;
RegisterClassA(&wc); RegisterClassA(&wc);
GetCursorPos(&orig_pos);
for (iterationNumber = 0; for (iterationNumber = 0;
iterationNumber < sizeof(expectedResults)/sizeof(expectedResults[0]); iterationNumber < sizeof(expectedResults)/sizeof(expectedResults[0]);
iterationNumber++) { iterationNumber++) {
@ -238,7 +241,7 @@ static void test_customdraw(void) {
DestroyWindow(parent); DestroyWindow(parent);
} }
SetCursorPos(orig_pos.x, orig_pos.y);
} }
static const CHAR testcallbackA[] = "callback"; static const CHAR testcallbackA[] = "callback";