From: Austin English <austinenglish@gmail.com>
Subject: ntdll: make sure flags are preserved in raise_trap_exception()
Message-Id: <CACC5Q1ejDSY_xQbzVL3ZCm--v=XcHsVx50is8iuQ8syYtuSzcw@mail.gmail.com>
Date: Sat, 12 Apr 2014 13:20:55 -0700

Original author never sent to wine-patches.

For https://bugs.winehq.org/show_bug.cgi?id=25561

-- 
-Austin

<div dir="ltr">Original author never sent to wine-patches.<br><br>For <a href="https://bugs.winehq.org/show_bug.cgi?id=25561">https://bugs.winehq.org/show_bug.cgi?id=25561</a><br clear="all"><div><div><br>-- <br>-Austin
</div></div></div>

diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index 63bf088..5f8b8fd 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -1868,9 +1868,10 @@ static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context
         if( !(context->EFlags & 0x100) || (ntdll_get_thread_data()->dr7 & 0xff) )
         {
             /* (possible) hardware breakpoint, fetch the debug registers */
+            DWORD saved_flags = context->ContextFlags;
             context->ContextFlags = CONTEXT_DEBUG_REGISTERS;
             NtGetContextThread(GetCurrentThread(), context);
-            context->ContextFlags |= CONTEXT_FULL;  /* restore flags */
+            context->ContextFlags |= saved_flags;  /* restore flags */
         }
 
         context->EFlags &= ~0x100;  /* clear single-step flag */