Merge from amd64-branch:

44501 (tkreuzer)
[NDK]
- Add CLIENT_ID32/64
- Create explicit 32/64 bit versions of PEB, GDI_TEB_BATCH and TEB, using macros.
- Fix some member names.

44503 (tkreuzer)
[CMD]
Fix a teb member name

44504 (tkreuzer)
[NTSOKRNL]
Fix a teb member name

44506 (tkreuzer)
[NDK]
fix a typo in the TEB definition

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

44512 (tkreuzer)
[NDK]
Fix some dependencies

44521 (tkreuzer)
[NTDKK]
- Don't use PEB::FastPeb(Un)LockRoutine, these members are deprecated since Windows 2003, use RtlEnter/LeaveCriticalSection instead.

44523 (tkreuzer)
[NTDLL]
Fix usage of PEB::KernelCallbacktable. It's a PVOID.

44524 (tkreuzer)
NDK]
- Add missing TEB member for Vista

44525 (tkreuzer)
[NDK]
Fix a TEB array size.

44526 (tkreuzer)
[USER32]
More fix of TEB::KernelCallbackTable usage

svn path=/trunk/; revision=46434

diff --cc reactos/base/shell/cmd/cmd.c
index 233cffa,233cffa..59f00ea
--- 1/reactos/base/shell/cmd/cmd.c
--- 2/reactos/base/shell/cmd/cmd.c
+++ b/reactos/base/shell/cmd/cmd.c
@@@ -244,7 -244,7 +244,7 @@@ static BOOL IsConsoleProcess(HANDLE Pro
                return TRUE;
        }
  
--      return IMAGE_SUBSYSTEM_WINDOWS_CUI == ProcessPeb.ImageSubSystem;
++      return IMAGE_SUBSYSTEM_WINDOWS_CUI == ProcessPeb.ImageSubsystem;
  }
  
  

diff --cc reactos/dll/ntdll/dbg/dbgui.c
Simple merge

diff --cc reactos/dll/ntdll/dispatch/dispatch.c
index 4fb3c43,4fb3c43..50a9ee8
--- 1/reactos/dll/ntdll/dispatch/dispatch.c
--- 2/reactos/dll/ntdll/dispatch/dispatch.c
+++ b/reactos/dll/ntdll/dispatch/dispatch.c
@@@ -79,8 -79,8 +79,8 @@@ KiUserCallbackDispatcher(ULONG Index
                           ULONG ArgumentLength)
  {
      /* Return with the result of the callback function */
++    USER_CALL *KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable;
      ZwCallbackReturn(NULL,
                       0,
--                     ((USER_CALL)(NtCurrentPeb()->KernelCallbackTable[Index]))
--                     (Argument, ArgumentLength));
++                     KernelCallbackTable[Index](Argument, ArgumentLength));
  }

