phlib: Update RS2 headers

Author: dmex

ProcessHacker/syssccpu.c

@@ -861,8 +861,8 @@ BOOLEAN PhSipGetCpuFrequencyFromDistribution(
 
     for (i = 0; i < NumberOfProcessors; i++)
     {
-        stateDistribution = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)((PCHAR)CurrentPerformanceDistribution + CurrentPerformanceDistribution->Offsets[i]);
-        stateDifference = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)((PCHAR)differences + stateSize * i);
+        stateDistribution = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)PTR_ADD_OFFSET(CurrentPerformanceDistribution, CurrentPerformanceDistribution->Offsets[i]);
+        stateDifference = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)PTR_ADD_OFFSET(differences, stateSize * i);
 
         if (stateDistribution->StateCount != 2)
         {
@@ -878,17 +878,17 @@ BOOLEAN PhSipGetCpuFrequencyFromDistribution(
             }
             else
             {
-                hitcountOld = (PSYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8)((PCHAR)stateDistribution->States + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8) * j);
-                stateDifference->States[j].Hits.QuadPart = hitcountOld->Hits;
+                hitcountOld = (PSYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8)PTR_ADD_OFFSET(stateDistribution->States, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8) * j);
+                stateDifference->States[j].Hits = hitcountOld->Hits;
                 stateDifference->States[j].PercentFrequency = hitcountOld->PercentFrequency;
             }
         }
     }
 
     for (i = 0; i < NumberOfProcessors; i++)
     {
-        stateDistribution = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)((PCHAR)PreviousPerformanceDistribution + PreviousPerformanceDistribution->Offsets[i]);
-        stateDifference = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)((PCHAR)differences + stateSize * i);
+        stateDistribution = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)PTR_ADD_OFFSET(PreviousPerformanceDistribution, PreviousPerformanceDistribution->Offsets[i]);
+        stateDifference = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)PTR_ADD_OFFSET(differences, stateSize * i);
 
         if (stateDistribution->StateCount != 2)
         {
@@ -900,12 +900,12 @@ BOOLEAN PhSipGetCpuFrequencyFromDistribution(
         {
             if (WindowsVersion >= WINDOWS_8_1)
             {
-                stateDifference->States[j].Hits.QuadPart -= stateDistribution->States[j].Hits.QuadPart;
+                stateDifference->States[j].Hits -= stateDistribution->States[j].Hits;
             }
             else
             {
-                hitcountOld = (PSYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8)((PCHAR)stateDistribution->States + sizeof(SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8) * j);
-                stateDifference->States[j].Hits.QuadPart -= hitcountOld->Hits;
+                hitcountOld = (PSYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8)PTR_ADD_OFFSET(stateDistribution->States, sizeof(SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT_WIN8) * j);
+                stateDifference->States[j].Hits -= hitcountOld->Hits;
             }
         }
     }
@@ -917,12 +917,12 @@ BOOLEAN PhSipGetCpuFrequencyFromDistribution(
 
     for (i = 0; i < NumberOfProcessors; i++)
     {
-        stateDifference = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)((PCHAR)differences + stateSize * i);
+        stateDifference = (PSYSTEM_PROCESSOR_PERFORMANCE_STATE_DISTRIBUTION)PTR_ADD_OFFSET(differences, stateSize * i);
 
         for (j = 0; j < 2; j++)
         {
-            count += (ULONGLONG)stateDifference->States[j].Hits.QuadPart;
-            total += (ULONGLONG)stateDifference->States[j].Hits.QuadPart * stateDifference->States[j].PercentFrequency;
+            count += stateDifference->States[j].Hits;
+            total += stateDifference->States[j].Hits * stateDifference->States[j].PercentFrequency;
         }
     }
 

phnt/include/ntexapi.h

@@ -1626,8 +1626,13 @@ typedef struct _SYSTEM_LOCK_TABLE_ENTRY_INFO
     USHORT Reserved1;
     ULONG ExclusiveOwnerThreadId;
     ULONG ActiveCount;
+    USHORT CreatorBackTraceIndex;
+    HANDLE OwningThread;
+    LONG LockCount;
     ULONG ContentionCount;
     ULONG Reserved2[2];
+    ULONG EntryCount;
+    LONG RecursionCount;
     ULONG NumberOfSharedWaiters;
     ULONG NumberOfExclusiveWaiters;
 } SYSTEM_LOCK_TABLE_ENTRY_INFO, *PSYSTEM_LOCK_TABLE_ENTRY_INFO;
@@ -2084,6 +2089,7 @@ typedef struct _SYSTEM_BOOT_ENVIRONMENT_INFORMATION
 {
     GUID BootIdentifier;
     FIRMWARE_TYPE FirmwareType;
+    ULONGLONG BootFlags;
 } SYSTEM_BOOT_ENVIRONMENT_INFORMATION, *PSYSTEM_BOOT_ENVIRONMENT_INFORMATION;
 
 // private
@@ -2101,7 +2107,11 @@ typedef struct _SYSTEM_VERIFIER_INFORMATION_EX
     UNICODE_STRING PreviousBucketName;
     ULONG IrpCancelTimeoutMsec;
     ULONG VerifierExtensionEnabled;
+#ifdef _WIN64
     ULONG Reserved[1];
+#else
+    ULONG Reserved[3];
+#endif
 } SYSTEM_VERIFIER_INFORMATION_EX, *PSYSTEM_VERIFIER_INFORMATION_EX;
 
 // private
@@ -2119,7 +2129,7 @@ typedef struct _SYSTEM_SYSTEM_DISK_INFORMATION
 // private
 typedef struct _SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT
 {
-    LARGE_INTEGER Hits; // ULONG in WIN8
+    ULONGLONG Hits; // ULONG in WIN8
     UCHAR PercentFrequency;
 } SYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT, *PSYSTEM_PROCESSOR_PERFORMANCE_HITCOUNT;
 
@@ -2248,6 +2258,13 @@ typedef struct _SYSTEM_VERIFIER_COUNTERS_INFORMATION
     SIZE_T PeakPagesForMdlBytes;
     SIZE_T ContiguousMemoryBytes;
     SIZE_T PeakContiguousMemoryBytes;
+    ULONG ExecutePoolTypes; // REDSTONE2
+    ULONG ExecutePageProtections;
+    ULONG ExecutePageMappings;
+    ULONG ExecuteWriteSections;
+    ULONG SectionAlignmentFailures;
+    ULONG UnsupportedRelocs;
+    ULONG IATInExecutableSection;
 } SYSTEM_VERIFIER_COUNTERS_INFORMATION, *PSYSTEM_VERIFIER_COUNTERS_INFORMATION;
 
 // private

phnt/include/ntpsapi.h

@@ -671,7 +671,9 @@ typedef struct _PROCESS_COMMIT_RELEASE_INFORMATION
     struct
     {
         ULONG Eligible : 1;
-        ULONG Spare : 31;
+        ULONG ReleaseRepurposedMemResetCommit : 1;
+        ULONG ForceReleaseMemResetCommit : 1;
+        ULONG Spare : 29;
     };
     SIZE_T CommitDebt;
     SIZE_T CommittedMemResetSize;