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

Timestamp:

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

Author:

phaller

Message:

.

File:

• trunk/src/shell32/new/shlfolder.cpp (modified) (8 diffs)

trunk/src/shell32/new/shlfolder.cpp

@@ -29 +29 @@
 #include "shell32_main.h"
 
+#include <heapstring.h>
 #include <misc.h>
 
@@ -209 +210 @@
 } IGenericSFImpl;
 
-static struct ICOM_VTABLE(IShellFolder) sfvt;
-static struct ICOM_VTABLE(IPersistFolder) psfvt;
-static struct ICOM_VTABLE(IDropTarget) dtvt;
+//static struct ICOM_VTABLE(IShellFolder) sfvt;
+//static struct ICOM_VTABLE(IPersistFolder) psfvt;
+//static struct ICOM_VTABLE(IDropTarget) dtvt;
 
 static IShellFolder * ISF_MyComputer_Constructor(void);
@@ -218 +219 @@
 #define _ICOM_THIS_From_IPersistFolder(class, name) class* This = (class*)(((char*)name)-_IPersistFolder_Offset);
         
-static struct ICOM_VTABLE(IDropTarget) dtvt;
 #define _IDropTarget_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblDropTarget)))
 #define _ICOM_THIS_From_IDropTarget(class, name) class* This = (class*)(((char*)name)-_IDropTarget_Offset);
@@ -278 +278 @@
 
             dwSize += _ILSimpleGetText(pidl,NULL,0);            /* add the size of our name*/
-            sf->sMyPath = SHAlloc(dwSize + 2);                  /* '\0' and backslash */
+            sf->sMyPath = (char*)SHAlloc(dwSize + 2);                   /* '\0' and backslash */
 
             if(!sf->sMyPath) return NULL;
@@ -562 +562 @@
         else
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID*)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -664 +664 @@
             _ILSimpleGetText(pidl1, szTemp1, MAX_PATH);
             _ILSimpleGetText(pidl2, szTemp2, MAX_PATH);
-            nReturn = strcasecmp(szTemp1, szTemp2);
+            nReturn = strcmp(szTemp1, szTemp2);
         
             if (nReturn == 0)                           /* first pidl different ? */
@@ -1178 +1178 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, riid, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, riid, (LPVOID*)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -1490 +1490 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID*)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;