Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-20 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix ownerdraw menu for miranda (patch by Brezenbak)

Browse source 
svn path=/trunk/; revision=21652
This commit is contained in:
Christoph von Wittich 2006-04-18 17:17:08 +00:00
parent 904d3ca622
commit ca3a742dba
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/subsystems/win32/win32k/ntuser/menu.c
View file

@ -744,15 +744,17 @@ BOOL FASTCALL
IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii) IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINFO lpmii)
{ {
PMENU_OBJECT SubMenuObject; PMENU_OBJECT SubMenuObject;
UINT fTypeMask = (MFT_BITMAP | MFT_MENUBARBREAK | MFT_MENUBREAK | MFT_OWNERDRAW | MFT_RADIOCHECK | MFT_RIGHTJUSTIFY | MFT_SEPARATOR | MF_POPUP);
if(!MenuItem || !MenuObject || !lpmii) if(!MenuItem || !MenuObject || !lpmii)
{ {
return FALSE; return FALSE;
} }
if( lpmii->fType & ~fTypeMask)
MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType); {
MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType); DPRINT("IntSetMenuItemInfo invalid fType flags %x\n", lpmii->fType & ~fTypeMask);
lpmii->fMask &= ~(MIIM_TYPE | MIIM_FTYPE);
}
if(lpmii->fMask & MIIM_BITMAP) if(lpmii->fMask & MIIM_BITMAP)
{ {
MenuItem->hbmpItem = lpmii->hbmpItem; MenuItem->hbmpItem = lpmii->hbmpItem;