Merge branch 'fix-explorer-msg-queue-hang' into 'master'

winex11.drv: Fix a possible desktop window message queue hang. See merge request wine/wine!5890
winex11.drv: Fix a possible desktop window message queue hang.
2024-11-19 17:06:04 -07:00 · 2024-11-16 13:44:11 +00:00 · 2024-08-23 12:10:16 +08:00
1 changed files with 5 additions and 1 deletions
--- a/dlls/winex11.drv/xrandr.c
+++ b/dlls/winex11.drv/xrandr.c
@ -1215,15 +1215,19 @@ static void xrandr14_free_monitors( struct gdi_monitor *monitors, int count )

 static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event )
 {
+    BOOL ret = FALSE;
    RECT rect;

    xrandr14_invalidate_current_mode_cache();
    if (hwnd == NtUserGetDesktopWindow() && NtUserGetWindowThread( hwnd, NULL ) == GetCurrentThreadId())
+    {
        NtUserCallNoParam( NtUserCallNoParam_DisplayModeChanged );
+        ret = TRUE;
+    }
    /* Update xinerama monitors for xinerama_get_fullscreen_monitors() */
    rect = get_host_primary_monitor_rect();
    xinerama_init( rect.right - rect.left, rect.bottom - rect.top );
-    return FALSE;
+    return ret;
 }

 static void xrandr14_register_event_handlers(void)