diff --cc reactos/dll/ntdll/ldr/startup.c
index 33353e7,c52c435..49a4a2c
--- 1/reactos/dll/ntdll/ldr/startup.c
--- 2/reactos/dll/ntdll/ldr/startup.c
+++ b/reactos/dll/ntdll/ldr/startup.c
@@@ -343,8 -343,8 +343,6 @@@ LdrpInit2(PCONTEXT Context
      /* initalize peb lock support */
      RtlInitializeCriticalSection(&PebLock);
      Peb->FastPebLock = &PebLock;
--    Peb->FastPebLockRoutine = (PPEBLOCKROUTINE)RtlEnterCriticalSection;
--    Peb->FastPebUnlockRoutine = (PPEBLOCKROUTINE)RtlLeaveCriticalSection;
  
      /* initialize tls bitmaps */
      RtlInitializeBitMap(&TlsBitMap, Peb->TlsBitmapBits, TLS_MINIMUM_AVAILABLE);

diff --cc reactos/dll/ntdll/ldr/utils.c
Simple merge

diff --cc reactos/dll/ntdll/rtl/libsupp.c
index e37e444,5fdcb68..90c3ce3
--- 1/reactos/dll/ntdll/rtl/libsupp.c
--- 2/reactos/dll/ntdll/rtl/libsupp.c
+++ b/reactos/dll/ntdll/rtl/libsupp.c
@@@ -83,7 -88,7 +83,7 @@@ VOID NTAP
  RtlAcquirePebLock(VOID)
  {
     PPEB Peb = NtCurrentPeb ();
--   Peb->FastPebLockRoutine (Peb->FastPebLock);
++   RtlEnterCriticalSection(Peb->FastPebLock);
  }
  
  /*
@@@ -93,7 -98,7 +93,7 @@@ VOID NTAP
  RtlReleasePebLock(VOID)
  {
     PPEB Peb = NtCurrentPeb ();
--   Peb->FastPebUnlockRoutine (Peb->FastPebLock);
++   RtlLeaveCriticalSection(Peb->FastPebLock);
  }
  
  /*

diff --cc reactos/dll/win32/kernel32/thread/fiber.c
Simple merge

diff --cc reactos/dll/win32/user32/misc/dllmain.c
index 044f493,044f493..7a1abc9
--- 1/reactos/dll/win32/user32/misc/dllmain.c
--- 2/reactos/dll/win32/user32/misc/dllmain.c
+++ b/reactos/dll/win32/user32/misc/dllmain.c
@@@ -217,23 -217,23 +217,25 @@@ BOO
  Init(VOID)
  {
     USERCONNECT UserCon;
++   PVOID *KernelCallbackTable;
  
     /* Set up the kernel callbacks. */
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] =
++   KernelCallbackTable = NtCurrentPeb()->KernelCallbackTable;
++   KernelCallbackTable[USER32_CALLBACK_WINDOWPROC] =
        (PVOID)User32CallWindowProcFromKernel;
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_SENDASYNCPROC] =
++   KernelCallbackTable[USER32_CALLBACK_SENDASYNCPROC] =
        (PVOID)User32CallSendAsyncProcForKernel;
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADSYSMENUTEMPLATE] =
++   KernelCallbackTable[USER32_CALLBACK_LOADSYSMENUTEMPLATE] =
        (PVOID)User32LoadSysMenuTemplateForKernel;
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADDEFAULTCURSORS] =
++   KernelCallbackTable[USER32_CALLBACK_LOADDEFAULTCURSORS] =
        (PVOID)User32SetupDefaultCursors;
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_HOOKPROC] =
++   KernelCallbackTable[USER32_CALLBACK_HOOKPROC] =
        (PVOID)User32CallHookProcFromKernel;
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_EVENTPROC] =
++   KernelCallbackTable[USER32_CALLBACK_EVENTPROC] =
        (PVOID)User32CallEventProcFromKernel;
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_LOADMENU] =
++   KernelCallbackTable[USER32_CALLBACK_LOADMENU] =
        (PVOID)User32CallLoadMenuFromKernel;
