Changeset 21961 for trunk/src/user32/menu.c

Timestamp:

Feb 2, 2012, 9:42:06 PM (14 years ago)

Author:

dmik

Message:

Support MIIM_FTYPE/MIIM_STRING flags properly in InsertMenuItem/SetMenuItemInfo.

The old Wine code doesn't seem to be aware of them. This in particular fixes the
broken context menu of newer Flash (see Flash ticket #42).

File:

• trunk/src/user32/menu.c (modified) (6 diffs)

trunk/src/user32/menu.c

@@ -1034 +1034 @@
     maxX = (TWEAK_WineLook == WIN31_LOOK) ? GetSystemMetrics(SM_CXBORDER) : 2+1 ;
 
+    dprintf(("*** 1 lppop->nItems %d", lppop->nItems));
     while (start < lppop->nItems)
     {
-    lpitem = &lppop->items[start];
-    orgX = maxX;
-    orgY = (TWEAK_WineLook == WIN31_LOOK) ? GetSystemMetrics(SM_CYBORDER) : 2;
-
-    maxTab = maxTabWidth = 0;
-
-      /* Parse items until column break or end of menu */
-    for (i = start; i < lppop->nItems; i++, lpitem++)
-    {
-        if ((i != start) &&
-        (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break;
-
-        MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, FALSE );
-
-        if (lpitem->fType & MF_MENUBARBREAK) orgX++;
-        maxX = max( maxX, lpitem->rect.right );
-        orgY = lpitem->rect.bottom;
-        if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab)
-        {
-        maxTab = max( maxTab, lpitem->xTab );
-        maxTabWidth = max(maxTabWidth,lpitem->rect.right-lpitem->xTab);
-        }
-    }
-
-      /* Finish the column (set all items to the largest width found) */
-    maxX = max( maxX, maxTab + maxTabWidth );
-    for (lpitem = &lppop->items[start]; start < i; start++, lpitem++)
-    {
-        lpitem->rect.right = maxX;
-        if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab)
-        lpitem->xTab = maxTab;
-
-    }
-    lppop->Height = max( lppop->Height, orgY );
+        lpitem = &lppop->items[start];
+        dprintf(("*** 1 lpitem=%x %x [%S] %x", lpitem, lpitem->fType, lpitem->text, lpitem->hSubMenu));
+        orgX = maxX;
+        orgY = (TWEAK_WineLook == WIN31_LOOK) ? GetSystemMetrics(SM_CYBORDER) : 2;
+
+        maxTab = maxTabWidth = 0;
+
+        /* Parse items until column break or end of menu */
+        for (i = start; i < lppop->nItems; i++, lpitem++)
+        {
+            if ((i != start) &&
+                (lpitem->fType & (MF_MENUBREAK | MF_MENUBARBREAK))) break;
+
+            dprintf(("*** 2 lpitem=%x %x [%S] %x", lpitem, lpitem->fType, lpitem->text, lpitem->hSubMenu));
+            MENU_CalcItemSize( hdc, lpitem, hwndOwner, orgX, orgY, FALSE );
+            dprintf(("*** 2 rect %d %d %d %d", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom));
+
+            if (lpitem->fType & MF_MENUBARBREAK) orgX++;
+            maxX = max( maxX, lpitem->rect.right );
+            orgY = lpitem->rect.bottom;
+            if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab)
+            {
+                maxTab = max( maxTab, lpitem->xTab );
+                maxTabWidth = max(maxTabWidth,lpitem->rect.right-lpitem->xTab);
+            }
+        }
+
+        /* Finish the column (set all items to the largest width found) */
+        maxX = max( maxX, maxTab + maxTabWidth );
+        for (lpitem = &lppop->items[start]; start < i; start++, lpitem++)
+        {
+            lpitem->rect.right = maxX;
+            if (IS_STRING_ITEM(lpitem->fType) && lpitem->xTab)
+                lpitem->xTab = maxTab;
+
+        }
+        lppop->Height = max( lppop->Height, orgY );
     }
 
@@ -1077 +1081 @@
     if(TWEAK_WineLook > WIN31_LOOK)
     {
-    lppop->Height += 2;
-    lppop->Width += 2;
-    }
+        lppop->Height += 2;
+        lppop->Width += 2;
+    }
+
+    dprintf(("*** 1 lppop->Height %d", lppop->Height));
+    dprintf(("*** 1 lppop->Width  %d", lppop->Width));
 
 #ifdef __WIN32OS2__
