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

Alexandre Julliard : msvcrt: Disable SSE2 memmove implementation on ARM64EC.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: bdd89987782b4828317b68264f48bc99cfaa33b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/bdd89987782b4828317b68264f48bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:21:45 2024 +0200 msvcrt: Disable SSE2 memmove implementation on ARM64EC. --- dlls/msvcrt/string.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 7f7959e81e6..571ca34b847 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2786,7 +2786,7 @@ int __cdecl memcmp(const void *ptr1, const void *ptr2, size_t n) return memcmp_blocks(p1, p2, n); } -#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || (defined(__x86_64__) && !defined(__arm64ec__)) #ifdef __i386__ @@ -3052,7 +3052,7 @@ __ASM_GLOBAL_FUNC( sse2_memmove, #endif void * __cdecl memmove(void *dst, const void *src, size_t n) { -#ifdef __x86_64__ +#if defined(__x86_64__) && !defined(__arm64ec__) return sse2_memmove(dst, src, n); #else unsigned char *d = dst;

1 0

Alexandre Julliard : kernelbase: Implement the GetProcAddress wrapper on ARM64EC.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: 468fbf5907f690c4df3e60a1794d2f7ce0eade13 URL: https://gitlab.winehq.org/wine/wine/-/commit/468fbf5907f690c4df3e60a1794d2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:23:38 2024 +0200 kernelbase: Implement the GetProcAddress wrapper on ARM64EC. --- dlls/kernelbase/loader.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index e0be2a88d2b..7afbe0460eb 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -430,7 +430,6 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO * GetProcAddress (kernelbase.@) */ -#ifdef __x86_64__ /* * Work around a Delphi bug on x86_64. When delay loading a symbol, * Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls @@ -440,6 +439,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetModuleHandleExW( DWORD flags, LPCWSTR name, HMO * these registers if the function takes floating point parameters. * This wrapper saves xmm0 - 3 to the stack. */ +#ifdef __arm64ec__ +FARPROC WINAPI __attribute__((naked)) GetProcAddress( HMODULE module, LPCSTR function ) +{ + asm( ".seh_proc \"#GetProcAddress\"\n\t" + "stp x29, x30, [sp, #-48]!\n\t" + ".seh_save_fplr_x 48\n\t" + ".seh_endprologue\n\t" + "stp d0, d1, [sp, #16]\n\t" + "stp d2, d3, [sp, #32]\n\t" + "bl \"#get_proc_address\"\n\t" + "ldp d0, d1, [sp, #16]\n\t" + "ldp d2, d3, [sp, #32]\n\t" + "ldp x29, x30, [sp], #48\n\t" + "ret\n\t" + ".seh_endproc" ); +} +#elif defined(__x86_64__) __ASM_GLOBAL_FUNC( GetProcAddress, ".byte 0x48\n\t" /* hotpatch prolog */ "pushq %rbp\n\t"

1 0

Alexandre Julliard : kernel32: Implement the GetProcAddress wrapper on ARM64EC.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: 338df02010be9d219c0496235b04320dc7f2cec7 URL: https://gitlab.winehq.org/wine/wine/-/commit/338df02010be9d219c0496235b0432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:23:50 2024 +0200 kernel32: Implement the GetProcAddress wrapper on ARM64EC. --- dlls/kernel32/module.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 433366d364b..ed15e57c29c 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -295,7 +295,6 @@ FARPROC get_proc_address( HMODULE hModule, LPCSTR function ) return fp; } -#ifdef __x86_64__ /* * Work around a Delphi bug on x86_64. When delay loading a symbol, * Delphi saves rcx, rdx, r8 and r9 to the stack. It then calls @@ -305,9 +304,25 @@ FARPROC get_proc_address( HMODULE hModule, LPCSTR function ) * these registers if the function takes floating point parameters. * This wrapper saves xmm0 - 3 to the stack. */ -extern FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ); - -__ASM_GLOBAL_FUNC( get_proc_address_wrapper, +#ifdef __arm64ec__ +FARPROC WINAPI __attribute__((naked)) GetProcAddress( HMODULE module, LPCSTR function ) +{ + asm( ".seh_proc \"#GetProcAddress\"\n\t" + "stp x29, x30, [sp, #-48]!\n\t" + ".seh_save_fplr_x 48\n\t" + ".seh_endprologue\n\t" + "stp d0, d1, [sp, #16]\n\t" + "stp d2, d3, [sp, #32]\n\t" + "bl \"#get_proc_address\"\n\t" + "ldp d0, d1, [sp, #16]\n\t" + "ldp d2, d3, [sp, #32]\n\t" + "ldp x29, x30, [sp], #48\n\t" + "ret\n\t" + ".seh_endproc" ); +} +#elif defined(__x86_64__) +__ASM_GLOBAL_FUNC( GetProcAddress, + ".byte 0x48\n\t" /* hotpatch prolog */ "pushq %rbp\n\t" __ASM_SEH(".seh_pushreg %rbp\n\t") __ASM_CFI(".cfi_adjust_cfa_offset 8\n\t") @@ -335,14 +350,9 @@ __ASM_GLOBAL_FUNC( get_proc_address_wrapper, "ret" ) #else /* __x86_64__ */ -static inline FARPROC get_proc_address_wrapper( HMODULE module, LPCSTR function ) +FARPROC WINAPI GetProcAddress( HMODULE module, LPCSTR function ) { return get_proc_address( module, function ); } #endif /* __x86_64__ */ - -FARPROC WINAPI GetProcAddress( HMODULE hModule, LPCSTR function ) -{ - return get_proc_address_wrapper( hModule, function ); -}

1 0

Alexandre Julliard : msvcrt: Use the __os_arm64x functions to get/set mxcsr on ARM64EC.
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: ad6674efdbfbc828918f8cb3bb433a11424c66e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad6674efdbfbc828918f8cb3bb433a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:20:17 2024 +0200 msvcrt: Use the __os_arm64x functions to get/set mxcsr on ARM64EC. --- dlls/msvcrt/math.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a62705bc8f4..cbe17463b03 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -698,14 +698,36 @@ __int64 CDECL _abs64( __int64 n ) } #if defined(__i386__) || defined(__x86_64__) + +static unsigned int get_mxcsr(void) +{ + unsigned int ret; +#ifdef __arm64ec__ + extern NTSTATUS (*__os_arm64x_get_x64_information)(ULONG,void*,void*); + __os_arm64x_get_x64_information( 0, &ret, NULL ); +#else + __asm__ __volatile__( "stmxcsr %0" : "=m" (ret) ); +#endif + return ret; +} + +static void set_mxcsr( unsigned int val ) +{ +#ifdef __arm64ec__ + extern NTSTATUS (*__os_arm64x_set_x64_information)(ULONG,ULONG_PTR,void*); + __os_arm64x_set_x64_information( 0, val, NULL ); +#else + __asm__ __volatile__( "ldmxcsr %0" : : "m" (val) ); +#endif +} + static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { #if defined(__GNUC__) || defined(__clang__) - unsigned long old_fpword, fpword; + unsigned int old_fpword, fpword = get_mxcsr(); unsigned int flags; - __asm__ __volatile__( "stmxcsr %0" : "=m" (fpword) ); old_fpword = fpword; cw_mask &= _MCW_EM | _MCW_RC | _MCW_DN; @@ -785,8 +807,7 @@ static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, } } - if (fpword != old_fpword) - __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); + if (fpword != old_fpword) set_mxcsr( fpword ); #else FIXME("not implemented\n"); if (cw) *cw = 0; @@ -993,7 +1014,7 @@ static void _setfp( unsigned int *cw, unsigned int cw_mask, __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); if (old_fpcr != fpcr) __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); -#elif defined(__arm__) && !defined(__SOFTFP__) +#elif defined(__arm__) DWORD old_fpscr, fpscr; unsigned int flags;

1 0

