https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c0950b557b1f5070ac2b2d3ebed9af24d9f48a2
commit 1c0950b557b1f5070ac2b2d3ebed9af24d9f48a2 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Wed Nov 23 06:16:17 2022 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Thu Nov 24 01:18:15 2022 +0100 [PSDK][NTOS:KD64] Update the KDDEBUGGER_DATA64 structure with new fields. Information from the Windows 10 SDK and from https://github.com/DarthTon/Blackbone/blob/master/src/BlackBoneDrv/NativeStructs.h --- ntoskrnl/kd64/kddata.c | 9 +++++++ sdk/include/psdk/wdbgexts.h | 62 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 70 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/kd64/kddata.c b/ntoskrnl/kd64/kddata.c index 46254df19a2..40a42fb01ba 100644 --- a/ntoskrnl/kd64/kddata.c +++ b/ntoskrnl/kd64/kddata.c @@ -513,6 +513,11 @@ DBGKD_GET_VERSION64 KdVersionBlock = 0, 0 }; + +#if (NTDDI_VERSION >= NTDDI_WS03) +C_ASSERT(sizeof(KDDEBUGGER_DATA64) >= 0x318); +#endif + KDDEBUGGER_DATA64 KdDebuggerDataBlock = { {{0}}, @@ -690,4 +695,8 @@ KDDEBUGGER_DATA64 KdDebuggerDataBlock = #endif {(ULONG_PTR)&IopNumTriageDumpDataBlocks}, {(ULONG_PTR)IopTriageDumpDataBlocks}, + +#if (NTDDI_VERSION >= NTDDI_LONGHORN) +#error KdDebuggerDataBlock requires other fields for this NT version! +#endif }; diff --git a/sdk/include/psdk/wdbgexts.h b/sdk/include/psdk/wdbgexts.h index e00427f92d9..9664ec201be 100644 --- a/sdk/include/psdk/wdbgexts.h +++ b/sdk/include/psdk/wdbgexts.h @@ -1,6 +1,12 @@ #ifndef _WDBGEXTS_ #define _WDBGEXTS_ +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + enum { DBGKD_SIMULATION_NONE, @@ -242,8 +248,14 @@ typedef struct _KDDEBUGGER_DATA64 GCC_ULONG64 KdPrintWritePointer; GCC_ULONG64 KdPrintRolloverCount; GCC_ULONG64 MmLoadedUserImageList; + +#if (NTDDI_VERSION >= NTDDI_WINXP) GCC_ULONG64 NtBuildLab; GCC_ULONG64 KiNormalSystemCall; +#endif + +/* NOTE: Documented as "NT 5.0 hotfix (QFE) addition" */ +#if (NTDDI_VERSION >= NTDDI_WIN2KSP4) GCC_ULONG64 KiProcessorBlock; GCC_ULONG64 MmUnloadedDrivers; GCC_ULONG64 MmLastUnloadedDriver; @@ -255,10 +267,16 @@ typedef struct _KDDEBUGGER_DATA64 GCC_ULONG64 MmPeakCommitment; GCC_ULONG64 MmTotalCommitLimitMaximum; GCC_ULONG64 CmNtCSDVersion; +#endif + +#if (NTDDI_VERSION >= NTDDI_WINXP) GCC_ULONG64 MmPhysicalMemoryBlock; GCC_ULONG64 MmSessionBase; GCC_ULONG64 MmSessionSize; GCC_ULONG64 MmSystemParentTablePage; +#endif + +#if (NTDDI_VERSION >= NTDDI_WS03) GCC_ULONG64 MmVirtualTranslationBase; USHORT OffsetKThreadNextProcessor; USHORT OffsetKThreadTeb; @@ -306,11 +324,53 @@ typedef struct _KDDEBUGGER_DATA64 USHORT Gdt64R3CmTeb; GCC_ULONG64 IopNumTriageDumpDataBlocks; GCC_ULONG64 IopTriageDumpDataBlocks; -#if 0 // Longhorn/Vista and later +#endif + +#if (NTDDI_VERSION >= NTDDI_LONGHORN) GCC_ULONG64 VfCrashDataBlock; GCC_ULONG64 MmBadPagesDetected; GCC_ULONG64 MmZeroedPageSingleBitErrorsDetected; #endif + +#if (NTDDI_VERSION >= NTDDI_WIN7) + GCC_ULONG64 EtwpDebuggerData; + USHORT OffsetPrcbContext; +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN8) + USHORT OffsetPrcbMaxBreakpoints; + USHORT OffsetPrcbMaxWatchpoints; + ULONG OffsetKThreadStackLimit; + ULONG OffsetKThreadStackBase; + ULONG OffsetKThreadQueueListEntry; + ULONG OffsetEThreadIrpList; + USHORT OffsetPrcbIdleThread; + USHORT OffsetPrcbNormalDpcState; + USHORT OffsetPrcbDpcStack; + USHORT OffsetPrcbIsrStack; + USHORT SizeKDPC_STACK_FRAME; +#endif + +#if (NTDDI_VERSION >= NTDDI_WINBLUE) // NTDDI_WIN81 + USHORT OffsetKPriQueueThreadListHead; + USHORT OffsetKThreadWaitReason; +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN10_RS1) + USHORT Padding; + GCC_ULONG64 PteBase; +#endif + +#if (NTDDI_VERSION >= NTDDI_WIN10_RS5) + GCC_ULONG64 RetpolineStubFunctionTable; + ULONG RetpolineStubFunctionTableSize; + ULONG RetpolineStubOffset; + ULONG RetpolineStubSize; +#endif } KDDEBUGGER_DATA64, *PKDDEBUGGER_DATA64; +#ifdef __cplusplus +} #endif + +#endif // _WDBGEXTS_
