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

Timestamp:

Nov 16, 2001, 1:57:45 PM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/shell32/pidl.c

@@ -43 +43 @@
 
 
-/****************************************************************************
- * local prototypes
- ****************************************************************************/
-
-LPITEMIDLIST _Optlink ODIN_ILGetNext(LPITEMIDLIST pidl);
-LPITEMIDLIST _Optlink ODIN_ILClone  (LPCITEMIDLIST pidl);
-DWORD        _Optlink ODIN_ILGetSize(LPITEMIDLIST pidl);
-
-void         _Optlink ODIN_SHFree   (LPVOID x);
-LPVOID       _Optlink ODIN_SHAlloc  (DWORD len);
-
-
+#define ODIN_ILGETNEXT(pidl) \
+  (pidl ? ( pidl->mkid.cb ? (LPITEMIDLIST) (((LPBYTE)pidl)+pidl->mkid.cb) : NULL) : NULL)
 
 #if defined( __WIN32OS2__) && defined(DEBUG)
@@ -97 +87 @@
                        pidltemp, pidltemp->mkid.cb,type,dwAttrib,szName,debugstr_a(szLongName), debugstr_a(szShortName));
 
-              pidltemp = ODIN_ILGetNext(pidltemp);
+              pidltemp = ODIN_ILGETNEXT(pidltemp);
 
             } while (pidltemp->mkid.cb);
@@ -165 +155 @@
               }
             }
-            pidltemp = ODIN_ILGetNext(pidltemp);
+            pidltemp = ODIN_ILGETNEXT(pidltemp);
           } while (pidltemp->mkid.cb);
         }
@@ -198 +188 @@
         {
           pidlLast = pidl;
-          pidl = ODIN_ILGetNext(pidl);
+          pidl = ODIN_ILGETNEXT(pidl);
         }
         return pidlLast;                
@@ -233 +223 @@
     return NULL;
     
-  len = ODIN_ILGetSize(pidl);
-  newpidl = (LPITEMIDLIST)ODIN_SHAlloc(len);
+  len = ILGetSize(pidl);
+  newpidl = (LPITEMIDLIST)SHAlloc(len);
   if (newpidl)
     memcpy(newpidl,pidl,len);
@@ -260 +250 @@
         {
           len = pidl->mkid.cb;  
-          pidlNew = (LPITEMIDLIST) ODIN_SHAlloc (len+2);
+          pidlNew = (LPITEMIDLIST) SHAlloc (len+2);
           if (pidlNew)
           {
@@ -266 +256 @@
 
             if (len)
-              ODIN_ILGetNext(pidlNew)->mkid.cb = 0x00;
+              ODIN_ILGETNEXT(pidlNew)->mkid.cb = 0x00;
           }
         }
@@ -291 +281 @@
 
         if (*ppPidl)