@@ -4530 +4537 @@
     }
 
+    // In the latest Win versions (2000+?) MIIM_TYPE is superceded by separate
+    // MIIM_BITMAP, MIIM_FTYPE, and MIIM_STRING flags. However, the old Wine
+    // code seems to be not aware of that. Fix it on our own here.
+    // NOTE: This should go away once the new Wine is merged in.
+    MENUITEMINFOA mii;
+    if (lpmii->fMask & (MIIM_FTYPE | MIIM_STRING) == MIIM_FTYPE | MIIM_STRING)
+    {
+        mii = *lpmii;
+        lpmii = &mii;
+        mii.fMask |= MIIM_TYPE;
+    }
+
     return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
                     (const MENUITEMINFOW *)lpmii, FALSE);
@@ -4540 +4559 @@
                                  const MENUITEMINFOW *lpmii)
 {
+    // In the latest Win versions (2000+?) MIIM_TYPE is superceded by separate
+    // MIIM_BITMAP, MIIM_FTYPE, and MIIM_STRING flags. However, the old Wine
+    // code seems to be not aware of that. Fix it on our own here.
+    // NOTE: This should go away once the new Wine is merged in.
+    MENUITEMINFOW mii;
+    if (lpmii->fMask & (MIIM_FTYPE | MIIM_STRING) == MIIM_FTYPE | MIIM_STRING)
+    {
+        mii = *lpmii;
+        lpmii = &mii;
+        mii.fMask |= MIIM_TYPE;
+    }
+
     return SetMenuItemInfo_common(MENU_FindItem(&hmenu, &item, bypos? MF_BYPOSITION : 0),
                     lpmii, TRUE);
@@ -4641 +4672 @@
                                 const MENUITEMINFOA *lpmii)
 {
+    // In the latest Win versions (2000+?) MIIM_TYPE is superceded by separate
+    // MIIM_BITMAP, MIIM_FTYPE, and MIIM_STRING flags. However, the old Wine
+    // code seems to be not aware of that. Fix it on our own here.
+    // NOTE: This should go away once the new Wine is merged in.
+    MENUITEMINFOA mii;
+    if (lpmii->fMask & (MIIM_FTYPE | MIIM_STRING) == MIIM_FTYPE | MIIM_STRING)
+    {
+        mii = *lpmii;
+        lpmii = &mii;
+        mii.fMask |= MIIM_TYPE;
+    }
+
     MENUITEM *item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 );
     return SetMenuItemInfo_common(item, (const MENUITEMINFOW *)lpmii, FALSE);
@@ -4652 +4695 @@
                                 const MENUITEMINFOW *lpmii)
 {
+    dprintf(("*** InsertMenuItem: %d %x %x [%S]", uItem, lpmii->fMask, lpmii->fType, lpmii->fType == MFT_STRING ? lpmii->dwTypeData : 0));
+
+    // In the latest Win versions (2000+?) MIIM_TYPE is superceded by separate
+    // MIIM_BITMAP, MIIM_FTYPE, and MIIM_STRING flags. However, the old Wine
+    // code seems to be not aware of that. Fix it on our own here.
+    // NOTE: This should go away once the new Wine is merged in.
+    MENUITEMINFOW mii;
+    if (lpmii->fMask & (MIIM_FTYPE | MIIM_STRING) == MIIM_FTYPE | MIIM_STRING)
+    {
+        mii = *lpmii;
+        lpmii = &mii;
+        mii.fMask |= MIIM_TYPE;
+    }
+
     MENUITEM *item = MENU_InsertItem(hMenu, uItem, bypos ? MF_BYPOSITION : 0 );
-    return SetMenuItemInfo_common(item, lpmii, TRUE);
+    dprintf(("*** InsertMenuItem 1: lpitem=%x %x [%S] %x", item, item->fType, item->text, item->hSubMenu));
+
+    BOOL b = SetMenuItemInfo_common(item, lpmii, TRUE);
+    dprintf(("*** InsertMenuItem 2: lpitem=%x %x [%S] %x", item, item->fType, item->text, item->hSubMenu));
+    return b;
 }