Changeset 795 for trunk/src/shell32/new/shlmenu.cpp

Timestamp:

Sep 2, 1999, 7:25:19 PM (26 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/shell32/new/shlmenu.cpp

@@ -21 +21 @@
 #include "pidl.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -160 +161 @@
                 {
                   ILGetDisplayName( pidlTemp, sTemp);
-                  if (! (PidlToSicIndex(lpsf, pidlTemp, FALSE, &iIcon)))
+                  if (! (PidlToSicIndex(lpsf, pidlTemp, FALSE, (UINT*)&iIcon)))
                     iIcon = FM_BLANK_ICON;
                   if ( SFGAO_FOLDER & ulItemAttr)
@@ -340 +341 @@
 
         if (VERSION_OsIsUnicode() && (lpText!=FM_SEPARATOR))
-          lpszText = HEAP_strdupWtoA ( GetProcessHeap(),0, lpText);
-
-        ret = FileMenu_AppendItemA(hMenu, (lpszText) ? lpszText : lpText, uID, icon, hMenuPopup, nItemHeight);
+          lpszText = (LPSTR)HEAP_strdupWtoA ( GetProcessHeap(),0, (LPCWSTR)lpText);
+
+        ret = FileMenu_AppendItemA(hMenu, (lpszText) ? lpszText : (LPCSTR)lpText, uID, icon, hMenuPopup, nItemHeight);
 
         if (lpszText)