[PATCH 0/2] MR7297: win32u: Post WM_MOUSELEAVE immediately when the cursor is not in the specified tracking window.
Fix erwin Data Modeler unable click its comboboxes in listboxes. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7297
From: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/msg.c | 86 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 85 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index e65da599deb..83364c32695 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14796,6 +14796,12 @@ static const struct message WmMouseHoverSeq[] = { { 0 } }; +static const struct message WmMouseLeaveSeq[] = +{ + { WM_MOUSELEAVE, sent | wparam | lparam, 0, 0 }, + { 0 } +}; + static void pump_msg_loop_timeout(DWORD timeout, BOOL inject_mouse_move) { MSG msg; @@ -14844,9 +14850,10 @@ static void test_TrackMouseEvent(void) { TRACKMOUSEEVENT tme; BOOL ret; - HWND hwnd, hchild; + HWND hwnd, hwnd2, hchild; RECT rc_parent, rc_child; UINT default_hover_time, hover_width = 0, hover_height = 0; + POINT old_pt; #define track_hover(track_hwnd, track_hover_time) \ tme.cbSize = sizeof(tme); \ @@ -15019,6 +15026,83 @@ static void test_TrackMouseEvent(void) DestroyWindow(hwnd); + /* Test that tracking a new window with TME_LEAVE and when the cursor is not in the new window, + * WM_MOUSELEAVE is immediately posted to the window */ + hwnd = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 100, + 100, 0, NULL, NULL, 0); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); + hwnd2 = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 50, 50, + 0, NULL, NULL, 0); + ok(!!hwnd2, "Failed to create window, error %lu.\n", GetLastError()); + + GetCursorPos(&old_pt); + SetCursorPos(150, 150); + + flush_events(); + flush_sequence(); + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(ret, "TrackMouseEvent(TME_LEAVE) failed, error %ld\n", GetLastError()); + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd2; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(ret, "TrackMouseEvent(TME_LEAVE) failed, error %ld\n", GetLastError()); + flush_events(); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", TRUE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + SetCursorPos(old_pt.x, old_pt.y); + + /* Test that tracking a new window with TME_LEAVE and when the cursor is not in the new window, + * the original tracking window is not changed */ + hwnd = CreateWindowA("TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 100, + 100, 0, NULL, NULL, 0); + ok(!!hwnd, "Failed to create window, error %lu.\n", GetLastError()); + hwnd2 = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 0, 0, 50, 50, 0, NULL, + NULL, 0); + ok(!!hwnd2, "Failed to create window, error %lu.\n", GetLastError()); + + GetCursorPos(&old_pt); + SetCursorPos(150, 150); + + flush_events(); + flush_sequence(); + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(ret, "TrackMouseEvent(TME_LEAVE) failed, error %ld\n", GetLastError()); + + tme.cbSize = sizeof(tme); + tme.dwFlags = TME_LEAVE; + tme.hwndTrack = hwnd2; + tme.dwHoverTime = HOVER_DEFAULT; + SetLastError(0xdeadbeef); + ret = pTrackMouseEvent(&tme); + ok(ret, "TrackMouseEvent(TME_LEAVE) failed, error %ld\n", GetLastError()); + + SetCursorPos(500, 500); + Sleep(default_hover_time); + flush_events(); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); + + DestroyWindow(hwnd2); + DestroyWindow(hwnd); + SetCursorPos(old_pt.x, old_pt.y); + #undef track_hover #undef track_query #undef track_hover_cancel -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7297
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Fix erwin Data Modeler unable click its comboboxes in listboxes. --- dlls/user32/tests/msg.c | 2 +- dlls/win32u/input.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 83364c32695..9282896262e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15057,7 +15057,7 @@ static void test_TrackMouseEvent(void) ret = pTrackMouseEvent(&tme); ok(ret, "TrackMouseEvent(TME_LEAVE) failed, error %ld\n", GetLastError()); flush_events(); - ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", TRUE); + ok_sequence(WmMouseLeaveSeq, "WmMouseLeaveSeq", FALSE); DestroyWindow(hwnd2); DestroyWindow(hwnd); diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c index e403b0f041d..424c4cff9f4 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c @@ -1813,6 +1813,17 @@ BOOL WINAPI NtUserTrackMouseEvent( TRACKMOUSEEVENT *info ) } else { + /* If TME_LEAVE is set and when the mouse is not in the tracking window, post WM_MOUSELEAVE + * now and don't overwrite the current tracking information */ + if (info->dwFlags & TME_LEAVE && !hwnd) + { + if (info->dwFlags & TME_NONCLIENT) + NtUserPostMessage( info->hwndTrack, WM_NCMOUSELEAVE, 0, 0 ); + else + NtUserPostMessage( info->hwndTrack, WM_MOUSELEAVE, 0, 0 ); + return TRUE; + } + /* In our implementation, it's possible that another window will receive * WM_MOUSEMOVE and call TrackMouseEvent before TrackMouseEventProc is * called. In such a situation, post the WM_MOUSELEAVE now. */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/7297
The CI failures on test-win10-21h2-64 are not caused by this MR. Adding new line changes can also trigger them. For example, see https://gitlab.winehq.org/zhiyi/wine/-/merge_requests/10 -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7297#note_94121
This merge request was approved by Rémi Bernon. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/7297
participants (3)
-
Rémi Bernon -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)