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

Timestamp:

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

Author:

phaller

Message:

Synchronized shell32 with wine

File:

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

trunk/src/shell32/iconcache.cpp

@@ -1 @@
-/* $Id: iconcache.cpp,v 1.8 2000-05-18 14:16:02 sandervl Exp $ */
+/* $Id: iconcache.cpp,v 1.9 2000-08-18 02:01:15 phaller Exp $ */
 
 /*
@@ -36 +36 @@
 
 #include "shellapi.h"
+#include "shlguid.h"
+#include "shlwapi.h"
 #include "pidl.h"
 #include "shell32_main.h"
+#include "wine/undocshell.h"
 
 #include <heapstring.h>
@@ -765 +768 @@
  *
  */
-BOOL PidlToSicIndex (IShellFolder * sh, LPITEMIDLIST pidl, BOOL bBigIcon, UINT * pIndex)
+BOOL PidlToSicIndex (IShellFolder * sh, 
+                     LPITEMIDLIST pidl, 
+                     BOOL bBigIcon, 
+                     UINT uFlags,
+                     UINT * pIndex)
 {
    IExtractIcon   *ei;
@@ -777 +784 @@
    if (SUCCEEDED (IShellFolder_GetUIObjectOf(sh, 0, 1, &pidl, &IID_IExtractIconA, 0, (void **)&ei)))
    {
-     if (NOERROR==IExtractIconA_GetIconLocation(ei, 0, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))
+     if (NOERROR==IExtractIconA_GetIconLocation(ei, uFlags, szIconFile, MAX_PATH, &iSourceIndex, &dwFlags))
      { *pIndex = SIC_GetIconIndex(szIconFile, iSourceIndex);
        ret = TRUE;
@@ -801 +808 @@
  */
 
-ODINFUNCTION3(UINT,SHMapPIDLToSystemImageListIndex,LPSHELLFOLDER, sh,
-                                                   LPITEMIDLIST,  pidl,
-                                                   UINT*,         pIndex)
+ODINFUNCTION3(int,SHMapPIDLToSystemImageListIndex,
+              LPSHELLFOLDER, sh,
+              LPITEMIDLIST,  pidl,
+              UINT*,         pIndex)
 {
    UINT  Index;
@@ -810 +818 @@
 
    if (pIndex)
-     PidlToSicIndex ( sh, pidl, 1, pIndex);
-   PidlToSicIndex ( sh, pidl, 0, &Index);
+     PidlToSicIndex ( sh, pidl, 1, 0, pIndex);
+   PidlToSicIndex ( sh, pidl, 0, 0, &Index);
    return Index;
 }