February 2024 - Wine-commits

Alexandre Julliard : ntdll: Move find_function_info() to the CPU backends.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 02ebacca0cca65c2a45f0679a4151a60fbd7eb7d URL: https://gitlab.winehq.org/wine/wine/-/commit/02ebacca0cca65c2a45f0679a4151a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 11:56:51 2024 +0100 ntdll: Move find_function_info() to the CPU backends. --- dlls/ntdll/exception.c | 36 ------------------------------------ dlls/ntdll/ntdll_misc.h | 1 - dlls/ntdll/signal_arm.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/signal_arm64.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/signal_arm64ec.c | 22 ++++++++++++++++++++++ dlls/ntdll/signal_x86_64.c | 22 ++++++++++++++++++++++ 6 files changed, 97 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 935b57b36b9..ebc8d8cf807 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -626,42 +626,6 @@ RUNTIME_FUNCTION *lookup_dynamic_function_table( ULONG_PTR pc, ULONG_PTR *base, return ret; } - -/* helper for lookup_function_info() */ -RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, ULONG_PTR base, - RUNTIME_FUNCTION *func, ULONG size ) -{ - int min = 0; - int max = size - 1; - - while (min <= max) - { -#ifdef __x86_64__ - int pos = (min + max) / 2; - if (pc < base + func[pos].BeginAddress) max = pos - 1; - else if (pc >= base + func[pos].EndAddress) min = pos + 1; - else - { - func += pos; - while (func->UnwindData & 1) /* follow chained entry */ - func = (RUNTIME_FUNCTION *)(base + (func->UnwindData & ~1)); - return func; - } -#elif defined(__arm__) - int pos = (min + max) / 2; - if (pc < base + (func[pos].BeginAddress & ~1)) max = pos - 1; - else if (pc >= base + get_runtime_function_end( &func[pos], base )) min = pos + 1; - else return func + pos; -#else /* __aarch64__ */ - int pos = (min + max) / 2; - if (pc < base + func[pos].BeginAddress) max = pos - 1; - else if (pc >= base + get_runtime_function_end( &func[pos], base )) min = pos + 1; - else return func + pos; -#endif - } - return NULL; -} - #endif /* __x86_64__ || __arm__ || __aarch64__ */ diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1aeed955bf4..4286fc48587 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -86,7 +86,6 @@ extern void (WINAPI *pWow64PrepareForException)( EXCEPTION_RECORD *rec, CONTEXT #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) extern RUNTIME_FUNCTION *lookup_dynamic_function_table( ULONG_PTR pc, ULONG_PTR *base, ULONG *count ); -extern RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, ULONG_PTR base, RUNTIME_FUNCTION *func, ULONG size ); #endif /* debug helpers */ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 76dac1b850c..57731d52dd7 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1113,6 +1113,32 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION *f return NULL; } +/********************************************************************** + * find_function_info + */ +static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, ULONG_PTR base, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + ULONG_PTR start = base + (func[pos].BeginAddress & ~1); + + if (pc >= start) + { + struct unwind_info *info = (struct unwind_info *)(base + func[pos].UnwindData); + if (pc < start + 2 * (func[pos].Flag ? func[pos].FunctionLength : info->function_length)) + return func + pos; + min = pos + 1; + } + else max = pos - 1; + } + return NULL; +} + /*********************************************************************** * RtlVirtualUnwind (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index cfb097bf7a2..f20a9c075a6 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1014,6 +1014,33 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION *f } +/********************************************************************** + * find_function_info + */ +static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, ULONG_PTR base, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + ULONG_PTR start = base + func[pos].BeginAddress; + + if (pc >= start) + { + ULONG len = func[pos].Flag ? func[pos].FunctionLength : + ((IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY_XDATA *)(base + func[pos].UnwindData))->FunctionLength; + if (pc < start + 4 * len) return func + pos; + min = pos + 1; + } + else max = pos - 1; + } + return NULL; +} + + /********************************************************************** * RtlVirtualUnwind (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 4429bc4fcf9..0ee58a015f7 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -229,6 +229,28 @@ static void context_arm_to_x64( CONTEXT *ctx, const ARM64_NT_CONTEXT *arm_ctx ) memcpy( ec_ctx->V, arm_ctx->V, sizeof(ec_ctx->V) ); } +static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, ULONG_PTR base, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + if (pc < base + func[pos].BeginAddress) max = pos - 1; + else if (pc >= base + func[pos].EndAddress) min = pos + 1; + else + { + func += pos; + while (func->UnwindData & 1) /* follow chained entry */ + func = (RUNTIME_FUNCTION *)(base + (func->UnwindData & ~1)); + return func; + } + } + return NULL; +} + /******************************************************************* * syscalls diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 09658eaa408..1fcb0eda4e2 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -249,6 +249,28 @@ static void dump_scope_table( ULONG64 base, const SCOPE_TABLE *table ) (char *)base + table->ScopeRecord[i].JumpTarget ); } +static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, ULONG_PTR base, + RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + if (pc < base + func[pos].BeginAddress) max = pos - 1; + else if (pc >= base + func[pos].EndAddress) min = pos + 1; + else + { + func += pos; + while (func->UnwindData & 1) /* follow chained entry */ + func = (RUNTIME_FUNCTION *)(base + (func->UnwindData & ~1)); + return func; + } + } + return NULL; +} + /*********************************************************************** * virtual_unwind

