commit 6b1b41cf85ad1857a280f636552052ceba7ceb65
author Francois Boisvert <francois@macadamian.com> Sun Mar 14 17:25:32 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Mar 14 17:25:32 1999 +0000
tree 11d4b4f8286d40da2bde1d2080677e4ec5c3ac4e
parent 2e1cafa288e61ef2271eda61da0e784073a7e297

Made access to the wnd struct thread-safe.

windows/x11drv/wnd.c

diff --git a/windows/x11drv/wnd.c b/windows/x11drv/wnd.c
index a1d9d0d..a6485bd 100644
--- a/windows/x11drv/wnd.c
+++ b/windows/x11drv/wnd.c
@@ -234,8 +234,10 @@
       
       if (cs->hwndParent)  /* Get window owner */
 	{
-	  Window win = X11DRV_WND_FindXWindow( WIN_FindWndPtr( cs->hwndParent ) );
+          WND *tmpWnd = WIN_FindWndPtr(cs->hwndParent);
+	  Window win = X11DRV_WND_FindXWindow( tmpWnd );
 	  if (win) TSXSetTransientForHint( display, X11DRV_WND_GetXWindow(wndPtr), win );
+          WIN_ReleaseWndPtr(tmpWnd);
 	}
       X11DRV_WND_RegisterWindow( wndPtr );
     }
@@ -264,7 +266,9 @@
  */
 WND *X11DRV_WND_SetParent(WND *wndPtr, WND *pWndParent)
 {
-    if( wndPtr && pWndParent && (wndPtr != WIN_GetDesktop()) )
+    WND *pDesktop = WIN_GetDesktop();
+    
+    if( wndPtr && pWndParent && (wndPtr != pDesktop) )
     {
 	WND* pWndPrev = wndPtr->parent;
 
@@ -284,7 +288,7 @@
             /* Create an X counterpart for reparented top-level windows
 	     * when not in the desktop mode. */
 
-            if( pWndParent == WIN_GetDesktop () )
+            if( pWndParent == pDesktop )
             {
                 wndPtr->dwStyle &= ~WS_CHILD;
                 wndPtr->wIDmenu = 0;
@@ -325,8 +329,10 @@
             }
 	    WIN_LinkWindow(wndPtr->hwndSelf, HWND_TOP);
 	}
+        WIN_ReleaseDesktop();
 	return pWndPrev;
     } /* failure */
+    WIN_ReleaseDesktop();
     return 0;
 }
 
@@ -339,7 +345,7 @@
 void X11DRV_WND_ForceWindowRaise(WND *wndPtr)
 {
   XWindowChanges winChanges;
-  WND *wndPrev;
+  WND *wndPrev,*pDesktop = WIN_GetDesktop();
   
   if( !wndPtr || !X11DRV_WND_GetXWindow(wndPtr) || (wndPtr->flags & WIN_MANAGED) )
     return;
@@ -354,11 +360,12 @@
       if (X11DRV_WND_GetXWindow(wndPtr)) 
 	TSXReconfigureWMWindow( display, X11DRV_WND_GetXWindow(wndPtr), 0,
 				CWStackMode, &winChanges );
-      wndPrev = WIN_GetDesktop()->child;
+      wndPrev = pDesktop->child;
       if (wndPrev == wndPtr) break;
       while (wndPrev && (wndPrev->next != wndPtr)) wndPrev = wndPrev->next;
       wndPtr = wndPrev;
     }
+  WIN_ReleaseDesktop();
 }
 
 /***********************************************************************
@@ -460,6 +467,8 @@
 	      
 	      TSXRestackWindows(display, stack, 2); 
 	      changeMask &= ~CWStackMode;
+              
+              WIN_ReleaseWndPtr(insertPtr);
 	    }
 	}
       if (changeMask)
@@ -472,6 +481,7 @@
     {
       if(X11DRV_WND_GetXWindow(wndPtr)) TSXMapWindow( display, X11DRV_WND_GetXWindow(wndPtr) );
     }
+  WIN_ReleaseWndPtr(winposPtr);
 }
 
 /*****************************************************************