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

Timestamp:

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

Author:

phaller

Message:

.

File:

• trunk/src/shell32/pidl.c (modified) (15 diffs)

trunk/src/shell32/pidl.c

@@ -50 +50 @@
 LPITEMIDLIST _Optlink ODIN_ILClone  (LPCITEMIDLIST pidl);
 DWORD        _Optlink ODIN_ILGetSize(LPITEMIDLIST pidl);
+
+void         _Optlink ODIN_SHFree   (LPVOID x);
+LPVOID       _Optlink ODIN_SHAlloc  (DWORD len);
+
 
 
@@ -230 +234 @@
     
   len = ODIN_ILGetSize(pidl);
-  newpidl = (LPITEMIDLIST)SHAlloc(len);
+  newpidl = (LPITEMIDLIST)ODIN_SHAlloc(len);
   if (newpidl)
     memcpy(newpidl,pidl,len);
@@ -256 +260 @@
         {
           len = pidl->mkid.cb;  
-          pidlNew = (LPITEMIDLIST) SHAlloc (len+2);
+          pidlNew = (LPITEMIDLIST) ODIN_SHAlloc (len+2);
           if (pidlNew)
           {
@@ -287 +291 @@
 
         if (*ppPidl)
-        { SHFree(*ppPidl);
+        { ODIN_SHFree(*ppPidl);
           *ppPidl = NULL;
         }
@@ -294 +298 @@
 
         if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead)))
-        { *ppPidl = SHAlloc (wLen);
+        { *ppPidl = ODIN_SHAlloc (wLen);
           if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead)))
           { ret = S_OK;
           }
           else
-          { SHFree(*ppPidl);
+          { ODIN_SHFree(*ppPidl);
             *ppPidl = NULL;
           }
@@ -306 +310 @@
         /* we are not yet fully compatible */
         if (!pcheck(*ppPidl))
-        { SHFree(*ppPidl);
+        { ODIN_SHFree(*ppPidl);
           *ppPidl = NULL;
         }
@@ -636 +640 @@
         len1  = ODIN_ILGetSize(pidl1)-2;
         len2  = ODIN_ILGetSize(pidl2);
-        pidlNew  = SHAlloc(len1+len2);
+        pidlNew  = ODIN_SHAlloc(len1+len2);
 
         if (pidlNew)
@@ -765 +769 @@
            idlRet = ODIN_ILClone(item);
            if (pidl)
-             SHFree (pidl);
+             ODIN_SHFree (pidl);
            return idlRet;
         }
@@ -778 +782 @@
         }
 
-        SHFree(pidl);
+        ODIN_SHFree(pidl);
         return idlRet;
 }
@@ -794 +798 @@
   if(!pidl) 
     return FALSE;
-  SHFree(pidl);
+  ODIN_SHFree(pidl);
   return TRUE;
 }
@@ -1189 +1193 @@
             ILFree (pidlChild);
 
-          SHFree (pidlParent);
+          ODIN_SHFree (pidlParent);
           if (psf) IShellFolder_Release(psf);
         }
@@ -1399 +1403 @@
         }
 
-        if(!(pidlOut = SHAlloc(uSize + 2))) return NULL;
+        if(!(pidlOut = ODIN_SHAlloc(uSize + 2))) return NULL;
         ZeroMemory(pidlOut, uSize + 2);
         pidlOut->mkid.cb = uSize;
@@ -1930 +1934 @@
         if(apidl)
         {
-          for(i = 0; i < cidl; i++) SHFree(apidl[i]);
-          SHFree(apidl);
+          for(i = 0; i < cidl; i++) ODIN_SHFree(apidl[i]);
+          ODIN_SHFree(apidl);
         }
 }
@@ -1943 +1947 @@
 {
         int i;
-        LPITEMIDLIST * apidldest = (LPITEMIDLIST*)SHAlloc(cidl * sizeof(LPITEMIDLIST));
+        LPITEMIDLIST * apidldest = (LPITEMIDLIST*)ODIN_SHAlloc(cidl * sizeof(LPITEMIDLIST));
         if(!apidlsrc) return NULL;
 
@@ -1960 +1964 @@
 {
         int i;
-        LPITEMIDLIST * dst = (LPITEMIDLIST*)SHAlloc(cida->cidl * sizeof(LPITEMIDLIST));
+        LPITEMIDLIST * dst = (LPITEMIDLIST*)ODIN_SHAlloc(cida->cidl * sizeof(LPITEMIDLIST));
 
         if(!dst) return NULL;