reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-03 18:53:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shlwapi: Ignore leading spaces in PathMatchSpec.

Browse Source
This commit is contained in:
Peter Oberndorfer 2006-04-11 19:17:52 +00:00 committed by Alexandre Julliard
parent 759324a20c
commit ac0bee4bf2
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/shlwapi/path.c
View File

@ -1869,18 +1869,17 @@ BOOL WINAPI PathMatchSpecA(LPCSTR lpszPath, LPCSTR lpszMask)
while (*lpszMask)
{
while (*lpszMask == ' ')
lpszMask++; /* Eat leading spaces */
if (PathMatchSingleMaskA(lpszPath, lpszMask))
return TRUE; /* Matches the current mask */
while (*lpszMask && *lpszMask != ';')
lpszMask = CharNextA(lpszMask);
lpszMask = CharNextA(lpszMask); /* masks separated by ';' */
if (*lpszMask == ';')
{
lpszMask++;
while (*lpszMask == ' ')
lpszMask++; /* masks may be separated by "; " */
}
}
return FALSE;
}
@ -1901,18 +1900,17 @@ BOOL WINAPI PathMatchSpecW(LPCWSTR lpszPath, LPCWSTR lpszMask)
while (*lpszMask)
{
while (*lpszMask == ' ')
lpszMask++; /* Eat leading spaces */
if (PathMatchSingleMaskW(lpszPath, lpszMask))
return TRUE; /* Matches the current path */
while (*lpszMask && *lpszMask != ';')
lpszMask++;
lpszMask++; /* masks separated by ';' */
if (*lpszMask == ';')
{
lpszMask++;
while (*lpszMask == ' ')
lpszMask++; /* Masks may be separated by "; " */
}
}
return FALSE;
}

2
dlls/shlwapi/tests/path.c
View File

@ -849,7 +849,7 @@ static void test_PathMatchSpec(void)
ok (PathMatchSpecA(file, spec1) == FALSE, "PathMatchSpec: Spec1 failed\n");
ok (PathMatchSpecA(file, spec2) == TRUE, "PathMatchSpec: Spec2 failed\n");
ok (PathMatchSpecA(file, spec3) == FALSE, "PathMatchSpec: Spec3 failed\n");
todo_wine ok (PathMatchSpecA(file, spec4) == TRUE, "PathMatchSpec: Spec4 failed\n");
ok (PathMatchSpecA(file, spec4) == TRUE, "PathMatchSpec: Spec4 failed\n");
todo_wine ok (PathMatchSpecA(file, spec5) == TRUE, "PathMatchSpec: Spec5 failed\n");
todo_wine ok (PathMatchSpecA(file, spec6) == TRUE, "PathMatchSpec: Spec6 failed\n");
ok (PathMatchSpecA(file, spec7) == FALSE, "PathMatchSpec: Spec7 failed\n");