[jimtabor] 72227: [Win32SS] - Fix regression from 62529, striped all the MF_POPUP from the code, no way to know if the submenu is a drop menu. See CORE-9269.

Author: jimtabor
Date: Mon Aug 15 01:14:47 2016
New Revision: 72227

URL: http://svn.reactos.org/svn/reactos?rev=72227&view=rev
Log:
[Win32SS]
- Fix regression from 62529, striped all the MF_POPUP from the code, no way to know if the
submenu is a drop menu. See CORE-9269.

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] Mon Aug 15 01:14:47 2016
@@ -4738,7 +4738,7 @@
 
    if (pItem->spSubMenu)
    {
-      return (pItem->spSubMenu->cItems << 8) |
((pItem->fState|pItem->fType) & 0xff);
+      return (pItem->spSubMenu->cItems << 8) |
((pItem->fState|pItem->fType|MF_POPUP) & 0xff);
    }
    else
       return (pItem->fType | pItem->fState);

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] Mon Aug 15 01:14:47
2016
@@ -1062,6 +1062,7 @@
   {
      PMENU pSubMenu = DesktopPtrToUser(pItem->spSubMenu);
      HMENU hsubmenu = UserHMGetHandle(pSubMenu);
+     Type |= MF_POPUP; // Fix CORE-9269
      if (!IsMenu(hsubmenu)) return (UINT)-1;
      else return (pSubMenu->cItems << 8) |
((pItem->fState|pItem->fType|Type) & 0xff);
   }