commit 6f07e8abbc1f047a96c7586704fa2db6c662c721
author Andreas Mohr <a.mohr@mailto.de> Tue Sep 19 02:38:11 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 19 02:38:11 2000 +0000
tree 9010a693d0e88f8811021938a9652f94cc9a0349
parent ab86a9e563d73163559b2d5ab894eb74bb0f89bb

Fixed window lock problem in SetMenu().

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index 6c60391..ea2bc55 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -4065,15 +4065,15 @@
 BOOL WINAPI SetMenu( HWND hWnd, HMENU hMenu )
 {
     WND * wndPtr = WIN_FindWndPtr(hWnd);
+    BOOL res = FALSE;
 
     TRACE("(%04x, %04x);\n", hWnd, hMenu);
 
     if (hMenu && !IsMenu(hMenu))
     {
 	WARN("hMenu is not a menu handle\n");
-	return FALSE;
+	goto exit;
     }
-	
 
     if (wndPtr && !(wndPtr->dwStyle & WS_CHILD))
     {
@@ -4085,10 +4085,8 @@
 	    LPPOPUPMENU lpmenu;
 
             if (!(lpmenu = MENU_GetMenu(hMenu)))
-            {
-                WIN_ReleaseWndPtr(wndPtr);
-                return FALSE;
-            }
+		goto exit;
+
             lpmenu->hWnd = hWnd;
             lpmenu->wFlags &= ~MF_POPUP;  /* Can't be a popup */
             lpmenu->Height = 0;  /* Make sure we recalculate the size */
@@ -4096,11 +4094,11 @@
 	if (IsWindowVisible(hWnd))
             SetWindowPos( hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE |
                         SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED );
-        WIN_ReleaseWndPtr(wndPtr);
-	return TRUE;
+	res = TRUE;
     }
+exit:
     WIN_ReleaseWndPtr(wndPtr);
-    return FALSE;
+    return res;
 }