[ros-diffs] [reactos] 01/03: [NDK] fix some rtltypes.h definitions

[Timo Kreuzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=30cd606fe2d3b44ef7badd1efcad31605a031fd6

commit 30cd606fe2d3b44ef7badd1efcad31605a031fd6
Author: Timo Kreuzer <timo.kreu...@reactos.org>
AuthorDate: Wed Aug 16 09:52:25 2017 +0200

    [NDK] fix some rtltypes.h definitions
---
 sdk/include/ndk/rtltypes.h | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/sdk/include/ndk/rtltypes.h b/sdk/include/ndk/rtltypes.h
index 46f1787d35..0ee0eb3d86 100644
--- a/sdk/include/ndk/rtltypes.h
+++ b/sdk/include/ndk/rtltypes.h
@@ -847,7 +847,6 @@ typedef struct _UNICODE_PREFIX_TABLE
     PUNICODE_PREFIX_TABLE_ENTRY LastNextEntry;
 } UNICODE_PREFIX_TABLE, *PUNICODE_PREFIX_TABLE;
 
-#ifdef NTOS_MODE_USER
 //
 // Pfx* routines' table structures
 //
@@ -866,7 +865,6 @@ typedef struct _PREFIX_TABLE
   CSHORT NameLength;
   PPREFIX_TABLE_ENTRY NextPrefixTree;
 } PREFIX_TABLE, *PPREFIX_TABLE;
-#endif
 
 //
 // Time Structure for RTL Time calls
@@ -921,25 +919,6 @@ typedef struct 
_RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME
     PVOID ActivationStackBackTrace[8];
 } RTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME, 
*PRTL_HEAP_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME;
 
-#if (NTDDI_VERSION >= NTDDI_WS03)
-typedef struct _ACTIVATION_CONTEXT_STACK
-{
-    PRTL_ACTIVATION_CONTEXT_STACK_FRAME ActiveFrame;
-    LIST_ENTRY FrameListCache;
-    ULONG Flags;
-    ULONG NextCookieSequenceNumber;
-    ULONG StackId;
-} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK;
-#else
-typedef struct _ACTIVATION_CONTEXT_STACK
-{
-    ULONG Flags;
-    ULONG NextCookieSequenceNumber;
-    PVOID ActiveFrame;
-    LIST_ENTRY FrameListCache;
-} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK;
-#endif
-
 typedef struct _ACTIVATION_CONTEXT_DATA
 {
     ULONG Magic;
@@ -964,6 +943,25 @@ typedef struct _ACTIVATION_CONTEXT_STACK_FRAMELIST
 
 #endif /* NTOS_MODE_USER */
 
+#if (NTDDI_VERSION >= NTDDI_WS03SP1)
+typedef struct _ACTIVATION_CONTEXT_STACK
+{
+    struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME *ActiveFrame;
+    LIST_ENTRY FrameListCache;
+    ULONG Flags;
+    ULONG NextCookieSequenceNumber;
+    ULONG StackId;
+} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK;
+#else
+typedef struct _ACTIVATION_CONTEXT_STACK
+{
+    ULONG Flags;
+    ULONG NextCookieSequenceNumber;
+    struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME *ActiveFrame;
+    LIST_ENTRY FrameListCache;
+} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK;
+#endif
+
 //
 // ACE Structure
 //