--   NtCurrentPeb()->KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] =
++   KernelCallbackTable[USER32_CALLBACK_CLIENTTHREADSTARTUP] =
        (PVOID)User32CallClientThreadSetupFromKernel;
  
     NtUserProcessConnect( NtCurrentProcess(),

diff --cc reactos/include/ndk/peb_teb.h
index 0000000,d6e9d71..38791b3
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/include/ndk/peb_teb.h
+++ b/reactos/include/ndk/peb_teb.h
@@@ -1,0 -1,387 +1,389 @@@
 -    UCHAR                  SpareBytes1[0x30 - 3 * sizeof(PTR(PVOID)];
+ 
+ #define PASTE2(x,y)       x##y
+ #define PASTE(x,y)         PASTE2(x,y)
+ 
+ #ifdef EXPLICIT_32BIT
+   #define STRUCT(x) PASTE(x,32)
+   #define PTR(x) ULONG
+ #elif defined(EXPLICIT_64BIT)
+   #define STRUCT(x) PASTE(x,64)
+   #define PTR(x) ULONG64
+ #else
+   #define STRUCT(x) x
+   #define PTR(x) x
+ #endif
+ 
+ #if defined(_WIN64) && !defined(EXPLICIT_32BIT)
+   #define GDI_HANDLE_BUFFER_SIZE 60
+ #else
+   #define GDI_HANDLE_BUFFER_SIZE 34
+ #endif
+ 
+ typedef struct STRUCT(_PEB)
+ {
+     BOOLEAN InheritedAddressSpace;
+     BOOLEAN ReadImageFileExecOptions;
+     BOOLEAN BeingDebugged;
+ #if (NTDDI_VERSION >= NTDDI_WS03)
+     union
+     {
+         BOOLEAN BitField;
+         struct
+         {
+             BOOLEAN ImageUsesLargePages:1;
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+             BOOLEAN IsProtectedProcess:1;
+             BOOLEAN IsLegacyProcess:1;
+             BOOLEAN IsImageDynamicallyRelocated:1;
+             BOOLEAN SkipPatchingUser32Forwarders:1;
+             BOOLEAN SpareBits:3;
+ #else
+             BOOLEAN SpareBits:7;
+ #endif
+         };
+     };
+ #else
+     BOOLEAN SpareBool;
+ #endif
+     PTR(HANDLE) Mutant;
+     PTR(PVOID) ImageBaseAddress;
+     PTR(PPEB_LDR_DATA) Ldr;
+     PTR(struct _RTL_USER_PROCESS_PARAMETERS*) ProcessParameters;
+     PTR(PVOID) SubSystemData;
+     PTR(PVOID) ProcessHeap;
+     PTR(struct _RTL_CRITICAL_SECTION*) FastPebLock;
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+     PTR(PVOID) AltThunkSListPtr;
+     PTR(PVOID) IFEOKey;
+     union
+     {
+         ULONG CrossProcessFlags;
+         struct
+         {
+             ULONG ProcessInJob:1;
+             ULONG ProcessInitializing:1;
+             ULONG ProcessUsingVEH:1;
+             ULONG ProcessUsingVCH:1;
+             ULONG ReservedBits0:28;
+         };
+     };
+     union
+     {
+         PTR(PVOID) KernelCallbackTable;
+         PTR(PVOID) UserSharedInfoPtr;
+     };
+ #elif (NTDDI_VERSION >= NTDDI_WS03)
+     PTR(PVOID) AltThunkSListPtr;
+     PTR(PVOID) SparePtr2;
+     ULONG EnvironmentUpdateCount;
+     PTR(PVOID) KernelCallbackTable;
+ #else
+     PTR(PPEBLOCKROUTINE) FastPebLockRoutine;
+     PTR(PPEBLOCKROUTINE) FastPebUnlockRoutine;
+     ULONG EnvironmentUpdateCount;
+     PTR(PVOID) KernelCallbackTable;
+ #endif
+     ULONG SystemReserved[1];
+     ULONG SpareUlong; // AtlThunkSListPtr32
+     PTR(PPEB_FREE_BLOCK) FreeList;
+     ULONG TlsExpansionCounter;
+     PTR(PVOID) TlsBitmap;
+     ULONG TlsBitmapBits[2];
+     PTR(PVOID) ReadOnlySharedMemoryBase;
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+     PTR(PVOID) HotpatchInformation;
+ #else
+     PTR(PVOID) ReadOnlySharedMemoryHeap;
+ #endif
+     PTR(PVOID*) ReadOnlyStaticServerData;
+     PTR(PVOID) AnsiCodePageData;
+     PTR(PVOID) OemCodePageData;
+     PTR(PVOID) UnicodeCaseTableData;
+     ULONG NumberOfProcessors;
+     ULONG NtGlobalFlag;
+     LARGE_INTEGER CriticalSectionTimeout;
+     PTR(ULONG_PTR) HeapSegmentReserve;
+     PTR(ULONG_PTR) HeapSegmentCommit;
+     PTR(ULONG_PTR) HeapDeCommitTotalFreeThreshold;
+     PTR(ULONG_PTR) HeapDeCommitFreeBlockThreshold;
+     ULONG NumberOfHeaps;
+     ULONG MaximumNumberOfHeaps;
+     PTR(PVOID*) ProcessHeaps;
+     PTR(PVOID) GdiSharedHandleTable;
+     PTR(PVOID) ProcessStarterHelper;
+     ULONG GdiDCAttributeList;
+     PTR(struct _RTL_CRITICAL_SECTION*) LoaderLock;
+     ULONG OSMajorVersion;
+     ULONG OSMinorVersion;
+     USHORT OSBuildNumber;
+     USHORT OSCSDVersion;
+     ULONG OSPlatformId;
+     ULONG ImageSubsystem;
+     ULONG ImageSubsystemMajorVersion;
+     ULONG ImageSubsystemMinorVersion;
+     PTR(ULONG_PTR) ImageProcessAffinityMask;
+     ULONG GdiHandleBuffer[GDI_HANDLE_BUFFER_SIZE];
+     PTR(PPOST_PROCESS_INIT_ROUTINE) PostProcessInitRoutine;
+     PTR(PVOID) TlsExpansionBitmap;
+     ULONG TlsExpansionBitmapBits[32];
+     ULONG SessionId;
+ #if (NTDDI_VERSION >= NTDDI_WINXP)
+     ULARGE_INTEGER AppCompatFlags;
+     ULARGE_INTEGER AppCompatFlagsUser;
+     PTR(PVOID) pShimData;
+     PTR(PVOID) AppCompatInfo;
+     STRUCT(UNICODE_STRING) CSDVersion;
+     PTR(struct _ACTIVATION_CONTEXT_DATA*) ActivationContextData;
+     PTR(struct _ASSEMBLY_STORAGE_MAP*) ProcessAssemblyStorageMap;
+     PTR(struct _ACTIVATION_CONTEXT_DATA*) SystemDefaultActivationContextData;
+     PTR(struct _ASSEMBLY_STORAGE_MAP*) SystemAssemblyStorageMap;
+     PTR(ULONG_PTR) MinimumStackCommit;
+ #endif
+ #if (NTDDI_VERSION >= NTDDI_WS03)
+     PTR(PVOID*) FlsCallback;
+     STRUCT(LIST_ENTRY) FlsListHead;
+     PTR(PVOID) FlsBitmap;
+     ULONG FlsBitmapBits[4];
+     ULONG FlsHighIndex;
+ #endif
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+     PTR(PVOID) WerRegistrationData;
+     PTR(PVOID) WerShipAssertPtr;
+ #endif
+ } STRUCT(PEB), *STRUCT(PPEB);
+ 
+ 
+ #if defined(_WIN64) && !defined(EXPLICIT_32BIT)
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Mutant) == 0x08);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Ldr) == 0x18);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), FastPebLock) == 0x038);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), TlsExpansionCounter) == 0x070);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), NtGlobalFlag) == 0x0BC);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), GdiSharedHandleTable) == 0x0F8);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), LoaderLock) == 0x110);
+ 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);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), FastPebLock) == 0x01C);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), TlsExpansionCounter) == 0x03C);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), NtGlobalFlag) == 0x068);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), GdiSharedHandleTable) == 0x094);
+ C_ASSERT(FIELD_OFFSET(STRUCT(PEB), LoaderLock) == 0x0A0);
+ 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
+ //
+ typedef struct STRUCT(_GDI_TEB_BATCH)
+ {
+     ULONG Offset;
+     PTR(HANDLE) HDC;
+     ULONG Buffer[0x136];
+ } STRUCT(GDI_TEB_BATCH), *STRUCT(PGDI_TEB_BATCH);
+ 
+ //
+ // Thread Environment Block (TEB)
+ //
+ typedef struct STRUCT(_TEB)
+ {
+     STRUCT(NT_TIB)         NtTib;
+     PTR(PVOID)             EnvironmentPointer;
+     STRUCT(CLIENT_ID)      ClientId;
+     PTR(PVOID)             ActiveRpcHandle;
+     PTR(PVOID)             ThreadLocalStoragePointer;
+     PTR(STRUCT(PPEB))      ProcessEnvironmentBlock;
+     ULONG                  LastErrorValue;
+     ULONG                  CountOfOwnedCriticalSections;
+     PTR(PVOID)             CsrClientThread;
+     PTR(PVOID)             Win32ThreadInfo;
+     ULONG                  User32Reserved[26];
+     ULONG                  UserReserved[5];
+     PTR(PVOID)             WOW32Reserved;
+     LCID                   CurrentLocale;
+     ULONG                  FpSoftwareStatusRegister;
+     PTR(PVOID)             SystemReserved1[54];
+     LONG                   ExceptionCode;
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+     PTR(struct _ACTIVATION_CONTEXT_STACK*) ActivationContextStackPointer;
 -    PTR(PVOID)             Instrumentation[9];
++    UCHAR                  SpareBytes1[0x30 - 3 * sizeof(PTR(PVOID))];
+     ULONG                  TxFsContext;
+ #elif (NTDDI_VERSION >= NTDDI_WS03)
+     PTR(struct _ACTIVATION_CONTEXT_STACK*) ActivationContextStackPointer;
+     UCHAR                  SpareBytes1[0x34 - 3 * sizeof(PTR(PVOID))];
+ #else
+     ACTIVATION_CONTEXT_STACK ActivationContextStack;
+     UCHAR                  SpareBytes1[24];
+ #endif
+     STRUCT(GDI_TEB_BATCH)  GdiTebBatch;
+     STRUCT(CLIENT_ID)      RealClientId;
+     PTR(PVOID)             GdiCachedProcessHandle;
+     ULONG                  GdiClientPID;
+     ULONG                  GdiClientTID;
+     PTR(PVOID)             GdiThreadLocalInfo;
+     PTR(SIZE_T)            Win32ClientInfo[62];
+     PTR(PVOID)             glDispatchTable[233];
+     PTR(SIZE_T)            glReserved1[29];
+     PTR(PVOID)             glReserved2;
+     PTR(PVOID)             glSectionInfo;
+     PTR(PVOID)             glSection;
+     PTR(PVOID)             glTable;
+     PTR(PVOID)             glCurrentRC;
+     PTR(PVOID)             glContext;
+     NTSTATUS               LastStatusValue;
+     STRUCT(UNICODE_STRING) StaticUnicodeString;
+     WCHAR                  StaticUnicodeBuffer[261];
+     PTR(PVOID)             DeallocationStack;
+     PTR(PVOID)             TlsSlots[64];
+     STRUCT(LIST_ENTRY)     TlsLinks;
+     PTR(PVOID)             Vdm;
+     PTR(PVOID)             ReservedForNtRpc;
+     PTR(PVOID)             DbgSsReserved[2];
+ #if (NTDDI_VERSION >= NTDDI_WS03)
+     ULONG                  HardErrorMode;
+ #else
+     ULONG                  HardErrorsAreDisabled;
+ #endif
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
 -C_ASSERT(FIELD_OFFSET(STRUCT(TEB), SubProcessTag) == 0x1728);
++    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;
+     PTR(PVOID)             EtwLocalData;
+ #else
+     PTR(PVOID)             Instrumentation[16];
+ #endif
+     PTR(PVOID)             WinSockData;
+     ULONG                  GdiBatchCount;
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+     BOOLEAN                SpareBool0;
+     BOOLEAN                SpareBool1;
+     BOOLEAN                SpareBool2;
+ #else
+     BOOLEAN                InDbgPrint;
+     BOOLEAN                FreeStackOnTermination;
+     BOOLEAN                HasFiberData;
+ #endif
+     UCHAR                  IdealProcessor;
+ #if (NTDDI_VERSION >= NTDDI_WS03)
+     ULONG                  GuaranteedStackBytes;
+ #else
+     ULONG                  Spare3;
+ #endif
+     PTR(PVOID)             ReservedForPerf;
+     PTR(PVOID)             ReservedForOle;
+     ULONG                  WaitingOnLoaderLock;
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+     PTR(PVOID)             SavedPriorityState;
+     PTR(ULONG_PTR)         SoftPatchPtr1;
+     PTR(ULONG_PTR)         ThreadPoolData;
+ #elif (NTDDI_VERSION >= NTDDI_WS03)
+     PTR(ULONG_PTR)         SparePointer1;
+     PTR(ULONG_PTR)         SoftPatchPtr1;
+     PTR(ULONG_PTR)         SoftPatchPtr2;
+ #else
+     Wx86ThreadState        Wx86Thread;
+ #endif
+     PTR(PVOID*)            TlsExpansionSlots;
+ #if defined(_WIN64) && !defined(EXPLICIT_32BIT)
+     PTR(PVOID)             DeallocationBStore;                                                  
+     PTR(PVOID)             BStoreLimit;                                                         
+ #endif
+     ULONG                  ImpersonationLocale;
+     ULONG                  IsImpersonating;
+     PTR(PVOID)             NlsCache;
+     PTR(PVOID)             pShimData;
+     ULONG                  HeapVirtualAffinity;
+     PTR(HANDLE)            CurrentTransactionHandle;
+     PTR(PTEB_ACTIVE_FRAME) ActiveFrame;
+ #if (NTDDI_VERSION >= NTDDI_WS03)
+     PVOID FlsData;
+ #endif
+ #if (NTDDI_VERSION >= NTDDI_LONGHORN)
+     PVOID PreferredLangauges;
+     PVOID UserPrefLanguages;
+     PVOID MergedPrefLanguages;
+     ULONG MuiImpersonation;
+     union
+     {
+         struct
+         {
+             USHORT SpareCrossTebFlags:16;
+         };
+         USHORT CrossTebFlags;
+     };
+     union
+     {
+         struct
+         {
+             USHORT DbgSafeThunkCall:1;
+             USHORT DbgInDebugPrint:1;
+             USHORT DbgHasFiberData:1;
+             USHORT DbgSkipThreadAttach:1;
+             USHORT DbgWerInShipAssertCode:1;
+             USHORT DbgIssuedInitialBp:1;
+             USHORT DbgClonedThread:1;
+             USHORT SpareSameTebBits:9;
+         };
+         USHORT SameTebFlags;
+     };
+     PTR(PVOID) TxnScopeEntercallback;
+     PTR(PVOID) TxnScopeExitCAllback;
+     PTR(PVOID) TxnScopeContext;
+     ULONG LockCount;
+     ULONG ProcessRundown;
+     ULONG64 LastSwitchTime;
+     ULONG64 TotalSwitchOutTime;
+     LARGE_INTEGER WaitReasonBitMap;
+ #else
+     BOOLEAN SafeThunkCall;
+     BOOLEAN BooleanSpare[3];
+ #endif
+ } STRUCT(TEB), *STRUCT(PTEB);
+ 
+ #if defined(_WIN64) && !defined(EXPLICIT_32BIT)
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), EnvironmentPointer) == 0x038);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), ExceptionCode) == 0x2C0);
+ 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), HardErrorMode) == 0xF28);
 -C_ASSERT(FIELD_OFFSET(STRUCT(TEB), SubProcessTag) == 0xF64);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), GdiBatchCount) == 0x1740);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), IdealProcessor) == 0x1747);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), WaitingOnLoaderLock) == 0x1760);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), TlsExpansionSlots) == 0x1780);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), WaitingOnLoaderLock) == 0x1760);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), ActiveFrame) == 0x17C0);
