June 2024 - Wine-commits - list.winehq.org

Paul Gofman : ntdll: Mind all the wildcards in has_wildcard().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 6edcd67775503169974bf9432b2f8d5f9a60da44 URL: https://gitlab.winehq.org/wine/wine/-/commit/6edcd67775503169974bf9432b2f8d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Jun 4 11:48:20 2024 -0600 ntdll: Mind all the wildcards in has_wildcard(). --- dlls/ntdll/unix/file.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 89fd942ea3b..b5bf6f9801d 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -320,13 +320,19 @@ static inline unsigned int dir_info_size( FILE_INFORMATION_CLASS class, unsigned } } +static BOOL is_wildcard( WCHAR c ) +{ + return c == '*' || c == '?' || c == '>' || c == '<' || c == '\"'; +} + static inline BOOL has_wildcard( const UNICODE_STRING *mask ) { int i; if (!mask) return TRUE; for (i = 0; i < mask->Length / sizeof(WCHAR); i++) - if (mask->Buffer[i] == '*' || mask->Buffer[i] == '?') return TRUE; + if (is_wildcard( mask->Buffer[i] )) return TRUE; + return FALSE; }

1 0

Paul Gofman : ntdll: Match wildcard recursively in match_filename().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 5f31aacbe8c86f431e8bd7fcf962e829dce74e38 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f31aacbe8c86f431e8bd7fcf962e8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 5 17:34:48 2024 -0600 ntdll: Match wildcard recursively in match_filename(). --- dlls/ntdll/unix/file.c | 82 ++++++++++++++++++-------------------------------- 1 file changed, 29 insertions(+), 53 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index b5bf6f9801d..724a9d99b00 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1421,30 +1421,13 @@ static ULONG hash_short_file_name( const WCHAR *name, int length, LPWSTR buffer /*********************************************************************** - * match_filename + * match_filename_part * - * Check a long file name against a mask. + * Recursive helper for match_filename(). * - * Tests (done in W95 DOS shell - case insensitive): - * *.txt test1.test.txt * - * *st1* test1.txt * - * *.t??????.t* test1.ta.tornado.txt * - * *tornado* test1.ta.tornado.txt * - * t*t test1.ta.tornado.txt * - * ?est* test1.txt * - * ?est??? test1.txt - - * *test1.txt* test1.txt * - * h?l?o*t.dat hellothisisatest.dat * */ -static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRING *mask_str ) +static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, const WCHAR *mask, const WCHAR *mask_end ) { - BOOL mismatch; - const WCHAR *mask = mask_str->Buffer; - const WCHAR *name_end = name + length; - const WCHAR *mask_end = mask + mask_str->Length / sizeof(WCHAR); - const WCHAR *lastjoker = NULL; - const WCHAR *next_to_retry = NULL; - while (name < name_end && mask < mask_end) { switch(*mask) @@ -1453,14 +1436,16 @@ static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRI mask++; while (mask < mask_end && *mask == '*') mask++; /* Skip consecutive '*' */ if (mask == mask_end) return TRUE; /* end of mask is all '*', so match */ - lastjoker = mask; - /* skip to the next match after the joker(s) */ - if (is_case_sensitive) - while (name < name_end && (*name != *mask)) name++; - else - while (name < name_end && (towupper(*name) != towupper(*mask))) name++; - next_to_retry = name; + while (name < name_end) + { + if (is_case_sensitive) + while (name < name_end && (*name != *mask)) name++; + else + while (name < name_end && (towupper(*name) != towupper(*mask))) name++; + if (match_filename_part( name, name_end, mask, mask_end )) return TRUE; + ++name; + } break; case '?': case '>': @@ -1468,32 +1453,10 @@ static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRI name++; break; default: - if (is_case_sensitive) mismatch = (*mask != *name); - else mismatch = (towupper(*mask) != towupper(*name)); - - if (!mismatch) - { - mask++; - name++; - if (mask == mask_end) - { - if (name == name_end) return TRUE; - if (lastjoker) mask = lastjoker; - } - } - else /* mismatch ! */ - { - if (lastjoker) /* we had an '*', so we can try unlimitedly */ - { - mask = lastjoker; - - /* this scan sequence was a mismatch, so restart - * 1 char after the first char we checked last time */ - next_to_retry++; - name = next_to_retry; - } - else return FALSE; /* bad luck */ - } + if (is_case_sensitive && *mask != *name) return FALSE; + if (!is_case_sensitive && towupper(*mask) != towupper(*name)) return FALSE; + mask++; + name++; break; } } @@ -1503,6 +1466,19 @@ static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRI } +/*********************************************************************** + * match_filename + * + * Check a file name against a mask. + * + */ +static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRING *mask_str ) +{ + return match_filename_part( name, name + length, mask_str->Buffer, + mask_str->Buffer + mask_str->Length / sizeof(WCHAR)); +} + + /*********************************************************************** * is_legal_8dot3_name *

1 0

Paul Gofman : ntdll: Add a special handling for .. in match_filename().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: bcc266b35cab4de9260ea40d958c1a9428f9b1c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/bcc266b35cab4de9260ea40d958c1a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 5 18:02:55 2024 -0600 ntdll: Add a special handling for .. in match_filename(). --- dlls/ntdll/tests/directory.c | 9 +++++++++ dlls/ntdll/unix/file.c | 3 +++ 2 files changed, 12 insertions(+) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 702e348b234..d4028a92519 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -470,7 +470,16 @@ static void test_NtQueryDirectoryFile(void) {L"*.**", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"*", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"**", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"?", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}}, + {L"?.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0}}, + {L"?..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, + {L"??", {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0}}, + {L"??.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, {L"??.???", {0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L"..*", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, + {L"*..*", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1}}, + {L"*..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, + {L"..?", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, }; OBJECT_ATTRIBUTES attr; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 724a9d99b00..ab567a63d19 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1474,6 +1474,9 @@ static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, co */ static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRING *mask_str ) { + /* Special handling for parent directory. */ + if (length == 2 && name[0] == '.' && name[1] == '.') --length; + return match_filename_part( name, name + length, mask_str->Buffer, mask_str->Buffer + mask_str->Length / sizeof(WCHAR)); }

