Skip to content

W
wine-winehq
Commit 9b98d3d3 authored by Mike Hearn's avatar Mike Hearn Committed by Alexandre Julliard
Browse files
Options

Fix Xlib locking in create_desktop.

parent 737e67b1
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
dlls/x11drv/window.c
View file @ 9b98d3d3
...@@ -744,10 +744,12 @@ void X11DRV_register_window( Display *display, HWND hwnd, struct x11drv_win_data ...@@ -744,10 +744,12 @@ void X11DRV_register_window( Display *display, HWND hwnd, struct x11drv_win_data
static void create_desktop( Display *display, WND *wndPtr ) static void create_desktop( Display *display, WND *wndPtr )
{ {
X11DRV_WND_DATA *data = wndPtr->pDriverData; X11DRV_WND_DATA *data = wndPtr->pDriverData;
VisualID visualid;
wine_tsx11_lock(); wine_tsx11_lock();
winContext = XUniqueContext(); winContext = XUniqueContext();
XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms ); XInternAtoms( display, (char **)atom_names, NB_XATOMS - FIRST_XATOM, False, X11DRV_Atoms );
visualid = XVisualIDFromVisual(visual);
wine_tsx11_unlock(); wine_tsx11_unlock();
whole_window_atom = MAKEINTATOMA( GlobalAddAtomA( "__wine_x11_whole_window" )); whole_window_atom = MAKEINTATOMA( GlobalAddAtomA( "__wine_x11_whole_window" ));
...@@ -759,7 +761,7 @@ static void create_desktop( Display *display, WND *wndPtr ) ...@@ -759,7 +761,7 @@ static void create_desktop( Display *display, WND *wndPtr )
SetPropA( wndPtr->hwndSelf, whole_window_atom, (HANDLE)root_window ); SetPropA( wndPtr->hwndSelf, whole_window_atom, (HANDLE)root_window );
SetPropA( wndPtr->hwndSelf, client_window_atom, (HANDLE)root_window ); SetPropA( wndPtr->hwndSelf, client_window_atom, (HANDLE)root_window );
SetPropA( wndPtr->hwndSelf, "__wine_x11_visual_id", (HANDLE)XVisualIDFromVisual(visual) ); SetPropA( wndPtr->hwndSelf, "__wine_x11_visual_id", (HANDLE)visualid );
X11DRV_InitClipboard(); X11DRV_InitClipboard();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment