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

Timestamp:

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

Author:

phaller

Message:

performance improvement

File:

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

trunk/src/shell32/shlfolder.c

@@ -36 +36 @@
 
 
+/****************************************************************************
+ * local prototypes
+ ****************************************************************************/
+
+DWORD        _Optlink ODIN_ILFree       (LPITEMIDLIST pidl);
+LPITEMIDLIST _Optlink ODIN_ILCombine    (LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2);
+LPITEMIDLIST _Optlink ODIN_ILClone      (LPCITEMIDLIST pidl);
+LPITEMIDLIST _Optlink ODIN_ILCloneFirst (LPCITEMIDLIST pidl);
+
+
 /***************************************************************************
  * debughelper: print out the return adress
@@ -119 +129 @@
           IShellFolder_Release(psfChild);
 
-          pidlTemp = ILCombine(*pidlInOut, pidlOut);
+          pidlTemp = ODIN_ILCombine(*pidlInOut, pidlOut);
 
           if (pidlOut) 
-            ILFree(pidlOut);
-        }
-
-        ILFree(*pidlInOut);
+            ODIN_ILFree(pidlOut);
+        }
+
+        ODIN_ILFree(*pidlInOut);
         *pidlInOut = pidlTemp;
 
@@ -160 +170 @@
           if (SUCCEEDED(hr))
           {
-            absPidl = ILCombine (pidlRoot, pidlChild);
+            absPidl = ODIN_ILCombine (pidlRoot, pidlChild);
             hr = IPersistFolder_Initialize(pPersistFolder, absPidl);
             IPersistFolder_Release(pPersistFolder);
@@ -187 +197 @@
         pdump(pidl);
         
-        if ((pidlFirst = ILCloneFirst(pidl)))
+        if ((pidlFirst = ODIN_ILCloneFirst(pidl)))
         { 
           hr = IShellFolder_BindToObject(psf, pidlFirst, NULL, &IID_IShellFolder, (LPVOID*)&psfChild);
@@ -202 +212 @@
             IShellFolder_Release(psfChild);
           }
-          ILFree(pidlFirst);
+          ODIN_ILFree(pidlFirst);
         }
 
@@ -518 +528 @@
           int len;
 
-          sf->absPidl = ILCombine(This->absPidl, pidl); /* build a absolute pidl */
+          sf->absPidl = ODIN_ILCombine(This->absPidl, pidl);    /* build a absolute pidl */
 
           if (!_ILIsSpecialFolder(pidl))                                /* only file system paths */
@@ -752 +762 @@
              && SUCCEEDED(IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder, (LPVOID*)&pPersistFolder)))
             {
-              absPidl = ILCombine (This->absPidl, pidl);
+              absPidl = ODIN_ILCombine (This->absPidl, pidl);
               IPersistFolder_Initialize(pPersistFolder, absPidl);
               IPersistFolder_Release(pPersistFolder);
@@ -764 +774 @@
         else if(_ILIsFolder(pidl))
         {
-          LPITEMIDLIST pidltemp = ILCloneFirst(pidl);
+          LPITEMIDLIST pidltemp = ODIN_ILCloneFirst(pidl);
           pShellFolder = IShellFolder_Constructor(iface, pidltemp);
-          ILFree(pidltemp);
+          ODIN_ILFree(pidltemp);
         }
         else
@@ -888 +898 @@
               if (pidl1 && pidl1->mkid.cb)              /* go deeper? */        
               {
-                pidlTemp = ILCloneFirst(pidl1);
+                pidlTemp = ODIN_ILCloneFirst(pidl1);
                 pidl2 = ILGetNext(pidl2);
         
@@ -898 +908 @@
                   hr = ResultFromShort(nReturn);
                 }
-                ILFree(pidlTemp);
+                ODIN_ILFree(pidlTemp);
               }
               else
@@ -1054 +1064 @@
           else if (IsEqualIID(riid, &IID_IExtractIconA) && (cidl == 1))
           {
-            pidl = ILCombine(This->absPidl,apidl[0]);
+            pidl = ODIN_ILCombine(This->absPidl,apidl[0]);
             pObj = (LPUNKNOWN)IExtractIconA_Constructor( pidl );
             SHFree(pidl);
@@ -1464 +1474 @@
           pidlitem = SHSimpleIDListFromPathA(lpstrNewDir);
 
-          pidl = ILCombine(This->absPidl, pidlitem);
+          pidl = ODIN_ILCombine(This->absPidl, pidlitem);
           SHChangeNotifyA(SHCNE_MKDIR, SHCNF_IDLIST, pidl, NULL);
           SHFree(pidl); 
@@ -1529 +1539 @@
               return E_FAIL;
             }
-            pidl = ILCombine(This->absPidl, apidl[i]);
+            pidl = ODIN_ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_RMDIR, SHCNF_IDLIST, pidl, NULL);
             SHFree(pidl); 
@@ -1543 +1553 @@
               return E_FAIL;
             }
-            pidl = ILCombine(This->absPidl, apidl[i]);
+            pidl = ODIN_ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_DELETE, SHCNF_IDLIST, pidl, NULL);
             SHFree(pidl); 
@@ -1796 +1806 @@
           /* combine pidls */
           SHGetSpecialFolderLocation(0, CSIDL_DESKTOPDIRECTORY, &deskpidl);
-          firstpidl = ILCloneFirst(pidl);
-          completepidl = ILCombine(deskpidl, firstpidl);
+          firstpidl = ODIN_ILCloneFirst(pidl);
+          completepidl = ODIN_ILCombine(deskpidl, firstpidl);
 
           pShellFolder = IShellFolder_Constructor(NULL, NULL);
@@ -1805 +1815 @@
             IPersistFolder_Release(ppf);
           }
-          ILFree(completepidl);
-          ILFree(deskpidl);
-          ILFree(firstpidl);
+          ODIN_ILFree(completepidl);
+          ODIN_ILFree(deskpidl);
+          ODIN_ILFree(firstpidl);
         }
         
@@ -2228 +2238 @@
           if (!_ILIsDrive(pidl)) return E_INVALIDARG;
 
-          pidltemp = ILCloneFirst(pidl);
+          pidltemp = ODIN_ILCloneFirst(pidl);
           pShellFolder = IShellFolder_Constructor(iface, pidltemp);
-          ILFree(pidltemp);
+          ODIN_ILFree(pidltemp);
         }