[ros-diffs] [tkreuzer] 43435: [Kd64] Copy KdVersionBlock like for x86, fix Value of ReportFlags member in KdpSetContextState for both x86 and amd64

Author: tkreuzer
Date: Tue Oct 13 13:19:07 2009
New Revision: 43435

URL: http://svn.reactos.org/svn/reactos?rev=43435&view=rev
Log:
[Kd64] Copy KdVersionBlock like for x86, fix Value of ReportFlags member in
KdpSetContextState for both x86 and amd64

Modified:
    branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1]
(original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Tue Oct 13
13:19:07 2009
@@ -21,20 +21,8 @@
 NTAPI
 KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version)
 {
-    Version->MajorVersion = 0;
-    Version->MinorVersion = 0;
-    Version->ProtocolVersion = DBGKD_64BIT_PROTOCOL_VERSION2;
-    Version->KdSecondaryVersion = KD_SECONDARY_VERSION_AMD64_CONTEXT;
-    Version->Flags = DBGKD_VERS_FLAG_PTR64 | DBGKD_VERS_FLAG_DATA;
-    Version->MachineType = IMAGE_FILE_MACHINE_AMD64;
-    Version->MaxPacketType = PACKET_TYPE_MAX;
-    Version->MaxStateChange = 0;
-    Version->MaxManipulate = 0;
-    Version->Simulation = DBGKD_SIMULATION_NONE;
-    Version->Unused[0] = 0;
-    Version->KernBase = 0xfffff80000800000ULL;
-    Version->PsLoadedModuleList =
(ULONG_PTR)&KeLoaderBlock->LoadOrderListHead;
-    Version->DebuggerDataList = 0;
+    /* Copy the version block */
+    RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64));
 }
 
 VOID
@@ -107,7 +95,7 @@
     WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS;
     if (WaitStateChange->ControlReport.SegCs == KGDT_64_R0_CODE)
     {
-        WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS;
+        WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS;
     }
 }
 

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk…
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Tue Oct 13
13:19:07 2009
@@ -95,7 +95,7 @@
     WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS;
     if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE)
     {
-        WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS;
+        WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS;
     }
 }