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

Timestamp:

Oct 11, 2001, 4:13:18 AM (24 years ago)

Author:

phaller

Message:

performance improvement

File:

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

trunk/src/shell32/pidl.c

@@ -42 +42 @@
 #endif
 
+
+/****************************************************************************
+ * local prototypes
+ ****************************************************************************/
+
+LPITEMIDLIST _Optlink ODIN_ILGetNext(LPITEMIDLIST pidl);
+LPITEMIDLIST _Optlink ODIN_ILClone  (LPCITEMIDLIST pidl);
+DWORD        _Optlink ODIN_ILGetSize(LPITEMIDLIST pidl);
+
+
 #if defined( __WIN32OS2__) && defined(DEBUG)
 void pdump (LPCITEMIDLIST pidl)
@@ -83 +93 @@
                        pidltemp, pidltemp->mkid.cb,type,dwAttrib,szName,debugstr_a(szLongName), debugstr_a(szShortName));
 
-              pidltemp = ILGetNext(pidltemp);
+              pidltemp = ODIN_ILGetNext(pidltemp);
 
             } while (pidltemp->mkid.cb);
@@ -151 +161 @@
               }
             }
-            pidltemp = ILGetNext(pidltemp);
+            pidltemp = ODIN_ILGetNext(pidltemp);
           } while (pidltemp->mkid.cb);
         }
@@ -184 +194 @@
         {
           pidlLast = pidl;
-          pidl = ILGetNext(pidl);
+          pidl = ODIN_ILGetNext(pidl);
         }
         return pidlLast;                
@@ -219 +229 @@
     return NULL;
     
-  len = ILGetSize(pidl);
+  len = ODIN_ILGetSize(pidl);
   newpidl = (LPITEMIDLIST)SHAlloc(len);
   if (newpidl)
@@ -252 +262 @@
 
             if (len)
-              ILGetNext(pidlNew)->mkid.cb = 0x00;
+              ODIN_ILGetNext(pidlNew)->mkid.cb = 0x00;
           }
         }
@@ -328 +338 @@
         {
           wLen += sizeof(WORD) + pidl->mkid.cb;
-          pidl = ILGetNext(pidl);
+          pidl = ODIN_ILGetNext(pidl);
         }
 
@@ -434 +444 @@
           return NULL;
     
-        len = ILGetSize(pidl);
+        len = ODIN_ILGetSize(pidl);
         newpidl = (LPITEMIDLIST)pCOMCTL32_Alloc(len);
         if (newpidl)
@@ -478 +488 @@
               return FALSE;
 
-            pidltemp1 = ILGetNext(pidltemp1);
-            pidltemp2 = ILGetNext(pidltemp2);
+            pidltemp1 = ODIN_ILGetNext(pidltemp1);
+            pidltemp2 = ODIN_ILGetNext(pidltemp2);
         }       
 
@@ -517 +527 @@
             return FALSE;
 
-          pParent = ILGetNext(pParent);
-          pChild = ILGetNext(pChild);
+          pParent = ODIN_ILGetNext(pParent);
+          pChild = ODIN_ILGetNext(pChild);
         }       
         
@@ -524 +534 @@
           return FALSE;
         
-        if ( ILGetNext(pChild)->mkid.cb && bImmediate)  /* not immediate descent */
+        if ( ODIN_ILGetNext(pChild)->mkid.cb && bImmediate)     /* not immediate descent */
           return FALSE;
         
@@ -577 +587 @@
               break;
 
-            pidltemp1 = ILGetNext(pidltemp1);
-            pidltemp2 = ILGetNext(pidltemp2);
+            pidltemp1 = ODIN_ILGetNext(pidltemp1);
+            pidltemp2 = ODIN_ILGetNext(pidltemp2);
             ret = pidltemp2;    
           }
@@ -606 +616 @@
         LPITEMIDLIST  pidlNew;
         
-        TRACE("pidl=%p pidl=%p\n",pidl1,pidl2);
 
         if(!pidl1 && !pidl2) return NULL;
