[ros-diffs] [reactos] 01/02: [SDK] Improve x64 definition of DISPATCHER_CONTEXT

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a22ab61a87ce582c8c936…

commit a22ab61a87ce582c8c936bdeaf8f066309b5f61f
Author:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Mon Jan 13 16:30:33 2020 +0100
Commit:     Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Sun Feb 9 15:56:30 2020 +0100

    [SDK] Improve x64 definition of DISPATCHER_CONTEXT
---
 sdk/include/ndk/amd64/ketypes.h | 13 +++++++------
 sdk/include/xdk/winnt_old.h     |  8 ++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/sdk/include/ndk/amd64/ketypes.h b/sdk/include/ndk/amd64/ketypes.h
index db276ee8af1..d2c4da16cc8 100644
--- a/sdk/include/ndk/amd64/ketypes.h
+++ b/sdk/include/ndk/amd64/ketypes.h
@@ -1001,15 +1001,16 @@ typedef struct _UCALLOUT_FRAME
 typedef struct _DISPATCHER_CONTEXT
 {
     ULONG64 ControlPc;
-    PVOID ImageBase;
-    PVOID FunctionEntry;
-    PVOID EstablisherFrame;
+    ULONG64 ImageBase;
+    struct _RUNTIME_FUNCTION *FunctionEntry;
+    ULONG64 EstablisherFrame;
     ULONG64 TargetIp;
-    PVOID ContextRecord;
-    PVOID LanguageHandler;
+    PCONTEXT ContextRecord;
+    PEXCEPTION_ROUTINE LanguageHandler;
     PVOID HandlerData;
-    PVOID HistoryTable;
+    struct _UNWIND_HISTORY_TABLE *HistoryTable;
     ULONG ScopeIndex;
+    ULONG Fill0;
 } DISPATCHER_CONTEXT, *PDISPATCHER_CONTEXT;
 
 typedef struct _KSTART_FRAME
diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h
index 1ea3d939739..500cea982d3 100644
--- a/sdk/include/xdk/winnt_old.h
+++ b/sdk/include/xdk/winnt_old.h
@@ -1488,11 +1488,11 @@ VOID
 typedef struct _DISPATCHER_CONTEXT
 {
     ULONG64 ControlPc;
-    PVOID ImageBase;
-    PVOID FunctionEntry;
-    PVOID EstablisherFrame;
+    ULONG64 ImageBase;
+    PRUNTIME_FUNCTION FunctionEntry;
+    ULONG64 EstablisherFrame;
     ULONG64 TargetIp;
-    PVOID ContextRecord;
+    struct _CONTEXT *ContextRecord;
     PEXCEPTION_ROUTINE LanguageHandler;
     PVOID HandlerData;
     PUNWIND_HISTORY_TABLE HistoryTable;