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

Timestamp:

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

Author:

phaller

Message:

.

File:

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

trunk/src/shell32/shlfolder.c

@@ -46 +46 @@
 
 DEFAULT_DEBUG_CHANNEL(shell);
-
-
-/****************************************************************************
- * 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);
-LPITEMIDLIST _Optlink ODIN_ILGetNext    (LPITEMIDLIST pidl);
-
-void         _Optlink ODIN_SHFree   (LPVOID x);
-LPVOID       _Optlink ODIN_SHAlloc  (DWORD len);
 
 
@@ -145 +131 @@
           IShellFolder_Release(psfChild);
 
-          pidlTemp = ODIN_ILCombine(*pidlInOut, pidlOut);
+          pidlTemp = ILCombine(*pidlInOut, pidlOut);
 
           if (pidlOut) 
-            ODIN_ILFree(pidlOut);
-        }
-
-        ODIN_ILFree(*pidlInOut);
+            ILFree(pidlOut);
+        }
+
+        ILFree(*pidlInOut);
         *pidlInOut = pidlTemp;
 
@@ -186 +172 @@
           if (SUCCEEDED(hr))
           {
-            absPidl = ODIN_ILCombine (pidlRoot, pidlChild);
+            absPidl = ILCombine (pidlRoot, pidlChild);
             hr = IPersistFolder_Initialize(pPersistFolder, absPidl);
             IPersistFolder_Release(pPersistFolder);
-            ODIN_SHFree(absPidl);
+            SHFree(absPidl);
             *ppvOut = pShellFolder;
           }
@@ -213 +199 @@
         pdump(pidl);
         
-        if ((pidlFirst = ODIN_ILCloneFirst(pidl)))
+        if ((pidlFirst = ILCloneFirst(pidl)))
         { 
           hr = IShellFolder_BindToObject(psf, pidlFirst, NULL, &IID_IShellFolder, (LPVOID*)&psfChild);
           if (SUCCEEDED(hr))
           {
-            pidlNext = ODIN_ILGetNext(pidl);
+            pidlNext = ILGetNext(pidl);
 
             hr = IShellFolder_GetDisplayNameOf(psfChild, pidlNext, dwFlags | SHGDN_INFOLDER, &strTemp);
@@ -228 +214 @@
             IShellFolder_Release(psfChild);
           }
-          ODIN_ILFree(pidlFirst);
+          ILFree(pidlFirst);
         }
 
@@ -434 +420 @@
             TRACE("-- destroyed IShellFolder(%p) was Desktopfolder\n",This);
           }
-          if(This->absPidl) ODIN_SHFree(This->absPidl);
-          if(This->sMyPath) ODIN_SHFree(This->sMyPath);
+          if(This->absPidl) SHFree(This->absPidl);
+          if(This->sMyPath) SHFree(This->sMyPath);
           HeapFree(GetProcessHeap(),0,This);
           return 0;
@@ -544 +530 @@
           int len;
 
-          sf->absPidl = ODIN_ILCombine(This->absPidl, pidl);    /* build a absolute pidl */
+          sf->absPidl = ILCombine(This->absPidl, pidl); /* build a absolute pidl */
 
           if (!_ILIsSpecialFolder(pidl))                                /* only file system paths */
@@ -555 +541 @@
 
             dwSize += _ILSimpleGetText(pidl,NULL,0);            /* add the size of our name*/
-            sf->sMyPath = ODIN_SHAlloc(dwSize + 2);                     /* '\0' and backslash */
+            sf->sMyPath = SHAlloc(dwSize + 2);                  /* '\0' and backslash */
 
             if(!sf->sMyPath) return NULL;
@@ -778 +764 @@
              && SUCCEEDED(IShellFolder_QueryInterface(pShellFolder, &IID_IPersistFolder, (LPVOID*)&pPersistFolder)))
             {
-              absPidl = ODIN_ILCombine (This->absPidl, pidl);
+              absPidl = ILCombine (This->absPidl, pidl);
               IPersistFolder_Initialize(pPersistFolder, absPidl);
               IPersistFolder_Release(pPersistFolder);
-              ODIN_SHFree(absPidl);
+              SHFree(absPidl);
             }
             else
@@ -790 +776 @@
         else if(_ILIsFolder(pidl))
         {
-          LPITEMIDLIST pidltemp = ODIN_ILCloneFirst(pidl);
+          LPITEMIDLIST pidltemp = ILCloneFirst(pidl);
           pShellFolder = IShellFolder_Constructor(iface, pidltemp);
-          ODIN_ILFree(pidltemp);
+          ILFree(pidltemp);
         }
         else
