Changeset 1558 for trunk/src/shell32/shlmenu.cpp

Timestamp:

Nov 2, 1999, 9:38:48 PM (26 years ago)

Author:

phaller

Message:

Add: update to wine/shell32 1999/11/02 #4

File:

• trunk/src/shell32/shlmenu.cpp (modified) (9 diffs)

trunk/src/shell32/shlmenu.cpp

@@ -1 @@
-/* $Id: shlmenu.cpp,v 1.3 1999-10-27 09:33:48 phaller Exp $ */
+/* $Id: shlmenu.cpp,v 1.4 1999-11-02 20:38:47 phaller Exp $ */
 
 /*
@@ -60 +60 @@
 
 typedef struct
-{  BOOL     bInitialized;
-   BOOL     bIsMagic;
+{
+   BOOL     bInitialized;
+   BOOL     bFixedItems;
 
    /* create */
@@ -165 +166 @@
      return 0;
 
+   pidl = ((pAlternatePidl) ? pAlternatePidl : menudata->pidl);
+   if (!pidl)
+      return 0;
+
    uID = menudata->uID;
-   pidl = ((pAlternatePidl) ? pAlternatePidl : menudata->pidl);
    uFlags = menudata->uFlags;
    uEnumFlags = menudata->uEnumFlags;
@@ -264 +268 @@
 
    menudata = (LPFMINFO)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(FMINFO));
-   menudata->bIsMagic = TRUE;
    menudata->crBorderColor = crBorderColor;
    menudata->nBorderWidth = nBorderWidth;
@@ -317 +320 @@
    MENUITEMINFOA  mii;
    LPFMITEM myItem;
+   LPFMINFO menudata;
+   MENUINFO MenuInfo;
 
    TRACE("0x%08x %s 0x%08x 0x%08x 0x%08x 0x%08x\n",
@@ -357 +362 @@
    InsertMenuItemA (hMenu, (UINT)-1, TRUE, &mii);
 
+   /* set bFixedItems to true */
+   MenuInfo.cbSize = sizeof(MENUINFO);
+   MenuInfo.fMask = MIM_MENUDATA;
+
+   if (! GetMenuInfo(hMenu, &MenuInfo))
+     return FALSE;
+
+   menudata = (LPFMINFO)MenuInfo.dwMenuData;
+   assert ((menudata != 0) && (MenuInfo.cbSize == sizeof(MENUINFO)));
+   menudata->bFixedItems = TRUE;
+   SetMenuInfo(hMenu, &MenuInfo);
+
    return TRUE;
 
@@ -549 +566 @@
    /* add the menubitmap */
    menuinfo = FM_GetMenuInfo(pMyItem->hMenu);
-   if (menuinfo->bIsMagic)
+   if (menuinfo->nBorderWidth)
      lpmis->itemWidth += menuinfo->nBorderWidth;
 
@@ -587 +604 @@
    /* add the menubitmap */
    menuinfo = FM_GetMenuInfo(pMyItem->hMenu);
-   if (menuinfo->bIsMagic)
+   if (menuinfo->nBorderWidth)
      TextRect.left += menuinfo->nBorderWidth;
 
@@ -979 +996 @@
 }
 
-