1 0

Alexandre Julliard : ntdll: Move RtlAddFunctionTable() to the CPU backends.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: ab69f7191219d6c4895a8501809f16c65a46a0a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/ab69f7191219d6c4895a8501809f16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 12:26:32 2024 +0100 ntdll: Move RtlAddFunctionTable() to the CPU backends. --- dlls/ntdll/exception.c | 68 --------------------------------------------- dlls/ntdll/signal_arm.c | 18 ++++++++++++ dlls/ntdll/signal_arm64.c | 19 +++++++++++++ dlls/ntdll/signal_arm64ec.c | 14 ++++++++++ dlls/ntdll/signal_x86_64.c | 14 ++++++++++ 5 files changed, 65 insertions(+), 68 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index ebc8d8cf807..358fb45bd37 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -382,74 +382,6 @@ static RTL_CRITICAL_SECTION_DEBUG dynamic_unwind_debug = }; static RTL_CRITICAL_SECTION dynamic_unwind_section = { &dynamic_unwind_debug, -1, 0, 0, 0, 0 }; -static ULONG_PTR get_runtime_function_end( RUNTIME_FUNCTION *func, ULONG_PTR addr ) -{ -#ifdef __x86_64__ - return func->EndAddress; -#elif defined(__arm__) - if (func->Flag) return func->BeginAddress + func->FunctionLength * 2; - else - { - struct unwind_info - { - DWORD function_length : 18; - DWORD version : 2; - DWORD x : 1; - DWORD e : 1; - DWORD f : 1; - DWORD count : 5; - DWORD words : 4; - } *info = (struct unwind_info *)(addr + func->UnwindData); - return func->BeginAddress + info->function_length * 2; - } -#else /* __aarch64__ */ - if (func->Flag) return func->BeginAddress + func->FunctionLength * 4; - else - { - struct unwind_info - { - DWORD function_length : 18; - DWORD version : 2; - DWORD x : 1; - DWORD e : 1; - DWORD epilog : 5; - DWORD codes : 5; - } *info = (struct unwind_info *)(addr + func->UnwindData); - return func->BeginAddress + info->function_length * 4; - } -#endif -} - -/********************************************************************** - * RtlAddFunctionTable (NTDLL.@) - */ -BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_PTR addr ) -{ - struct dynamic_unwind_entry *entry; - - TRACE( "%p %lu %Ix\n", table, count, addr ); - - /* NOTE: Windows doesn't check if table is aligned or a NULL pointer */ - - entry = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*entry) ); - if (!entry) - return FALSE; - - entry->base = addr; - entry->end = addr + (count ? get_runtime_function_end( &table[count - 1], addr ) : 0); - entry->table = table; - entry->count = count; - entry->max_count = 0; - entry->callback = NULL; - entry->context = NULL; - - RtlEnterCriticalSection( &dynamic_unwind_section ); - list_add_tail( &dynamic_unwind_list, &entry->entry ); - RtlLeaveCriticalSection( &dynamic_unwind_section ); - return TRUE; -} - - /********************************************************************** * RtlInstallFunctionTableCallback (NTDLL.@) */ diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 57731d52dd7..7b8ddc59c43 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1208,6 +1208,24 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base, } +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_PTR base ) +{ + ULONG_PTR end = base; + void *ret; + + if (count) + { + RUNTIME_FUNCTION *func = table + count - 1; + struct unwind_info *info = (struct unwind_info *)(base + func->UnwindData); + end += func->BeginAddress + 2 * (func->Flag ? func->FunctionLength : info->function_length); + } + return !RtlAddGrowableFunctionTable( &ret, table, count, 0, base, end ); +} + + /********************************************************************** * call_consolidate_callback * diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index f20a9c075a6..16c68bf5c05 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1110,6 +1110,25 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base, } +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_PTR base ) +{ + ULONG_PTR end = base; + void *ret; + + if (count) + { + RUNTIME_FUNCTION *func = table + count - 1; + ULONG len = func->Flag ? func->FunctionLength : + ((IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY_XDATA *)(base + func->UnwindData))->FunctionLength; + end += func->BeginAddress + 4 * len; + } + return !RtlAddGrowableFunctionTable( &ret, table, count, 0, base, end ); +} + + /********************************************************************** * call_consolidate_callback * diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 0ee58a015f7..bf1a705368b 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1858,6 +1858,20 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base, } +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_PTR base ) +{ + ULONG_PTR end = base; + void *ret; + + if (count) end += table[count - 1].EndAddress; + + return !RtlAddGrowableFunctionTable( &ret, table, count, 0, base, end ); +} + + /******************************************************************* * RtlUnwindEx (NTDLL.@) */ diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 1fcb0eda4e2..8cd18a3811b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -1079,6 +1079,20 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base, } +/********************************************************************** + * RtlAddFunctionTable (NTDLL.@) + */ +BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, ULONG_PTR base ) +{ + ULONG_PTR end = base; + void *ret; + + if (count) end += table[count - 1].EndAddress; + + return !RtlAddGrowableFunctionTable( &ret, table, count, 0, base, end ); +} + + struct unwind_exception_frame { EXCEPTION_REGISTRATION_RECORD frame;

1 0

Alexandre Julliard : ntdll: Support ARM64EC code in RtlLookupFunctionEntry.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 0b3d3ad2b7fa08e99ee6574c44b28a0ac64d9f7b URL: https://gitlab.winehq.org/wine/wine/-/commit/0b3d3ad2b7fa08e99ee6574c44b28a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 21:18:12 2024 +0100 ntdll: Support ARM64EC code in RtlLookupFunctionEntry. --- dlls/ntdll/signal_arm64ec.c | 41 ++++++++++++++++++++++++++++++- dlls/ntdll/tests/exception.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index bf1a705368b..5b97b7238b3 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -252,6 +252,30 @@ static RUNTIME_FUNCTION *find_function_info( ULONG_PTR pc, ULONG_PTR base, } +static ARM64_RUNTIME_FUNCTION *find_function_info_arm64( ULONG_PTR pc, ULONG_PTR base, + ARM64_RUNTIME_FUNCTION *func, ULONG size ) +{ + int min = 0; + int max = size - 1; + + while (min <= max) + { + int pos = (min + max) / 2; + ULONG_PTR start = base + func[pos].BeginAddress; + + if (pc >= start) + { + ULONG len = func[pos].Flag ? func[pos].FunctionLength : + ((IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY_XDATA *)(base + func[pos].UnwindData))->FunctionLength; + if (pc < start + 4 * len) return func + pos; + min = pos + 1; + } + else max = pos - 1; + } + return NULL; +} + + /******************************************************************* * syscalls */ @@ -1844,11 +1868,26 @@ PRUNTIME_FUNCTION WINAPI RtlLookupFunctionEntry( ULONG_PTR pc, ULONG_PTR *base, ULONG size; if ((func = RtlLookupFunctionTable( pc, base, &size ))) + { + if (RtlIsEcCode( (void *)pc )) + { + ARM64_RUNTIME_FUNCTION *arm64func = (ARM64_RUNTIME_FUNCTION *)func; + size /= sizeof(*arm64func); + return (RUNTIME_FUNCTION *)find_function_info_arm64( pc, *base, arm64func, size ); + } return find_function_info( pc, *base, func, size / sizeof(*func)); + } if ((func = lookup_dynamic_function_table( pc, &dynbase, &size ))) { - RUNTIME_FUNCTION *ret = find_function_info( pc, dynbase, func, size ); + RUNTIME_FUNCTION *ret; + + if (RtlIsEcCode( (void *)pc )) + ret = (RUNTIME_FUNCTION *)find_function_info_arm64( pc, dynbase, + (ARM64_RUNTIME_FUNCTION *)func, size ); + else + ret = find_function_info( pc, dynbase, func, size ); + if (ret) *base = dynbase; return ret; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index f01bb488a6a..c061edc46ed 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -186,6 +186,7 @@ static NTSTATUS (WINAPI *pRtlWow64GetThreadContext)(HANDLE, WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64SetThreadContext)(HANDLE, const WOW64_CONTEXT *); static NTSTATUS (WINAPI *pRtlWow64GetCpuAreaInfo)(WOW64_CPURESERVED*,ULONG,WOW64_CPU_AREA_INFO*); static NTSTATUS (WINAPI *pRtlGetNativeSystemInformation)(SYSTEM_INFORMATION_CLASS,void*,ULONG,ULONG*); +static NTSTATUS (WINAPI *pNtAllocateVirtualMemoryEx)(HANDLE,PVOID*,SIZE_T*,ULONG,ULONG,MEM_EXTENDED_PARAMETER*,ULONG); static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif @@ -2994,6 +2995,9 @@ static void test_dynamic_unwind(void) { static const BYTE fast_forward[] = { 0x48, 0x8b, 0xc4, 0x48, 0x89, 0x58, 0x20, 0x55, 0x5d, 0xe9 }; IMAGE_ARM64EC_METADATA *metadata; + ARM64_RUNTIME_FUNCTION *arm64func = (ARM64_RUNTIME_FUNCTION *)buf; + MEM_EXTENDED_PARAMETER param = { 0 }; + SIZE_T size = 0x1000; if (!memcmp( pRtlLookupFunctionEntry, fast_forward, sizeof(fast_forward) )) { @@ -3012,6 +3016,58 @@ static void test_dynamic_unwind(void) ok( len == metadata->ExtraRFETableSize, "RtlLookupFunctionTable wrong len, got: %lu / %lu\n", len, metadata->ExtraRFETableSize ); } + + arm64func->BeginAddress = code_offset; + arm64func->Flag = 1; + arm64func->FunctionLength = 4; + arm64func->RegF = 1; + arm64func->RegI = 1; + arm64func->H = 1; + arm64func->CR = 1; + arm64func->FrameSize = 1; + arm64func++; + arm64func->BeginAddress = code_offset + 16; + arm64func->Flag = 1; + arm64func->FunctionLength = 4; + arm64func->RegF = 1; + arm64func->RegI = 1; + arm64func->H = 1; + arm64func->CR = 1; + arm64func->FrameSize = 1; + + param.Type = MemExtendedParameterAttributeFlags; + param.ULong64 = MEM_EXTENDED_PARAMETER_EC_CODE; + ptr = NULL; + status = pNtAllocateVirtualMemoryEx( GetCurrentProcess(), &ptr, &size, MEM_RESERVE | MEM_COMMIT, + PAGE_EXECUTE_READWRITE, &param, 1 ); + ok( !status, "NtAllocateVirtualMemoryEx failed %lx\n", status ); + + growable_table = NULL; + status = pRtlAddGrowableFunctionTable( &growable_table, (RUNTIME_FUNCTION *)buf, + 2, 2, (ULONG_PTR)ptr, (ULONG_PTR)ptr + code_offset + 64 ); + ok( !status, "RtlAddGrowableFunctionTable failed %lx\n", status ); + + base = 0xdeadbeef; + func = pRtlLookupFunctionEntry( (ULONG_PTR)ptr + code_offset + 8, &base, NULL ); + ok( func == (RUNTIME_FUNCTION *)buf, "RtlLookupFunctionEntry expected func: %p, got: %p\n", + buf, func ); + ok( base == (ULONG_PTR)ptr, "RtlLookupFunctionEntry expected base: %Ix, got: %Ix\n", + (ULONG_PTR)ptr, base ); + + base = 0xdeadbeef; + func = pRtlLookupFunctionEntry( (ULONG_PTR)ptr + code_offset + 16, &base, NULL ); + ok( func == (RUNTIME_FUNCTION *)(buf + sizeof(*arm64func)), + "RtlLookupFunctionEntry expected func: %p, got: %p\n", buf + sizeof(*arm64func), func ); + ok( base == (ULONG_PTR)ptr, "RtlLookupFunctionEntry expected base: %Ix, got: %Ix\n", + (ULONG_PTR)ptr, base ); + + base = 0xdeadbeef; + func = pRtlLookupFunctionEntry( (ULONG_PTR)ptr + code_offset + 32, &base, NULL ); + ok( !func, "RtlLookupFunctionEntry got: %p\n", func ); + ok( base == 0xdeadbeef, "RtlLookupFunctionEntry got: %Ix\n", base ); + + pRtlDeleteGrowableFunctionTable( growable_table ); + VirtualFree( ptr, 0, MEM_FREE ); } } @@ -13057,6 +13113,7 @@ START_TEST(exception) X(RtlWow64SetThreadContext); X(RtlWow64GetCpuAreaInfo); X(RtlGetNativeSystemInformation); + X(NtAllocateVirtualMemoryEx); #undef X p_setjmp = (void *)GetProcAddress( hmsvcrt, "_setjmp" );

1 0

Alexandre Julliard : ntdll: Make APCs alertable by default on ARM platforms.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 8f278f89df31a0874a73bd0e8004e0af75b652e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8f278f89df31a0874a73bd0e8004e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 21:08:26 2024 +0100 ntdll: Make APCs alertable by default on ARM platforms. --- dlls/ntdll/unix/signal_arm.c | 9 +++++---- dlls/ntdll/unix/signal_arm64.c | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 0f6f81d2ee1..9501f8fbaef 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1035,10 +1035,11 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a NtGetContextThread( GetCurrentThread(), &stack->context ); stack->context.R0 = status; } - stack->func = func; - stack->args[0] = arg1; - stack->args[1] = arg2; - stack->args[2] = arg3; + stack->func = func; + stack->args[0] = arg1; + stack->args[1] = arg2; + stack->args[2] = arg3; + stack->alertable = TRUE; frame->sp = (DWORD)stack; frame->pc = (DWORD)pKiUserApcDispatcher; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index bc5b8f0b88a..6d6f7bcc8b9 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -754,10 +754,11 @@ NTSTATUS call_user_apc_dispatcher( CONTEXT *context, ULONG_PTR arg1, ULONG_PTR a NtGetContextThread( GetCurrentThread(), &stack->context ); stack->context.X0 = status; } - stack->func = func; - stack->args[0] = arg1; - stack->args[1] = arg2; - stack->args[2] = arg3; + stack->func = func; + stack->args[0] = arg1; + stack->args[1] = arg2; + stack->args[2] = arg3; + stack->alertable = TRUE; frame->sp = (ULONG64)stack; frame->pc = (ULONG64)pKiUserApcDispatcher;

1 0

Zebediah Figura : urlmon/tests: Add basic tests for CoInternetParseUrl(PARSE_CANONICALIZE).
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 6ff5c3b5002e89c36d68e40ac3a701daf07ab14e URL: https://gitlab.winehq.org/wine/wine/-/commit/6ff5c3b5002e89c36d68e40ac3a701… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 2 21:28:36 2024 -0600 urlmon/tests: Add basic tests for CoInternetParseUrl(PARSE_CANONICALIZE). --- dlls/urlmon/tests/misc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 796f54a4f62..e65feed7318 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -401,6 +401,17 @@ static void test_CoInternetParseUrl(void) if(parse_tests[i].rootdocument) ok(!lstrcmpW(parse_tests[i].rootdocument, buf), "[%d] wrong rootdocument, received %s\n", i, wine_dbgstr_w(buf)); } + + size = 0xdeadbeef; + hres = pCoInternetParseUrl(L"http://a/b/../c", PARSE_CANONICALIZE, 0, buf, 3, &size, 0); + ok(hres == E_POINTER, "got %#lx\n", hres); + ok(size == wcslen(L"http://a/c") + 1, "got %lu\n", size); + + size = 0xdeadbeef; + hres = pCoInternetParseUrl(L"http://a/b/../c", PARSE_CANONICALIZE, 0, buf, sizeof(buf), &size, 0); + ok(hres == S_OK, "got %#lx\n", hres); + ok(!wcscmp(buf, L"http://a/c"), "got %s\n", debugstr_w(buf)); + ok(size == wcslen(buf), "got %lu\n", size); } static void test_CoInternetCompareUrl(void)

1 0

Zebediah Figura : shlwapi/tests: Move the UrlCanonicalize() tests into test_UrlCanonicalizeA().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: dc800b56b66dfba3e393f53669d92769826fc527 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc800b56b66dfba3e393f53669d927… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Dec 3 20:14:31 2021 -0600 shlwapi/tests: Move the UrlCanonicalize() tests into test_UrlCanonicalizeA(). --- dlls/shlwapi/tests/url.c | 245 +++++++++++++++++++++++------------------------ 1 file changed, 120 insertions(+), 125 deletions(-)

1 0

Zebediah Figura : shlwapi/tests: Remove the unused "wszExpectUrl" variable from check_url_canonicalize().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: fc0c738f9dd22503945c498501ce07d6b64b3fd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc0c738f9dd22503945c498501ce07… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 5 19:21:35 2021 -0600 shlwapi/tests: Remove the unused "wszExpectUrl" variable from check_url_canonicalize(). --- dlls/shlwapi/tests/url.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index d99be7b6a43..6f8bae7a21a 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -777,7 +777,6 @@ static void check_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; WCHAR wszReturnUrl[INTERNET_MAX_URL_LENGTH]; LPWSTR wszUrl = GetWideString(szUrl); - LPWSTR wszExpectUrl = GetWideString(szExpectUrl); LPWSTR wszConvertedUrl; HRESULT ret; @@ -804,7 +803,6 @@ static void check_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, FreeWideString(wszConvertedUrl); FreeWideString(wszUrl); - FreeWideString(wszExpectUrl); }

1 0

Zebediah Figura : shlwapi/tests: Use winetest_push_context() in test_UrlCanonicalizeA().
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: a4ac824fe5cd50d2861ebd4ab2ff2766546b69bf URL: https://gitlab.winehq.org/wine/wine/-/commit/a4ac824fe5cd50d2861ebd4ab2ff27… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Dec 5 19:31:19 2021 -0600 shlwapi/tests: Use winetest_push_context() in test_UrlCanonicalizeA(). --- dlls/shlwapi/tests/url.c | 51 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 6f8bae7a21a..3856701f24b 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -772,37 +772,38 @@ static void test_UrlGetPart(void) } /* ########################### */ -static void check_url_canonicalize(int index, const char *szUrl, DWORD dwFlags, const char *szExpectUrl, BOOL todo) +static void check_url_canonicalize(const char *url, DWORD flags, const char *expect, BOOL todo) { - CHAR szReturnUrl[INTERNET_MAX_URL_LENGTH]; - WCHAR wszReturnUrl[INTERNET_MAX_URL_LENGTH]; - LPWSTR wszUrl = GetWideString(szUrl); - LPWSTR wszConvertedUrl; - HRESULT ret; + char output[INTERNET_MAX_URL_LENGTH]; + WCHAR outputW[INTERNET_MAX_URL_LENGTH]; + WCHAR *urlW = GetWideString(url); + WCHAR *expectW; + HRESULT hr; + DWORD size; - DWORD dwSize; + winetest_push_context("URL %s, flags %#lx", debugstr_a(url), flags); - dwSize = INTERNET_MAX_URL_LENGTH; - ret = UrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags); - ok(ret == E_INVALIDARG, "Got unexpected hr %#lx for index %d.\n", ret, index); - ret = UrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags); - ok(ret == S_OK || (!szUrl[0] && ret == S_FALSE) /* Vista+ */, - "Got unexpected hr %#lx for index %d.\n", ret, index); + size = INTERNET_MAX_URL_LENGTH; + hr = UrlCanonicalizeA(url, NULL, &size, flags); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = UrlCanonicalizeA(url, output, &size, flags); + ok(hr == S_OK || (!url[0] && hr == S_FALSE) /* Vista+ */, "Got unexpected hr %#lx.\n", hr); todo_wine_if (todo) - ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08lx url '%s' Expected \"%s\", but got \"%s\", index %d\n", dwFlags, szUrl, szExpectUrl, szReturnUrl, index); + ok(!strcmp(output, expect), "Expected %s, got %s.\n", debugstr_a(expect), debugstr_a(output)); + + size = INTERNET_MAX_URL_LENGTH; + hr = UrlCanonicalizeW(urlW, NULL, &size, flags); + ok(hr == E_INVALIDARG, "Got unexpected hr %#lx.\n", hr); + hr = UrlCanonicalizeW(urlW, outputW, &size, flags); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - dwSize = INTERNET_MAX_URL_LENGTH; - ret = UrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags); - ok(ret == E_INVALIDARG, "Got unexpected hr %#lx for index %d.\n", ret, index); - ret = UrlCanonicalizeW(wszUrl, wszReturnUrl, &dwSize, dwFlags); - ok(ret == S_OK, "Got unexpected hr %#lx for index %d.\n", ret, index); + expectW = GetWideString(output); + ok(!wcscmp(outputW, expectW), "Expected %s, got %s.\n", debugstr_w(expectW), debugstr_w(outputW)); + FreeWideString(expectW); - wszConvertedUrl = GetWideString(szReturnUrl); - ok(lstrcmpW(wszReturnUrl, wszConvertedUrl)==0, - "Strings didn't match between ansi and unicode UrlCanonicalize, index %d!\n", index); - FreeWideString(wszConvertedUrl); + FreeWideString(urlW); - FreeWideString(wszUrl); + winetest_pop_context(); } @@ -1157,7 +1158,7 @@ static void test_UrlCanonicalizeA(void) /* test url-modification */ for (i = 0; i < ARRAY_SIZE(tests); i++) - check_url_canonicalize(i, tests[i].url, tests[i].flags, tests[i].expect, tests[i].todo); + check_url_canonicalize(tests[i].url, tests[i].flags, tests[i].expect, tests[i].todo); } /* ########################### */

1 0

Zebediah Figura : shlwapi/tests: Move UrlCombine() error tests out of the loop.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: ca29c3a422de6d47c11e56820bda8a686a69c65a URL: https://gitlab.winehq.org/wine/wine/-/commit/ca29c3a422de6d47c11e56820bda8a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 19 22:46:27 2023 -0500 shlwapi/tests: Move UrlCombine() error tests out of the loop. And expand them a bit while we're at it. --- dlls/shlwapi/tests/url.c | 72 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 3856701f24b..dbee7926aa8 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -1263,34 +1263,13 @@ static void check_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFl wszUrl2 = GetWideString(szUrl2); wszExpectUrl = GetWideString(szExpectUrl); - hr = UrlCombineA(szUrl1, szUrl2, NULL, NULL, dwFlags); - ok(hr == E_INVALIDARG, "UrlCombineA returned 0x%08lx, expected 0x%08lx\n", hr, E_INVALIDARG); - - dwSize = 0; - hr = UrlCombineA(szUrl1, szUrl2, NULL, &dwSize, dwFlags); - ok(hr == E_POINTER, "Checking length of string, return was 0x%08lx, expected 0x%08lx\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %ld, expected %ld\n", dwSize, dwExpectLen+1); - - dwSize--; - hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); - ok(hr == E_POINTER, "UrlCombineA returned 0x%08lx, expected 0x%08lx\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %ld, expected %ld\n", dwSize, dwExpectLen+1); - + dwSize = ARRAY_SIZE(szReturnUrl); hr = UrlCombineA(szUrl1, szUrl2, szReturnUrl, &dwSize, dwFlags); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(dwSize == dwExpectLen, "Got length %ld, expected %ld\n", dwSize, dwExpectLen); ok(!strcmp(szReturnUrl, szExpectUrl), "Expected %s, got %s.\n", szExpectUrl, szReturnUrl); - dwSize = 0; - hr = UrlCombineW(wszUrl1, wszUrl2, NULL, &dwSize, dwFlags); - ok(hr == E_POINTER, "Checking length of string, return was 0x%08lx, expected 0x%08lx\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %ld, expected %ld\n", dwSize, dwExpectLen+1); - - dwSize--; - hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); - ok(hr == E_POINTER, "UrlCombineW returned 0x%08lx, expected 0x%08lx\n", hr, E_POINTER); - ok(dwSize == dwExpectLen+1, "Got length %ld, expected %ld\n", dwSize, dwExpectLen+1); - + dwSize = ARRAY_SIZE(wszReturnUrl); hr = UrlCombineW(wszUrl1, wszUrl2, wszReturnUrl, &dwSize, dwFlags); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); ok(dwSize == dwExpectLen, "Got length %ld, expected %ld\n", dwSize, dwExpectLen); @@ -1308,7 +1287,54 @@ static void check_url_combine(const char *szUrl1, const char *szUrl2, DWORD dwFl static void test_UrlCombine(void) { + WCHAR bufferW[30]; + char buffer[30]; unsigned int i; + HRESULT hr; + DWORD size; + + hr = UrlCombineA("http://base/", "relative", NULL, NULL, 0); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + size = 0; + hr = UrlCombineA("http://base/", "relative", NULL, &size, 0); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + ok(size == strlen("http://base/relative") + 1, "Got size %lu.\n", size); + + --size; + strcpy(buffer, "x"); + hr = UrlCombineA("http://base/", "relative", buffer, &size, 0); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + ok(size == strlen("http://base/relative") + 1, "Got size %lu.\n", size); + ok(!strcmp(buffer, "x"), "Got buffer contents %s.\n", debugstr_a(buffer)); + + strcpy(buffer, "x"); + hr = UrlCombineA("http://base/", "relative", buffer, &size, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size == strlen("http://base/relative"), "Got size %lu.\n", size); + ok(!strcmp(buffer, "http://base/relative"), "Got buffer contents %s.\n", debugstr_a(buffer)); + + hr = UrlCombineW(L"http://base/", L"relative", NULL, NULL, 0); + ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + + size = 0; + hr = UrlCombineW(L"http://base/", L"relative", NULL, &size, 0); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + ok(size == strlen("http://base/relative") + 1, "Got size %lu.\n", size); + + --size; + wcscpy(bufferW, L"x"); + hr = UrlCombineW(L"http://base/", L"relative", bufferW, &size, 0); + ok(hr == E_POINTER, "Got hr %#lx.\n", hr); + ok(size == strlen("http://base/relative") + 1, "Got size %lu.\n", size); + ok(!wcscmp(bufferW, L"x"), "Got buffer contents %s.\n", debugstr_a(buffer)); + + wcscpy(bufferW, L"x"); + hr = UrlCombineW(L"http://base/", L"relative", bufferW, &size, 0); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(size == strlen("http://base/relative"), "Got size %lu.\n", size); + ok(!wcscmp(bufferW, L"http://base/relative"), "Got buffer contents %s.\n", debugstr_w(bufferW)); + for (i = 0; i < ARRAY_SIZE(TEST_COMBINE); i++) { check_url_combine(TEST_COMBINE[i].url1, TEST_COMBINE[i].url2, TEST_COMBINE[i].flags, TEST_COMBINE[i].expecturl); }

1 0

Zebediah Figura : kernelbase: Do not use isalnum() with Unicode characters.
by Alexandre Julliard 13 Feb '24

13 Feb '24

Module: wine Branch: master Commit: 13d48ed315fe4119f06b8d42dc14ee91eb7e43f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/13d48ed315fe4119f06b8d42dc14ee… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 6 11:04:05 2024 -0600 kernelbase: Do not use isalnum() with Unicode characters. It does not expect code points higher than U+00FF and will read past the end of the ctypes[] array. --- dlls/kernelbase/path.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 40ddf840045..067bb0c87a7 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1769,7 +1769,7 @@ UINT WINAPI PathGetCharTypeW(WCHAR ch) { if (ch < 126) { - if (((ch & 0x1) && ch != ';') || !ch || isalnum(ch) || ch == '$' || ch == '&' || ch == '(' || + if (((ch & 0x1) && ch != ';') || !ch || iswalnum(ch) || ch == '$' || ch == '&' || ch == '(' || ch == '.' || ch == '@' || ch == '^' || ch == '\'' || ch == '`') { flags |= GCT_SHORTCHAR; /* All these are valid for DOS */ @@ -2824,7 +2824,7 @@ HRESULT WINAPI ParseURLW(const WCHAR *url, PARSEDURLW *result) if (result->cbSize != sizeof(*result)) return E_INVALIDARG; - while (*ptr && (isalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) + while (*ptr && (iswalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.')) ptr++; if (*ptr != ':' || ptr <= url + 1) @@ -3260,7 +3260,7 @@ static BOOL url_needs_escape(WCHAR ch, DWORD flags, DWORD int_flags) if (ch <= 31 || (ch >= 127 && ch <= 255) ) return TRUE; - if (isalnum(ch)) + if (iswalnum(ch)) return FALSE; switch (ch) { @@ -3655,9 +3655,9 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR switch (state) { case 0: - if (!isalnum(*wk1)) {state = 3; break;} + if (!iswalnum(*wk1)) {state = 3; break;} *wk2++ = *wk1++; - if (!isalnum(*wk1)) {state = 3; break;} + if (!iswalnum(*wk1)) {state = 3; break;} *wk2++ = *wk1++; state = 1; break; @@ -3743,12 +3743,12 @@ HRESULT WINAPI UrlCanonicalizeW(const WCHAR *src_url, WCHAR *canonicalized, DWOR } break; case 4: - if (!isalnum(*wk1) && (*wk1 != '-') && (*wk1 != '.') && (*wk1 != ':')) + if (!iswalnum(*wk1) && (*wk1 != '-') && (*wk1 != '.') && (*wk1 != ':')) { state = 3; break; } - while (isalnum(*wk1) || (*wk1 == '-') || (*wk1 == '.') || (*wk1 == ':')) + while (iswalnum(*wk1) || (*wk1 == '-') || (*wk1 == '.') || (*wk1 == ':')) *wk2++ = *wk1++; state = 5; if (!*wk1) @@ -4225,7 +4225,7 @@ HRESULT WINAPI UrlGetPartA(const char *url, char *out, DWORD *out_len, DWORD par static const WCHAR *parse_scheme( const WCHAR *p ) { - while (isalnum( *p ) || *p == '+' || *p == '-' || *p == '.') + while (iswalnum( *p ) || *p == '+' || *p == '-' || *p == '.') ++p; return p; }

1 0