Changeset 7099 for trunk/src

Timestamp:

Oct 17, 2001, 7:24:28 PM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/shell32/shlfolder.c

@@ -806 +806 @@
         else
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ODIN_ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -909 +909 @@
             if (nReturn == 0)                           /* first pidl different ? */
             {
-              pidl1 = ILGetNext(pidl1);
+              pidl1 = ODIN_ILGetNext(pidl1);
 
               if (pidl1 && pidl1->mkid.cb)              /* go deeper? */        
               {
                 pidlTemp = ODIN_ILCloneFirst(pidl1);
-                pidl2 = ILGetNext(pidl2);
+                pidl2 = ODIN_ILGetNext(pidl2);
         
                 hr = IShellFolder_BindToObject(iface, pidlTemp, NULL, &IID_IShellFolder, (LPVOID*)&psf);
@@ -927 +927 @@
               else
               {
-                pidl2 = ILGetNext(pidl2);
+                pidl2 = ODIN_ILGetNext(pidl2);
                 if (pidl2 && pidl2->mkid.cb)            /* go deeper on #2 ? */
                     hr = ResultFromShort(-1);           /* two different */
@@ -1841 +1841 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, riid, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ODIN_ILGetNext(pidl), NULL, riid, (LPVOID)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;
@@ -2264 +2264 @@
         else                            /* go deeper */
         {
-          IShellFolder_BindToObject(pShellFolder, ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
+          IShellFolder_BindToObject(pShellFolder, ODIN_ILGetNext(pidl), NULL, &IID_IShellFolder, (LPVOID)&pSubFolder);
           IShellFolder_Release(pShellFolder);
           *ppvOut = pSubFolder;