commit b222001defc8d9db67232aae68f2d3a83c4ecd5d
author Alexandre Julliard <julliard@winehq.org> Mon Mar 06 16:42:34 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Mar 06 16:42:34 2006 +0100
tree f4e6fa37fe0d004199111781dc748fe75c65716f
parent c29b7c352438669ee22961466360e926a831d313

shell32: Fixed handling of null-terminated file list in SHFileOperation.

dlls/shell32/shlfileop.c

diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index 18d1133..d6c9159 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -791,29 +791,19 @@
 static DWORD count_files(LPCWSTR szFileList)
 {
     DWORD dwCount = 0;
-    LPCWSTR p = szFileList;
-    LPCWSTR q = p + 1;
-    LPCWSTR str = p;
+    LPCWSTR str = szFileList;
 
     /* test empty list */
-    if (!szFileList[0] && !szFileList[1])
-        return -1;
-    
-    /* p,q search: stop when we reach double null terminator */
-    while (*p || *q)
+    if (!szFileList[0]) return -1;
+
+    while (*str)
     {
-        if (!*q)
-        {
-            if (StrPBrkW(str, wWildcardChars))
-                dwCount += count_wildcard_files(str);
-            else
-                dwCount++;
+        if (StrPBrkW(str, wWildcardChars))
+            dwCount += count_wildcard_files(str);
+        else
+            dwCount++;
 
-            str = q + 1;
-        }
-
-        p++;
-        q++;
+        str += lstrlenW(str) + 1;
     }
 
     return dwCount;