Ken Thomases : user32: Allow sent WM_CANCELMODE to end menu tracking in a window's menu bar.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: effc28e16effc43e91633c0a051f949a6a195438
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=effc28e16effc43e91633c0a05...

Author: Ken Thomases <ken(a)codeweavers.com>
Date:   Fri May 17 00:40:30 2013 -0500

user32: Allow sent WM_CANCELMODE to end menu tracking in a window's menu bar.

---

 dlls/user32/menu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 0a38440..ae5cb36 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -2429,7 +2429,7 @@ void MENU_EndMenu( HWND hwnd )
 {
     POPUPMENU *menu;
     menu = top_popup_hmenu ? MENU_GetMenu( top_popup_hmenu ) : NULL;
-    if (menu && hwnd == menu->hwndOwner) EndMenu();
+    if (menu && (hwnd == menu->hWnd || hwnd == menu->hwndOwner)) EndMenu();
 }
 
 /***********************************************************************