update for HEAD-2003091401

[reactos.git] / ntoskrnl / include / internal / i386 / ps.h

diff --git a/ntoskrnl/include/internal/i386/ps.h b/ntoskrnl/include/internal/i386/ps.h
index f7eac43..a37b625 100644 (file)
--- a/ntoskrnl/include/internal/i386/ps.h
+++ b/ntoskrnl/include/internal/i386/ps.h
@@ -26,6 +26,7 @@
 #define KTHREAD_STACK_LIMIT       0x1C
 #define KTHREAD_TEB               0x20
 #define KTHREAD_KERNEL_STACK      0x28
+#define KTHREAD_SERVICE_TABLE     0xDC
 #define KTHREAD_PREVIOUS_MODE     0x137
 #define KTHREAD_TRAP_FRAME        0x128
 #define KTHREAD_CALLBACK_STACK    0x120
@@ -33,37 +34,97 @@
 #define ETHREAD_THREADS_PROCESS   0x234
 
 #define KPROCESS_DIRECTORY_TABLE_BASE 0x18
+#define KPROCESS_LDT_DESCRIPTOR0      0x20
+#define KPROCESS_LDT_DESCRIPTOR1      0x24
+#define KPROCESS_IOPM_OFFSET          0x30
 
 #define KPCR_BASE                 0xFF000000
 
 #define KPCR_EXCEPTION_LIST       0x0
 #define KPCR_SELF                 0x18
-#define KPCR_TSS                  0x28
+#define KPCR_TSS                  0x3C
 #define KPCR_CURRENT_THREAD       0x124        
 
 #ifndef __ASM__
 
+#ifndef __USE_W32API
+
+#pragma pack(push,4)
+
+/*
+ * Processor Control Region Thread Information Block
+ */
+typedef struct _KPCR_TIB {
+  PVOID  ExceptionList;         /* 00 */
+  PVOID  StackBase;             /* 04 */
+  PVOID  StackLimit;            /* 08 */
+  PVOID  SubSystemTib;          /* 0C */
+  union {
+    PVOID  FiberData;           /* 10 */
+    DWORD  Version;             /* 10 */
+  };
+  PVOID  ArbitraryUserPointer;  /* 14 */
+} KPCR_TIB, *PKPCR_TIB; /* 18 */
+
+typedef struct _KPCR {
+  KPCR_TIB  Tib;                /* 00 */
+  struct _KPCR  *Self;          /* 18 */
+  struct _KPRCB  *PCRCB;        /* 1C */
+  KIRQL  Irql;                  /* 20 */
+  ULONG  IRR;                   /* 24 */
+  ULONG  IrrActive;             /* 28 */
+  ULONG  IDR;                   /* 2C */
+  PVOID  KdVersionBlock;        /* 30 */
+  PUSHORT  IDT;                 /* 34 */
+  PUSHORT  GDT;                 /* 38 */
+  struct _KTSS  *TSS;           /* 3C */
+  USHORT  MajorVersion;         /* 40 */
+  USHORT  MinorVersion;         /* 42 */
+  KAFFINITY  SetMember;         /* 44 */
+  ULONG  StallScaleFactor;      /* 48 */
+  UCHAR  DebugActive;           /* 4C */
+  UCHAR  ProcessorNumber;       /* 4D */
+  UCHAR  Reserved[2];           /* 4E */
+} KPCR;
+
+#pragma pack(pop)
+
+typedef struct _KPCR *PKPCR;
+
+#endif /* __USE_W32API */
+
+#pragma pack(push,4)
+
 /*
  * Processor Control Region
+ * The first part of this structure must match the KPCR structure in w32api
  */
-typedef struct _KPCR
-{
-  PVOID ExceptionList;               /* 00 */
-  PVOID StackBase;                   /* 04 */
-  PVOID StackLimit;                  /* 08 */
-  PVOID SubSystemTib;                /* 0C */
-  PVOID Reserved1;                   /* 10 */
-  PVOID ArbitraryUserPointer;        /* 14 */
-  struct _KPCR* Self;                /* 18 */
-  UCHAR ProcessorNumber;             /* 1C */
-  KIRQL Irql;                        /* 1D */
-  UCHAR Reserved2[0x2];              /* 1E */
-  PUSHORT IDT;                       /* 20 */
-  PUSHORT GDT;                       /* 24 */
-  KTSS* TSS;                         /* 28 */
-  UCHAR Reserved3[0xF8];             /* 2C */
-  struct _KTHREAD* CurrentThread;    /* 124 */
-} __attribute__((packed)) KPCR, *PKPCR;
+typedef struct _IKPCR {
+  KPCR_TIB  Tib;                /* 00 */
+  struct _KPCR  *Self;          /* 18 */
+  struct _KPRCB  *PCRCB;        /* 1C */
+  KIRQL  Irql;                  /* 20 */
+  ULONG  IRR;                   /* 24 */
+  ULONG  IrrActive;             /* 28 */
+  ULONG  IDR;                   /* 2C */
+  PVOID  KdVersionBlock;        /* 30 */
+  PUSHORT  IDT;                 /* 34 */
+  PUSHORT  GDT;                 /* 38 */
+  struct _KTSS  *TSS;           /* 3C */
+  USHORT  MajorVersion;         /* 40 */
+  USHORT  MinorVersion;         /* 42 */
+  KAFFINITY  SetMember;         /* 44 */
+  ULONG  StallScaleFactor;      /* 48 */
+  UCHAR  DebugActive;           /* 4C */
+  UCHAR  ProcessorNumber;       /* 4D */
+  UCHAR  Reserved[2];           /* 4E */
+  UCHAR  Reserved2[0xD4];       /* 50 */
+  struct _KTHREAD* CurrentThread; /* 124 */
+} IKPCR, *PIKPCR;
+
+#pragma pack(pop)
+
+#ifndef __USE_W32API
 
 static inline PKPCR KeGetCurrentKPCR(VOID)
 {
@@ -76,6 +137,8 @@ static inline PKPCR KeGetCurrentKPCR(VOID)
   return((PKPCR)value);
 }
 
+#endif /* __USE_W32API */
+
 VOID
 Ki386ContextSwitch(struct _KTHREAD* NewThread, 
                   struct _KTHREAD* OldThread);