Fix PsAttributes winsiderss#147, Fix spacing

Author: dmex

phnt/include/ntpsapi.h

@@ -1222,15 +1222,15 @@ typedef enum _PS_ATTRIBUTE_NUM
     PsAttributeIdealProcessor, // in PPROCESSOR_NUMBER
     PsAttributeUmsThread, // ? in PUMS_CREATE_THREAD_ATTRIBUTES
     PsAttributeMitigationOptions, // in UCHAR
-    PsAttributeProtectionLevel,
+    PsAttributeProtectionLevel, // in ULONG
     PsAttributeSecureProcess, // since THRESHOLD
     PsAttributeJobList,
     PsAttributeChildProcessPolicy, // since THRESHOLD2
     PsAttributeAllApplicationPackagesPolicy, // since REDSTONE
     PsAttributeWin32kFilter,
     PsAttributeSafeOpenPromptOriginClaim,
-    PsAttributeBnoIsolation,
-    PsAttributeDesktopAppPolicy,
+    PsAttributeBnoIsolation, // PS_BNO_ISOLATION_PARAMETERS
+    PsAttributeDesktopAppPolicy, // in ULONG
     PsAttributeMax
 } PS_ATTRIBUTE_NUM;
 
@@ -1243,11 +1243,11 @@ typedef enum _PS_ATTRIBUTE_NUM
     ((Additive) ? PS_ATTRIBUTE_ADDITIVE : 0))
 
 #define PS_ATTRIBUTE_PARENT_PROCESS \
-    PsAttributeValue(PsAttributeParentProcess, FALSE, TRUE, FALSE)
+    PsAttributeValue(PsAttributeParentProcess, FALSE, TRUE, TRUE)
 #define PS_ATTRIBUTE_DEBUG_PORT \
-    PsAttributeValue(PsAttributeDebugPort, FALSE, TRUE, FALSE)
+    PsAttributeValue(PsAttributeDebugPort, FALSE, TRUE, TRUE)
 #define PS_ATTRIBUTE_TOKEN \
-    PsAttributeValue(PsAttributeToken, FALSE, TRUE, FALSE)
+    PsAttributeValue(PsAttributeToken, FALSE, TRUE, TRUE)
 #define PS_ATTRIBUTE_CLIENT_ID \
     PsAttributeValue(PsAttributeClientId, TRUE, FALSE, FALSE)
 #define PS_ATTRIBUTE_TEB_ADDRESS \
@@ -1274,6 +1274,8 @@ typedef enum _PS_ATTRIBUTE_NUM
     PsAttributeValue(PsAttributeIdealProcessor, TRUE, TRUE, FALSE)
 #define PS_ATTRIBUTE_MITIGATION_OPTIONS \
     PsAttributeValue(PsAttributeMitigationOptions, FALSE, TRUE, TRUE)
+#define PS_ATTRIBUTE_PROTECTION_LEVEL \
+    PsAttributeValue(PsAttributeProtectionLevel, FALSE, TRUE, FALSE)
 
 // end_rev
 
@@ -1331,18 +1333,14 @@ typedef struct _PS_STD_HANDLE_INFO
     ULONG StdHandleSubsystemType;
 } PS_STD_HANDLE_INFO, *PPS_STD_HANDLE_INFO;
 
-// windows-internals-book:"Chapter 5"
-typedef enum _PS_CREATE_STATE
+// private
+typedef struct _PS_BNO_ISOLATION_PARAMETERS
 {
-    PsCreateInitialState,
-    PsCreateFailOnFileOpen,
-    PsCreateFailOnSectionCreate,
-    PsCreateFailExeFormat,
-    PsCreateFailMachineMismatch,
-    PsCreateFailExeName, // Debugger specified
-    PsCreateSuccess,
-    PsCreateMaximumStates
-} PS_CREATE_STATE;
+    UNICODE_STRING IsolationPrefix;
+    ULONG HandleCount;
+    PVOID *Handles;
+    BOOLEAN IsolationEnabled;
+} PS_BNO_ISOLATION_PARAMETERS, *PPS_BNO_ISOLATION_PARAMETERS;
 
 // private
 typedef enum _PS_MITIGATION_OPTION
@@ -1369,6 +1367,19 @@ typedef enum _PS_MITIGATION_OPTION
     PS_MITIGATION_OPTION_RESTRICT_SET_THREAD_CONTEXT
 } PS_MITIGATION_OPTION;
 
+// windows-internals-book:"Chapter 5"
+typedef enum _PS_CREATE_STATE
+{
+    PsCreateInitialState,
+    PsCreateFailOnFileOpen,
+    PsCreateFailOnSectionCreate,
+    PsCreateFailExeFormat,
+    PsCreateFailMachineMismatch,
+    PsCreateFailExeName, // Debugger specified
+    PsCreateSuccess,
+    PsCreateMaximumStates
+} PS_CREATE_STATE;
+
 typedef struct _PS_CREATE_INFO
 {
     SIZE_T Size;

phnt/include/ntrtl.h

@@ -323,13 +323,13 @@ typedef struct _RTL_SPLAY_LINKS
 } RTL_SPLAY_LINKS, *PRTL_SPLAY_LINKS;
 
 #define RtlInitializeSplayLinks(Links) \
