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

Timestamp:

Mar 29, 2000, 5:24:08 PM (25 years ago)

Author:

cbratschi

Message:

onopen fix, FindFirstFileMultiA, "shell.dll" icon fix, load exe icons

File:

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

trunk/src/shell32/iconcache.cpp

@@ -1 @@
-/* $Id: iconcache.cpp,v 1.5 2000-03-27 15:09:20 cbratschi Exp $ */
+/* $Id: iconcache.cpp,v 1.6 2000-03-29 15:24:04 cbratschi Exp $ */
 
 /*
@@ -251 +251 @@
 HGLOBAL WINAPI ICO_ExtractIconEx(LPCSTR lpszExeFileName, HICON * RetPtr, UINT nIconIndex, UINT n, UINT cxDesired, UINT cyDesired )
 {  HGLOBAL  hRet = 0;
-   LPBYTE      pData;
+   LPBYTE   pData;
    OFSTRUCT ofs;
    DWORD    sig;
    HFILE    hFile = OpenFile( lpszExeFileName, &ofs, OF_READ );
-   UINT      iconDirCount = 0,iconCount = 0;
-   LPBYTE      peimage;
-   HANDLE      fmapping;
+   UINT     iconDirCount = 0,iconCount = 0;
+   LPBYTE   peimage;
+   HANDLE   fmapping;
    ULONG    uSize;
 
@@ -619 +619 @@
    if ( INVALID_INDEX == index )
    {
-     ret = SIC_LoadIcon (sSourceFile, dwSourceIndex);
+     if (strcmp(sSourceFile,"shell32.dll") == 0)
+       ret = -1; //icon not in cache -> set to default
+     else
+       ret = SIC_LoadIcon (sSourceFile, dwSourceIndex);
    }
    else