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

Timestamp:

Aug 18, 2000, 4:01:27 AM (25 years ago)

Author:

phaller

Message:

Synchronized shell32 with wine

File:

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

trunk/src/shell32/shlmenu.cpp

@@ -1 @@
-/* $Id: shlmenu.cpp,v 1.5 2000-03-26 16:34:53 cbratschi Exp $ */
+/* $Id: shlmenu.cpp,v 1.6 2000-08-18 02:01:25 phaller Exp $ */
 
 /*
@@ -43 +43 @@
 #include "winversion.h"
 #include "shell32_main.h"
+#include "shlguid.h"
 
 #include "pidl.h"
@@ -143 +144 @@
 static int FM_InitMenuPopup(HMENU hmenu, LPITEMIDLIST pAlternatePidl)
 {  IShellFolder   *lpsf, *lpsf2;
-   ULONG    ulItemAttr;
+   ULONG    ulItemAttr = SFGAO_FOLDER;
    UINT     uID, uFlags, uEnumFlags;
    LPFNFMCALLBACK lpfnCallback;
@@ -196 +197 @@
       {
         ILGetDisplayName( pidlTemp, sTemp);
-        if (! (PidlToSicIndex(lpsf, pidlTemp, FALSE, (UINT*)&iIcon)))
+        if (! (PidlToSicIndex(lpsf, pidlTemp, FALSE, 0, (UINT*)&iIcon)))
           iIcon = FM_BLANK_ICON;
         if ( SFGAO_FOLDER & ulItemAttr)
@@ -473 +474 @@
  * FileMenu_AppendFilesForPidl                 [SHELL32.124]
  */
-ODINFUNCTION3(HMENU, FileMenu_AppendFilesForPidl,
+ODINFUNCTION3(int,   FileMenu_AppendFilesForPidl,
               HMENU, hmenu,
               LPCITEMIDLIST, pidl,
@@ -519 +520 @@
  * FileMenu_TrackPopupMenuEx                   [SHELL32.116]
  */
-ODINFUNCTION6(HRESULT, FileMenu_TrackPopupMenuEx,
+ODINFUNCTION6(BOOL,    FileMenu_TrackPopupMenuEx,
               HMENU, hMenu,
               UINT, uFlags,