+ #else
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), EnvironmentPointer) == 0x01C);
+ 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), GdiBatchCount) == 0xF70);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), TlsExpansionSlots) == 0xF94);
+ C_ASSERT(FIELD_OFFSET(STRUCT(TEB), ActiveFrame) == 0xFB0);
+ #endif
+ 
+ #undef PTR
+ #undef STRUCT
+ #undef PASTE
+ #undef PASTE2
+ #undef GDI_HANDLE_BUFFER_SIZE

diff --cc reactos/include/ndk/pstypes.h
index 45e27f2,ca5477c..d423b7a
--- 1/reactos/include/ndk/pstypes.h
--- 2/reactos/include/ndk/pstypes.h
+++ b/reactos/include/ndk/pstypes.h
@@@ -26,6 -26,6 +26,7 @@@ Author
  #include <ldrtypes.h>
  #include <mmtypes.h>
  #include <obtypes.h>
++#include <rtltypes.h>
  #ifndef NTOS_MODE_USER
  #include <extypes.h>
  #include <setypes.h>
@@@ -771,146 -644,39 +645,50 @@@ typedef struct _TEB_ACTIVE_FRAM
      PTEB_ACTIVE_FRAME_CONTEXT Context;
  } TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME;
  
+ typedef struct _CLIENT_ID32
+ {
+     ULONG UniqueProcess;
+     ULONG UniqueThread;
+ } CLIENT_ID32, *PCLIENT_ID32;
+ 
+ typedef struct _CLIENT_ID64
+ {
+     ULONG64 UniqueProcess;
+     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)
  //
