Changeset 793

Timestamp:

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

Author:

phaller

Message:

.

Location:

trunk/src/shell32/new

Files:

• iconcache.cpp (modified) (7 diffs)
• pidl.cpp (modified) (16 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);
 }
 /*************************************************************************

trunk/src/shell32/new/pidl.cpp ¶

@@ -29 +29 @@
 #include "wine/undocshell.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -257 +258 @@
 
         if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead)))
-        { *ppPidl = SHAlloc (wLen);
+        { *ppPidl = (ITEMIDLIST*)SHAlloc (wLen);
           if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead)))
           { ret = S_OK;
@@ -310 +311 @@
         if (SUCCEEDED (SHGetDesktopFolder(&sf)))
         {
-          ret = IShellFolder_ParseDisplayName(sf,0, NULL, path, &pchEaten, ppidl, attributes);
+          ret = IShellFolder_ParseDisplayName(sf,0, NULL, (LPOLESTR)path, &pchEaten, ppidl, attributes);
           IShellFolder_Release(sf);
         }
@@ -318 +319 @@
 {
         if ( VERSION_OsIsUnicode())
-          return SHILCreateFromPathW (path, ppidl, attributes);
-        return SHILCreateFromPathA (path, ppidl, attributes);
+          return SHILCreateFromPathW ((LPCWSTR)path, ppidl, attributes);
+        return SHILCreateFromPathA ((LPCSTR)path, ppidl, attributes);
 }
 
@@ -394 +395 @@
             _ILSimpleGetText(pidltemp2, szData2, MAX_PATH);
 
-            if (strcasecmp ( szData1, szData2 )!=0 )
+            if (strcmp ( szData1, szData2 )!=0 )
               return FALSE;
 
@@ -430 +431 @@
           _ILSimpleGetText(pChild, szData2, MAX_PATH);
 
-          if (strcasecmp ( szData1, szData2 )!=0 )
+          if (strcmp ( szData1, szData2 )!=0 )
             return FALSE;
 
@@ -488 +489 @@
             _ILSimpleGetText(pidltemp2, szData2, MAX_PATH);
 
-            if (strcasecmp(szData1,szData2))
+            if (strcmp(szData1,szData2))
               break;
 
@@ -539 +540 @@
         len1  = ILGetSize(pidl1)-2;
         len2  = ILGetSize(pidl2);
-        pidlNew  = SHAlloc(len1+len2);
+        pidlNew  = (ITEMIDLIST*)SHAlloc(len1+len2);
 
         if (pidlNew)
@@ -731 +732 @@
 {
         if ( VERSION_OsIsUnicode())
-          return ILCreateFromPathW (path);
-        return ILCreateFromPathA (path);
+          return ILCreateFromPathW ((LPCWSTR)path);
+        return ILCreateFromPathA ((LPCSTR)path);
 }
 /*************************************************************************
@@ -776 +777 @@
 {
         if ( VERSION_OsIsUnicode())
-          return SHSimpleIDListFromPathW (lpszPath);
-        return SHSimpleIDListFromPathA (lpszPath);
+          return SHSimpleIDListFromPathW ((LPWSTR)lpszPath);
+        return SHSimpleIDListFromPathA ((LPSTR)lpszPath);
 }
 
@@ -846 +847 @@
           case SHGDFIL_FINDDATA:
             {
-               WIN32_FIND_DATAA * pfd = dest;
+               WIN32_FIND_DATAA * pfd = (WIN32_FIND_DATAA*)dest;
                CHAR     pszPath[MAX_PATH];
                HANDLE   handle;
@@ -997 +998 @@
 
         if (VERSION_OsIsUnicode())
-          return SHGetPathFromIDListW(pidl,pszPath);
-        return SHGetPathFromIDListA(pidl,pszPath);
+          return SHGetPathFromIDListW(pidl,(LPWSTR)pszPath);
+        return SHGetPathFromIDListA(pidl,(LPSTR)pszPath);
 }
 
@@ -1145 +1146 @@
         { case PT_DESKTOP:
             uSize = 0;
-            pidlOut = SHAlloc(uSize + 2);
+            pidlOut = (ITEMIDLIST*)SHAlloc(uSize + 2);
             pidlOut->mkid.cb = uSize;
             TRACE_(pidl)("- create Desktop\n");
@@ -1152 +1153 @@
           case PT_MYCOMP:
             uSize = 2 + 2 + sizeof(GUID);
-            pidlOut = SHAlloc(uSize + 2);
+            pidlOut = (ITEMIDLIST*)SHAlloc(uSize + 2);
             ZeroMemory(pidlOut, uSize + 2);
             pidlOut->mkid.cb = uSize;
@@ -1163 +1164 @@
           case PT_DRIVE:
             uSize = 2 + 23;
-            pidlOut = SHAlloc(uSize + 2);
+            pidlOut = (ITEMIDLIST*)SHAlloc(uSize + 2);
             ZeroMemory(pidlOut, uSize + 2);
             pidlOut->mkid.cb = uSize;
@@ -1176 +1177 @@
           case PT_VALUE:
             uSize = 2 + 12 + uInSize;
-            pidlOut = SHAlloc(uSize + 2);
+            pidlOut = (ITEMIDLIST*)SHAlloc(uSize + 2);
             ZeroMemory(pidlOut, uSize + 2);
             pidlOut->mkid.cb = uSize;