Update HEAP_INFORMATION_CLASS, Fix RTL_USER_PROCESS_PARAMETERS32 types

Author: dmex

ProcessHacker/dbgcon.c

@@ -1558,7 +1558,7 @@ NTSTATUS PhpDebugConsoleThreadStart(
             debuggingInfo.StackTraceDepth = 32;
             debuggingInfo.HeapLeakEnumerationRoutine = PhpLeakEnumerationRoutine;
 
-            if (!NT_SUCCESS(RtlSetHeapInformation(NULL, HeapDebuggingInformation, &debuggingInfo, sizeof(HEAP_DEBUGGING_INFORMATION))))
+            if (!NT_SUCCESS(RtlSetHeapInformation(NULL, HeapSetDebuggingInformation, &debuggingInfo, sizeof(HEAP_DEBUGGING_INFORMATION))))
             {
                 wprintf(L"Unable to initialize heap debugging. Make sure that you are using Windows 7 or above.");
             }

phnt/include/ntrtl.h

@@ -3595,8 +3595,44 @@ RtlWalkHeap(
     _Inout_ PRTL_HEAP_WALK_ENTRY Entry
     );
 
-// rev
-#define HeapDebuggingInformation 0x80000002
+// HEAP_INFORMATION_CLASS
+#define HeapCompatibilityInformation 0x0 // q; s: ULONG
+#define HeapEnableTerminationOnCorruption 0x1 // q; s: NULL
+#define HeapExtendedInformation 0x2 // q; s: HEAP_EXTENDED_INFORMATION
+#define HeapOptimizeResources 0x3 // q; s: HEAP_OPTIMIZE_RESOURCES_INFORMATION 
+#define HeapTaggingInformation 0x4
+#define HeapStackDatabase 0x5
+#define HeapDetailedFailureInformation 0x80000001
+#define HeapSetDebuggingInformation 0x80000002 // q; s: HEAP_DEBUGGING_INFORMATION
+
+typedef struct _PROCESS_HEAP_INFORMATION
+{
+    ULONG_PTR ReserveSize;
+    ULONG_PTR CommitSize;
+    ULONG NumberOfHeaps;
+    ULONG_PTR FirstHeapInformationOffset;
+} PROCESS_HEAP_INFORMATION, *PPROCESS_HEAP_INFORMATION;
+
+typedef struct _HEAP_INFORMATION
+{
+    ULONG_PTR Address;
+    ULONG Mode;
+    ULONG_PTR ReserveSize;
+    ULONG_PTR CommitSize;
+    ULONG_PTR FirstRegionInformationOffset;
+    ULONG_PTR NextHeapInformationOffset;
+} HEAP_INFORMATION, *PHEAP_INFORMATION;
+
+typedef struct _HEAP_EXTENDED_INFORMATION
+{
+    HANDLE Process;
+    ULONG_PTR Heap;
+    ULONG Level;
+    PVOID CallbackRoutine;
+    PVOID CallbackContext;
+    PROCESS_HEAP_INFORMATION ProcessHeapInformation;
+    HEAP_INFORMATION HeapInformation;
+} HEAP_EXTENDED_INFORMATION, *PHEAP_EXTENDED_INFORMATION;
 
 // rev
 typedef NTSTATUS (NTAPI *PRTL_HEAP_LEAK_ENUMERATION_ROUTINE)(

phnt/include/ntwow64.h

@@ -219,8 +219,8 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS32
     UNICODE_STRING32 RuntimeData;
     RTL_DRIVE_LETTER_CURDIR32 CurrentDirectories[RTL_MAX_DRIVE_LETTERS];
 
-    ULONG EnvironmentSize;
-    ULONG EnvironmentVersion;
+    WOW64_POINTER(ULONG_PTR) EnvironmentSize;
+    WOW64_POINTER(ULONG_PTR) EnvironmentVersion;
     WOW64_POINTER(PVOID) PackageDependencyData;
     ULONG ProcessGroupId;
     ULONG LoaderThreads;