Commit a90f695f authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard

kernelbase: Get unprocessed mask in FindFirstFileExW().

parent 68fecd77
......@@ -3019,8 +3019,8 @@ static void test_FindFirstFile_wildcards(void)
{1, "..< ", ", '..a'"},
{1, "?", ", '.', '..', 'a'"},
{1, "?.", ", '.', '..', 'a'"},
{1, "?. ", ", '.', '..', 'a'"},
{0, "?.", ", '.', '..', 'a'"},
{0, "?. ", ", '.', '..', 'a'"},
{1, "??.", ", '.', '..', 'a', 'aa'"},
{1, "??. ", ", '.', '..', 'a', 'aa'"},
{1, "???.", ", '.', '..', 'a', 'aa', 'aaa'"},
......
......@@ -1190,6 +1190,7 @@ HANDLE WINAPI DECLSPEC_HOTPATCH FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_
if (has_wildcard)
{
size = 8192;
mask = PathFindFileNameW( filename );
mask_size = (lstrlenW( mask ) + 1) * sizeof(*mask);
}
else size = max_entry_size;
......@@ -1408,7 +1409,7 @@ static BOOL match_filename( const WCHAR *name, int length, const WCHAR *mask )
}
}
while (mask < mask_end && (*mask == '.' || *mask == '*'))
while (mask < mask_end && (*mask == ' ' || *mask == '.' || *mask == '*'))
mask++;
return (name == name_end && mask == mask_end);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment