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.

shell32: Skip dot directories in SHFileOperation.
c29b7c35 · Aric Stewart · Alexandre Julliard · 71b94726 · c29b7c35
Commit c29b7c35 authored Mar 03, 2006 by Aric Stewart Committed by Alexandre Julliard Mar 06, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 10 deletions

shlfileop.c dlls/shell32/shlfileop.c +8 -10

No files found.
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -779,7 +779,7 @@ static DWORD count_wildcard_files(LPCWSTR szWildFile)
    
    while (res)
    {
-        dwCount++;
+        if (!IsDotDir(wfd.cFileName)) dwCount++;
        res = FindNextFileW(hFile, &wfd);
    }

@@ -879,18 +879,16 @@ static void parse_wildcard_files(FILE_LIST *flList, LPWSTR szFile, LPDWORD pdwLi
    WIN32_FIND_DATAW wfd;
    HANDLE hFile = FindFirstFileW(szFile, &wfd);
    LPWSTR szFullPath;
-    BOOL res = TRUE, bDir;
-    
-    while (res)
+    BOOL res;
+
+    for (res = TRUE; res; res = FindNextFileW(hFile, &wfd))
    {
+        if (IsDotDir(wfd.cFileName)) continue;
        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);
-
-        if (bDir)
+        if (add_file_to_entry(&flList->feFiles[(*pdwListIndex)++],
+                              szFullPath, TRUE))
            flList->bAnyDirectories = TRUE;
+        HeapFree(GetProcessHeap(), 0, szFullPath);
    }

    FindClose(hFile);