system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 11:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed flag checks in SetMenuItemInfoA, NT doesn't do this.

Browse source
This commit is contained in:
Alexandre Julliard 2003-01-16 01:17:34 +00:00
parent 9140349886
commit 27fba89d03
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
controls/menu.c
View file

@ -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);
} }