winex11.drv: Lock display when expecting error events.

If the display is not locked, another thread could take the error event and handle it with the default error handlers and thus not handled by the current thread with the specified error handlers. Fix Cladun X2 crash at start. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>

winex11.drv: Lock display when expecting error events.
18ae96e5 · Zhiyi Zhang · Alexandre Julliard · ed546bf1 · 18ae96e5
Commit 18ae96e5 authored Apr 25, 2022 by Zhiyi Zhang Committed by Alexandre Julliard Jul 13, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

x11drv_main.c dlls/winex11.drv/x11drv_main.c +2 -0

No files found.
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -273,6 +273,7 @@ static inline BOOL ignore_error( Display *display, XErrorEvent *event )
 void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg )
 {
    pthread_mutex_lock( &error_mutex );
+    XLockDisplay( display );
    err_callback         = callback;
    err_callback_display = display;
    err_callback_arg     = arg;
@@ -291,6 +292,7 @@ int X11DRV_check_error(void)
 {
    int res = err_callback_result;
    err_callback = NULL;
+    XUnlockDisplay( err_callback_display );
    pthread_mutex_unlock( &error_mutex );
    return res;
 }