Skip to content

Commit f835fc8

Browse files
committed
fix safe attach option on 32 bit
1 parent bfec722 commit f835fc8

File tree

1 file changed

+41
-14
lines changed

1 file changed

+41
-14
lines changed

TitanEngine/ntdll.h

+41-14
Original file line numberDiff line numberDiff line change
@@ -2528,6 +2528,15 @@ typedef struct _PEB_LDR_DATA
25282528
HANDLE ShutdownThreadId;
25292529
} PEB_LDR_DATA, *PPEB_LDR_DATA;
25302530

2531+
typedef struct _ACTIVATION_CONTEXT_STACK
2532+
{
2533+
struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME* ActiveFrame;
2534+
LIST_ENTRY FrameListCache;
2535+
ULONG Flags;
2536+
ULONG NextCookieSequenceNumber;
2537+
ULONG StackId;
2538+
} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK;
2539+
25312540
typedef struct _PEB
25322541
{
25332542
BOOLEAN InheritedAddressSpace;
@@ -2585,12 +2594,14 @@ typedef struct _PEB
25852594
ULONG TlsExpansionCounter;
25862595
PVOID TlsBitmap;
25872596
ULONG TlsBitmapBits[2];
2597+
25882598
PVOID ReadOnlySharedMemoryBase;
2589-
PVOID HotpatchInformation;
2599+
PVOID SharedData; // HotpatchInformation
25902600
PVOID* ReadOnlyStaticServerData;
2591-
PVOID AnsiCodePageData;
2592-
PVOID OemCodePageData;
2593-
PVOID UnicodeCaseTableData;
2601+
2602+
PVOID AnsiCodePageData; // PCPTABLEINFO
2603+
PVOID OemCodePageData; // PCPTABLEINFO
2604+
PVOID UnicodeCaseTableData; // PNLSTABLEINFO
25942605

25952606
ULONG NumberOfProcessors;
25962607
ULONG NtGlobalFlag;
@@ -2603,7 +2614,7 @@ typedef struct _PEB
26032614

26042615
ULONG NumberOfHeaps;
26052616
ULONG MaximumNumberOfHeaps;
2606-
PVOID* ProcessHeaps;
2617+
PVOID* ProcessHeaps; // PHEAP
26072618

26082619
PVOID GdiSharedHandleTable;
26092620
PVOID ProcessStarterHelper;
@@ -2631,14 +2642,14 @@ typedef struct _PEB
26312642
ULARGE_INTEGER AppCompatFlags;
26322643
ULARGE_INTEGER AppCompatFlagsUser;
26332644
PVOID pShimData;
2634-
PVOID AppCompatInfo;
2645+
PVOID AppCompatInfo; // APPCOMPAT_EXE_DATA
26352646

26362647
UNICODE_STRING CSDVersion;
26372648

2638-
PVOID ActivationContextData;
2639-
PVOID ProcessAssemblyStorageMap;
2640-
PVOID SystemDefaultActivationContextData;
2641-
PVOID SystemAssemblyStorageMap;
2649+
PVOID ActivationContextData; // ACTIVATION_CONTEXT_DATA
2650+
PVOID ProcessAssemblyStorageMap; // ASSEMBLY_STORAGE_MAP
2651+
PVOID SystemDefaultActivationContextData; // ACTIVATION_CONTEXT_DATA
2652+
PVOID SystemAssemblyStorageMap; // ASSEMBLY_STORAGE_MAP
26422653

26432654
SIZE_T MinimumStackCommit;
26442655

@@ -2650,7 +2661,7 @@ typedef struct _PEB
26502661

26512662
PVOID WerRegistrationData;
26522663
PVOID WerShipAssertPtr;
2653-
PVOID pContextData;
2664+
PVOID pUnused; // pContextData
26542665
PVOID pImageHeaderHash;
26552666
union
26562667
{
@@ -2667,6 +2678,8 @@ typedef struct _PEB
26672678
PVOID TppWorkerpListLock;
26682679
LIST_ENTRY TppWorkerpList;
26692680
PVOID WaitOnAddressHashTable[128];
2681+
PVOID TelemetryCoverageHeader; // REDSTONE3
2682+
ULONG CloudFileFlags;
26702683
} PEB, *PPEB;
26712684

26722685
#define GDI_BATCH_BUFFER_SIZE 310
@@ -2711,17 +2724,31 @@ typedef struct _TEB
27112724
LCID CurrentLocale;
27122725
ULONG FpSoftwareStatusRegister;
27132726
PVOID ReservedForDebuggerInstrumentation[16];
2714-
PVOID SystemReserved1[37];
2727+
#ifdef _WIN64
2728+
PVOID SystemReserved1[30];
2729+
#else
2730+
PVOID SystemReserved1[26];
2731+
#endif
2732+
CHAR PlaceholderCompatibilityMode;
2733+
CHAR PlaceholderReserved[11];
2734+
ULONG ProxiedProcessId;
2735+
ACTIVATION_CONTEXT_STACK ActivationStack;
2736+
27152737
UCHAR WorkingOnBehalfTicket[8];
27162738
NTSTATUS ExceptionCode;
27172739

2718-
PVOID ActivationContextStackPointer;
2740+
PACTIVATION_CONTEXT_STACK ActivationContextStackPointer;
27192741
ULONG_PTR InstrumentationCallbackSp;
27202742
ULONG_PTR InstrumentationCallbackPreviousPc;
27212743
ULONG_PTR InstrumentationCallbackPreviousSp;
2744+
#ifdef _WIN64
27222745
ULONG TxFsContext;
2723-
2746+
#endif
27242747
BOOLEAN InstrumentationCallbackDisabled;
2748+
#ifndef _WIN64
2749+
UCHAR SpareBytes[23];
2750+
ULONG TxFsContext;
2751+
#endif
27252752
GDI_TEB_BATCH GdiTebBatch;
27262753
CLIENT_ID RealClientId;
27272754
HANDLE GdiCachedProcessHandle;

0 commit comments

Comments
 (0)