Skip to content

W
wine-cw
Commit 8322fc6a authored by Ulrich Czekalla's avatar Ulrich Czekalla Committed by Alexandre Julliard
Browse files
Options

Avoid holding x11drv lock while calling function that grabs gdi

lock. Prevents potential deadly embrace.
parent 84232099
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
dlls/x11drv/winpos.c
View file @ 8322fc6a
...@@ -959,7 +959,6 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *winpos ) ...@@ -959,7 +959,6 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *winpos )
wine_tsx11_unlock(); wine_tsx11_unlock();
} }
wine_tsx11_lock();
if (bChangePos) if (bChangePos)
X11DRV_sync_whole_window_position( display, wndPtr, !(winpos->flags & SWP_NOZORDER) ); X11DRV_sync_whole_window_position( display, wndPtr, !(winpos->flags & SWP_NOZORDER) );
else else
...@@ -973,7 +972,9 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *winpos ) ...@@ -973,7 +972,9 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *winpos )
(winpos->flags & SWP_FRAMECHANGED)) (winpos->flags & SWP_FRAMECHANGED))
{ {
/* if we moved the client area, repaint the whole non-client window */ /* if we moved the client area, repaint the whole non-client window */
wine_tsx11_lock();
XClearArea( display, get_whole_window(wndPtr), 0, 0, 0, 0, True ); XClearArea( display, get_whole_window(wndPtr), 0, 0, 0, 0, True );
wine_tsx11_unlock();
winpos->flags |= SWP_FRAMECHANGED; winpos->flags |= SWP_FRAMECHANGED;
} }
if (winpos->flags & SWP_SHOWWINDOW) if (winpos->flags & SWP_SHOWWINDOW)
...@@ -986,8 +987,11 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *winpos ) ...@@ -986,8 +987,11 @@ BOOL X11DRV_SetWindowPos( WINDOWPOS *winpos )
{ {
/* resizing from zero size to non-zero -> map */ /* resizing from zero size to non-zero -> map */
TRACE( "mapping non zero size or off-screen win %p\n", winpos->hwnd ); TRACE( "mapping non zero size or off-screen win %p\n", winpos->hwnd );
wine_tsx11_lock();
XMapWindow( display, get_whole_window(wndPtr) ); XMapWindow( display, get_whole_window(wndPtr) );
wine_tsx11_unlock();
} }
wine_tsx11_lock();
XFlush( display ); /* FIXME: should not be necessary */ XFlush( display ); /* FIXME: should not be necessary */
wine_tsx11_unlock(); wine_tsx11_unlock();
} }
......
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