[PATCH 1/2] ntdll: don't try to handle kill(SIGTRAP)

Peter Beutner p.beutner at gmx.net
Fri Nov 9 10:47:01 CST 2007


Obviously no windows app is going to send us a SIGTRAP
and wine no longer uses it itself.

If this check should stay anyway, it would be better
done in the signal handler by checking for si_code == SI_USER.
But trying to handle it here would make the next patch needlessly
complex.
---
 dlls/ntdll/signal_i386.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
index a6f6ed5..793b22e 100644
--- a/dlls/ntdll/signal_i386.c
+++ b/dlls/ntdll/signal_i386.c
@@ -1048,15 +1048,6 @@ static void WINAPI raise_trap_exception( EXCEPTION_RECORD *rec, CONTEXT *context
         {
             context->ContextFlags = CONTEXT_DEBUG_REGISTERS;
             NtGetContextThread(GetCurrentThread(), context);
-            /* we have either:
-             *    - a bp from a debug register
-             *    - a single step interrupt at popf instruction, which just has
-             *      removed the TF.
-             *    - someone did a kill(SIGTRAP) on us, and we shall return
-             *      a breakpoint, not a single step exception
-             */
-            if ( !(context->Dr6 & 0xf) && !(context->Dr6 & 0x4000) )
-                rec->ExceptionCode = EXCEPTION_BREAKPOINT;
             context->ContextFlags |= CONTEXT_FULL;  /* restore flags */
         }
     }
-- 
1.5.3.4







More information about the wine-patches mailing list