-    { \
-        PRTL_SPLAY_LINKS _SplayLinks; \
-        _SplayLinks = (PRTL_SPLAY_LINKS)(Links); \
-        _SplayLinks->Parent = _SplayLinks; \
-        _SplayLinks->LeftChild = NULL; \
-        _SplayLinks->RightChild = NULL; \
-    }
+{ \
+    PRTL_SPLAY_LINKS _SplayLinks; \
+    _SplayLinks = (PRTL_SPLAY_LINKS)(Links); \
+    _SplayLinks->Parent = _SplayLinks; \
+    _SplayLinks->LeftChild = NULL; \
+    _SplayLinks->RightChild = NULL; \
+}
 
 #define RtlParent(Links) ((PRTL_SPLAY_LINKS)(Links)->Parent)
 #define RtlLeftChild(Links) ((PRTL_SPLAY_LINKS)(Links)->LeftChild)
@@ -339,24 +339,24 @@ typedef struct _RTL_SPLAY_LINKS
 #define RtlIsRightChild(Links) ((RtlRightChild(RtlParent(Links)) == (PRTL_SPLAY_LINKS)(Links)))
 
 #define RtlInsertAsLeftChild(ParentLinks, ChildLinks) \
-    { \
-        PRTL_SPLAY_LINKS _SplayParent; \
-        PRTL_SPLAY_LINKS _SplayChild; \
-        _SplayParent = (PRTL_SPLAY_LINKS)(ParentLinks); \
-        _SplayChild = (PRTL_SPLAY_LINKS)(ChildLinks); \
-        _SplayParent->LeftChild = _SplayChild; \
-        _SplayChild->Parent = _SplayParent; \
-    }
+{ \
+    PRTL_SPLAY_LINKS _SplayParent; \
+    PRTL_SPLAY_LINKS _SplayChild; \
+    _SplayParent = (PRTL_SPLAY_LINKS)(ParentLinks); \
+    _SplayChild = (PRTL_SPLAY_LINKS)(ChildLinks); \
+    _SplayParent->LeftChild = _SplayChild; \
+    _SplayChild->Parent = _SplayParent; \
+}
 
 #define RtlInsertAsRightChild(ParentLinks, ChildLinks) \
-    { \
-        PRTL_SPLAY_LINKS _SplayParent; \
-        PRTL_SPLAY_LINKS _SplayChild; \
-        _SplayParent = (PRTL_SPLAY_LINKS)(ParentLinks); \
-        _SplayChild = (PRTL_SPLAY_LINKS)(ChildLinks); \
-        _SplayParent->RightChild = _SplayChild; \
-        _SplayChild->Parent = _SplayParent; \
-    }
+{ \
+    PRTL_SPLAY_LINKS _SplayParent; \
+    PRTL_SPLAY_LINKS _SplayChild; \
+    _SplayParent = (PRTL_SPLAY_LINKS)(ParentLinks); \
+    _SplayChild = (PRTL_SPLAY_LINKS)(ChildLinks); \
+    _SplayParent->RightChild = _SplayChild; \
+    _SplayChild->Parent = _SplayParent; \
+}
 
 NTSYSAPI
 PRTL_SPLAY_LINKS
@@ -954,11 +954,11 @@ typedef struct _RTL_RESOURCE
     RTL_CRITICAL_SECTION CriticalSection;
 
     HANDLE SharedSemaphore;
-    ULONG NumberOfWaitingShared;
+    volatile ULONG NumberOfWaitingShared;
     HANDLE ExclusiveSemaphore;
-    ULONG NumberOfWaitingExclusive;
+    volatile ULONG NumberOfWaitingExclusive;
 
-    LONG NumberOfActive; // negative: exclusive acquire; zero: not acquired; positive: shared acquire(s)
+    volatile LONG NumberOfActive; // negative: exclusive acquire; zero: not acquired; positive: shared acquire(s)
     HANDLE ExclusiveOwnerThread;
 
     ULONG Flags; // RTL_RESOURCE_FLAG_*
@@ -2407,8 +2407,8 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS
     UNICODE_STRING RuntimeData;
     RTL_DRIVE_LETTER_CURDIR CurrentDirectories[RTL_MAX_DRIVE_LETTERS];
 
-    ULONG EnvironmentSize;
-    ULONG EnvironmentVersion;
+    ULONG_PTR EnvironmentSize;
+    ULONG_PTR EnvironmentVersion;
     PVOID PackageDependencyData;
     ULONG ProcessGroupId;
     ULONG LoaderThreads;