Define PPEB in ntddk.h

[reactos.git] / reactos / include / ndk / peb_teb.h

diff --git a/reactos/include/ndk/peb_teb.h b/reactos/include/ndk/peb_teb.h
index d6e9d71..ec4b2d3 100644 (file)
--- a/reactos/include/ndk/peb_teb.h
+++ b/reactos/include/ndk/peb_teb.h
@@ -1,4 +1,3 @@
-
 #define PASTE2(x,y)       x##y
 #define PASTE(x,y)         PASTE2(x,y)
 
@@ -19,6 +18,10 @@
   #define GDI_HANDLE_BUFFER_SIZE 34
 #endif
 
+#if defined(_NTDDK_INCLUDED_) || defined(_NTIFS_)
+#define PPEB PPEB_RENAMED
+#endif
+
 typedef struct STRUCT(_PEB)
 {
     BOOLEAN InheritedAddressSpace;
@@ -152,6 +155,7 @@ typedef struct STRUCT(_PEB)
 #endif
 } STRUCT(PEB), *STRUCT(PPEB);
 
+#undef PPEB
 
 #if defined(_WIN64) && !defined(EXPLICIT_32BIT)
 C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Mutant) == 0x08);
@@ -165,7 +169,9 @@ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), ImageSubsystem) == 0x128);
 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,8 +184,10 @@ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), ImageSubsystem) == 0x0B4);
 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
 
 //
 // GDI Batch Descriptor
@@ -215,7 +223,7 @@ typedef struct STRUCT(_TEB)
     LONG                   ExceptionCode;
 #if (NTDDI_VERSION >= NTDDI_LONGHORN)
     PTR(struct _ACTIVATION_CONTEXT_STACK*) ActivationContextStackPointer;
-    UCHAR                  SpareBytes1[0x30 - 3 * sizeof(PTR(PVOID)];
+    UCHAR                  SpareBytes1[0x30 - 3 * sizeof(PTR(PVOID))];
     ULONG                  TxFsContext;
 #elif (NTDDI_VERSION >= NTDDI_WS03)
     PTR(struct _ACTIVATION_CONTEXT_STACK*) ActivationContextStackPointer;
@@ -254,10 +262,11 @@ typedef struct STRUCT(_TEB)
     ULONG                  HardErrorsAreDisabled;
 #endif
 #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-    PTR(PVOID)             Instrumentation[9];
+    PTR(PVOID)             Instrumentation[13 - sizeof(GUID)/sizeof(PTR(PVOID))];
     GUID                   ActivityId;
     PTR(PVOID)             SubProcessTag;
     PTR(PVOID)             EtwLocalData;
+    PTR(PVOID)             EtwTraceData;
 #elif (NTDDI_VERSION >= NTDDI_WS03)
     PTR(PVOID)             Instrumentation[14];
     PTR(PVOID)             SubProcessTag;
@@ -360,7 +369,6 @@ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiTebBatch) == 0x2F0);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), LastStatusValue) == 0x1250);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), Vdm) == 0x1690);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), HardErrorMode) == 0x16B0);
-C_ASSERT(FIELD_OFFSET(STRUCT(TEB), SubProcessTag) == 0x1728);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiBatchCount) == 0x1740);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), IdealProcessor) == 0x1747);
 C_ASSERT(FIELD_OFFSET(STRUCT(TEB), WaitingOnLoaderLock) == 0x1760);
@@ -373,8 +381,6 @@ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), ExceptionCode) == 0x1A4);
 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);