wow64: Fixup Eip for breakpoint exceptions.

Matching the 32-bit setup_raise_exception().

wow64: Fixup Eip for breakpoint exceptions.
ce737601 · Alexandre Julliard · 3e3af62b · ce737601
Commit ce737601 authored Mar 09, 2023 by Alexandre Julliard
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

syscall.c dlls/wow64/syscall.c +3 -0

No files found.
--- a/dlls/wow64/syscall.c
+++ b/dlls/wow64/syscall.c
@@ -215,6 +215,9 @@ static void call_user_exception_dispatcher( EXCEPTION_RECORD32 *rec, void *ctx32
            context = RtlLocateLegacyContext( context_ex, NULL );
            *context = ctx;
            context->ContextFlags = flags;
+            /* adjust Eip for breakpoints in software emulation (hardware exceptions already adjust Rip) */
+            if (rec->ExceptionCode == EXCEPTION_BREAKPOINT && (wow64info->CpuFlags & WOW64_CPUFLAGS_SOFTWARE))
+                context->Eip--;
            stack->context_ptr = PtrToUlong( context );

            if (src_ex)