* Sync up to trunk head (r65394).

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

diff --git a/ntoskrnl/kd64/kdapi.c b/ntoskrnl/kd64/kdapi.c
index a3ce60d..5ea8641 100644 (file)
--- a/ntoskrnl/kd64/kdapi.c
+++ b/ntoskrnl/kd64/kdapi.c
@@ -316,7 +316,7 @@ DumpTraceData(IN PSTRING TraceData)
     TraceDataBuffer[0] = TraceDataBufferPosition;
 
     /* Setup the trace data */
-    TraceData->Length = TraceDataBufferPosition * sizeof(ULONG);
+    TraceData->Length = (USHORT)(TraceDataBufferPosition * sizeof(ULONG));
     TraceData->Buffer = (PCHAR)TraceDataBuffer;
 
     /* Reset the buffer location */
@@ -351,7 +351,7 @@ KdpSetCommonState(IN ULONG NewState,
                         0,
                         MMDBG_COPY_UNSAFE,
                         &InstructionCount);
-    WaitStateChange->ControlReport.InstructionCount = InstructionCount;
+    WaitStateChange->ControlReport.InstructionCount = (USHORT)InstructionCount;
 
     /* Clear all the breakpoints in this region */
     HadBreakpoints =
@@ -433,7 +433,8 @@ KdpReadVirtualMemory(IN PDBGKD_MANIPULATE_STATE64 State,
                                               &Length);
 
     /* Return the actual length read */
-    Data->Length = ReadMemory->ActualBytesRead = Length;
+    ReadMemory->ActualBytesRead = Length;
+    Data->Length = (USHORT)Length;
 
     /* Send the packet */
     KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
@@ -524,7 +525,8 @@ KdpReadPhysicalmemory(IN PDBGKD_MANIPULATE_STATE64 State,
                                               &Length);
 
     /* Return the actual length read */
-    Data->Length = ReadMemory->ActualBytesRead = Length;
+    ReadMemory->ActualBytesRead = Length;
+    Data->Length = (USHORT)Length;
 
     /* Send the packet */
     KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
@@ -614,7 +616,8 @@ KdpReadControlSpace(IN PDBGKD_MANIPULATE_STATE64 State,
                                                  &Length);
 
     /* Return the actual length read */
-    Data->Length = ReadMemory->ActualBytesRead = Length;
+    ReadMemory->ActualBytesRead = Length;
+    Data->Length = (USHORT)Length;
 
     /* Send the reply */
     KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
@@ -851,7 +854,8 @@ KdpGetBusData(IN PDBGKD_MANIPULATE_STATE64 State,
                                             &Length);
 
     /* Return the actual length read */
-    Data->Length = GetBusData->Length = Length;
+    GetBusData->Length = Length;
+    Data->Length = (USHORT)Length;
 
     /* Send the reply */
     KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,
@@ -909,7 +913,7 @@ KdpReadIoSpace(IN PDBGKD_MANIPULATE_STATE64 State,
 
     /*
      * Clear the value so 1 or 2 byte reads
-     * don't leave the higher bits unmodified 
+     * don't leave the higher bits unmodified
      */
     ReadIo->DataValue = 0;
 
@@ -976,7 +980,7 @@ KdpReadIoSpaceExtended(IN PDBGKD_MANIPULATE_STATE64 State,
 
     /*
      * Clear the value so 1 or 2 byte reads
-     * don't leave the higher bits unmodified 
+     * don't leave the higher bits unmodified
      */
     ReadIoExtended->DataValue = 0;
 
@@ -1085,7 +1089,7 @@ KdpSendWaitContinue(IN ULONG PacketType,
     Data.MaximumLength = sizeof(KdpMessageBuffer);
     Data.Buffer = KdpMessageBuffer;
 
-    /* 
+    /*
      * Reset the context state to ensure the debugger has received
      * the current context before it sets it
      */
@@ -1350,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:
 
@@ -1418,7 +1435,7 @@ KdpReportLoadSymbolsStateChange(IN PSTRING PathName,
 
             /* Set up the data */
             Data.Buffer = KdpPathBuffer;
-            Data.Length = PathNameLength;
+            Data.Length = (USHORT)PathNameLength;
             ExtraData = &Data;
         }
         else
@@ -1506,7 +1523,7 @@ KdpReportCommandStringStateChange(IN PSTRING NameString,
         /* Now set up the header and the data */
         Header.Length = sizeof(DBGKD_ANY_WAIT_STATE_CHANGE);
         Header.Buffer = (PCHAR)&WaitStateChange;
-        Data.Length = TotalLength;
+        Data.Length = (USHORT)TotalLength;
         Data.Buffer = KdpMessageBuffer;
 
         /* Send State Change packet and wait for a reply */
@@ -1735,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!
     }
 }
 
@@ -1886,9 +1903,7 @@ KdDisableDebuggerWithLock(IN BOOLEAN NeedLock)
 
             /* We are disabled now */
             KdDebuggerEnabled = FALSE;
-#undef KdDebuggerEnabled
             SharedUserData->KdDebuggerEnabled = FALSE;
-#define KdDebuggerEnabled _KdDebuggerEnabled
         }
      }
 
@@ -1944,6 +1959,18 @@ KdSystemDebugControl(IN SYSDBG_COMMAND Command,
                      IN OUT PULONG ReturnLength,
                      IN KPROCESSOR_MODE PreviousMode)
 {
+    /* handle sime internal commands */
+    if (Command == ' soR')
+    {
+        switch ((ULONG_PTR)InputBuffer)
+        {
+            case 0x24:
+                MmDumpArmPfnDatabase(FALSE);
+                break;
+        }
+        return STATUS_SUCCESS;
+    }
+
     /* Local kernel debugging is not yet supported */
     DbgPrint("KdSystemDebugControl is unimplemented!\n");
     return STATUS_NOT_IMPLEMENTED;