Changeset 793 for trunk/src/shell32/new/iconcache.cpp

Timestamp:

Sep 2, 1999, 6:42:57 PM (26 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/shell32/new/iconcache.cpp

@@ -12 +12 @@
 #include "winuser.h"
 #include "wingdi.h"
-#include "wine/winuser16.h"
-#include "wine/winbase16.h"
-#include "neexe.h"
+//#include "wine/winuser16.h"
+//#include "wine/winbase16.h"
+//#include "neexe.h"
 #include "cursoricon.h"
 #include "module.h"
@@ -67 +67 @@
 }
 #endif
+
+
+static HDPA             sic_hdpa = 0;
+static CRITICAL_SECTION SHELL32_SicCS;
+
+
+
 /*************************************************************************
  *                              SHELL_GetResourceTable
@@ -334 +341 @@
           }
 
-          if ( !(peimage = MapViewOfFile(fmapping,FILE_MAP_READ,0,0,0)))
+          if ( !(peimage = (BYTE*)MapViewOfFile(fmapping,FILE_MAP_READ,0,0,0)))
           { WARN("failed to mmap filemap.\n");
             hRet = ICO_INVALID_FILE;
@@ -466 +473 @@
 } SIC_ENTRY, * LPSIC_ENTRY;
 
-static HDPA             sic_hdpa = 0;
-static CRITICAL_SECTION SHELL32_SicCS;
-
 /*****************************************************************************
  * SIC_CompareEntrys                    [called by comctl32.dll]
@@ -481 +485 @@
           return 1;
 
-        if (strcasecmp(((LPSIC_ENTRY)p1)->sSourceFile,((LPSIC_ENTRY)p2)->sSourceFile))
+        if (strcmp(((LPSIC_ENTRY)p1)->sSourceFile,((LPSIC_ENTRY)p2)->sSourceFile))
           return 1;
 
@@ -787 +791 @@
 INT WINAPI Shell_GetCachedImageIndexAW(LPCVOID szPath, INT nIndex, BOOL bSimulateDoc)
 {       if( VERSION_OsIsUnicode())
-          return Shell_GetCachedImageIndexW(szPath, nIndex, bSimulateDoc);
-        return Shell_GetCachedImageIndexA(szPath, nIndex, bSimulateDoc);
+          return Shell_GetCachedImageIndexW((LPWSTR)szPath, nIndex, bSimulateDoc);
+        return Shell_GetCachedImageIndexA((LPSTR)szPath, nIndex, bSimulateDoc);
 }
 
@@ -796 +800 @@
 HICON WINAPI ExtractIconExAW ( LPCVOID lpszFile, INT nIconIndex, HICON * phiconLarge, HICON * phiconSmall, UINT nIcons )
 {       if (VERSION_OsIsUnicode())
-          return ExtractIconExW ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
-        return ExtractIconExA ( lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
+          return ExtractIconExW ( (LPWSTR)lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
+        return ExtractIconExA ( (LPSTR)lpszFile, nIconIndex, phiconLarge, phiconSmall, nIcons);
 }
 /*************************************************************************