commit 8322fc6a57b865a11bf1d5a5149339cd804a1324
author Ulrich Czekalla <ulrich@codeweavers.com> Tue Aug 10 23:42:52 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 10 23:42:52 2004 +0000
tree c55361368f4467eadf03344e1223c0f6eb625b5a
parent 842320998a48dca6084f982cdbb351e4bdcbf93a

Avoid holding x11drv lock while calling function that grabs gdi
lock. Prevents potential deadly embrace.

dlls/x11drv/winpos.c

diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c
index abf326b..094f258 100644
--- a/dlls/x11drv/winpos.c
+++ b/dlls/x11drv/winpos.c
@@ -959,7 +959,6 @@
             wine_tsx11_unlock();
         }
 
-        wine_tsx11_lock();
         if (bChangePos)
             X11DRV_sync_whole_window_position( display, wndPtr, !(winpos->flags & SWP_NOZORDER) );
         else
@@ -973,7 +972,9 @@
             (winpos->flags & SWP_FRAMECHANGED))
         {
             /* 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 );
+            wine_tsx11_unlock();
             winpos->flags |= SWP_FRAMECHANGED;
         }
         if (winpos->flags & SWP_SHOWWINDOW)
@@ -986,8 +987,11 @@
         {
             /* resizing from zero size to non-zero -> map */
             TRACE( "mapping non zero size or off-screen win %p\n", winpos->hwnd );
+            wine_tsx11_lock();
             XMapWindow( display, get_whole_window(wndPtr) );
+            wine_tsx11_unlock();
         }
+        wine_tsx11_lock();
         XFlush( display );  /* FIXME: should not be necessary */
         wine_tsx11_unlock();
     }