commit 3a3cd9fab1ab8796120ddb91abd390188292b895
author Francois Boisvert <francois@macadamian.com> Sun Mar 28 12:42:52 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Mar 28 12:42:52 1999 +0000
tree 81109b10c8f7cf8ee8345e84b81a82ede80d124a
parent 0dddc09bc4516b164ebe49c783b6322dbc85257c

Fixed some bugs in thread safeness for wnd struct.

windows/mdi.c

diff --git a/windows/mdi.c b/windows/mdi.c
index a519a4a..6eb8862 100644
--- a/windows/mdi.c
+++ b/windows/mdi.c
@@ -120,23 +120,25 @@
     for( index = id+1; index <= clientInfo->nActiveChildren + 
 				clientInfo->idFirstChild; index++ )
     {
-	wndPtr = WIN_FindWndPtr(MDI_GetChildByID(clientWnd,index));
-	if( !wndPtr )
+        WND *tmpWnd = WIN_FindWndPtr(MDI_GetChildByID(clientWnd,index));
+	if( !tmpWnd )
 	{
 	      TRACE(mdi,"no window for id=%i\n",index);
+            WIN_ReleaseWndPtr(tmpWnd);
 	      continue;
 	}
     
 	/* set correct id */
-	wndPtr->wIDmenu--;
+	tmpWnd->wIDmenu--;
 
 	n = sprintf(buffer, "%d ",index - clientInfo->idFirstChild);
-	if (wndPtr->text)
-            lstrcpynA(buffer + n, wndPtr->text, sizeof(buffer) - n );	
+	if (tmpWnd->text)
+            lstrcpynA(buffer + n, tmpWnd->text, sizeof(buffer) - n );	
 
 	/* change menu */
 	ModifyMenuA(clientInfo->hWindowMenu ,index ,MF_BYCOMMAND | MF_STRING,
                       index - 1 , buffer ); 
+        WIN_ReleaseWndPtr(tmpWnd);
     }
     retvalue = TRUE;
 END:
@@ -711,7 +713,7 @@
                                 SWP_DRAWFRAME | SWP_NOACTIVATE | SWP_NOZORDER);
 	    }
 	}
-	HeapFree( SystemHeap, 0, heapPtr );
+	WIN_ReleaseWinArray(heapPtr);
     }
 
     if( total < ci->nActiveChildren )
@@ -787,7 +789,7 @@
 		x += xsize;
 	    }
 	}
-	HeapFree( SystemHeap, 0, heapPtr );
+	WIN_ReleaseWinArray(heapPtr);
     }
   
     if( total < ci->nActiveChildren ) ArrangeIconicWindows( wndClient->hwndSelf );
@@ -902,10 +904,12 @@
 
     if (!clientWnd)
            return;
-    WIN_ReleaseWndPtr(clientWnd);
 
     if (!ci)
+    {
+       WIN_ReleaseWndPtr(clientWnd);
            return;
+    }
 
     /* store new "default" title if lpTitle is not NULL */
     if (lpTitle) 
@@ -944,13 +948,14 @@
 		    strcat( lpBuffer, "]" );
 		}
 	    }
-            WIN_ReleaseWndPtr(childWnd);
 	}
 	else
 	{
             strncpy(lpBuffer, ci->frameTitle, MDI_MAXTITLELENGTH );
 	    lpBuffer[MDI_MAXTITLELENGTH]='\0';
 	}
+        WIN_ReleaseWndPtr(childWnd);
+
     }
     else
 	lpBuffer[0] = '\0';
@@ -959,6 +964,9 @@
     if( repaint == MDI_REPAINTFRAME)
 	SetWindowPos( frameWnd->hwndSelf, 0,0,0,0,0, SWP_FRAMECHANGED |
 			SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER );
+
+    WIN_ReleaseWndPtr(clientWnd);
+
 }