[PATCH 0/1] MR3147: winemac.drv: Don't expect an internal driver message to set last error.
NtUserMessageCall(..., NtUserSendDriverMessage) does not ensure the validity of the hwnd, so this check will incorrectly fail if the last error was ERROR_INVALID_WINDOW_HANDLE by coincidence. The notify_owner call immediately following this code will catch a destroyed owner hwnd. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3147
From: Tim Clem <tclem(a)codeweavers.com> NtUserMessageCall(..., NtUserSendDriverMessage) does not ensure the validity of the hwnd, so this check will incorrectly fail if the last error was ERROR_INVALID_WINDOW_HANDLE by coincidence. The notify_owner call immediately following this code will catch a destroyed owner hwnd. --- dlls/winemac.drv/systray.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 8b3452e7540..42ffe49f563 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -342,13 +342,7 @@ void macdrv_status_item_mouse_button(const macdrv_event *event) else if (event->status_item_mouse_button.count % 2 == 0) msg += WM_LBUTTONDBLCLK - WM_LBUTTONDOWN; - if (!send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0) && - RtlGetLastWin32Error() == ERROR_INVALID_WINDOW_HANDLE) - { - WARN("window %p was destroyed, removing icon 0x%x\n", icon->owner, icon->id); - delete_icon(icon); - return; - } + send_message(icon->owner, WM_MACDRV_ACTIVATE_ON_FOLLOWING_FOCUS, 0, 0); if (!notify_owner(icon, msg, event->status_item_mouse_button.x, event->status_item_mouse_button.y)) return; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/3147
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=134124 Your paranoid android. === debian11 (32 bit report) === wmvcore: wmvcore.c:1713: Test failed: Stream 0: Format 4: Got hr 0xc00d0041. wmvcore.c:1730: Test failed: Stream 0: Format 4: Media types didn't match.
participants (3)
-
Marvin -
Tim Clem -
Tim Clem (@tclem)