[ros-diffs] [jimtabor] 71707: [Win32SS] - Remove unused flag and set old menu type back, based on wine.

Author: jimtabor
Date: Thu Jun 30 17:01:14 2016
New Revision: 71707

URL: http://svn.reactos.org/svn/reactos?rev=71707&view=rev
Log:
[Win32SS]
- Remove unused flag and set old menu type back, based on wine.

Modified:
    trunk/reactos/win32ss/user/ntuser/menu.c
    trunk/reactos/win32ss/user/user32/windows/menu.c

Modified: trunk/reactos/win32ss/user/ntuser/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/menu.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/menu.c	[iso-8859-1] Thu Jun 30 17:01:14 2016
@@ -1336,7 +1336,7 @@
    if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (MenuItem->fState &
MFS_DISABLED )) return -1;
 
    /* search rekursiv when needed */
-   if ( (MenuItem->fType & MF_POPUP) && (gmdiFlags &
GMDI_GOINTOPOPUPS) && MenuItem->spSubMenu)
+   if ( (gmdiFlags & GMDI_GOINTOPOPUPS) && MenuItem->spSubMenu )
    {
       UINT ret;
       (*gismc)++;

Modified: trunk/reactos/win32ss/user/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] Thu Jun 30 17:01:14
2016
@@ -162,7 +162,7 @@
    if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (Item->fState &
MFS_DISABLED )) return -1;
 
    /* search rekursiv when needed */
-   if ( (Item->fType & MF_POPUP) &&  (gmdiFlags & GMDI_GOINTOPOPUPS)
&& Item->spSubMenu)
+   if ( (gmdiFlags & GMDI_GOINTOPOPUPS) && Item->spSubMenu )
    {
       UINT ret;
       (*gismc)++;
@@ -509,6 +509,7 @@
                 return NULL;
             }
             mii.fMask |= MIIM_SUBMENU;
+            mii.fType |= MF_POPUP;
         }
         else if (!mii.dwTypeData[0] && !(mii.fType & MF_SEPARATOR))
         {