Changeset 7014 for trunk/src/shell32/shlfolder.c

Timestamp:

Oct 11, 2001, 4:33:03 AM (24 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/shell32/shlfolder.c (modified) (13 diffs)

trunk/src/shell32/shlfolder.c

@@ -44 +44 @@
 LPITEMIDLIST _Optlink ODIN_ILClone      (LPCITEMIDLIST pidl);
 LPITEMIDLIST _Optlink ODIN_ILCloneFirst (LPCITEMIDLIST pidl);
+LPITEMIDLIST _Optlink ODIN_ILGetNext    (LPITEMIDLIST pidl);
+
+void         _Optlink ODIN_SHFree   (LPVOID x);
+LPVOID       _Optlink ODIN_SHAlloc  (DWORD len);
 
 
@@ -173 +177 @@
             hr = IPersistFolder_Initialize(pPersistFolder, absPidl);
             IPersistFolder_Release(pPersistFolder);
-            SHFree(absPidl);
+            ODIN_SHFree(absPidl);
             *ppvOut = pShellFolder;
           }
@@ -202 +206 @@
           if (SUCCEEDED(hr))
           {
-            pidlNext = ILGetNext(pidl);
+            pidlNext = ODIN_ILGetNext(pidl);
 
             hr = IShellFolder_GetDisplayNameOf(psfChild, pidlNext, dwFlags | SHGDN_INFOLDER, &strTemp);
@@ -418 +422 @@
             TRACE("-- destroyed IShellFolder(%p) was Desktopfolder\n",This);
           }
-          if(This->absPidl) SHFree(This->absPidl);
-          if(This->sMyPath) SHFree(This->sMyPath);
+          if(This->absPidl) ODIN_SHFree(This->absPidl);
+          if(This->sMyPath) ODIN_SHFree(This->sMyPath);
           HeapFree(GetProcessHeap(),0,This);
           return 0;
@@ -539 +543 @@
 
             dwSize += _ILSimpleGetText(pidl,NULL,0);            /* add the size of our name*/
-            sf->sMyPath = SHAlloc(dwSize + 2);                  /* '\0' and backslash */
+            sf->sMyPath = ODIN_SHAlloc(dwSize + 2);                     /* '\0' and backslash */
 
             if(!sf->sMyPath) return NULL;
@@ -765 +769 @@
               IPersistFolder_Initialize(pPersistFolder, absPidl);
               IPersistFolder_Release(pPersistFolder);
-              SHFree(absPidl);
+              ODIN_SHFree(absPidl);
             }
             else
@@ -1066 +1070 @@
             pidl = ODIN_ILCombine(This->absPidl,apidl[0]);
             pObj = (LPUNKNOWN)IExtractIconA_Constructor( pidl );
-            SHFree(pidl);
+            ODIN_SHFree(pidl);
             hr = S_OK;
           } 
@@ -1476 +1480 @@
           pidl = ODIN_ILCombine(This->absPidl, pidlitem);
           SHChangeNotifyA(SHCNE_MKDIR, SHCNF_IDLIST, pidl, NULL);
-          SHFree(pidl); 
+          ODIN_SHFree(pidl); 
 
           if (ppidlOut) *ppidlOut = pidlitem;
@@ -1541 +1545 @@
             pidl = ODIN_ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_RMDIR, SHCNF_IDLIST, pidl, NULL);
-            SHFree(pidl); 
+            ODIN_SHFree(pidl); 
           }
           else if (_ILIsValue(apidl[i]))
@@ -1555 +1559 @@
             pidl = ODIN_ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_DELETE, SHCNF_IDLIST, pidl, NULL);
-            SHFree(pidl); 
+            ODIN_SHFree(pidl); 
           }
 
@@ -1597 +1601 @@
               MESSAGE("would copy %s to %s\n", szSrcPath, szDstPath);
             }
-            SHFree(pidl);
+            ODIN_SHFree(pidl);
           }
           IPersistFolder2_Release(ppf2);
@@ -2662 +2666 @@
         if(This->absPidl)
         {
-          SHFree(This->absPidl);
+          ODIN_SHFree(This->absPidl);
           This->absPidl = NULL;
         }
         if(This->sMyPath)
         {
-          SHFree(This->sMyPath);
+          ODIN_SHFree(This->sMyPath);
           This->sMyPath = NULL;
         }
@@ -2677 +2681 @@
         if (SHGetPathFromIDListA(pidl, sTemp))
         {
-          This->sMyPath = SHAlloc(strlen(sTemp)+1);
+          This->sMyPath = ODIN_SHAlloc(strlen(sTemp)+1);
           strcpy(This->sMyPath, sTemp);
         }