From 27fba89d03b0fbbb111af87bb8fc29541c94ae7b Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 16 Jan 2003 01:17:34 +0000 Subject: [PATCH] Removed flag checks in SetMenuItemInfoA, NT doesn't do this. --- controls/menu.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/controls/menu.c b/controls/menu.c index 89bb876315f..d371637eb3e 100644 --- a/controls/menu.c +++ b/controls/menu.c @@ -4274,20 +4274,6 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu, BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos, const MENUITEMINFOA *lpmii) { - if ((lpmii->fType & (MF_HILITE|MF_POPUP)) || (lpmii->fState)) { - /* QuickTime does pass invalid data into SetMenuItemInfo. - * do some of the checks Windows does. - */ - WARN("Bad masks (0x%08x) for type (0x%08x) or state (0x%08x)\n", - lpmii->fMask, lpmii->fType,lpmii->fState ); - } - - /* is the app setting both MFT_BITMAP and MFT_SEPARATOR (which is wrong)? */ - if (lpmii->fType & (MFT_BITMAP | MFT_SEPARATOR)) { - WARN("fType contains MFT_BITMAP and MFT_SEPARATOR, API violation\n"); - return FALSE; - } - return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0), (const MENUITEMINFOW *)lpmii, FALSE); }