From ec977e20728997e219427d791908aa1a8719f467 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Sat, 25 Dec 2004 23:40:47 +0000
Subject: [PATCH] - Set the popup menu flag in IntSetMenuItemInfo when setting
 the handle of submenu.

svn path=/trunk/; revision=12337
---
 reactos/subsys/win32k/ntuser/menu.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/reactos/subsys/win32k/ntuser/menu.c b/reactos/subsys/win32k/ntuser/menu.c
index 4615cbb0288..9f4a5a2996b 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.58 2004/12/25 22:59:10 navaraf Exp $
+/* $Id: menu.c,v 1.59 2004/12/25 23:40:47 navaraf Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -747,14 +747,23 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINF
   {
     MenuItem->hSubMenu = lpmii->hSubMenu;
     /* Make sure the submenu is marked as a popup menu */
-    if (0 != (MenuItem->fType & MF_POPUP))
+    if (MenuItem->hSubMenu)
     {
       SubMenuObject = IntGetMenuObject(MenuItem->hSubMenu);
-      if (NULL != SubMenuObject)
+      if (SubMenuObject != NULL)
       {
         SubMenuObject->MenuInfo.Flags |= MF_POPUP;
+        MenuItem->fType |= MF_POPUP;
         IntReleaseMenuObject(SubMenuObject);
       }
+      else
+      {
+        MenuItem->fType &= ~MF_POPUP;
+      }
+    }
+    else
+    {
+      MenuItem->fType &= ~MF_POPUP;
     }
   }
   if ((lpmii->fMask & (MIIM_TYPE | MIIM_STRING)) &&