commit c29b7c352438669ee22961466360e926a831d313
author Aric Stewart <aric@codeweavers.com> Fri Mar 03 10:08:32 2006 -0600
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 06 15:57:22 2006 +0100
tree ec8680a8f9576e11f3c8e680a9fe8bd74feb8722
parent 71b94726d9661d2f51afe4bd72539de656dcd0a3

shell32: Skip dot directories in SHFileOperation.

In ShFileOperation when generating a file list with * wildcards, for
example for deletion, do not include the dot directories (. and ..) in
the list, because that cause the operation to spiral out of control.

dlls/shell32/shlfileop.c

diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index e12df61..18d1133 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -779,7 +779,7 @@
     
     while (res)
     {
-        dwCount++;
+        if (!IsDotDir(wfd.cFileName)) dwCount++;
         res = FindNextFileW(hFile, &wfd);
     }
 
@@ -879,18 +879,16 @@
     WIN32_FIND_DATAW wfd;
     HANDLE hFile = FindFirstFileW(szFile, &wfd);
     LPWSTR szFullPath;
-    BOOL res = TRUE, bDir;
-    
-    while (res)
-    {
-        szFullPath = wildcard_to_file(szFile, wfd.cFileName);
-        bDir = add_file_to_entry(&flList->feFiles[(*pdwListIndex)++],
-                                 szFullPath, TRUE);
-        HeapFree(GetProcessHeap(), 0, szFullPath);
-        res = FindNextFileW(hFile, &wfd);
+    BOOL res;
 
-        if (bDir)
+    for (res = TRUE; res; res = FindNextFileW(hFile, &wfd))
+    {
+        if (IsDotDir(wfd.cFileName)) continue;
+        szFullPath = wildcard_to_file(szFile, wfd.cFileName);
+        if (add_file_to_entry(&flList->feFiles[(*pdwListIndex)++],
+                              szFullPath, TRUE))
             flList->bAnyDirectories = TRUE;
+        HeapFree(GetProcessHeap(), 0, szFullPath);
     }
 
     FindClose(hFile);