Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 22:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32SS]

Browse source 
- Remove unused flag and set old menu type back, based on wine.

svn path=/trunk/; revision=71707
This commit is contained in:
James Tabor 2016-06-30 17:01:14 +00:00
parent 2dc8635605
commit 74a8923afe
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/user/ntuser/menu.c
View file

@ -1336,7 +1336,7 @@ IntGetMenuDefaultItem(PMENU MenuObject, UINT fByPos, UINT gmdiFlags, DWORD *gism
if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (MenuItem->fState & MFS_DISABLED )) return -1; if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (MenuItem->fState & MFS_DISABLED )) return -1;
/* search rekursiv when needed */ /* search rekursiv when needed */
if ( (MenuItem->fType & MF_POPUP) && (gmdiFlags & GMDI_GOINTOPOPUPS) && MenuItem->spSubMenu) if ( (gmdiFlags & GMDI_GOINTOPOPUPS) && MenuItem->spSubMenu )
{ {
UINT ret; UINT ret;
(*gismc)++; (*gismc)++;

3
reactos/win32ss/user/user32/windows/menu.c
View file

@ -162,7 +162,7 @@ IntGetMenuDefaultItem(PMENU Menu, BOOL fByPos, UINT gmdiFlags, DWORD *gismc)
if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (Item->fState & MFS_DISABLED )) return -1; if ( (!(GMDI_USEDISABLED & gmdiFlags)) && (Item->fState & MFS_DISABLED )) return -1;
/* search rekursiv when needed */ /* search rekursiv when needed */
if ( (Item->fType & MF_POPUP) && (gmdiFlags & GMDI_GOINTOPOPUPS) && Item->spSubMenu) if ( (gmdiFlags & GMDI_GOINTOPOPUPS) && Item->spSubMenu )
{ {
UINT ret; UINT ret;
(*gismc)++; (*gismc)++;
@ -509,6 +509,7 @@ static LPCSTR MENUEX_ParseResource(LPCSTR res, HMENU hMenu)
return NULL; return NULL;
} }
mii.fMask |= MIIM_SUBMENU; mii.fMask |= MIIM_SUBMENU;
mii.fType |= MF_POPUP;
} }
else if (!mii.dwTypeData[0] && !(mii.fType & MF_SEPARATOR)) else if (!mii.dwTypeData[0] && !(mii.fType & MF_SEPARATOR))
{ {