commit 6f0560dfa7b2c4aa2e9eb5f762f08193d4471137
author Nikolay Sivov <nsivov@codeweavers.com> Sun Apr 11 23:37:19 2010 +0400
committer Alexandre Julliard <julliard@winehq.org> Mon Apr 12 11:29:34 2010 +0200
tree a0a72bbf953da9cda060dadc3e354694c0e7cb9d
parent ab53187cf7b4e123ff789460aef59cef127b98ea

user32: Set WM_EXITMENULOOP wParam same way as for WM_ENTERMENULOOP.

dlls/user32/menu.c

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index f8cc39d..764b7ea 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -3292,14 +3292,15 @@
 
     return TRUE;
 }
+
 /***********************************************************************
  *           MENU_ExitTracking
  */
-static BOOL MENU_ExitTracking(HWND hWnd)
+static BOOL MENU_ExitTracking(HWND hWnd, BOOL bPopup)
 {
     TRACE("hwnd=%p\n", hWnd);
 
-    SendMessageW( hWnd, WM_EXITMENULOOP, 0, 0 );
+    SendMessageW( hWnd, WM_EXITMENULOOP, bPopup, 0 );
     ShowCaret(0);
     top_popup = 0;
     top_popup_hmenu = NULL;
@@ -3322,7 +3323,7 @@
     {
 	MENU_InitTracking( hWnd, hMenu, FALSE, wFlags );
 	MENU_TrackMenu( hMenu, wFlags, pt.x, pt.y, hWnd, NULL );
-	MENU_ExitTracking(hWnd);
+	MENU_ExitTracking(hWnd, FALSE);
     }
 }
 
@@ -3384,7 +3385,7 @@
 
 track_menu:
     MENU_TrackMenu( hTrackMenu, wFlags, 0, 0, hwnd, NULL );
-    MENU_ExitTracking( hwnd );
+    MENU_ExitTracking( hwnd, FALSE );
 }
 
 /**********************************************************************
@@ -3424,7 +3425,7 @@
     if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 ))
         ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd,
                               lpTpm ? &lpTpm->rcExclude : NULL );
-    MENU_ExitTracking(hWnd);
+    MENU_ExitTracking(hWnd, TRUE);
 
     return ret;
 }