@@ -615 +624 @@
         if(!pidl1)
         {
-          pidlNew = ILClone(pidl2);
+          pidlNew = ODIN_ILClone(pidl2);
           return pidlNew;
         }
@@ -621 +630 @@
         if(!pidl2)
         {
-          pidlNew = ILClone(pidl1);
+          pidlNew = ODIN_ILClone(pidl1);
           return pidlNew;
         }
 
-        len1  = ILGetSize(pidl1)-2;
-        len2  = ILGetSize(pidl2);
+        len1  = ODIN_ILGetSize(pidl1)-2;
+        len2  = ODIN_ILGetSize(pidl2);
         pidlNew  = SHAlloc(len1+len2);
 
@@ -709 +718 @@
 
 /*************************************************************************
- * ILGetNext [SHELL32.153]
+ * ODIN_ILGetNext [SHELL32.153]
  *  gets the next simple pidl of a complex pidl
  *
@@ -721 +730 @@
               LPITEMIDLIST, pidl)
 {
-        WORD len;
-        
-        TRACE("(pidl=%p)\n",pidl);
-
-        if(pidl)
-        {
-          len =  pidl->mkid.cb;
-          if (len)
-          {
-            pidl = (LPITEMIDLIST) (((LPBYTE)pidl)+len);
-            return pidl;
-          }
-        }
-        return NULL;
+  WORD len;
+
+  if(pidl)
+  {
+    len =  pidl->mkid.cb;
+    if (len)
+      return (LPITEMIDLIST) (((LPBYTE)pidl)+len);
+  }
+  return NULL;
 }
 /*************************************************************************
@@ -759 +763 @@
         if (_ILIsDesktop(pidl))
         {
-           idlRet = ILClone(item);
+           idlRet = ODIN_ILClone(item);
            if (pidl)
              SHFree (pidl);
@@ -788 +792 @@
               LPITEMIDLIST, pidl)
 {
-        TRACE("(pidl=0x%08lx)\n",(DWORD)pidl);
-
-        if(!pidl) return FALSE;
-        SHFree(pidl);
-        return TRUE;
+  if(!pidl) 
+    return FALSE;
+  SHFree(pidl);
+  return TRUE;
 }
 /*************************************************************************
@@ -1167 +1170 @@
           /* we are on desktop level */
           if (ppidlLast) 
-            *ppidlLast = ILClone(pidl);
+            *ppidlLast = ODIN_ILClone(pidl);
           hr = SHGetDesktopFolder((IShellFolder**)ppv);
         }
         else
         {
-          pidlChild =  ILClone(ILFindLastID(pidl));
-          pidlParent = ILClone(pidl);
+          pidlChild =  ODIN_ILClone(ILFindLastID(pidl));
+          pidlParent = ODIN_ILClone(pidl);
           ILRemoveLastID(pidlParent);
 
@@ -1432 +1435 @@
         }
         
-        pidlTemp = ILGetNext(pidlOut);
+        pidlTemp = ODIN_ILGetNext(pidlOut);
         if (pidlTemp)
           pidlTemp->mkid.cb = 0x00;
@@ -1452 +1455 @@
 
         if(_ILIsMyComputer(pidl))
-          pidl = ILGetNext(pidl);
+          pidl = ODIN_ILGetNext(pidl);
 
         if (pidl && _ILIsDrive(pidl))
@@ -1944 +1947 @@
 
         for(i = 0; i < cidl; i++)
-          apidldest[i] = ILClone(apidlsrc[i]);
+          apidldest[i] = ODIN_ILClone(apidlsrc[i]);
 
         return apidldest;
@@ -1962 +1965 @@
 
         if (pidl)
-          *pidl = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[0]]));
+          *pidl = ODIN_ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[0]]));
 
         for(i = 0; i < cida->cidl; i++)
-          dst[i] = ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[i + 1]]));
+          dst[i] = ODIN_ILClone((LPITEMIDLIST)(&((LPBYTE)cida)[cida->aoffset[i + 1]]));
 
         return dst;