1 0

Paul Gofman : ntdll: Implement matching DOS_STAR in NtQueryDirectoryFile().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: db032ac4a9e30d06c430eb3125cb78b4d5ba4073 URL: https://gitlab.winehq.org/wine/wine/-/commit/db032ac4a9e30d06c430eb3125cb78… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 5 18:21:30 2024 -0600 ntdll: Implement matching DOS_STAR in NtQueryDirectoryFile(). --- dlls/kernel32/tests/file.c | 4 +-- dlls/ntdll/tests/directory.c | 64 ++++++++++++++++++++++++++++++++++++-------- dlls/ntdll/unix/file.c | 40 ++++++++++++++++++++++++++- 3 files changed, 94 insertions(+), 14 deletions(-)

1 0

Paul Gofman : ntdll: Implement matching DOS_DOT in NtQueryDirectoryFile().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: a31d68d800e3520b65ff5eb0cfa8f38a2795dca4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a31d68d800e3520b65ff5eb0cfa8f3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 5 18:27:18 2024 -0600 ntdll: Implement matching DOS_DOT in NtQueryDirectoryFile(). --- dlls/ntdll/tests/directory.c | 19 +++++++++++++++++++ dlls/ntdll/unix/file.c | 14 ++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index c12c5547ade..d61a1a73b3f 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -485,12 +485,17 @@ static void test_NtQueryDirectoryFile(void) {L"<", {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1}}, {L"<.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1}}, {L"<..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, + {L"<.\"", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1}}, {L".<", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 1, 0}}, {L"..<", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, {L"..*", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, {L"*..*", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1}}, {L"*..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, {L"..?", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, + {L"..\"", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L"\"", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}}, + {L"\"\"", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}}, + {L"\"\"\"", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}}, {L"a.<", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1}}, {L"ea.tmp.tmp<", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}}, {L"<tmp", {1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}}, @@ -499,7 +504,20 @@ static void test_NtQueryDirectoryFile(void) {L"<nam<tmp", {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {L"<name.<", {1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {L"<name<", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L"<\"", {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1}}, + {L"*\"", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"*\"tmp\"tmp\"", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}}, + {L"n\"tmp", {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L"ea\"", {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L"\"a", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0}}, + {L"\"\"a", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}}, + {L"e\"a", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L"*\"tmp", {1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0}}, {L"<.<", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"<\"<", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"<\"<\"", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, + {L"<\"<.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, + {L"<.<\"", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"<<", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"<a", {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 0, 0}}, {L"*a", {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0}}, @@ -512,6 +530,7 @@ static void test_NtQueryDirectoryFile(void) {L"<.<<", {1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"<<<", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"< ..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L"<\"\"", {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1}}, }; OBJECT_ATTRIBUTES attr; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 8694564b576..eee3610b487 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1441,10 +1441,11 @@ static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, co while (name < name_end) { + c = *mask == '"' ? '.' : *mask; if (is_case_sensitive) - while (name < name_end && (*name != *mask)) name++; + while (name < name_end && (*name != c)) name++; else - while (name < name_end && (towupper(*name) != towupper(*mask))) name++; + while (name < name_end && (towupper(*name) != towupper(c))) name++; if (match_filename_part( name, name_end, mask, mask_end )) return TRUE; ++name; } @@ -1469,7 +1470,7 @@ static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, co { while (name < next_dot) { - c = *mask; + c = *mask == '"' ? '.' : *mask; if (!is_wildcard(c)) { if (is_case_sensitive) @@ -1491,14 +1492,15 @@ static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, co name++; break; default: - if (is_case_sensitive && *mask != *name) return FALSE; - if (!is_case_sensitive && towupper(*mask) != towupper(*name)) return FALSE; + c = *mask == '"' ? '.' : *mask; + if (is_case_sensitive && c != *name) return FALSE; + if (!is_case_sensitive && towupper(c) != towupper(*name)) return FALSE; mask++; name++; break; } } - while (mask < mask_end && (*mask == '*' || *mask == '<')) + while (mask < mask_end && (*mask == '*' || *mask == '<' || *mask == '"')) mask++; return (name == name_end && mask == mask_end); }

1 0

Paul Gofman : ntdll: Properly match DOS_QM in match_filename().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 2e048acf2940a402496d0daea971be54d1e25609 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e048acf2940a402496d0daea971be… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 3 16:42:36 2024 -0600 ntdll: Properly match DOS_QM in match_filename(). --- dlls/ntdll/tests/directory.c | 11 +++++++++++ dlls/ntdll/unix/file.c | 12 ++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index d61a1a73b3f..babe0f7a8fe 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -531,6 +531,17 @@ static void test_NtQueryDirectoryFile(void) {L"<<<", {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}}, {L"< ..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {L"<\"\"", {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1}}, + {L">", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0}}, + {L">.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0}}, + {L">..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, + {L">>", {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0}}, + {L">>.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0}}, + {L">>>", {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 0}}, + {L">>.>>>", {0, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 1, 1}}, + {L">.>", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 1, 0, 0, 1}}, + {L">>.tmp", {0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L">>tmp", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, + {L">>>tmp", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, }; OBJECT_ATTRIBUTES attr; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index eee3610b487..d3bbcdffdc6 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1487,10 +1487,18 @@ static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, co break; } case '?': - case '>': mask++; name++; break; + case '>': + mask++; + if (*name == '.') + { + while (mask < mask_end && *mask == '>') mask++; + if (mask == mask_end) name++; + } + else name++; + break; default: c = *mask == '"' ? '.' : *mask; if (is_case_sensitive && c != *name) return FALSE; @@ -1500,7 +1508,7 @@ static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, co break; } } - while (mask < mask_end && (*mask == '*' || *mask == '<' || *mask == '"')) + while (mask < mask_end && (*mask == '*' || *mask == '<' || *mask == '"' || *mask == '>')) mask++; return (name == name_end && mask == mask_end); }

1 0

Paul Gofman : ntdll: Skip name search for wildcards in asterisk handling in match_filename().
by Alexandre Julliard 07 Jun '24

07 Jun '24

Module: wine Branch: master Commit: 691ccd64b30d9c4c8777c29980a35b4a072e7c48 URL: https://gitlab.winehq.org/wine/wine/-/commit/691ccd64b30d9c4c8777c29980a35b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jun 5 16:18:01 2024 -0600 ntdll: Skip name search for wildcards in asterisk handling in match_filename(). --- dlls/ntdll/tests/directory.c | 1 + dlls/ntdll/unix/file.c | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index babe0f7a8fe..c05b51860e1 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -483,6 +483,7 @@ static void test_NtQueryDirectoryFile(void) {L"??.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, {L"??.???", {0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}}, {L"<", {0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1}}, + {L"*<a", {0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0}}, {L"<.", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1}}, {L"<..", {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}}, {L"<.\"", {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1}}, diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d3bbcdffdc6..429f8839ed2 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1442,10 +1442,13 @@ static BOOLEAN match_filename_part( const WCHAR *name, const WCHAR *name_end, co while (name < name_end) { c = *mask == '"' ? '.' : *mask; - if (is_case_sensitive) - while (name < name_end && (*name != c)) name++; - else - while (name < name_end && (towupper(*name) != towupper(c))) name++; + if (!is_wildcard(c)) + { + if (is_case_sensitive) + while (name < name_end && (*name != c)) name++; + else + while (name < name_end && (towupper(*name) != towupper(c))) name++; + } if (match_filename_part( name, name_end, mask, mask_end )) return TRUE; ++name; }

1 0

Ziqing Hui : qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 5396e722d5a979a0f219bdb0abc9f69c2287f1ff URL: https://gitlab.winehq.org/wine/wine/-/commit/5396e722d5a979a0f219bdb0abc9f6… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Tue Jun 4 11:18:06 2024 +0800 qasf/dmowrapper: Return failure in dmo_wrapper_sink_Receive if samples allocating fails. --- dlls/qasf/dmowrapper.c | 11 +++++++---- dlls/qasf/tests/dmowrapper.c | 3 --- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 1d4ad7f75e6..2caf59c746d 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -249,9 +249,6 @@ static HRESULT process_output(struct dmo_wrapper *filter, IMediaObject *dmo) BOOL more_data; HRESULT hr; - if (FAILED(hr = get_output_samples(filter))) - return hr; - do { more_data = FALSE; @@ -325,6 +322,8 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed /* Calling Discontinuity() might change the DMO's mind about whether it * has more data to process. The DirectX documentation explicitly * states that we should call ProcessOutput() again in this case. */ + if (FAILED(hr = get_output_samples(filter))) + goto out; process_output(filter, dmo); } @@ -346,6 +345,8 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed goto out; } + if (FAILED(hr = get_output_samples(filter))) + goto out; process_output(filter, dmo); out: @@ -366,7 +367,9 @@ static HRESULT dmo_wrapper_sink_eos(struct strmbase_sink *iface) if (FAILED(hr = IMediaObject_Discontinuity(dmo, index))) ERR("Discontinuity() failed, hr %#lx.\n", hr); - process_output(filter, dmo); + if (SUCCEEDED(get_output_samples(filter))) + process_output(filter, dmo); + if (FAILED(hr = IMediaObject_Flush(dmo))) ERR("Flush() failed, hr %#lx.\n", hr); diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index 632b7e2e558..ada45c447b1 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1703,9 +1703,7 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, hr = IMemAllocator_Decommit(testsink->sink.pAllocator); ok(hr == S_OK, "Decommit returned %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == VFW_E_NOT_COMMITTED, "Receive returned %#lx.\n", hr); - todo_wine ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput); ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive); @@ -1720,7 +1718,6 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, hr = IMemInputPin_Receive(input, sample); todo_wine ok(hr == VFW_E_WRONG_STATE, "Receive returned %#lx.\n", hr); - todo_wine ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput); ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive);

1 0

Ziqing Hui : qasf/dmowrapper: Allocate output samples before calling ProcessInput().
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: c6f4d04697d2b2f7575a66ae978dbd0bdbab2c9d URL: https://gitlab.winehq.org/wine/wine/-/commit/c6f4d04697d2b2f7575a66ae978dbd… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed Jun 5 13:56:23 2024 +0800 qasf/dmowrapper: Allocate output samples before calling ProcessInput(). --- dlls/qasf/dmowrapper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index 2caf59c746d..f94b00dbb44 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -327,6 +327,9 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed process_output(filter, dmo); } + if (FAILED(hr = get_output_samples(filter))) + goto out; + if (IMediaSample_IsSyncPoint(sample) == S_OK) flags |= DMO_INPUT_DATA_BUFFERF_SYNCPOINT; @@ -345,8 +348,6 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed goto out; } - if (FAILED(hr = get_output_samples(filter))) - goto out; process_output(filter, dmo); out:

1 0

Ziqing Hui : qasf/dmowrapper: Return VFW_E_WRONG_STATE in dmo_wrapper_sink_Receive.
by Alexandre Julliard 06 Jun '24

06 Jun '24

Module: wine Branch: master Commit: 86de254ecd62c4225b1e6d5cd6d94534d13105f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/86de254ecd62c4225b1e6d5cd6d945… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu May 16 18:14:57 2024 +0800 qasf/dmowrapper: Return VFW_E_WRONG_STATE in dmo_wrapper_sink_Receive. --- dlls/qasf/dmowrapper.c | 3 +++ dlls/qasf/tests/dmowrapper.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index f94b00dbb44..76704f88cd4 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -309,6 +309,9 @@ static HRESULT WINAPI dmo_wrapper_sink_Receive(struct strmbase_sink *iface, IMed DWORD flags = 0; HRESULT hr; + if (filter->filter.state == State_Stopped) + return VFW_E_WRONG_STATE; + IUnknown_QueryInterface(filter->dmo, &IID_IMediaObject, (void **)&dmo); if (IMediaSample_IsDiscontinuity(sample) == S_OK) diff --git a/dlls/qasf/tests/dmowrapper.c b/dlls/qasf/tests/dmowrapper.c index ada45c447b1..70dcc0c453e 100644 --- a/dlls/qasf/tests/dmowrapper.c +++ b/dlls/qasf/tests/dmowrapper.c @@ -1716,12 +1716,10 @@ static void test_sample_processing(IMediaControl *control, IMemInputPin *input, hr = IBaseFilter_Stop(dmo_filter); ok(hr == S_OK, "Stop returned %#lx.\n", hr); hr = IMemInputPin_Receive(input, sample); - todo_wine ok(hr == VFW_E_WRONG_STATE, "Receive returned %#lx.\n", hr); ok(got_ProcessInput == 0, "Got %u calls to ProcessInput().\n", got_ProcessInput); ok(got_ProcessOutput == 0, "Got %u calls to ProcessOutput().\n", got_ProcessOutput); ok(got_Receive == 0, "Got %u calls to Receive().\n", got_Receive); - todo_wine ok(got_Discontinuity == 0, "Got %u calls to Discontinuity().\n", got_Discontinuity); hr = IMediaControl_Run(control); ok(hr == S_OK, "Run returned %#lx.\n", hr);

1 0