[User32]

- Patch by Dmitry Timoshkov : Menu item with a "magic" bitmap should not have MFT_BITMAP type set.
- Wine sync port.

svn path=/trunk/; revision=69933

diff --git a/reactos/win32ss/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
index a83666f..63b5f08 100644 (file)
--- a/reactos/win32ss/user/user32/windows/menu.c
+++ b/reactos/win32ss/user/user32/windows/menu.c
@@ -201,7 +201,8 @@ static BOOL GetMenuItemInfo_common ( HMENU hmenu,
             return FALSE;
         }
        lpmii->fType = pItem->fType & MENUITEMINFO_TYPE_MASK;
-        if( pItem->hbmp) lpmii->fType |= MFT_BITMAP;
+        if (pItem->hbmp && !IS_MAGIC_BITMAP(pItem->hbmp))
+            lpmii->fType |= MFT_BITMAP;
        lpmii->hbmpItem = pItem->hbmp; /* not on Win9x/ME */
         if( lpmii->fType & MFT_BITMAP)
         {