From 74a8923afe1f69d2691500b0356101e48e261bcd Mon Sep 17 00:00:00 2001 From: James Tabor Date: Thu, 30 Jun 2016 17:01:14 +0000 Subject: [PATCH] [Win32SS] - Remove unused flag and set old menu type back, based on wine. svn path=/trunk/; revision=71707 --- reactos/win32ss/user/ntuser/menu.c | 2 +- reactos/win32ss/user/user32/windows/menu.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/win32ss/user/ntuser/menu.c b/reactos/win32ss/user/ntuser/menu.c index 2cb3f0738fa..6113bfee9f2 100644 --- a/reactos/win32ss/user/ntuser/menu.c +++ b/reactos/win32ss/user/ntuser/menu.c @@ -1336,7 +1336,7 @@ IntGetMenuDefaultItem(PMENU MenuObject, UINT fByPos, UINT gmdiFlags, DWORD *gism 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)++; diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c index 63b5f081a5e..11538e3dc55 100644 --- a/reactos/win32ss/user/user32/windows/menu.c +++ b/reactos/win32ss/user/user32/windows/menu.c @@ -162,7 +162,7 @@ IntGetMenuDefaultItem(PMENU Menu, BOOL fByPos, UINT gmdiFlags, DWORD *gismc) 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 @@ static LPCSTR MENUEX_ParseResource(LPCSTR res, HMENU hMenu) return NULL; } mii.fMask |= MIIM_SUBMENU; + mii.fType |= MF_POPUP; } else if (!mii.dwTypeData[0] && !(mii.fType & MF_SEPARATOR)) { -- 2.17.1