-        { ODIN_SHFree(*ppPidl);
+        { SHFree(*ppPidl);
           *ppPidl = NULL;
         }
@@ -298 +288 @@
 
         if (SUCCEEDED(IStream_Read(pStream, (LPVOID)&wLen, 2, &dwBytesRead)))
-        { *ppPidl = ODIN_SHAlloc (wLen);
+        { *ppPidl = SHAlloc (wLen);
           if (SUCCEEDED(IStream_Read(pStream, *ppPidl , wLen, &dwBytesRead)))
           { ret = S_OK;
           }
           else
-          { ODIN_SHFree(*ppPidl);
+          { SHFree(*ppPidl);
             *ppPidl = NULL;
           }
@@ -310 +300 @@
         /* we are not yet fully compatible */
         if (!pcheck(*ppPidl))
-        { ODIN_SHFree(*ppPidl);
+        { SHFree(*ppPidl);
           *ppPidl = NULL;
         }
@@ -342 +332 @@
         {
           wLen += sizeof(WORD) + pidl->mkid.cb;
-          pidl = ODIN_ILGetNext(pidl);
+          pidl = ODIN_ILGETNEXT(pidl);
         }
 
@@ -448 +438 @@
           return NULL;
     
-        len = ODIN_ILGetSize(pidl);
+        len = ILGetSize(pidl);
         newpidl = (LPITEMIDLIST)pCOMCTL32_Alloc(len);
         if (newpidl)
@@ -497 +487 @@
               return FALSE;
 
-            pidl1 = ODIN_ILGetNext(pidl1);
-            pidl2 = ODIN_ILGetNext(pidl2);
+            pidl1 = ODIN_ILGETNEXT(pidl1);
+            pidl2 = ODIN_ILGETNEXT(pidl2);
         }
   
@@ -537 +527 @@
             return FALSE;
 
-          pParent = ODIN_ILGetNext(pParent);
-          pChild = ODIN_ILGetNext(pChild);
+          pParent = ODIN_ILGETNEXT(pParent);
+          pChild = ODIN_ILGETNEXT(pChild);
         }       
         
@@ -544 +534 @@
           return FALSE;
         
-        if ( ODIN_ILGetNext(pChild)->mkid.cb && bImmediate)     /* not immediate descent */
+        if ( ODIN_ILGETNEXT(pChild)->mkid.cb && bImmediate)     /* not immediate descent */
           return FALSE;
         
@@ -598 +588 @@
               break;
 
-            pidltemp1 = ODIN_ILGetNext(pidltemp1);
-            pidltemp2 = ODIN_ILGetNext(pidltemp2);
+            pidltemp1 = ODIN_ILGETNEXT(pidltemp1);
+            pidltemp2 = ODIN_ILGETNEXT(pidltemp2);
             ret = pidltemp2;    
           }
@@ -635 +625 @@
         if(!pidl1)
         {
-          pidlNew = ODIN_ILClone(pidl2);
+          pidlNew = ILClone(pidl2);
           return pidlNew;
         }
@@ -641 +631 @@
         if(!pidl2)
         {
-          pidlNew = ODIN_ILClone(pidl1);
+          pidlNew = ILClone(pidl1);
           return pidlNew;
         }
 
-        len1  = ODIN_ILGetSize(pidl1)-2;
-        len2  = ODIN_ILGetSize(pidl2);
-        pidlNew  = ODIN_SHAlloc(len1+len2);
+        len1  = ILGetSize(pidl1)-2;
+        len2  = ILGetSize(pidl2);
+        pidlNew  = SHAlloc(len1+len2);
 
         if (pidlNew)
@@ -729 +719 @@
 
 /*************************************************************************
- * ODIN_ILGetNext [SHELL32.153]
+ * ODIN_ILGETNEXT [SHELL32.153]
  *  gets the next simple pidl of a complex pidl
  *
@@ -741 +731 @@
               LPITEMIDLIST, pidl)
 {
+#ifdef __WIN32OS2__
+  return ODIN_ILGETNEXT(pidl);
+#else
   WORD len;
 
@@ -750 +743 @@
   }
   return NULL;
+#endif
 }
 /*************************************************************************
@@ -774 +768 @@
         if (_ILIsDesktop(pidl))
         {
-           idlRet = ODIN_ILClone(item);
+           idlRet = ILClone(item);
            if (pidl)
-             ODIN_SHFree (pidl);
+             SHFree (pidl);
            return idlRet;
         }
@@ -789 +783 @@
         }
 
-        ODIN_SHFree(pidl);
+        SHFree(pidl);
         return idlRet;
 }
@@ -805 +799 @@
   if(!pidl) 
     return FALSE;
-  ODIN_SHFree(pidl);
+  SHFree(pidl);
   return TRUE;
 }
@@ -1181 +1175 @@
           /* we are on desktop level */
           if (ppidlLast) 
-            *ppidlLast = ODIN_ILClone(pidl);
+            *ppidlLast = ILClone(pidl);
           hr = SHGetDesktopFolder((IShellFolder**)ppv);
         }
         else
         {
-          pidlChild =  ODIN_ILClone(ILFindLastID(pidl));
-          pidlParent = ODIN_ILClone(pidl);
+          pidlChild =  ILClone(ILFindLastID(pidl));
+          pidlParent = ILClone(pidl);
           ILRemoveLastID(pidlParent);
 
@@ -1200 +1194 @@
             ILFree (pidlChild);
 
-          ODIN_SHFree (pidlParent);
+          SHFree (pidlParent);
           if (psf) IShellFolder_Release(psf);
         }
@@ -1410 +1404 @@
         }
 
-        if(!(pidlOut = ODIN_SHAlloc(uSize + 2))) return NULL;
+        if(!(pidlOut = SHAlloc(uSize + 2))) return NULL;
         ZeroMemory(pidlOut, uSize + 2);
         pidlOut->mkid.cb = uSize;
@@ -1446 +1440 @@
         }
         
-        pidlTemp = ODIN_ILGetNext(pidlOut);
+        pidlTemp = ODIN_ILGETNEXT(pidlOut);
         if (pidlTemp)
           pidlTemp->mkid.cb = 0x00;
@@ -1466 +1460 @@
 
         if(_ILIsMyComputer(pidl))
-          pidl = ODIN_ILGetNext(pidl);
+          pidl = ODIN_ILGETNEXT(pidl);
 
         if (pidl && _ILIsDrive(pidl))
@@ -2022 +2016 @@
         if(apidl)
         {
-          for(i = 0; i < cidl; i++) ODIN_SHFree(apidl[i]);
-          ODIN_SHFree(apidl);
+          for(i = 0; i < cidl; i++) SHFree(apidl[i]);
+          SHFree(apidl);
         }
 }
@@ -2035 +2029 @@
 {
         int i;
-        LPITEMIDLIST * apidldest = (LPITEMIDLIST*)ODIN_SHAlloc(cidl * sizeof(LPITEMIDLIST));
+        LPITEMIDLIST * apidldest = (LPITEMIDLIST*)SHAlloc(cidl * sizeof(LPITEMIDLIST));
         if(!apidlsrc) return NULL;
 
         for(i = 0; i < cidl; i++)
-          apidldest[i] = ODIN_ILClone(apidlsrc[i]);
+          apidldest[i] = ILClone(apidlsrc[i]);
 
         return apidldest;
@@ -2052 +2046 @@
 {
         int i;
-        LPITEMIDLIST * dst = (LPITEMIDLIST*)ODIN_SHAlloc(cida->cidl * sizeof(LPITEMIDLIST));
+        LPITEMIDLIST * dst = (LPITEMIDLIST*)SHAlloc(cida->cidl * sizeof(LPITEMIDLIST));
 
         if(!dst) return NULL;
 
         if (pidl)
-          *pidl = ODIN_ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[0]]));
+          *pidl = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[0]]));
 
         for(i = 0; i < cida->cidl; i++)
-          dst[i] = ODIN_ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[i + 1]]));
+          dst[i] = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[i + 1]]));
 
         return dst;