May 2020 - Wine-commits - list.winehq.org

Paul Gofman : wined3d: Allow multisample destination locations for all colour blits.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 826cee41a7b0d4dcb0d35c1cb33c548ed18a3413 URL: https://source.winehq.org/git/wine.git/?a=commit;h=826cee41a7b0d4dcb0d35c1c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:17 2020 +0430 wined3d: Allow multisample destination locations for all colour blits. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bdcbdf5a2a..94743c45e3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1459,6 +1459,20 @@ struct wined3d_blitter *wined3d_cpu_blitter_create(void) return blitter; } +static bool wined3d_is_colour_blit(enum wined3d_blit_op blit_op) +{ + switch (blit_op) + { + case WINED3D_BLIT_OP_COLOR_BLIT: + case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: + case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: + return true; + + default: + return false; + } +} + HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const struct wined3d_box *dst_box, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const struct wined3d_box *src_box, DWORD flags, const struct wined3d_blt_fx *fx, @@ -1701,7 +1715,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) dst_location = dst_texture->resource.map_binding; else if (dst_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE - && (scale || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + && (scale || convert || !wined3d_is_colour_blit(blit_op))) dst_location = WINED3D_LOCATION_RB_RESOLVED; else dst_location = dst_texture->resource.draw_binding;

1 0

Paul Gofman : wined3d: Allow multisample source locations for all colour blits.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 3aa53f328c5ed9225248dea6f8fe9ebf4273e2ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa53f328c5ed9225248dea6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 28 22:50:18 2020 +0430 wined3d: Allow multisample source locations for all colour blits. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 94743c45e3..503f9f45e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1707,7 +1707,7 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ if (src_texture->resource.multisample_type != WINED3D_MULTISAMPLE_NONE && ((scale && !context->d3d_info->scaled_resolve) - || convert || blit_op != WINED3D_BLIT_OP_COLOR_BLIT)) + || convert || !wined3d_is_colour_blit(blit_op))) src_location = WINED3D_LOCATION_RB_RESOLVED; else src_location = src_texture->resource.draw_binding;

1 0