- typedef struct _TEB
- {
-     NT_TIB Tib;
-     PVOID EnvironmentPointer;
-     CLIENT_ID ClientId;
-     PVOID ActiveRpcHandle;
-     PVOID ThreadLocalStoragePointer;
-     struct _PEB *ProcessEnvironmentBlock;
-     ULONG LastErrorValue;
-     ULONG CountOfOwnedCriticalSections;
-     PVOID CsrClientThread;
-     struct _W32THREAD* Win32ThreadInfo;
-     ULONG User32Reserved[0x1A];
-     ULONG UserReserved[5];
-     PVOID WOW32Reserved;
-     LCID CurrentLocale;
-     ULONG FpSoftwareStatusRegister;
-     PVOID SystemReserved1[0x36];
-     LONG ExceptionCode;
-     struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer;
- #ifdef _WIN64
-     UCHAR SpareBytes1[24];
- #else
-     UCHAR SpareBytes1[0x24];
- #endif
-     ULONG TxFsContext;
-     GDI_TEB_BATCH GdiTebBatch;
-     CLIENT_ID RealClientId;
-     PVOID GdiCachedProcessHandle;
-     ULONG GdiClientPID;
-     ULONG GdiClientTID;
-     PVOID GdiThreadLocalInfo;
-     SIZE_T Win32ClientInfo[62];
-     PVOID glDispatchTable[0xE9];
-     SIZE_T glReserved1[0x1D];
-     PVOID glReserved2;
-     PVOID glSectionInfo;
-     PVOID glSection;
-     PVOID glTable;
-     PVOID glCurrentRC;
-     PVOID glContext;
-     NTSTATUS LastStatusValue;
-     UNICODE_STRING StaticUnicodeString;
-     WCHAR StaticUnicodeBuffer[0x105];
-     PVOID DeallocationStack;
-     PVOID TlsSlots[0x40];
-     LIST_ENTRY TlsLinks;
-     PVOID Vdm;
-     PVOID ReservedForNtRpc;
-     PVOID DbgSsReserved[0x2];
-     ULONG HardErrorDisabled;
+ #include "peb_teb.h"
+ 
  #ifdef _WIN64
-     PVOID Instrumentation[11];
- #else
-     PVOID Instrumentation[9];
- #endif
-     GUID ActivityId;
-     PVOID SubProcessTag;
-     PVOID EtwTraceData;
- #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-     PVOID EtwLocalData;
- #endif
-     PVOID WinSockData;
-     ULONG GdiBatchCount;
- #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-     BOOLEAN SpareBool0;
-     BOOLEAN SpareBool1;
-     BOOLEAN SpareBool2;
- #else
-     BOOLEAN InDbgPrint;
-     BOOLEAN FreeStackOnTermination;
-     BOOLEAN HasFiberData;
- #endif
-     UCHAR IdealProcessor;
-     ULONG GuaranteedStackBytes;
-     PVOID ReservedForPerf;
-     PVOID ReservedForOle;
-     ULONG WaitingOnLoaderLock;
- #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-     PVOID SavedPriorityState;
- #else
-     ULONG SparePointer1;
- #endif
-     ULONG SoftPatchPtr1;
-     ULONG SoftPatchPtr2;
-     PVOID *TlsExpansionSlots;
-     ULONG ImpersonationLocale;
-     ULONG IsImpersonating;
-     PVOID NlsCache;
-     PVOID pShimData;
-     ULONG HeapVirualAffinity;
-     PVOID CurrentTransactionHandle;
-     PTEB_ACTIVE_FRAME ActiveFrame;
- #if (NTDDI_VERSION >= NTDDI_WS03)
-     PVOID FlsData;
- #endif
- #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-     PVOID PreferredLangauges;
-     PVOID UserPrefLanguages;
-     PVOID MergedPrefLanguages;
-     ULONG MuiImpersonation;
-     union
-     {
-         struct
-         {
-             USHORT SpareCrossTebFlags:16;
-         };
-         USHORT CrossTebFlags;
-     };
-     union
-     {
-         struct
-         {
-             USHORT DbgSafeThunkCall:1;
-             USHORT DbgInDebugPrint:1;
-             USHORT DbgHasFiberData:1;
-             USHORT DbgSkipThreadAttach:1;
-             USHORT DbgWerInShipAssertCode:1;
-             USHORT DbgIssuedInitialBp:1;
-             USHORT DbgClonedThread:1;
-             USHORT SpareSameTebBits:9;
-         };
-         USHORT SameTebFlags;
-     };
-     PVOID TxnScopeEntercallback;
-     PVOID TxnScopeExitCAllback;
-     PVOID TxnScopeContext;
-     ULONG LockCount;
-     ULONG ProcessRundown;
-     ULONGLONG LastSwitchTime;
-     ULONGLONG TotalSwitchOutTime;
-     LARGE_INTEGER WaitReasonBitMap;
- #else
-     UCHAR SafeThunkCall;
-     UCHAR BooleanSpare[3];
+ //
+ // Explicit 32 bit PEB/TEB
+ //
+ #define EXPLICIT_32BIT
+ #include "peb_teb.h"
+ #undef EXPLICIT_32BIT
+ 
+ //
+ // Explicit 64 bit PEB/TEB
+ //
+ #define EXPLICIT_64BIT
+ #include "peb_teb.h"
+ #undef EXPLICIT_64BIT
  #endif
- } TEB, *PTEB;
  
  #ifdef NTOS_MODE_USER
  

