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

Author: jimtabor
Date: Wed Nov 18 21:28:57 2015
New Revision: 69933

URL: http://svn.reactos.org/svn/reactos?rev=69933&view=rev
Log:
[User32]
- Patch by Dmitry Timoshkov : Menu item with a "magic" bitmap should not have
MFT_BITMAP type set.
- Wine sync port.

Modified:
    trunk/reactos/win32ss/user/user32/windows/menu.c

Modified: trunk/reactos/win32ss/user/user32/windows/menu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/menu.c	[iso-8859-1] Wed Nov 18 21:28:57
2015
@@ -201,7 +201,8 @@
             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)
         {