Jacek Caban : d3d9/tests: Use int for indexes in generate_bumpmap_textures.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: f9e9ef36faca6e768d0b597f690b8122170d42ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e9ef36faca6e768d0b597f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 27 23:55:08 2020 +0200 d3d9/tests: Use int for indexes in generate_bumpmap_textures. Fixes -Wabsolute-value warning. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index f873f3ae9b..5b0955b4ea 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3160,7 +3160,7 @@ done: } static void generate_bumpmap_textures(IDirect3DDevice9 *device) { - unsigned int i, x, y; + int i, x, y; HRESULT hr; IDirect3DTexture9 *texture[2] = {NULL, NULL}; D3DLOCKED_RECT locked_rect;

1 0

Martin Storsjo : configure: Pass -fasynchronous-unwind-tables to the compiler.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: ad7fcd2c40eadb79a10ef64d6a9440b8b53132e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ad7fcd2c40eadb79a10ef64d… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:37 2020 +0300 configure: Pass -fasynchronous-unwind-tables to the compiler. On aarch64-linux-gnu, unwind tables aren't emitted by default (contrary to x86_64-linux-gnu), so we must pass the flag (or -funwind-tables) to the compiler to make it generate them. Previously wine just added the flag to the linker options. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index b652ddbf79..f1292fa4ca 100755 --- a/configure +++ b/configure @@ -17909,6 +17909,7 @@ fi $as_echo "$ac_cv_c_cfi_support" >&6; } if test "$ac_cv_c_cfi_support" = "yes" then + DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables" LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else if test "x$enable_win64" = "xyes" diff --git a/configure.ac b/configure.ac index c0f60fe694..816e368451 100644 --- a/configure.ac +++ b/configure.ac @@ -2141,6 +2141,7 @@ AC_CACHE_CHECK([whether CFI directives are supported in assembly code], ac_cv_c_ ac_cv_c_cfi_support="yes",ac_cv_c_cfi_support="no")) if test "$ac_cv_c_cfi_support" = "yes" then + DLLFLAGS="$DLLFLAGS -fasynchronous-unwind-tables" LDDLLFLAGS="$LDDLLFLAGS -fasynchronous-unwind-tables" else if test "x$enable_win64" = "xyes"

1 0

Martin Storsjo : ntdll: Fix handling of the save_lrpair unwind opcode.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 8477f61b9fc25e99cdf942ba745d08efd41d6c22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8477f61b9fc25e99cdf942ba… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:38 2020 +0300 ntdll: Fix handling of the save_lrpair unwind opcode. The register offset should be multiplied by 2, and the second register is always Lr. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4c5944759f..7a3625b706 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1467,7 +1467,10 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, CONTEXT *context, else if (*ptr < 0xd6) /* save_reg_x */ restore_regs( 19 + ((val >> 5) & 0xf), 1, -(val & 0x1f) - 1, context, ptrs ); else if (*ptr < 0xd8) /* save_lrpair */ - restore_regs( 19 + ((val >> 6) & 0x7), 2, val & 0x3f, context, ptrs ); + { + restore_regs( 19 + 2 * ((val >> 6) & 0x7), 1, val & 0x3f, context, ptrs ); + restore_regs( 30, 1, (val & 0x3f) + 1, context, ptrs ); + } else if (*ptr < 0xda) /* save_fregp */ restore_fpregs( 8 + ((val >> 6) & 0x7), save_next, val & 0x3f, context, ptrs ); else if (*ptr < 0xdc) /* save_fregp_x */

1 0

Martin Storsjo : ntdll: Fix byte vs register units in unwind_packed_data.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: d6e9795223f0c978132342d77b36f8284ab1aed3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6e9795223f0c978132342d7… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:39 2020 +0300 ntdll: Fix byte vs register units in unwind_packed_data. restore_regs and restore_fpregs take offsets in units of registers, not bytes. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 7a3625b706..8ccf3da57e 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -1517,6 +1517,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION int i; unsigned int len, offset, skip = 0; unsigned int int_size = func->u.s.RegI * 8, fp_size = func->u.s.RegF * 8, regsave, local_size; + unsigned int int_regs, fp_regs, saved_regs, local_size_regs; TRACE( "function %lx-%lx: len=%#x flag=%x regF=%u regI=%u H=%u CR=%u frame=%x\n", base + func->BeginAddress, base + func->BeginAddress + func->u.s.FunctionLength * 4, @@ -1529,6 +1530,11 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION regsave = ((int_size + fp_size + 8 * 8 * func->u.s.H) + 0xf) & ~0xf; local_size = func->u.s.FrameSize * 16 - regsave; + int_regs = int_size / 8; + fp_regs = fp_size / 8; + saved_regs = regsave / 8; + local_size_regs = local_size / 8; + /* check for prolog/epilog */ if (func->u.s.Flag == 1) { @@ -1568,9 +1574,9 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION context->u.X[30] = fp[1]; } context->Sp += local_size; - if (fp_size) restore_fpregs( 8, fp_size / 8, int_size, context, ptrs ); - if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs ); - restore_regs( 19, func->u.s.RegI, -regsave, context, ptrs ); + if (fp_size) restore_fpregs( 8, fp_regs, int_regs, context, ptrs ); + if (func->u.s.CR == 1) restore_regs( 30, 1, int_regs - 1, context, ptrs ); + restore_regs( 19, func->u.s.RegI, -saved_regs, context, ptrs ); } else { @@ -1582,7 +1588,7 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (local_size <= 512) { /* stp x29,lr,[sp,-#local_size]! */ - if (pos++ > skip) restore_regs( 29, 2, -local_size, context, ptrs ); + if (pos++ > skip) restore_regs( 29, 2, -local_size_regs, context, ptrs ); break; } /* stp x29,lr,[sp,0] */ @@ -1603,16 +1609,16 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION { if (func->u.s.RegF % 2 == 0 && pos++ > skip) /* str d%u,[sp,#fp_size] */ - restore_fpregs( 8 + func->u.s.RegF, 1, int_size + fp_size - 8, context, ptrs ); + restore_fpregs( 8 + func->u.s.RegF, 1, int_regs + fp_regs - 1, context, ptrs ); for (i = func->u.s.RegF / 2 - 1; i >= 0; i--) { if (pos++ <= skip) continue; if (!i && !int_size) /* stp d8,d9,[sp,-#regsave]! */ - restore_fpregs( 8, 2, -regsave, context, ptrs ); + restore_fpregs( 8, 2, -saved_regs, context, ptrs ); else /* stp dn,dn+1,[sp,#offset] */ - restore_fpregs( 8 + 2 * i, 2, int_size + 16 * i, context, ptrs ); + restore_fpregs( 8 + 2 * i, 2, int_regs + 2 * i, context, ptrs ); } } @@ -1621,15 +1627,15 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (func->u.s.RegI % 2) { /* stp xn,lr,[sp,#offset] */ - if (func->u.s.CR == 1) restore_regs( 30, 1, int_size - 8, context, ptrs ); + if (func->u.s.CR == 1) restore_regs( 30, 1, int_regs - 1, context, ptrs ); /* str xn,[sp,#offset] */ restore_regs( 18 + func->u.s.RegI, 1, - (func->u.s.RegI > 1) ? 8 * func->u.s.RegI - 8 : -regsave, + (func->u.s.RegI > 1) ? func->u.s.RegI - 1 : -saved_regs, context, ptrs ); } else if (func->u.s.CR == 1) /* str lr,[sp,#offset] */ - restore_regs( 30, 1, func->u.s.RegI ? int_size - 8 : -regsave, context, ptrs ); + restore_regs( 30, 1, func->u.s.RegI ? int_regs - 1 : -saved_regs, context, ptrs ); } for (i = func->u.s.RegI / 2 - 1; i >= 0; i--) @@ -1637,10 +1643,10 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, RUNTIME_FUNCTION if (pos++ <= skip) continue; if (i) /* stp xn,xn+1,[sp,#offset] */ - restore_regs( 19 + 2 * i, 2, 16 * i, context, ptrs ); + restore_regs( 19 + 2 * i, 2, 2 * i, context, ptrs ); else /* stp x19,x20,[sp,-#regsave]! */ - restore_regs( 19, 2, -regsave, context, ptrs ); + restore_regs( 19, 2, -saved_regs, context, ptrs ); } } return NULL;

1 0

Martin Storsjo : ntdll: Pass a nonnull handler_data in when continuing after a collided unwind.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 8e4f0b2a15f5c452aec93bda5fd185f0b4438c67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e4f0b2a15f5c452aec93bda… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:40 2020 +0300 ntdll: Pass a nonnull handler_data in when continuing after a collided unwind. This matches what was done for RtlUnwindEx in 93ecc54ae560a3677dfa78ca0f5448d7aef0cbd9, applying the same change in call_function_handlers (when called from raise_exception). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 8ccf3da57e..b364f08e9a 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -859,7 +859,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con dispatch.ContextRecord = &context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &context, NULL, &frame, NULL ); + &context, &dispatch.HandlerData, &frame, NULL ); goto unwind_done; } default: @@ -889,7 +889,7 @@ static NTSTATUS call_function_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_con dispatch.ContextRecord = &context; RtlVirtualUnwind( UNW_FLAG_NHANDLER, dispatch.ImageBase, dispatch.ControlPc, dispatch.FunctionEntry, - &context, NULL, &frame, NULL ); + &context, &dispatch.HandlerData, &frame, NULL ); teb_frame = teb_frame->Prev; goto unwind_done; }

1 0

Martin Storsjo : ntdll: Store the real stack pointer in RtlCaptureContext.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: 42a5885669e35f13725ab8e36d3a95132bd49ffc URL: https://source.winehq.org/git/wine.git/?a=commit;h=42a5885669e35f13725ab8e3… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:41 2020 +0300 ntdll: Store the real stack pointer in RtlCaptureContext. In most cases, unwinding will use the frame pointer anyway, so it doesn't make much of a difference, but for cases where it won't, capture the actual stack pointer. (In most cases on arm64, calling the RtlCaptureContext won't cause anything extra to be pushed on the stack at that point anyway). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index b364f08e9a..4c9017b9e2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -265,8 +265,8 @@ __ASM_STDCALL_FUNC( RtlCaptureContext, 8, "stp x23, x24, [x0, #0xc0]\n\t" /* context->X23,X24 */ "stp x25, x26, [x0, #0xd0]\n\t" /* context->X25,X26 */ "stp x27, x28, [x0, #0xe0]\n\t" /* context->X27,X28 */ - "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ - "add x1, x29, #0x10\n\t" + "stp x29, x30, [x0, #0xf0]\n\t" /* context->Fp,Lr */ + "mov x1, sp\n\t" "stp x1, x30, [x0, #0x100]\n\t" /* context->Sp,Pc */ "mov w1, #0x400000\n\t" /* CONTEXT_ARM64 */ "add w1, w1, #0x3\n\t" /* CONTEXT_FULL */

1 0

Martin Storsjo : ntdll: Fix unwinding functions that end with a branch instruction.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: babbf352b651dac6458335e71a980317b3b42386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=babbf352b651dac6458335e7… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:42 2020 +0300 ntdll: Fix unwinding functions that end with a branch instruction. This happens with functions that aren't intended to return e.g. like _Unwind_Resume. In these cases, the return address is outside of the function (the first instruction in the next function). Set the flag CONTEXT_UNWOUND_TO_CALL after unwinding to a callsite, and if this flag is set, look up a RUNTIME_FUNCTION based on Control.Pc - 4. This isn't a complete (nor probably entirely correct) implementation of the flag CONTEXT_UNWOUND_TO_CALL, but it practically seems to work fine and fixes a large number of unwinding cases. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 13 ++++++++++++- include/winnt.h | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index 4c9017b9e2..cdffda7a12 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -527,6 +527,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX *frame = context->Sp; context->Pc = context->u.s.Lr; context->Sp = context->Sp + sizeof(ULONG64); + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; return STATUS_SUCCESS; } @@ -577,6 +578,7 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX unw_get_reg( &cursor, UNW_AARCH64_X30, (unw_word_t *)&context->u.s.Lr ); unw_get_reg( &cursor, UNW_AARCH64_SP, (unw_word_t *)&context->Sp ); context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", @@ -614,10 +616,17 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->ScopeIndex = 0; dispatch->EstablisherFrame = 0; dispatch->ControlPc = context->Pc; + /* + * TODO: CONTEXT_UNWOUND_TO_CALL should be cleared if unwound past a + * signal frame. + */ + dispatch->ControlPcIsUnwound = (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) != 0; /* first look for PE exception information */ - if ((dispatch->FunctionEntry = lookup_function_info( context->Pc, &dispatch->ImageBase, &module ))) + if ((dispatch->FunctionEntry = lookup_function_info( + context->Pc - (dispatch->ControlPcIsUnwound ? 4 : 0), + &dispatch->ImageBase, &module ))) { dispatch->LanguageHandler = RtlVirtualUnwind( type, dispatch->ImageBase, context->Pc, dispatch->FunctionEntry, context, @@ -654,6 +663,7 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX dispatch->EstablisherFrame = context->u.s.Fp; dispatch->LanguageHandler = NULL; context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; return STATUS_SUCCESS; } @@ -1758,6 +1768,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG_PTR base, ULONG_PTR pc, TRACE( "ret: lr=%lx sp=%lx handler=%p\n", context->u.s.Lr, context->Sp, handler ); context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; *frame_ret = context->Sp; return handler; } diff --git a/include/winnt.h b/include/winnt.h index 34951766dd..aa4daaa55f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -1863,6 +1863,8 @@ NTSYSAPI PVOID WINAPI RtlVirtualUnwind(DWORD,DWORD,DWORD,RUNTIME_FUNCTION*,CONTE #define CONTEXT_FLOATING_POINT (CONTEXT_ARM64 | 0x00000004) #define CONTEXT_DEBUG_REGISTERS (CONTEXT_ARM64 | 0x00000008) +#define CONTEXT_UNWOUND_TO_CALL 0x20000000 + #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER) #define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)

1 0

Martin Storsjo : wine/asm.h: Use __ASM_CFI on clang too, despite not defining __GCC_HAVE_DWARF2_CFI_ASM.
by Alexandre Julliard 28 May '20

28 May '20

Module: wine Branch: master Commit: c22e8645b08547eeff322b047492c2214ae248d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c22e8645b08547eeff322b04… Author: Martin Storsjo <martin(a)martin.st> Date: Thu May 28 11:14:43 2020 +0300 wine/asm.h: Use __ASM_CFI on clang too, despite not defining __GCC_HAVE_DWARF2_CFI_ASM. It has already been unconditionally enabled for macOS (which uses clang). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/asm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/asm.h b/include/wine/asm.h index 7165f47e96..7650d84a79 100644 --- a/include/wine/asm.h +++ b/include/wine/asm.h @@ -33,7 +33,7 @@ # define __ASM_STDCALL(name,args) __ASM_NAME(name) #endif -#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) +#if defined(__GCC_HAVE_DWARF2_CFI_ASM) || defined(__APPLE__) || defined(__clang__) # define __ASM_CFI(str) str #else # define __ASM_CFI(str)

1 0