ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Alexandre Julliard 2006-03-06 16:42:34 +01:00
parent c29b7c3524
commit b222001def
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/shell32/shlfileop.c
View File

@ -791,29 +791,19 @@ static DWORD count_wildcard_files(LPCWSTR szWildFile)
static DWORD count_files(LPCWSTR szFileList) static DWORD count_files(LPCWSTR szFileList)
{ {
DWORD dwCount = 0; DWORD dwCount = 0;
LPCWSTR p = szFileList; LPCWSTR str = szFileList;
LPCWSTR q = p + 1;
LPCWSTR str = p;
/* test empty list */ /* test empty list */
if (!szFileList[0] && !szFileList[1]) if (!szFileList[0]) return -1;
return -1;
/* p,q search: stop when we reach double null terminator */ while (*str)
while (*p || *q)
{
if (!*q)
{ {
if (StrPBrkW(str, wWildcardChars)) if (StrPBrkW(str, wWildcardChars))
dwCount += count_wildcard_files(str); dwCount += count_wildcard_files(str);
else else
dwCount++; dwCount++;
str = q + 1; str += lstrlenW(str) + 1;
}
p++;
q++;
} }
return dwCount; return dwCount;