- Wine-Commits - list.winehq.org

Alexandre Julliard : include: Add some public exception handling structures.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: b9a985a677bb3f36bea71184314b17cc537500de URL: https://gitlab.winehq.org/wine/wine/-/commit/b9a985a677bb3f36bea71184314b17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 14:49:47 2024 +0100 include: Add some public exception handling structures. --- dlls/ntdll/signal_arm.c | 12 -- dlls/ntdll/signal_arm64.c | 47 ++----- dlls/ntdll/signal_x86_64.c | 12 -- dlls/ntdll/tests/exception.c | 42 ++---- include/winnt.h | 309 ++++++++++++++++++++++++++----------------- 5 files changed, 208 insertions(+), 214 deletions(-)

1 0

Alexandre Julliard : ntdll: Support ARM64EC code in RtlLookupFunctionEntry.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

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: Move find_function_info() to the CPU backends.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

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 Feb. 13, 2024

Feb. 13, 2024

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: Move RtlLookupFunctionEntry() to the CPU backends.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 215a8e68d35bfe55bc8dc203deb6e73d6f215a0f URL: https://gitlab.winehq.org/wine/wine/-/commit/215a8e68d35bfe55bc8dc203deb6e7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 13 11:25:43 2024 +0100 ntdll: Move RtlLookupFunctionEntry() to the CPU backends. --- dlls/ntdll/exception.c | 93 ++++++++++++++++---------------------------- dlls/ntdll/ntdll_misc.h | 3 +- dlls/ntdll/signal_arm.c | 74 +++++++++++++++-------------------- dlls/ntdll/signal_arm64.c | 36 +++++++++++++---- dlls/ntdll/signal_arm64ec.c | 25 ++++++++++++ dlls/ntdll/signal_x86_64.c | 32 +++++++++++++-- dlls/ntdll/tests/exception.c | 5 +++ 7 files changed, 155 insertions(+), 113 deletions(-)

1 0

Francisco Casas : tests: Remove [require] directives for tests that use int and bool uniforms.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 6a8939e19f312c8ab85d2d111766a693c75e490c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6a8939e19f312c8ab85d2d111766a… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 31 17:10:29 2024 -0300 tests: Remove [require] directives for tests that use int and bool uniforms. These tests should actually compile and run in SM1, which is possible if we pass the int and uint uniforms in the expected IEEE 754 float format for SM1 shaders. Also, bools should be passed as 1.0f or 0.0f to SM1. --- tests/hlsl/any.shader_test | 46 +++++----- tests/hlsl/bool-cast.shader_test | 18 ++-- tests/hlsl/cast-to-float.shader_test | 21 ++--- tests/hlsl/cast-to-half.shader_test | 21 ++--- tests/hlsl/cast-to-int.shader_test | 24 ++--- tests/hlsl/cast-to-uint.shader_test | 4 +- tests/hlsl/ceil.shader_test | 10 +-- tests/hlsl/floor.shader_test | 9 +- tests/hlsl/function-cast.shader_test | 7 +- tests/hlsl/ldexp.shader_test | 12 +-- tests/hlsl/lerp.shader_test | 15 ++-- tests/hlsl/sign.shader_test | 35 +++++--- tests/hlsl/switch.shader_test | 165 +++++++++++++++++++++-------------- tests/hlsl/trunc.shader_test | 9 +- 14 files changed, 220 insertions(+), 176 deletions(-)

1 0

Francisco Casas : tests: Don't ignore SM1 on a non-const-indexing.shader_test test.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: faec42e8a1b0613f6e38bc8b3f1586ca903ed6ec URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/faec42e8a1b0613f6e38bc8b3f158… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 29 21:04:20 2024 -0300 tests: Don't ignore SM1 on a non-const-indexing.shader_test test. The previous [require] block makes us skip the test for SM4. --- tests/hlsl/non-const-indexing.shader_test | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index b0452148..ba60367f 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -216,7 +216,11 @@ draw quad probe all rgba (1, 5, 3, 4) -[pixel shader] +[require] +% reset requirements + + +[pixel shader todo(sm<4)] uniform float4 f[4]; uniform uint4 u; uniform uint4 v;

1 0

Francisco Casas : tests/vkd3d-shader: Set uninitialized uniforms to a value.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 0f9f5269e9c9cfb9882cda3c712f820d6f35295b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0f9f5269e9c9cfb9882cda3c712f8… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 31 15:21:23 2024 -0300 tests/vkd3d-shader: Set uninitialized uniforms to a value. Avoids a potential source of non-determinism because the padding bytes between uniforms could be left uninitialized. --- tests/shader_runner.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index fe5ee597..866fd5d4 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -551,9 +551,13 @@ static void set_resource(struct shader_runner *runner, struct resource *resource static void set_uniforms(struct shader_runner *runner, size_t offset, size_t count, const void *uniforms) { + size_t initial_count = runner->uniform_count; + runner->uniform_count = align(max(runner->uniform_count, offset + count), 4); vkd3d_array_reserve((void **)&runner->uniforms, &runner->uniform_capacity, runner->uniform_count, sizeof(*runner->uniforms)); + memset(runner->uniforms + initial_count, 127, + (runner->uniform_count - initial_count) * sizeof(*runner->uniforms)); memcpy(runner->uniforms + offset, uniforms, count * sizeof(*runner->uniforms)); }

1 0

Francisco Casas : tests/shader-runner: Introduce "if" qualifier.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: vkd3d Branch: master Commit: 22c47e57f5e351a63ed061e8231161b884f6ce38 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22c47e57f5e351a63ed061e823116… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 29 20:07:39 2024 -0300 tests/shader-runner: Introduce "if" qualifier. When the "if" qualifier is added to a directive, the directive is skipped if the shader->minimum_shader_model is not included in the range. This can be used on the "probe" directives for tests that have different expected results on different shader models, without having to resort to [require] blocks. --- tests/hlsl/arithmetic-int.shader_test | 8 ++--- tests/hlsl/duplicate-modifiers.shader_test | 7 ++--- tests/hlsl/initializer-implicit-array.shader_test | 9 ++---- tests/hlsl/initializer-numeric.shader_test | 6 ++-- tests/hlsl/non-const-indexing.shader_test | 36 +++-------------------- tests/shader_runner.c | 36 +++++++++++++++++++++-- 6 files changed, 47 insertions(+), 55 deletions(-) diff --git a/tests/hlsl/arithmetic-int.shader_test b/tests/hlsl/arithmetic-int.shader_test index 46b64181..7a64894d 100644 --- a/tests/hlsl/arithmetic-int.shader_test +++ b/tests/hlsl/arithmetic-int.shader_test @@ -104,10 +104,9 @@ float4 main() : SV_TARGET draw quad probe all rgba (0.0, 0.0, 0.0, 0.0) + [require] shader model >= 4.0 -% dxcompiler performs this calculation on unsigned values and emits zero. -shader model < 6.0 [pixel shader] float4 main() : SV_TARGET @@ -120,10 +119,9 @@ float4 main() : SV_TARGET [test] draw quad -probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) +if(sm<6) probe all rgba (-2147483648.0, -2147483648.0, -2147483648.0, -2147483648.0) +if(sm>=6) probe all rgba (0.0, 0.0, 0.0, 0.0) -[require] -shader model >= 4.0 [pixel shader] float4 main() : sv_target diff --git a/tests/hlsl/duplicate-modifiers.shader_test b/tests/hlsl/duplicate-modifiers.shader_test index bf1d9c1b..87f56495 100644 --- a/tests/hlsl/duplicate-modifiers.shader_test +++ b/tests/hlsl/duplicate-modifiers.shader_test @@ -1,7 +1,3 @@ -% Returns (0.1, 0.3, 0.2, 0.4) with dxcompiler -[require] -shader model < 6.0 - [pixel shader] typedef const precise row_major float2x2 mat_t; float4 main() : sv_target @@ -12,4 +8,5 @@ float4 main() : sv_target [test] draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +if(sm<6) probe all rgba (0.1, 0.2, 0.3, 0.4) +if(sm>=6) probe all rgba (0.1, 0.3, 0.2, 0.4) diff --git a/tests/hlsl/initializer-implicit-array.shader_test b/tests/hlsl/initializer-implicit-array.shader_test index 25cd1564..e1182599 100644 --- a/tests/hlsl/initializer-implicit-array.shader_test +++ b/tests/hlsl/initializer-implicit-array.shader_test @@ -11,10 +11,6 @@ draw quad probe all rgba (50, 60, 70, 80) -% dxcompiler emits a nop shader which returns immediately. -[require] -shader model < 6.0 - [pixel shader] float4 main() : sv_target { @@ -26,10 +22,9 @@ float4 main() : sv_target [test] draw quad -probe all rgba (5.0, 6.0, 7.0, 8.0) +% dxcompiler emits a nop shader which returns immediately. +if(sm<6) probe all rgba (5.0, 6.0, 7.0, 8.0) -[require] -% reset requirements [pixel shader] float4 main() : sv_target diff --git a/tests/hlsl/initializer-numeric.shader_test b/tests/hlsl/initializer-numeric.shader_test index 617b6740..1b41dfb5 100644 --- a/tests/hlsl/initializer-numeric.shader_test +++ b/tests/hlsl/initializer-numeric.shader_test @@ -60,9 +60,6 @@ draw quad probe all rgba (3.0, 250.0, 16.0, 4.2949673e+009) 4 -[require] -shader model < 6.0 - [pixel shader] float4 main() : sv_target { @@ -73,4 +70,5 @@ float4 main() : sv_target [test] draw quad -probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 +if(sm<6) probe all rgba (-1294967296.0, 3000000000.0, 0.0, 0.0) 4 +if(sm>=6) probe all rgba (3000000000.0, 3000000000.0, 0.0, 0.0) 4 diff --git a/tests/hlsl/non-const-indexing.shader_test b/tests/hlsl/non-const-indexing.shader_test index ba60367f..aed33092 100644 --- a/tests/hlsl/non-const-indexing.shader_test +++ b/tests/hlsl/non-const-indexing.shader_test @@ -236,23 +236,6 @@ float4 main() : sv_target } % FXC is incapable of compiling this correctly, but results differ for SM1-3 vs SM4-5. -[require] -shader model < 4.0 - -[test] -uniform 0 float 1.0 -uniform 4 float 2.0 -uniform 8 float 3.0 -uniform 12 float 4.0 -uniform 16 uint4 3 1 0 2 -uniform 20 uint4 0 3 1 2 -todo draw quad -todo(sm<4) probe all rgba (1.0, 1.0, 1.0, 1.0) - -[require] -shader model >= 4.0 -shader model < 6.0 - [test] uniform 0 float 1.0 uniform 4 float 2.0 @@ -260,18 +243,7 @@ uniform 8 float 3.0 uniform 12 float 4.0 uniform 16 uint4 3 1 0 2 uniform 20 uint4 0 3 1 2 -draw quad -todo probe all rgba (4.0, 4.0, 4.0, 4.0) - -[require] -shader model >= 6.0 - -[test] -uniform 0 float 1.0 -uniform 4 float 2.0 -uniform 8 float 3.0 -uniform 12 float 4.0 -uniform 16 uint4 3 1 0 2 -uniform 20 uint4 0 3 1 2 -draw quad -probe all rgba (4.0, 3.0, 2.0, 1.0) +todo(sm<4) draw quad +if(sm<4) todo probe all rgba (1.0, 1.0, 1.0, 1.0) +if(sm>=4 & sm<6) todo probe all rgba (4.0, 4.0, 4.0, 4.0) +if(sm>=6) probe all rgba (4.0, 3.0, 2.0, 1.0) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 866fd5d4..a683866c 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -657,14 +657,46 @@ static void read_uint64_t2(const char **line, struct u64vec2 *v) static void parse_test_directive(struct shader_runner *runner, const char *line) { + bool skip_directive = false; + const char *line_ini; + bool match = true; char *rest; int ret; runner->is_todo = false; - if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + while (match) { - runner->is_todo = true; + match = false; + + if (match_string_with_args(line, "todo", &line, runner->minimum_shader_model)) + { + runner->is_todo = true; + match = true; + } + + line_ini = line; + if (match_string_with_args(line, "if", &line, runner->minimum_shader_model)) + { + match = true; + } + else if (line != line_ini) + { + /* Matched "if" but for other shader models. */ + skip_directive = true; + match = true; + } + } + + if (skip_directive) + { + const char *new_line; + + if ((new_line = strchr(line, '\n'))) + line = new_line + 1; + else + line += strlen(line); + return; } if (match_string(line, "dispatch", &line))

1 0

Paul Gofman : kernel32/tests: Add tests for critical section debug info presence.
by Alexandre Julliard Feb. 13, 2024

Feb. 13, 2024

Module: wine Branch: master Commit: 0b441c4c8ff9854d8154ab1846fc63f904781f00 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b441c4c8ff9854d8154ab1846fc63… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 18 17:02:28 2023 -0600 kernel32/tests: Add tests for critical section debug info presence. --- dlls/kernel32/tests/sync.c | 32 +++++++++++++++++++++++++++++++- include/winnt.h | 12 +++++++----- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index 56a9d6e4859..25cf75cd686 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2741,7 +2741,8 @@ static void test_crit_section(void) to override that. */ memset(&cs, 0, sizeof(cs)); InitializeCriticalSection(&cs); - ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1 || broken(!!cs.DebugInfo) /* before Win8 */, + "Unexpected debug info pointer %p.\n", cs.DebugInfo); DeleteCriticalSection(&cs); ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); @@ -2751,10 +2752,39 @@ static void test_crit_section(void) return; } + memset(&cs, 0, sizeof(cs)); + ret = pInitializeCriticalSectionEx(&cs, 0, 0); + ok(ret, "Failed to initialize critical section.\n"); + todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1 || broken(!!cs.DebugInfo) /* before Win8 */, + "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + memset(&cs, 0, sizeof(cs)); ret = pInitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); ok(ret, "Failed to initialize critical section.\n"); ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + todo_wine ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + memset(&cs, 0, sizeof(cs)); + ret = pInitializeCriticalSectionEx(&cs, 0, 0); + ok(ret, "Failed to initialize critical section.\n"); + todo_wine ok(cs.DebugInfo == (void *)(ULONG_PTR)-1 || broken(!!cs.DebugInfo) /* before Win8 */, + "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + ok(cs.DebugInfo == NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + + memset(&cs, 0, sizeof(cs)); + ret = pInitializeCriticalSectionEx(&cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO); + ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* before Win8 */, + "Failed to initialize critical section, error %lu.\n", GetLastError()); + if (!ret) + { + ret = pInitializeCriticalSectionEx(&cs, 0, 0); + ok(ret, "Failed to initialize critical section.\n"); + } + ok(cs.DebugInfo && cs.DebugInfo != (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); ret = TryEnterCriticalSection(&cs); ok(ret, "Failed to enter critical section.\n"); diff --git a/include/winnt.h b/include/winnt.h index 2dc4eeb69d4..08ca04f8667 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6113,11 +6113,13 @@ typedef struct _RTL_CRITICAL_SECTION { ULONG_PTR SpinCount; } RTL_CRITICAL_SECTION, *PRTL_CRITICAL_SECTION; -#define RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO 0x1000000 -#define RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN 0x2000000 -#define RTL_CRITICAL_SECTION_FLAG_STATIC_INIT 0x4000000 -#define RTL_CRITICAL_SECTION_ALL_FLAG_BITS 0xFF000000 -#define RTL_CRITICAL_SECTION_FLAG_RESERVED (RTL_CRITICAL_SECTION_ALL_FLAG_BITS & ~0x7000000) +#define RTL_CRITICAL_SECTION_FLAG_NO_DEBUG_INFO 0x01000000 +#define RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN 0x02000000 +#define RTL_CRITICAL_SECTION_FLAG_STATIC_INIT 0x04000000 +#define RTL_CRITICAL_SECTION_FLAG_RESOURCE_TYPE 0x08000000 +#define RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO 0x10000000 +#define RTL_CRITICAL_SECTION_ALL_FLAG_BITS 0xff000000 +#define RTL_CRITICAL_SECTION_FLAG_RESERVED 0xe0000000 typedef struct _RTL_SRWLOCK { PVOID Ptr;

1 0