diff --cc reactos/include/ndk/rtlfuncs.h
index debd1ee,5db3fc3..210dd2f
--- 1/reactos/include/ndk/rtlfuncs.h
--- 2/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@@ -25,6 -25,6 +25,7 @@@ Author
  #include <umtypes.h>
  #include <ntnls.h>
  #include <rtltypes.h>
++#include <pstypes.h>
  #include <extypes.h>
  #include "in6addr.h"
  #include "inaddr.h"

diff --cc reactos/include/ndk/rtltypes.h
index 70aa3ed,70aa3ed..aa6d860
--- 1/reactos/include/ndk/rtltypes.h
--- 2/reactos/include/ndk/rtltypes.h
+++ b/reactos/include/ndk/rtltypes.h
@@@ -23,7 -23,7 +23,8 @@@ Author
  // Dependencies
  //
  #include <umtypes.h>
--#include <pstypes.h>
++#include <mmtypes.h>
++#include <ldrtypes.h>
  
  //
  // Maximum Atom Length
@@@ -760,6 -760,6 +761,7 @@@ typedef struct _RTL_CALLER_ALLOCATED_AC
  } 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,6 +771,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
  

diff --cc reactos/include/ndk/umtypes.h
index 7e02d76,7e02d76..95c1c8f
--- 1/reactos/include/ndk/umtypes.h
--- 2/reactos/include/ndk/umtypes.h
+++ b/reactos/include/ndk/umtypes.h
@@@ -151,6 -151,6 +151,8 @@@ typedef struct _CSTRIN
      CONST CHAR *Buffer;
  } CSTRING, *PCSTRING;
  