Alexandre Julliard : msvcrt: Reimplement __crtCapturePreviousContext() based on RtlWalkFrameChain().
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: 356be34dcd2b1acfaa55c5d896b06a2628d41dfe URL: https://gitlab.winehq.org/wine/wine/-/commit/356be34dcd2b1acfaa55c5d896b06a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 7 10:19:57 2024 +0200 msvcrt: Reimplement __crtCapturePreviousContext() based on RtlWalkFrameChain(). --- dlls/msvcrt/except_arm64ec.c | 20 +++++++++++++++++++- dlls/msvcrt/except_x86_64.c | 36 ++++++++++++++---------------------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index 12790cee7d8..b2e723f79b3 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -144,7 +144,25 @@ int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, */ void __cdecl __crtCapturePreviousContext( CONTEXT *ctx ) { - FIXME("not implemented\n"); + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR pc, frame, base; + void *data; + ULONG i; + + RtlCaptureContext( ctx ); + for (i = 0; i < 2; i++) + { + pc = ctx->Rip; + if ((ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL) && RtlIsEcCode( pc )) pc -= 4; + if (!(func = RtlLookupFunctionEntry( pc, &base, &table ))) break; + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, pc, func, ctx, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!ctx->Rip) break; + if (!frame) break; + } } #endif diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 1c3cc62bc7f..e0fda975be4 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -133,33 +133,25 @@ int handle_fpieee_flt( __msvcrt_ulong exception_code, EXCEPTION_POINTERS *ep, /********************************************************************* * __crtCapturePreviousContext (MSVCR110.@) */ -void __cdecl get_prev_context(CONTEXT *ctx, DWORD64 rip) +void __cdecl __crtCapturePreviousContext( CONTEXT *ctx ) { - ULONG64 frame, image_base; - RUNTIME_FUNCTION *rf; + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR frame, base; void *data; + ULONG i; - TRACE("(%p)\n", ctx); - - rf = RtlLookupFunctionEntry(ctx->Rip, &image_base, NULL); - if(!rf) { - FIXME("RtlLookupFunctionEntry failed\n"); - return; + RtlCaptureContext( ctx ); + for (i = 0; i < 2; i++) + { + if (!(func = RtlLookupFunctionEntry( ctx->Rip, &base, &table ))) break; + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, ctx->Rip, func, ctx, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) break; + if (!ctx->Rip) break; + if (!frame) break; } - - RtlVirtualUnwind(UNW_FLAG_NHANDLER, image_base, ctx->Rip, - rf, ctx, &data, &frame, NULL); } - -__ASM_GLOBAL_FUNC( __crtCapturePreviousContext, - "movq %rcx,8(%rsp)\n\t" - "call " __ASM_NAME("RtlCaptureContext") "\n\t" - "movq 8(%rsp),%rcx\n\t" /* context */ - "leaq 8(%rsp),%rax\n\t" - "movq %rax,0x98(%rcx)\n\t" /* context->Rsp */ - "movq (%rsp),%rax\n\t" - "movq %rax,0xf8(%rcx)\n\t" /* context->Rip */ - "jmp " __ASM_NAME("get_prev_context") ) #endif #endif /* __x86_64__ */

1 0

Paul Gofman : kernelbase: Preprocess wildcarded mask and pass it with NtQueryDirectoryFile().
by Alexandre Julliard June 7, 2024

June 7, 2024

Module: wine Branch: master Commit: e1d2fb8e058c8a70d01e56e5a89ca22ecbc0e164 URL: https://gitlab.winehq.org/wine/wine/-/commit/e1d2fb8e058c8a70d01e56e5a89ca2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 3 20:13:21 2024 -0600 kernelbase: Preprocess wildcarded mask and pass it with NtQueryDirectoryFile(). --- dlls/kernel32/tests/file.c | 156 +++++++++++++++++++++++++------------------ dlls/kernelbase/file.c | 154 +++++++++++------------------------------- dlls/ntdll/tests/directory.c | 5 ++ 3 files changed, 137 insertions(+), 178 deletions(-)

1 0

Paul Gofman : ntdll: Skip name search for wildcards in asterisk handling in match_filename().
by Alexandre Julliard June 7, 2024

June 7, 2024

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

Paul Gofman : ntdll: Properly match DOS_QM in match_filename().
by Alexandre Julliard June 7, 2024

June 7, 2024

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: Implement matching DOS_DOT in NtQueryDirectoryFile().
by Alexandre Julliard June 7, 2024

June 7, 2024

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: Implement matching DOS_STAR in NtQueryDirectoryFile().
by Alexandre Julliard June 7, 2024

June 7, 2024

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