Igor Tarasov : user32: Further implementation of MNS_NOTIFYBYPOS.

[Alexandre Julliard]

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

Author: Igor Tarasov <tarasov.igor(a)gmail.com>
Date:   Fri May 23 18:35:33 2008 +0900

user32: Further implementation of MNS_NOTIFYBYPOS.

---

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

diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 49de5e1..dd859b1 100644
--- 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