* Sync up to trunk head (r65270).

[reactos.git] / ntoskrnl / kd64 / kdapi.c

diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c
index 4e008e7..5ea8641 100644 (file)
--- a/ntoskrnl/kd64/kdapi.c
+++ b/ntoskrnl/kd64/kdapi.c
@@ -1354,6 +1354,19 @@ SendPacket:
                 KdpNotSupported(&ManipulateState);
                 break;
 
+            case 0x315f: // This one is unknown, but used by WinDbg, keep silent!
+
+                /* Setup an empty message, with failure */
+                Data.Length = 0;
+                ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL;
+
+                /* Send it */
+                KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
+                             &Header,
+                             &Data,
+                             &KdpContext);
+                break;
+
             /* Unsupported Message */
             default:
 
@@ -1739,7 +1752,7 @@ KdExitDebugger(IN BOOLEAN Enable)
     {
         /* Queue a DPC for the time slip */
         InterlockedIncrement(&KdpTimeSlipPending);
-        KeInsertQueueDpc(&KdpTimeSlipDpc, NULL, NULL);
+        KeInsertQueueDpc(&KdpTimeSlipDpc, NULL, NULL); // FIXME: this can trigger context switches!
     }
 }
 
@@ -1890,9 +1903,7 @@ KdDisableDebuggerWithLock(IN BOOLEAN NeedLock)
 
             /* We are disabled now */
             KdDebuggerEnabled = FALSE;
-#undef KdDebuggerEnabled
             SharedUserData->KdDebuggerEnabled = FALSE;
-#define KdDebuggerEnabled _KdDebuggerEnabled
         }
      }
 
@@ -1953,14 +1964,6 @@ KdSystemDebugControl(IN SYSDBG_COMMAND Command,
     {
         switch ((ULONG_PTR)InputBuffer)
         {
-            case 0x30: // ManualBugCheck:
-                KeBugCheck(MANUALLY_INITIATED_CRASH);
-                break;
-
-             case 0x25: // EnterDebugger:
-                DbgBreakPoint();
-                break;
-
             case 0x24:
                 MmDumpArmPfnDatabase(FALSE);
                 break;