ntdll: Report SegDs to be identical to SegSs in x86_64 exception handlers.

Based on a patch by Dávid Török. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47970Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Report SegDs to be identical to SegSs in x86_64 exception handlers.
195c57ee · Zebediah Figura · Alexandre Julliard · 10d7a804 · 195c57ee · 195c57ee
Commit 195c57ee authored Mar 28, 2021 by Zebediah Figura Committed by Alexandre Julliard Mar 29, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

signal_x86_64.c dlls/ntdll/signal_x86_64.c +4 -0

exception.c dlls/ntdll/tests/exception.c +1 -1

No files found.
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -567,6 +567,10 @@ NTSTATUS WINAPI dispatch_exception( EXCEPTION_RECORD *rec, CONTEXT *context )
              context->R12, context->R13, context->R14, context->R15 );
    }

+    /* Legends of Runeterra depends on having SegDs == SegSs in an exception
+     * handler. */
+    context->SegDs = context->SegSs;
+
    if (call_vectored_handlers( rec, context ) == EXCEPTION_CONTINUE_EXECUTION)
        NtContinue( context, FALSE );


--- a/dlls/ntdll/tests/exception.c
+++ b/dlls/ntdll/tests/exception.c
@@ -3020,7 +3020,7 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
        "%u: Unexpected exception address %p/%p\n", entry,
        rec->ExceptionAddress, (char*)context->Rip );

-    todo_wine ok( context->SegDs == context->SegSs,
+    ok( context->SegDs == context->SegSs,
        "%u: ds %#x does not match ss %#x\n", entry, context->SegDs, context->SegSs );
    todo_wine ok( context->SegEs == context->SegSs,
        "%u: es %#x does not match ss %#x\n", entry, context->SegEs, context->SegSs );