@@ -806 +792 @@
         else
         {
-          IShellFolder_BindToObject(pShellFolder, ODIN_ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -909 +895 @@
             if (nReturn == 0)                           /* first pidl different ? */
             {
-              pidl1 = ODIN_ILGetNext(pidl1);
+              pidl1 = ILGetNext(pidl1);
 
               if (pidl1 && pidl1->mkid.cb)              /* go deeper? */        
               {
-                pidlTemp = ODIN_ILCloneFirst(pidl1);
-                pidl2 = ODIN_ILGetNext(pidl2);
+                pidlTemp = ILCloneFirst(pidl1);
+                pidl2 = ILGetNext(pidl2);
         
                 hr = IShellFolder_BindToObject(iface, pidlTemp, NULL, &IID_IShellFolder, (LPVOID*)&psf);
@@ -923 +909 @@
                   hr = ResultFromShort(nReturn);
                 }
-                ODIN_ILFree(pidlTemp);
+                ILFree(pidlTemp);
               }
               else
               {
-                pidl2 = ODIN_ILGetNext(pidl2);
+                pidl2 = ILGetNext(pidl2);
                 if (pidl2 && pidl2->mkid.cb)            /* go deeper on #2 ? */
                     hr = ResultFromShort(-1);           /* two different */
@@ -1079 +1065 @@
           else if (IsEqualIID(riid, &IID_IExtractIconA) && (cidl == 1))
           {
-            pidl = ODIN_ILCombine(This->absPidl,apidl[0]);
+            pidl = ILCombine(This->absPidl,apidl[0]);
             pObj = (LPUNKNOWN)IExtractIconA_Constructor( pidl );
-            ODIN_SHFree(pidl);
+            SHFree(pidl);
             hr = S_OK;
           } 
@@ -1489 +1475 @@
           pidlitem = SHSimpleIDListFromPathA(lpstrNewDir);
 
-          pidl = ODIN_ILCombine(This->absPidl, pidlitem);
+          pidl = ILCombine(This->absPidl, pidlitem);
           SHChangeNotifyA(SHCNE_MKDIR, SHCNF_IDLIST, pidl, NULL);
-          ODIN_SHFree(pidl); 
+          SHFree(pidl); 
 
           if (ppidlOut) *ppidlOut = pidlitem;
@@ -1554 +1540 @@
               return E_FAIL;
             }
-            pidl = ODIN_ILCombine(This->absPidl, apidl[i]);
+            pidl = ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_RMDIR, SHCNF_IDLIST, pidl, NULL);
-            ODIN_SHFree(pidl); 
+            SHFree(pidl); 
           }
           else if (_ILIsValue(apidl[i]))
@@ -1568 +1554 @@
               return E_FAIL;
             }
-            pidl = ODIN_ILCombine(This->absPidl, apidl[i]);
+            pidl = ILCombine(This->absPidl, apidl[i]);
             SHChangeNotifyA(SHCNE_DELETE, SHCNF_IDLIST, pidl, NULL);
-            ODIN_SHFree(pidl); 
+            SHFree(pidl); 
           }
 
@@ -1612 +1598 @@
               MESSAGE("would copy %s to %s\n", szSrcPath, szDstPath);
             }
-            ODIN_SHFree(pidl);
+            SHFree(pidl);
           }
           IPersistFolder2_Release(ppf2);
@@ -1821 +1807 @@
           /* combine pidls */
           SHGetSpecialFolderLocation(0, CSIDL_DESKTOPDIRECTORY, &deskpidl);
-          firstpidl = ODIN_ILCloneFirst(pidl);
-          completepidl = ODIN_ILCombine(deskpidl, firstpidl);
+          firstpidl = ILCloneFirst(pidl);
+          completepidl = ILCombine(deskpidl, firstpidl);
 
           pShellFolder = IShellFolder_Constructor(NULL, NULL);
@@ -1830 +1816 @@
             IPersistFolder_Release(ppf);
           }
-          ODIN_ILFree(completepidl);
-          ODIN_ILFree(deskpidl);
-          ODIN_ILFree(firstpidl);
+          ILFree(completepidl);
+          ILFree(deskpidl);
+          ILFree(firstpidl);
         }
         
@@ -1841 +1827 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ODIN_ILGetNext(pidl), NULL, riid, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, riid, (LPVOID)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -2253 +2239 @@
           if (!_ILIsDrive(pidl)) return E_INVALIDARG;
 
-          pidltemp = ODIN_ILCloneFirst(pidl);
+          pidltemp = ILCloneFirst(pidl);
           pShellFolder = IShellFolder_Constructor(iface, pidltemp);
-          ODIN_ILFree(pidltemp);
+          ILFree(pidltemp);
         }
 
@@ -2264 +2250 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ODIN_ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -2677 +2663 @@
         if(This->absPidl)
         {
-          ODIN_SHFree(This->absPidl);
+          SHFree(This->absPidl);
           This->absPidl = NULL;
         }
         if(This->sMyPath)
         {
-          ODIN_SHFree(This->sMyPath);
+          SHFree(This->sMyPath);
           This->sMyPath = NULL;
         }
@@ -2692 +2678 @@
         if (SHGetPathFromIDListA(pidl, sTemp))
         {
-          This->sMyPath = ODIN_SHAlloc(strlen(sTemp)+1);
+          This->sMyPath = SHAlloc(strlen(sTemp)+1);
           strcpy(This->sMyPath, sTemp);
         }