From 30aad7b52a005fcb383e1274fdbfbdaf98b50acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= <ge@gse.nl>
Date: Thu, 15 Sep 2005 22:07:35 +0000
Subject: [PATCH] Fix some of the damage r17811 did to the GDB stub

svn path=/trunk/; revision=17871
---
 reactos/ntoskrnl/kd/wrappers/gdbstub.c | 9 ++++-----
 reactos/ntoskrnl/ke/i386/exp.c         | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/reactos/ntoskrnl/kd/wrappers/gdbstub.c b/reactos/ntoskrnl/kd/wrappers/gdbstub.c
index 8e2142aed60..e15c1a75571 100644
--- a/reactos/ntoskrnl/kd/wrappers/gdbstub.c
+++ b/reactos/ntoskrnl/kd/wrappers/gdbstub.c
@@ -1068,7 +1068,7 @@ GspSetHwBreakpoint(ULONG BreakpointNumber,
 }
 
 
-static BOOL gdb_attached_yet = TRUE;
+static BOOL gdb_attached_yet = FALSE;
 /*
  * This function does all command procesing for interfacing to gdb.
  */
@@ -1102,7 +1102,7 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
     {
       GspAccessLocation = NULL;
       GspMemoryError = TRUE;
-      TrapFrame->Eip += 3;
+      Context->Eip += 3;
     }
   else
     {
@@ -1321,8 +1321,7 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
 #error Unknown compiler for inline assembler
 #endif
 
-                KeContextToTrapFrame(Context, NULL, TrapFrame, KernelMode);
-                return ((SigVal == 5) ? (kdContinue) : (kdHandleException));
+                return kdContinue;
                 break;
               }
 
@@ -1399,7 +1398,7 @@ KdpGdbEnterDebuggerException(PEXCEPTION_RECORD ExceptionRecord,
       ASSERT(0);
     }
 
-    return kdDoNotHandleException;
+    return kdContinue;
 }
 
 
diff --git a/reactos/ntoskrnl/ke/i386/exp.c b/reactos/ntoskrnl/ke/i386/exp.c
index aa5630fb100..ce4f06d3fee 100644
--- a/reactos/ntoskrnl/ke/i386/exp.c
+++ b/reactos/ntoskrnl/ke/i386/exp.c
@@ -1242,7 +1242,7 @@ KiDispatchException(PEXCEPTION_RECORD ExceptionRecord,
                                                &Context,
                                                TrapFrame,
                                                TRUE,
-                                               FALSE);
+                                               TRUE);
 
             /* Exit if we're continuing */
             if (Action == kdContinue) goto Handled;