Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-04 03:34:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Win32SS]

Browse source 
- 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.

svn path=/trunk/; revision=72227
This commit is contained in:
James Tabor 2016-08-15 01:14:47 +00:00
parent 12ea67644c
commit fddaeea688
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4738,7 +4738,7 @@ UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags)
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);

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

@ -1062,6 +1062,7 @@ GetMenuState(
{
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);
}