mirror of
https://github.com/reactos/reactos.git
synced 2024-07-06 12:45:16 +00:00
[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. svn path=/trunk/; revision=72227
This commit is contained in:
parent
12ea67644c
commit
fddaeea688
|
@ -4738,7 +4738,7 @@ UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags)
|
||||||
|
|
||||||
if (pItem->spSubMenu)
|
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
|
else
|
||||||
return (pItem->fType | pItem->fState);
|
return (pItem->fType | pItem->fState);
|
||||||
|
|
|
@ -1062,6 +1062,7 @@ GetMenuState(
|
||||||
{
|
{
|
||||||
PMENU pSubMenu = DesktopPtrToUser(pItem->spSubMenu);
|
PMENU pSubMenu = DesktopPtrToUser(pItem->spSubMenu);
|
||||||
HMENU hsubmenu = UserHMGetHandle(pSubMenu);
|
HMENU hsubmenu = UserHMGetHandle(pSubMenu);
|
||||||
|
Type |= MF_POPUP; // Fix CORE-9269
|
||||||
if (!IsMenu(hsubmenu)) return (UINT)-1;
|
if (!IsMenu(hsubmenu)) return (UINT)-1;
|
||||||
else return (pSubMenu->cItems << 8) | ((pItem->fState|pItem->fType|Type) & 0xff);
|
else return (pSubMenu->cItems << 8) | ((pItem->fState|pItem->fType|Type) & 0xff);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue