Commit in reactos/ntoskrnl on MAIN
kd/gdbstub.c+5-21.25 -> 1.26
ke/catch.c+2-61.52 -> 1.53
+7-8
2 modified files
Fix handling of debug traps in GDB stub/KiDispatchException (This time for real I hope, sorry for the breakage)

reactos/ntoskrnl/kd
gdbstub.c 1.25 -> 1.26
diff -u -r1.25 -r1.26
--- gdbstub.c	13 Nov 2004 23:00:15 -0000	1.25
+++ gdbstub.c	14 Nov 2004 16:00:02 -0000	1.26
@@ -1337,7 +1337,8 @@
                     KeLowerIrql(OldIrql);
                   }
 
-                return kdHandleException;
+                KeContextToTrapFrame(Context, TrapFrame);
+                return ((SigVal == 5) ? (kdContinue) : (kdHandleException));
                 break;
               }
 
@@ -1411,7 +1412,9 @@
         }
     }
 
-  return ((SigVal == 5) ? (kdContinue) : (kdHandleException));
+    /* not reached */
+    ASSERT(0);
+    return kdHandleException;
 }
 
 

reactos/ntoskrnl/ke
catch.c 1.52 -> 1.53
diff -u -r1.52 -r1.53
--- catch.c	13 Nov 2004 23:00:15 -0000	1.52
+++ catch.c	14 Nov 2004 16:00:02 -0000	1.53
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: catch.c,v 1.52 2004/11/13 23:00:15 blight Exp $
+/* $Id: catch.c,v 1.53 2004/11/14 16:00:02 blight Exp $
  *
  * PROJECT:              ReactOS kernel
  * FILE:                 ntoskrnl/ke/catch.c
@@ -46,7 +46,7 @@
 {
   EXCEPTION_DISPOSITION Value;
   CONTEXT TContext;
-  KD_CONTINUE_TYPE Action = kdContinue;
+  KD_CONTINUE_TYPE Action = kdHandleException;
 
   DPRINT("KiDispatchException() called\n");
 
@@ -166,10 +166,6 @@
 	    }
 	}
     }
-  else
-    {
-      KeContextToTrapFrame (Context, KeGetCurrentThread()->TrapFrame);
-    }
 }
 
 /*
CVSspam 0.2.8