From: Soham Nandy <soham.nandy2006@gmail.com> Co-authored-by: Paul Gofman <pgofman@codeweavers.com> --- dlls/ntdll/unix/signal_x86_64.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index c48636ee194..16a3484a47a 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2154,7 +2154,12 @@ static BOOL handle_syscall_trap( struct thread_data *data, ucontext_t *sigcontex is_inside_signal_stack( data, (void *)RSP_sig(sigcontext) ))) { TRACE_(seh)( "ignoring HWBKPT in syscall/signal stack rip=%p\n", - (void *)RIP_sig(sigcontext) ); + else if (siginfo->si_code == 4 /* TRAP_HWBKPT */ && (is_inside_syscall( data, RSP_sig(sigcontext) ) + || is_inside_signal_stack( data, (void *)RSP_sig(sigcontext) ))) + { + TRACE_(seh)( "ignoring HWBKPT rip=%p\n", (void *)RIP_sig(sigcontext) ); + return TRUE; + } return TRUE; } else return FALSE; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11071