From a4c2f8ebd347669701660fefb0b3c12bed9fdc53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 25 Mar 2004 12:32:13 +0000
Subject: [PATCH] Make sure submenus are marked as popups

svn path=/trunk/; revision=8872
---
 reactos/subsys/win32k/ntuser/menu.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c
index 7ddb4aeff23..1a3dc6d679e 100644
--- a/reactos/subsys/win32k/ntuser/menu.c
+++ b/reactos/subsys/win32k/ntuser/menu.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: menu.c,v 1.51 2004/03/09 14:03:18 gvg Exp $
+/* $Id: menu.c,v 1.52 2004/03/25 12:32:13 gvg Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -707,6 +707,7 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINF
 {
   PUNICODE_STRING Source;
   UINT copylen = 0;
+  PMENU_OBJECT SubMenuObject;
   
   if(!MenuItem || !MenuObject || !lpmii)
   {
@@ -749,6 +750,16 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINF
   if(lpmii->fMask & MIIM_SUBMENU)
   {
     MenuItem->hSubMenu = lpmii->hSubMenu;
+    /* Make sure the submenu is marked as a popup menu */
+    if (0 != (MenuItem->fType & MF_POPUP))
+    {
+      SubMenuObject = IntGetMenuObject(MenuItem->hSubMenu);
+      if (NULL != SubMenuObject)
+      {
+        SubMenuObject->MenuInfo.Flags |= MF_POPUP;
+        IntReleaseMenuObject(SubMenuObject);
+      }
+    }
   }
   if((lpmii->fMask & (MIIM_TYPE | MIIM_STRING)) && 
            (MENU_ITEM_TYPE(lpmii->fType) == MF_STRING))