mirror of
git://source.winehq.org/git/wine.git
synced 2024-10-31 11:43:31 +00:00
Removed flag checks in SetMenuItemInfoA, NT doesn't do this.
This commit is contained in:
parent
9140349886
commit
27fba89d03
1 changed files with 0 additions and 14 deletions
|
@ -4274,20 +4274,6 @@ static BOOL SetMenuItemInfo_common(MENUITEM * menu,
|
||||||
BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos,
|
BOOL WINAPI SetMenuItemInfoA(HMENU hmenu, UINT item, BOOL bypos,
|
||||||
const MENUITEMINFOA *lpmii)
|
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),
|
return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
|
||||||
(const MENUITEMINFOW *)lpmii, FALSE);
|
(const MENUITEMINFOW *)lpmii, FALSE);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue