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

Henri Verbeet : wined3d: Slightly adjust an ERR in shader_spirv_compile_shader().
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 37bb8c14e010c4141a86101fe7bf9380d29090c6 URL: https://gitlab.winehq.org/wine/wine/-/commit/37bb8c14e010c4141a86101fe7bf93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Feb 26 16:51:41 2024 +0100 wined3d: Slightly adjust an ERR in shader_spirv_compile_shader(). We're not necessarily compiling DXBC shaders here after commit 1474f5cc47d9f056382f04ea5dff3314c6d181b8. --- dlls/wined3d/shader_spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index acdf47b504e..3919368ac45 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -325,7 +325,7 @@ static VkShaderModule shader_spirv_compile_shader(struct wined3d_context_vk *con if (ret < 0) { - ERR("Failed to compile DXBC, ret %d.\n", ret); + ERR("Failed to compile shader, ret %d.\n", ret); return VK_NULL_HANDLE; }

1 0

Nikolay Sivov : d3d10_1/tests: Add a basic test for returned preferred profiles.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 0a9ad614e62107f882ec6172b026766f94a5f624 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a9ad614e62107f882ec6172b02676… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 14:52:42 2024 +0100 d3d10_1/tests: Add a basic test for returned preferred profiles. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10_1/tests/d3d10_1.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index 75b01c89903..ad7aaeb0dc4 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -1039,6 +1039,20 @@ static void test_fx_4_1_blend_state(void) ok(!refcount, "Device has %lu references left.\n", refcount); } +static void test_shader_profiles(void) +{ + const char *profile; + + profile = D3D10GetVertexShaderProfile(NULL); + ok(!strcmp(profile, "vs_4_0"), "Unexpected profile %s.\n", profile); + + profile = D3D10GetGeometryShaderProfile(NULL); + ok(!strcmp(profile, "gs_4_0"), "Unexpected profile %s.\n", profile); + + profile = D3D10GetPixelShaderProfile(NULL); + ok(!strcmp(profile, "ps_4_0"), "Unexpected profile %s.\n", profile); +} + START_TEST(d3d10_1) { test_create_device(); @@ -1047,4 +1061,5 @@ START_TEST(d3d10_1) test_create_blend_state(); test_getdc(); test_fx_4_1_blend_state(); + test_shader_profiles(); }

1 0

Nikolay Sivov : d3d10_1/tests: Add an effect compilation test using 10.1 features.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 5eb46419b44c8ce4362d06205fb33e7085685ff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/5eb46419b44c8ce4362d06205fb33e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 25 15:25:23 2024 +0100 d3d10_1/tests: Add an effect compilation test using 10.1 features. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10_1/tests/d3d10_1.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index ad7aaeb0dc4..e3cd3943594 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -1053,6 +1053,30 @@ static void test_shader_profiles(void) ok(!strcmp(profile, "ps_4_0"), "Unexpected profile %s.\n", profile); } +static void test_compile_effect(void) +{ + char default_bs_source[] = "BlendState default_blend_state {};"; + char bs_source2[] = + "BlendState blend_state\n" + "{\n" + " srcblend[0] = zero;\n" + "};"; + ID3D10Blob *blob; + HRESULT hr; + + hr = D3D10CompileEffectFromMemory(default_bs_source, strlen(default_bs_source), + NULL, NULL, NULL, 0, 0, &blob, NULL); + todo_wine + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (SUCCEEDED(hr)) + ID3D10Blob_Release(blob); + + /* Compilation fails due to 10.1 feature incompatibility with fx_4_0 profile. */ + hr = D3D10CompileEffectFromMemory(bs_source2, strlen(bs_source2), NULL, NULL, NULL, + 0, 0, &blob, NULL); + ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); +} + START_TEST(d3d10_1) { test_create_device(); @@ -1062,4 +1086,5 @@ START_TEST(d3d10_1) test_getdc(); test_fx_4_1_blend_state(); test_shader_profiles(); + test_compile_effect(); }

1 0

Paul Gofman : ntdll: Respect red zone in usr1_handler() on x64.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 6f55a13169797dd073575c052a6418e3cecbcfad URL: https://gitlab.winehq.org/wine/wine/-/commit/6f55a13169797dd073575c052a6418… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 4 19:54:54 2024 -0600 ntdll: Respect red zone in usr1_handler() on x64. Fixes a regression introduced by efd3d31082645fab83c6a4994705654edafa9163. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index fb1bca99f3d..d071120af85 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2152,7 +2152,7 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext ) ULONG64 saved_compaction = 0; struct xcontext *context; - context = (struct xcontext *)(((ULONG_PTR)RSP_sig(ucontext) - sizeof(*context)) & ~15); + context = (struct xcontext *)(((ULONG_PTR)RSP_sig(ucontext) - 128 /* red zone */ - sizeof(*context)) & ~15); if ((char *)context < (char *)ntdll_get_thread_data()->kernel_stack) { ERR_(seh)( "kernel stack overflow.\n" );

1 0

Alexandre Julliard : ntdll: Also copy non-volatile regs on collided unwind.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 5c98412929c4d0953fc23ab22c9c9009ccd0f992 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c98412929c4d0953fc23ab22c9c90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 5 10:09:40 2024 +0100 ntdll: Also copy non-volatile regs on collided unwind. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56401 --- dlls/ntdll/signal_arm.c | 48 ++++++++++++++++++----------------------------- dlls/ntdll/signal_arm64.c | 48 ++++++++++++++++++----------------------------- 2 files changed, 36 insertions(+), 60 deletions(-)

1 0

Alexandre Julliard : ntdll: Use a common wrapper to call exception handlers on ARM64.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 8d8c10fe9298e2920ccd8b744be9acbac8378d04 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d8c10fe9298e2920ccd8b744be9ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 5 10:29:10 2024 +0100 ntdll: Use a common wrapper to call exception handlers on ARM64. --- dlls/ntdll/signal_arm64.c | 76 ++++++++++++++--------------------------------- 1 file changed, 22 insertions(+), 54 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 7c5b003a893..d48c65a5f36 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -278,63 +278,20 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT /*********************************************************************** - * call_handler_wrapper + * call_seh_handler */ -extern DWORD WINAPI call_handler_wrapper( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ); -__ASM_GLOBAL_FUNC( call_handler_wrapper, +DWORD WINAPI call_seh_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ); +__ASM_GLOBAL_FUNC( call_seh_handler, "stp x29, x30, [sp, #-16]!\n\t" ".seh_save_fplr_x 16\n\t" - "mov x29, sp\n\t" - ".seh_set_fp\n\t" ".seh_endprologue\n\t" - ".seh_handler " __ASM_NAME("nested_exception_handler") ", @except\n\t" - "mov x3, x2\n\t" /* dispatch */ - "mov x2, x1\n\t" /* context */ - "ldr x1, [x3, #0x18]\n\t" /* dispatch->EstablisherFrame */ - "ldr x15, [x3, #0x30]\n\t" /* dispatch->LanguageHandler */ - "blr x15\n\t" + ".seh_handler nested_exception_handler, @except\n\t" + "blr x4\n\t" "ldp x29, x30, [sp], #16\n\t" "ret" ) -/********************************************************************** - * call_handler - * - * Call a single exception handler. - */ -static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) -{ - DWORD res; - - TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = call_handler_wrapper( rec, context, dispatch ); - TRACE( "handler at %p returned %lu\n", dispatch->LanguageHandler, res ); - - rec->ExceptionFlags &= EXCEPTION_NONCONTINUABLE; - return res; -} - - -/********************************************************************** - * call_teb_handler - * - * Call a single exception handler from the TEB chain. - * FIXME: Handle nested exceptions. - */ -static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame ) -{ - DWORD res; - - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); - res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); - return res; -} - - /********************************************************************** * call_seh_handlers * @@ -349,6 +306,7 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) CONTEXT context; NTSTATUS status; ULONG_PTR frame; + DWORD res; context = *orig_context; dispatch.TargetPc = 0; @@ -374,7 +332,14 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) if (dispatch.LanguageHandler) { - switch (call_handler( rec, orig_context, &dispatch )) + TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", + dispatch.LanguageHandler, rec, dispatch.EstablisherFrame, orig_context, &dispatch ); + res = call_seh_handler( rec, dispatch.EstablisherFrame, orig_context, + &dispatch, dispatch.LanguageHandler ); + rec->ExceptionFlags &= EXCEPTION_NONCONTINUABLE; + TRACE( "handler at %p returned %lu\n", dispatch.LanguageHandler, res ); + + switch (res) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; @@ -397,10 +362,13 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) /* hack: call wine handlers registered in the tib list */ else while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < context.Sp) { - TRACE( "found wine frame %p rsp %I64x handler %p\n", - teb_frame, context.Sp, teb_frame->Handler ); - dispatch.EstablisherFrame = (ULONG64)teb_frame; - switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) + TRACE( "calling TEB handler %p (rec=%p frame=%p context=%p dispatch=%p) sp=%I64x\n", + teb_frame->Handler, rec, teb_frame, orig_context, &dispatch, context.Sp ); + res = call_seh_handler( rec, (ULONG_PTR)teb_frame, orig_context, + &dispatch, (PEXCEPTION_ROUTINE)teb_frame->Handler ); + TRACE( "TEB handler at %p returned %lu\n", teb_frame->Handler, res ); + + switch (res) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION;

