fixed a bug in IntSetMenuItemInfo

svn path=/trunk/; revision=20927
This commit is contained in:
Christoph von Wittich 2006-01-16 23:26:41 +00:00
parent fef4764e1f
commit 87df19f3e9

View file

@ -750,7 +750,8 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINF
return FALSE; return FALSE;
} }
MenuItem->fType = lpmii->fType; MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType);
MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType);
if(lpmii->fMask & MIIM_BITMAP) if(lpmii->fMask & MIIM_BITMAP)
{ {
@ -777,7 +778,8 @@ IntSetMenuItemInfo(PMENU_OBJECT MenuObject, PMENU_ITEM MenuItem, PROSMENUITEMINF
FreeMenuText(MenuItem); FreeMenuText(MenuItem);
RtlInitUnicodeString(&MenuItem->Text, NULL); RtlInitUnicodeString(&MenuItem->Text, NULL);
} }
MenuItem->fType = lpmii->fType; MenuItem->fType &= ~MENU_ITEM_TYPE(MenuItem->fType);
MenuItem->fType |= MENU_ITEM_TYPE(lpmii->fType);
} }
if(lpmii->fMask & MIIM_ID) if(lpmii->fMask & MIIM_ID)
{ {