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.

winemac.drv: Don't expect an internal driver message to set last error.
98748075 · Tim Clem · Alexandre Julliard · 5b11157e · 98748075
Commit 98748075 authored Jun 23, 2023 by Tim Clem Committed by Alexandre Julliard Jun 26, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

systray.c dlls/winemac.drv/systray.c +1 -7

No files found.
--- 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) &&
+            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;
-            }
            if (!notify_owner(icon, msg, event->status_item_mouse_button.x, event->status_item_mouse_button.y))
                return;