1 0

Alexandre Julliard : ntdll: Use a common wrapper to call exception handlers on ARM.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: d6285af1fcb59f2b501cf975ded4a96c8addf163 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6285af1fcb59f2b501cf975ded4a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 5 10:30:26 2024 +0100 ntdll: Use a common wrapper to call exception handlers on ARM. --- dlls/ntdll/signal_arm.c | 73 +++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 51 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 81a4ecb3071..f57ae55f6ee 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -255,60 +255,20 @@ static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT /*********************************************************************** - * call_handler_wrapper + * call_seh_handler */ -extern DWORD WINAPI call_handler_wrapper( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ); -__ASM_GLOBAL_FUNC( call_handler_wrapper, +DWORD WINAPI call_seh_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ); +__ASM_GLOBAL_FUNC( call_seh_handler, "push {r4,lr}\n\t" ".seh_save_regs {r4,lr}\n\t" ".seh_endprologue\n\t" - ".seh_handler " __ASM_NAME("nested_exception_handler") ", %except\n\t" - "mov r3, r2\n\t" /* dispatch */ - "mov r2, r1\n\t" /* context */ - "ldr r1, [r3, #0x0c]\n\t" /* dispatch->EstablisherFrame */ - "ldr ip, [r3, #0x18]\n\t" /* dispatch->LanguageHandler */ + ".seh_handler nested_exception_handler, %except\n\t" + "ldr ip, [sp, #8]\n\t" /* handler */ "blx ip\n\t" "pop {r4,pc}\n\t" ) -/********************************************************************** - * call_handler - * - * Call a single exception handler. - */ -static DWORD call_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch ) -{ - DWORD res; - - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = call_handler_wrapper( rec, context, dispatch ); - TRACE( "handler at %p returned %lu\n", dispatch->LanguageHandler, res ); - - rec->ExceptionFlags &= EXCEPTION_NONCONTINUABLE; - return res; -} - - -/********************************************************************** - * call_teb_handler - * - * Call a single exception handler from the TEB chain. - * FIXME: Handle nested exceptions. - */ -static DWORD call_teb_handler( EXCEPTION_RECORD *rec, CONTEXT *context, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame ) -{ - DWORD res; - - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); - res = teb_frame->Handler( rec, teb_frame, context, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); - return res; -} - - /********************************************************************** * call_seh_handlers * @@ -323,6 +283,7 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) CONTEXT context; NTSTATUS status; ULONG_PTR frame; + DWORD res; context = *orig_context; dispatch.TargetPc = 0; @@ -348,7 +309,14 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) if (dispatch.LanguageHandler) { - switch (call_handler( rec, orig_context, &dispatch )) + TRACE( "calling handler %p (rec=%p, frame=%lx context=%p, dispatch=%p)\n", + dispatch.LanguageHandler, rec, dispatch.EstablisherFrame, orig_context, &dispatch ); + res = call_seh_handler( rec, dispatch.EstablisherFrame, orig_context, + &dispatch, dispatch.LanguageHandler ); + rec->ExceptionFlags &= EXCEPTION_NONCONTINUABLE; + TRACE( "handler at %p returned %lu\n", dispatch.LanguageHandler, res ); + + switch (res) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION; @@ -371,10 +339,13 @@ NTSTATUS call_seh_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_context ) /* hack: call wine handlers registered in the tib list */ else while (is_valid_frame( (ULONG_PTR)teb_frame ) && (DWORD)teb_frame < context.Sp) { - TRACE( "found wine frame %p rsp %lx handler %p\n", - teb_frame, context.Sp, teb_frame->Handler ); - dispatch.EstablisherFrame = (DWORD)teb_frame; - switch (call_teb_handler( rec, orig_context, &dispatch, teb_frame )) + TRACE( "calling TEB handler %p (rec=%p frame=%p context=%p dispatch=%p) sp=%lx\n", + teb_frame->Handler, rec, teb_frame, orig_context, &dispatch, context.Sp ); + res = call_seh_handler( rec, (ULONG_PTR)teb_frame, orig_context, + &dispatch, (PEXCEPTION_ROUTINE)teb_frame->Handler ); + TRACE( "TEB handler at %p returned %lu\n", teb_frame->Handler, res ); + + switch (res) { case ExceptionContinueExecution: if (rec->ExceptionFlags & EXCEPTION_NONCONTINUABLE) return STATUS_NONCONTINUABLE_EXCEPTION;

1 0

Alexandre Julliard : ntdll: Use a common wrapper to call unwind handlers on ARM64.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: 5f890e3ce9b8119cef1a8a8a84aa37e525753514 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f890e3ce9b8119cef1a8a8a84aa37… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 5 10:54:47 2024 +0100 ntdll: Use a common wrapper to call unwind handlers on ARM64. --- dlls/ntdll/signal_arm64.c | 118 ++++++++++++++++------------------------------ 1 file changed, 40 insertions(+), 78 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index d48c65a5f36..32aca81b198 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -200,82 +200,22 @@ EXCEPTION_DISPOSITION WINAPI unwind_exception_handler( EXCEPTION_RECORD *record, return ExceptionCollidedUnwind; } + /********************************************************************** - * unwind_handler_wrapper + * call_unwind_handler */ -extern DWORD WINAPI unwind_handler_wrapper( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ); -__ASM_GLOBAL_FUNC( unwind_handler_wrapper, +DWORD WINAPI call_unwind_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ); +__ASM_GLOBAL_FUNC( call_unwind_handler, "stp x29, x30, [sp, #-32]!\n\t" ".seh_save_fplr_x 32\n\t" - "mov x29, sp\n\t" - ".seh_set_fp\n\t" ".seh_endprologue\n\t" - ".seh_handler " __ASM_NAME("unwind_exception_handler") ", @except, @unwind\n\t" - "str x1, [sp, #16]\n\t" /* frame[-2] = dispatch */ - "mov x3, x1\n\t" - "ldr x1, [x3, #0x18]\n\t" /* dispatch->EstablisherFrame */ - "ldr x2, [x3, #0x28]\n\t" /* dispatch->ContextRecord */ - "ldr x15, [x3, #0x30]\n\t" /* dispatch->LanguageHandler */ - "blr x15\n\t" + ".seh_handler unwind_exception_handler, @except\n\t" + "str x3, [sp, #16]\n\t" /* frame[-2] = dispatch */ + "blr x4\n\t" "ldp x29, x30, [sp], #32\n\t" "ret" ) -/********************************************************************** - * call_unwind_handler - * - * Call a single unwind handler. - */ -static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) -{ - DWORD res; - - TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = unwind_handler_wrapper( rec, dispatch ); - TRACE( "handler %p returned %lx\n", dispatch->LanguageHandler, res ); - - switch (res) - { - case ExceptionContinueSearch: - case ExceptionCollidedUnwind: - break; - default: - raise_status( STATUS_INVALID_DISPOSITION, rec ); - break; - } - - return res; -} - - -/********************************************************************** - * call_teb_unwind_handler - * - * Call a single unwind handler from the TEB chain. - */ -static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame ) -{ - DWORD res; - - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); - - switch (res) - { - case ExceptionContinueSearch: - case ExceptionCollidedUnwind: - break; - default: - raise_status( STATUS_INVALID_DISPOSITION, rec ); - break; - } - - return res; -} - /*********************************************************************** * call_seh_handler @@ -601,7 +541,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec CONTEXT new_context; NTSTATUS status; ULONG_PTR frame; - DWORD i; + DWORD i, res; RtlCaptureContext( context ); new_context = *context; @@ -654,8 +594,20 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (ULONG64)end_frame) rec->ExceptionFlags |= EXCEPTION_TARGET_UNWIND; - if (call_unwind_handler( rec, &dispatch ) == ExceptionCollidedUnwind) + + TRACE( "calling handler %p (rec=%p, frame=%I64x context=%p, dispatch=%p)\n", + dispatch.LanguageHandler, rec, dispatch.EstablisherFrame, + dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, dispatch.EstablisherFrame, dispatch.ContextRecord, + &dispatch, dispatch.LanguageHandler ); + TRACE( "handler %p returned %lx\n", dispatch.LanguageHandler, res ); + + switch (res) { + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, @@ -663,21 +615,30 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec NULL ); rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; } - rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; } else /* hack: call builtin handlers registered in the tib list */ { - DWORD64 backup_frame = dispatch.EstablisherFrame; while (is_valid_frame( (ULONG_PTR)teb_frame ) && (ULONG64)teb_frame < new_context.Sp && (ULONG64)teb_frame < (ULONG64)end_frame) { - TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); - dispatch.EstablisherFrame = (ULONG64)teb_frame; - if (call_teb_unwind_handler( rec, &dispatch, teb_frame ) == ExceptionCollidedUnwind) + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, (ULONG_PTR)teb_frame, dispatch.ContextRecord, &dispatch, + (PEXCEPTION_ROUTINE)teb_frame->Handler ); + TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); + teb_frame = __wine_pop_frame( teb_frame ); + + switch (res) { - teb_frame = __wine_pop_frame( teb_frame ); + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, @@ -685,11 +646,12 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec &frame, NULL ); rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; } - teb_frame = __wine_pop_frame( teb_frame ); } if ((ULONG64)teb_frame == (ULONG64)end_frame && (ULONG64)end_frame < new_context.Sp) break; - dispatch.EstablisherFrame = backup_frame; } if (dispatch.EstablisherFrame == (ULONG64)end_frame) break;

1 0

Alexandre Julliard : ntdll: Use a common wrapper to call unwind handlers on ARM.
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: wine Branch: master Commit: a9428fe390146a9fb3b8037bb08753a5233c3552 URL: https://gitlab.winehq.org/wine/wine/-/commit/a9428fe390146a9fb3b8037bb08753… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 5 11:57:55 2024 +0100 ntdll: Use a common wrapper to call unwind handlers on ARM. --- dlls/ntdll/signal_arm.c | 120 +++++++++++++++++------------------------------- 1 file changed, 42 insertions(+), 78 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index f57ae55f6ee..af33c6c08b6 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -180,78 +180,20 @@ EXCEPTION_DISPOSITION WINAPI unwind_exception_handler( EXCEPTION_RECORD *record, return ExceptionCollidedUnwind; } -/********************************************************************** - * unwind_handler_wrapper - */ -extern DWORD WINAPI unwind_handler_wrapper( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ); -__ASM_GLOBAL_FUNC( unwind_handler_wrapper, - "push {r1,lr}\n\t" - ".seh_save_regs {r1,lr}\n\t" - ".seh_endprologue\n\t" - ".seh_handler " __ASM_NAME("unwind_exception_handler") ", %except, %unwind\n\t" - "mov r3, r1\n\t" /* dispatch */ - "ldr r1, [r3, #0x0c]\n\t" /* dispatch->EstablisherFrame */ - "ldr r2, [r3, #0x14]\n\t" /* dispatch->ContextRecord */ - "ldr ip, [r3, #0x18]\n\t" /* dispatch->LanguageHandler */ - "blx ip\n\t" - "pop {r1,pc}\n\t" ) - /********************************************************************** * call_unwind_handler - * - * Call a single unwind handler. - */ -static DWORD call_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch ) -{ - DWORD res; - - TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", - dispatch->LanguageHandler, rec, dispatch->EstablisherFrame, dispatch->ContextRecord, dispatch ); - res = unwind_handler_wrapper( rec, dispatch ); - TRACE( "handler %p returned %lx\n", dispatch->LanguageHandler, res ); - - switch (res) - { - case ExceptionContinueSearch: - case ExceptionCollidedUnwind: - break; - default: - raise_status( STATUS_INVALID_DISPOSITION, rec ); - break; - } - - return res; -} - - -/********************************************************************** - * call_teb_unwind_handler - * - * Call a single unwind handler from the TEB chain. */ -static DWORD call_teb_unwind_handler( EXCEPTION_RECORD *rec, DISPATCHER_CONTEXT *dispatch, - EXCEPTION_REGISTRATION_RECORD *teb_frame ) -{ - DWORD res; - - TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", - teb_frame->Handler, rec, teb_frame, dispatch->ContextRecord, dispatch ); - res = teb_frame->Handler( rec, teb_frame, dispatch->ContextRecord, (EXCEPTION_REGISTRATION_RECORD**)dispatch ); - TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); - - switch (res) - { - case ExceptionContinueSearch: - case ExceptionCollidedUnwind: - break; - default: - raise_status( STATUS_INVALID_DISPOSITION, rec ); - break; - } - - return res; -} +DWORD WINAPI call_unwind_handler( EXCEPTION_RECORD *rec, ULONG_PTR frame, + CONTEXT *context, void *dispatch, PEXCEPTION_ROUTINE handler ); +__ASM_GLOBAL_FUNC( call_unwind_handler, + "push {r3,lr}\n\t" + ".seh_save_regs {r3,lr}\n\t" + ".seh_endprologue\n\t" + ".seh_handler unwind_exception_handler, %except\n\t" + "ldr ip, [sp, #8]\n\t" /* handler */ + "blx ip\n\t" + "pop {r3,pc}\n\t" ) /*********************************************************************** @@ -528,7 +470,7 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec CONTEXT new_context; NTSTATUS status; ULONG_PTR frame; - DWORD i; + DWORD i, res; RtlCaptureContext( context ); new_context = *context; @@ -581,8 +523,20 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec raise_status( STATUS_INVALID_UNWIND_TARGET, rec ); } if (dispatch.EstablisherFrame == (DWORD)end_frame) rec->ExceptionFlags |= EXCEPTION_TARGET_UNWIND; - if (call_unwind_handler( rec, &dispatch ) == ExceptionCollidedUnwind) + + TRACE( "calling handler %p (rec=%p, frame=0x%lx context=%p, dispatch=%p)\n", + dispatch.LanguageHandler, rec, dispatch.EstablisherFrame, + dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, dispatch.EstablisherFrame, dispatch.ContextRecord, + &dispatch, dispatch.LanguageHandler ); + TRACE( "handler %p returned %lx\n", dispatch.LanguageHandler, res ); + + switch (res) { + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, @@ -590,21 +544,30 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec NULL ); rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; } - rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; } else /* hack: call builtin handlers registered in the tib list */ { - DWORD backup_frame = dispatch.EstablisherFrame; while (is_valid_frame( (ULONG_PTR)teb_frame ) && (DWORD)teb_frame < new_context.Sp && (DWORD)teb_frame < (DWORD)end_frame) { - TRACE( "found builtin frame %p handler %p\n", teb_frame, teb_frame->Handler ); - dispatch.EstablisherFrame = (DWORD)teb_frame; - if (call_teb_unwind_handler( rec, &dispatch, teb_frame ) == ExceptionCollidedUnwind) + TRACE( "calling TEB handler %p (rec=%p, frame=%p context=%p, dispatch=%p)\n", + teb_frame->Handler, rec, teb_frame, dispatch.ContextRecord, &dispatch ); + res = call_unwind_handler( rec, (ULONG_PTR)teb_frame, dispatch.ContextRecord, &dispatch, + (PEXCEPTION_ROUTINE)teb_frame->Handler ); + TRACE( "handler at %p returned %lu\n", teb_frame->Handler, res ); + teb_frame = __wine_pop_frame( teb_frame ); + + switch (res) { - teb_frame = __wine_pop_frame( teb_frame ); + case ExceptionContinueSearch: + rec->ExceptionFlags &= ~EXCEPTION_COLLIDED_UNWIND; + break; + case ExceptionCollidedUnwind: new_context = *context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, @@ -612,11 +575,12 @@ void WINAPI RtlUnwindEx( PVOID end_frame, PVOID target_ip, EXCEPTION_RECORD *rec &frame, NULL ); rec->ExceptionFlags |= EXCEPTION_COLLIDED_UNWIND; goto unwind_done; + default: + raise_status( STATUS_INVALID_DISPOSITION, rec ); + break; } - teb_frame = __wine_pop_frame( teb_frame ); } if ((DWORD)teb_frame == (DWORD)end_frame && (DWORD)end_frame < new_context.Sp) break; - dispatch.EstablisherFrame = backup_frame; } if (dispatch.EstablisherFrame == (DWORD)end_frame) break;

1 0

Henri Verbeet : vkd3d-utils: Restore the \since 1.11 command on D3DReflect().
by Alexandre Julliard 05 Mar '24

05 Mar '24

Module: vkd3d Branch: master Commit: 0885bf30826a97934d4dddbe6a16ae07c73de464 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0885bf30826a97934d4dddbe6a16a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 5 10:30:53 2024 +0100 vkd3d-utils: Restore the \since 1.11 command on D3DReflect(). This was effectively dropped by 8c6f5b847ba112301693eda38a1ce30b282ec555. --- include/vkd3d_utils.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/vkd3d_utils.h b/include/vkd3d_utils.h index 7616a3f3..65e17276 100644 --- a/include/vkd3d_utils.h +++ b/include/vkd3d_utils.h @@ -119,6 +119,7 @@ VKD3D_UTILS_API HRESULT WINAPI D3DStripShader(const void *data, SIZE_T data_size /** \since 1.11 */ VKD3D_UTILS_API HRESULT WINAPI D3DDisassemble(const void *data, SIZE_T data_size, UINT flags, const char *comments, ID3DBlob **blob); +/** \since 1.11 */ VKD3D_UTILS_API HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID iid, void **reflection); #ifdef __cplusplus

1 0