Changeset 9094 for trunk/src

Timestamp:

Aug 22, 2002, 4:20:44 PM (23 years ago)

Author:

sandervl

Message:

Added bugfix to IEnumIDList_Folder_Constructor (from Wine); Enabled Christoph Bratschi's CreateFolderEnumList optimization

File:

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

trunk/src/shell32/enumidlist.c

@@ -1 @@
-/* $Id: enumidlist.c,v 1.5 2002-06-07 08:21:43 sandervl Exp $ */
+/* $Id: enumidlist.c,v 1.6 2002-08-22 14:20:44 sandervl Exp $ */
 /*
  *      IEnumIDList
@@ -92 +92 @@
  *  CreateFolderEnumList()
  */
+#define __WIN32OS2__TEST_TURNED_OFF
+
 #ifdef __WIN32OS2__TEST_TURNED_OFF
 //CB: Special version to speed up retrieving files in a directory
-
+//SvL: Works well and is twice as fast. Quite important when called way too
+//     many times
 /**************************************************************************
  *  AddToEnumList()
@@ -210 +213 @@
                     return FALSE;
                   }
-                } else if (dwFlags & SHCONTF_NONFOLDERS)
+                } 
+                else 
+                if (dwFlags & SHCONTF_NONFOLDERS)
                 { //file
                   pidl = _ILCreateValue(&stffile[x]);
@@ -221 +226 @@
               }
               count = MULTICOUNT;
-            } while(FindNextFileMultiA(hFile,stffile,&count));
+            } 
+            while(FindNextFileMultiA(hFile,stffile,&count));
+
             FindClose(hFile);
             UniteEnumLists((IEnumIDList*)This);
@@ -514 +521 @@
             {
               HeapFree(GetProcessHeap(),0,lpeidl);
+              lpeidl = NULL;
             }
           }