++#endif
++
  typedef struct _STRING32 {
      USHORT   Length;
      USHORT   MaximumLength;
@@@ -167,7 -167,7 +169,6 @@@ typedef struct _STRING64 
    UNICODE_STRING64, *PUNICODE_STRING64, 
    ANSI_STRING64, *PANSI_STRING64;
  
--#endif
  
  typedef struct _OBJECT_ATTRIBUTES
  {

diff --cc reactos/ntoskrnl/dbgk/dbgkutil.c
Simple merge

diff --cc reactos/ntoskrnl/ke/i386/usercall.c
index a07a055,a07a055..07ce444
--- 1/reactos/ntoskrnl/ke/i386/usercall.c
--- 2/reactos/ntoskrnl/ke/i386/usercall.c
+++ b/reactos/ntoskrnl/ke/i386/usercall.c
@@@ -169,7 -169,7 +169,7 @@@ KeUserModeCallback(IN ULONG RoutineInde
  
          /* Save the exception list */
          Teb = KeGetCurrentThread()->Teb;
--        ExceptionList = Teb->Tib.ExceptionList;
++        ExceptionList = Teb->NtTib.ExceptionList;
  
          /* Jump to user mode */
          *UserEsp = NewStack;
@@@ -177,7 -177,7 +177,7 @@@
          if (CallbackStatus != STATUS_CALLBACK_POP_STACK)
          {
              /* Only restore the exception list if we didn't crash in ring 3 */
--            Teb->Tib.ExceptionList = ExceptionList;
++            Teb->NtTib.ExceptionList = ExceptionList;
              CallbackStatus = STATUS_SUCCESS;
          }
          else

diff --cc reactos/ntoskrnl/mm/ARM3/procsup.c
Simple merge

diff --cc reactos/ntoskrnl/rtl/libsupp.c
Simple merge