Changeset 3271 for trunk/src/shell32/enumidlist.cpp

Timestamp:

Mar 29, 2000, 5:24:08 PM (25 years ago)

Author:

cbratschi

Message:

onopen fix, FindFirstFileMultiA, "shell.dll" icon fix, load exe icons

File:

• trunk/src/shell32/enumidlist.cpp (modified) (4 diffs)

trunk/src/shell32/enumidlist.cpp

@@ -1 @@
-/* $Id: enumidlist.cpp,v 1.3 2000-03-27 15:09:19 cbratschi Exp $ */
+/* $Id: enumidlist.cpp,v 1.4 2000-03-29 15:24:03 cbratschi Exp $ */
 
 /*
@@ -187 +187 @@
         ICOM_THIS(IEnumIDListImpl,iface);
 
+        const MULTICOUNT = 64;
         LPITEMIDLIST    pidl=NULL;
-        WIN32_FIND_DATAA stffile;
+        WIN32_FIND_DATAA *stffile = NULL;
+        DWORD count;
         HANDLE hFile;
         CHAR  szPath[MAX_PATH];
@@ -204 +206 @@
         {
           TRACE("-- (%p)-> enumerate SHCONTF_FOLDERS of %s\n",This,debugstr_a(szPath));
-          hFile = FindFirstFileA(szPath,&stffile);
-          if ( hFile != INVALID_HANDLE_VALUE )
+          count = MULTICOUNT;
+          stffile = (WIN32_FIND_DATAA*)malloc(count*sizeof(WIN32_FIND_DATAA));
+          hFile = FindFirstFileMultiA(szPath,stffile,&count);
+          if (hFile != INVALID_HANDLE_VALUE)
           {
             do
             {
-              if (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-              { //directory
-                if (strcmp (stffile.cFileName, ".") && strcmp (stffile.cFileName, ".."))
-                {
-                  pidl = _ILCreateFolder (&stffile);
-                  if(pidl && AddToEnumList((IEnumIDList*)This, pidl))
+              for (int x = 0;x < count;x++)
+              {
+                if (stffile[x].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+                { //directory
+                  if (strcmp (stffile[x].cFileName, ".") && strcmp (stffile[x].cFileName, ".."))
                   {
+                    pidl = _ILCreateFolder (&stffile[x]);
+                    if (pidl && AddToEnumList((IEnumIDList*)This, pidl))
+                      continue;
+                    free(stffile);
+                    FindClose(hFile);
+                    return FALSE;
+                  }
+                } else if (dwFlags & SHCONTF_NONFOLDERS)
+                { //file
+                  pidl = _ILCreateValue(&stffile[x]);
+                  if (pidl && AddToEnumList2((IEnumIDList*)This, pidl))
                     continue;
-                  }
+                  free(stffile);
+                  FindClose(hFile);
                   return FALSE;
                 }
-              } else if (dwFlags & SHCONTF_NONFOLDERS)
-              { //file
-                pidl = _ILCreateValue(&stffile);
-                if(pidl && AddToEnumList2((IEnumIDList*)This, pidl))
-                {
-                  continue;
-                }
-                return FALSE;
               }
-            } while( FindNextFileA(hFile,&stffile));
-            FindClose (hFile);
+            } while(FindNextFileMultiA(hFile,stffile,&(count = MULTICOUNT)));
+            FindClose(hFile);
             UniteEnumLists((IEnumIDList*)This);
           }
@@ -239 +246 @@
         {
           TRACE("-- (%p)-> enumerate SHCONTF_NONFOLDERS of %s\n",This,debugstr_a(szPath));
-          hFile = FindFirstFileA(szPath,&stffile);
-          if ( hFile != INVALID_HANDLE_VALUE )
+          count = MULTICOUNT;
+          if (!stffile) stffile = (WIN32_FIND_DATAA*)malloc(count*sizeof(WIN32_FIND_DATAA));
+          hFile = FindFirstFileMultiA(szPath,stffile,&count);
+          if (hFile != INVALID_HANDLE_VALUE)
           {
             do
             {
-              if (! (stffile.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
+              for (int x = 0;x < count;x++)
               {
-                pidl = _ILCreateValue(&stffile);
-                if(pidl && AddToEnumList((IEnumIDList*)This, pidl))
+                if (! (stffile[x].dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
                 {
-                  continue;
+                  pidl = _ILCreateValue(&stffile[x]);
+                  if (pidl && AddToEnumList((IEnumIDList*)This, pidl))
+                    continue;
+                  free(stffile);
+                  FindClose(hFile);
+                  return FALSE;
                 }
-                return FALSE;
               }
-            } while( FindNextFileA(hFile,&stffile));
+            } while(FindNextFileMultiA(hFile,stffile,&(count = MULTICOUNT)));
             FindClose (hFile);
           }
         }
+        if (stffile) free(stffile);
+
         return TRUE;
 }