Commit in reactos/subsys/win32k/ntuser on MAIN
menu.c+12-31.58 -> 1.59
- Set the popup menu flag in IntSetMenuItemInfo when setting the handle of submenu.

reactos/subsys/win32k/ntuser
menu.c 1.58 -> 1.59
diff -u -r1.58 -r1.59
--- menu.c	25 Dec 2004 22:59:10 -0000	1.58
+++ menu.c	25 Dec 2004 23:40:47 -0000	1.59
@@ -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 @@
   {
     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)) && 
CVSspam 0.2.8