[tkreuzer] 44511: [NDK] - Add Wx86ThreadState - Add WinXP version of ACTIVATION_CONTEXT_STACK - rtltypes doesn't depend on pstypes, but the opposite way around now

Author: tkreuzer
Date: Thu Dec 10 03:30:09 2009
New Revision: 44511

URL: http://svn.reactos.org/svn/reactos?rev=44511&view=rev
Log:
[NDK]
- Add Wx86ThreadState
- Add WinXP version of ACTIVATION_CONTEXT_STACK
- rtltypes doesn't depend on pstypes, but the opposite way around now

Modified:
    branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h
    branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h
    branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h

Modified: branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ndk/peb_teb.h [iso-8859-1] Thu Dec 10 03:30:09 2009
@@ -165,7 +165,9 @@
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), ImageProcessAffinityMask) == 0x138);
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), PostProcessInitRoutine) == 0x230);
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), SessionId) == 0x2C0);
+#if (NTDDI_VERSION >= NTDDI_WS03)
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), FlsHighIndex) == 0x350);
+#endif
 #else
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Mutant) == 0x04);
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Ldr) == 0x0C);
@@ -178,7 +180,9 @@
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), ImageProcessAffinityMask) == 0x0C0);
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), PostProcessInitRoutine) == 0x14C);
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), SessionId) == 0x1D4);
+#if (NTDDI_VERSION >= NTDDI_WS03)
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), FlsHighIndex) == 0x22C);
+#endif
 #endif

//
@@ -373,8 +377,6 @@
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiTebBatch) == 0x1D4);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), LastStatusValue) == 0xBF4);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), Vdm) == 0xF18);
-C_ASSERT(FIELD_OFFSET(STRUCT(TEB), HardErrorMode) == 0xF28);
-C_ASSERT(FIELD_OFFSET(STRUCT(TEB), SubProcessTag) == 0xF64);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiBatchCount) == 0xF70);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), TlsExpansionSlots) == 0xF94);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), ActiveFrame) == 0xFB0);

Modified: branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ndk/pstypes.h [iso-8859-1] Thu Dec 10 03:30:09 2009
@@ -26,6 +26,7 @@
 #include <ldrtypes.h>
 #include <mmtypes.h>
 #include <obtypes.h>
+#include <rtltypes.h>
 #ifndef NTOS_MODE_USER
 #include <extypes.h>
 #include <setypes.h>
@@ -656,6 +657,17 @@
     ULONG64 UniqueThread;
 } CLIENT_ID64, *PCLIENT_ID64;

+#if (NTDDI_VERSION < NTDDI_WS03)
+typedef struct _Wx86ThreadState
+{
+    PULONG  CallBx86Eip;
+    PVOID   DeallocationCpu;
+    BOOLEAN UseKnownWx86Dll;
+    CHAR    OleStubInvoked;
+} Wx86ThreadState, *PWx86ThreadState;
+#endif
+
+
 //
 // Process Environment Block (PEB)
 // Thread Environment Block (TEB)

Modified: branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/includ...
==============================================================================
--- branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/include/ndk/rtltypes.h [iso-8859-1] Thu Dec 10 03:30:09 2009
@@ -23,7 +23,6 @@
 // Dependencies
 //
 #include <umtypes.h>
-#include <pstypes.h>

//
 // Maximum Atom Length
@@ -760,6 +759,7 @@
 } RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED,
   *PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED;

+#if (NTDDI_VERSION >= NTDDI_WS03)
 typedef struct _ACTIVATION_CONTEXT_STACK
 {
     PRTL_ACTIVATION_CONTEXT_STACK_FRAME ActiveFrame;
@@ -769,6 +769,15 @@
     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

#endif