From 237742e8e52ba304e6d1847d037b458364982d00 Mon Sep 17 00:00:00 2001
From: Ratin Gao <ratin@knsoft.org>
Date: Mon, 30 Sep 2024 03:52:12 +0800
Subject: [PATCH] [SYNC] Sync phnt and update KNSoft.Precomp4C

---
 README.md                                    |  2 +-
 README.zh-CN.md                              |  2 +-
 Source/Include/KNSoft/NDK/NT/Ex/SysInfo.h    | 10 +++++++++-
 Source/KNSoft.NDK/KNSoft.NDK.vcxproj         |  8 ++++----
 Source/KNSoft.NDK/KNSoft.NDK.vcxproj.filters |  2 +-
 Source/KNSoft.NDK/packages.config            |  2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index bcf41d6..a1d1da8 100644
--- a/README.md
+++ b/README.md
@@ -84,6 +84,6 @@ The content from the following public sources were lawfully used:
 - Windows Internals
 
 And public projects:
-- phnt (from [winsiderss/systeminformer](https://github.com/winsiderss/systeminformer), [commit 6a372fc5](https://github.com/winsiderss/systeminformer/commit/6a372fc5167e3c27230dee84644817c5e54ef5ed)) - [MIT](https://github.com/winsiderss/phnt/blob/master/LICENSE)
+- phnt (from [winsiderss/systeminformer](https://github.com/winsiderss/systeminformer), [commit 6a626538](https://github.com/winsiderss/systeminformer/commit/6a6265382ad6d4b12c362555df6a3ae4843c18f7)) - [MIT](https://github.com/winsiderss/phnt/blob/master/LICENSE)
 
 [KNSoft.NDK](https://github.com/KNSoft/KNSoft.NDK) also uses [KNSoft/Precomp4C](https://github.com/KNSoft/Precomp4C) to generate DLL import libraries.
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 86c2b06..bea92ed 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -84,6 +84,6 @@ NuGet包[KNSoft.NDK](https://www.nuget.org/packages/KNSoft.NDK)包含所有头
 - Windows Internals
 
 和公开项目：
-- phnt（来自[winsiderss/systeminformer](https://github.com/winsiderss/systeminformer)，[提交 6a372fc5](https://github.com/winsiderss/systeminformer/commit/6a372fc5167e3c27230dee84644817c5e54ef5ed)）- [MIT](https://github.com/winsiderss/phnt/blob/master/LICENSE)
+- phnt（来自[winsiderss/systeminformer](https://github.com/winsiderss/systeminformer)，[提交 6a626538](https://github.com/winsiderss/systeminformer/commit/6a6265382ad6d4b12c362555df6a3ae4843c18f7)）- [MIT](https://github.com/winsiderss/phnt/blob/master/LICENSE)
 
 [KNSoft.NDK](https://github.com/KNSoft/KNSoft.NDK)也使用了[KNSoft/Precomp4C](https://github.com/KNSoft/Precomp4C)来生成DLL引入库。
diff --git a/Source/Include/KNSoft/NDK/NT/Ex/SysInfo.h b/Source/Include/KNSoft/NDK/NT/Ex/SysInfo.h
index c06bef1..dbc9bb3 100644
--- a/Source/Include/KNSoft/NDK/NT/Ex/SysInfo.h
+++ b/Source/Include/KNSoft/NDK/NT/Ex/SysInfo.h
@@ -252,7 +252,7 @@ typedef enum _SYSTEM_INFORMATION_CLASS
     SystemPointerAuthInformation, // SYSTEM_POINTER_AUTH_INFORMATION
     SystemSecureKernelDebuggerInformation,
     SystemOriginalImageFeatureInformation, // q: in: SYSTEM_ORIGINAL_IMAGE_FEATURE_INFORMATION_INPUT, out: SYSTEM_ORIGINAL_IMAGE_FEATURE_INFORMATION_OUTPUT // NtQuerySystemInformationEx
-    SystemMemoryNumaInformation, // SYSTEM_MEMORY_NUMA_INFORMATION_INPUT, SYSTEM_MEMORY_NUMA_INFORMATION_OUTPUT 
+    SystemMemoryNumaInformation, // SYSTEM_MEMORY_NUMA_INFORMATION_INPUT, SYSTEM_MEMORY_NUMA_INFORMATION_OUTPUT
     SystemMemoryNumaPerformanceInformation, // SYSTEM_MEMORY_NUMA_PERFORMANCE_INFORMATION_INPUTSYSTEM_MEMORY_NUMA_PERFORMANCE_INFORMATION_INPUT, SYSTEM_MEMORY_NUMA_PERFORMANCE_INFORMATION_OUTPUT // since 24H2 // 240
     SystemCodeIntegritySignedPoliciesFullInformation,
     SystemSecureSecretsInformation,
@@ -2475,6 +2475,14 @@ typedef struct _SYSTEM_HYPERVISOR_DETAIL_INFORMATION
 // private
 typedef struct _SYSTEM_PROCESSOR_CYCLE_STATS_INFORMATION
 {
+    //
+    // First index is bucket (see: PoGetFrequencyBucket) selected based on latest frequency percent
+    // using _KPRCB.PowerState.FrequencyBucketThresholds.
+    //
+    // Second index is _KPRCB.PowerState.ArchitecturalEfficiencyClass, accounting for architecture
+    // dependent KeHeteroSystem and using _KPRCB.PowerState.EarlyBootArchitecturalEfficiencyClass
+    // instead, when appropriate.
+    //
     ULONGLONG Cycles[4][2];
 } SYSTEM_PROCESSOR_CYCLE_STATS_INFORMATION, *PSYSTEM_PROCESSOR_CYCLE_STATS_INFORMATION;
 
diff --git a/Source/KNSoft.NDK/KNSoft.NDK.vcxproj b/Source/KNSoft.NDK/KNSoft.NDK.vcxproj
index d2c4202..39989fa 100644
--- a/Source/KNSoft.NDK/KNSoft.NDK.vcxproj
+++ b/Source/KNSoft.NDK/KNSoft.NDK.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.props" Condition="Exists('..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.props')" />
+  <Import Project="..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.props" Condition="Exists('..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Release|ARM64">
       <Configuration>Release</Configuration>
@@ -258,13 +258,13 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.targets" Condition="Exists('..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.targets')" />
+    <Import Project="..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.targets" Condition="Exists('..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.props'))" />
-    <Error Condition="!Exists('..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.Precomp4C.1.0.9-alpha\build\KNSoft.Precomp4C.targets'))" />
+    <Error Condition="!Exists('..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.props'))" />
+    <Error Condition="!Exists('..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\KNSoft.Precomp4C.1.0.11-alpha\build\KNSoft.Precomp4C.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/Source/KNSoft.NDK/KNSoft.NDK.vcxproj.filters b/Source/KNSoft.NDK/KNSoft.NDK.vcxproj.filters
index 82a83ca..3a517aa 100644
--- a/Source/KNSoft.NDK/KNSoft.NDK.vcxproj.filters
+++ b/Source/KNSoft.NDK/KNSoft.NDK.vcxproj.filters
@@ -450,10 +450,10 @@
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="..\Include\KNSoft\NDK\Package\UnitTest.inl">
       <Filter>Package</Filter>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Precomp4C_LibCreate Include="WinAPI\KNSoft.NDK.Ntdll.Hash.xml">
diff --git a/Source/KNSoft.NDK/packages.config b/Source/KNSoft.NDK/packages.config
index 196bfb0..f959f22 100644
--- a/Source/KNSoft.NDK/packages.config
+++ b/Source/KNSoft.NDK/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="KNSoft.Precomp4C" version="1.0.9-alpha" targetFramework="native" />
+  <package id="KNSoft.Precomp4C" version="1.0.11-alpha" targetFramework="native" />
 </packages>
\ No newline at end of file