Changeset 5618 for trunk/src/shell32/shlmenu.c

Timestamp:

Apr 28, 2001, 3:33:49 PM (24 years ago)

Author:

sandervl

Message:

resync with latest wine

File:

• trunk/src/shell32/shlmenu.c (modified) (7 diffs)

trunk/src/shell32/shlmenu.c

@@ -1 @@
-/* $Id: shlmenu.c,v 1.1 2000-08-30 13:52:59 sandervl Exp $ */
 /*
  * see www.geocities.com/SiliconValley/4942/filemenu.html
  */
-#ifdef __WIN32OS2__
-#define ICOM_CINTERFACE 1
-#include <odin.h>
-#endif
 #include <string.h>
 
+#include "shlobj.h"
 #include "wine/obj_base.h"
 #include "wine/obj_enumidlist.h"
 #include "wine/obj_shellfolder.h"
 #include "wine/undocshell.h"
-
+#include "shlwapi.h"
 #include "heap.h"
 #include "debugtools.h"
@@ -52 +48 @@
 #define CCH_MAXITEMTEXT 256
 
-DEFAULT_DEBUG_CHANNEL(shell)
+DEFAULT_DEBUG_CHANNEL(shell);
 
 LPFMINFO FM_GetMenuInfo(HMENU hmenu)
@@ -359 +355 @@
 
 }
+
+/**********************************************************************/
+
 BOOL WINAPI FileMenu_AppendItemAW(
         HMENU hMenu,
@@ -603 +602 @@
         
         Shell_GetImageList(0, &hImageList);
-        pImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL);
+        ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL);
 
         TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top, TextRect.right, TextRect.bottom);
@@ -691 +690 @@
 
         GetMenuItemInfoA(hMenu, uID, FALSE, &mii );
-        if ( mii.hSubMenu );
+        if ( mii.hSubMenu )
+        {
+          /* FIXME: Do what? */
+        }
 
         DeleteMenu(hMenu, MF_BYCOMMAND, uID);
@@ -711 +713 @@
 
         GetMenuItemInfoA(hMenu, uPos, TRUE, &mii );
-        if ( mii.hSubMenu );
+        if ( mii.hSubMenu )
+        {
+          /* FIXME: Do what? */
+        }
 
         DeleteMenu(hMenu, MF_BYPOSITION, uPos);
@@ -820 +825 @@
         return(FALSE);
 }
+
+/**********************************************************************/
 
 HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags)