user32: Further implementation of MNS_NOTIFYBYPOS.

356c47e8 · Igor Tarasov · Alexandre Julliard · 0161606b · 356c47e8
Commit 356c47e8 authored May 23, 2008 by Igor Tarasov Committed by Alexandre Julliard May 28, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

menu.c dlls/user32/menu.c +4 -1

No files found.
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -2472,7 +2472,10 @@ static INT MENU_ExecFocusedItem( MTRACKER* pmt, HMENU hMenu, UINT wFlags )
 				  MAKELPARAM((INT16)pmt->pt.x, (INT16)pmt->pt.y) );
 		else
 		{
-                    if (menu->dwStyle & MNS_NOTIFYBYPOS)
+                    POPUPMENU *topmenu = MENU_GetMenu( pmt->hTopMenu );
+                    DWORD dwStyle = menu->dwStyle | (topmenu ? topmenu->dwStyle : 0);
+
+                    if (dwStyle & MNS_NOTIFYBYPOS)
                        PostMessageW( pmt->hOwnerWnd, WM_MENUCOMMAND, menu->FocusedItem,
                                      (LPARAM)hMenu);
                    else