Skip to content

Commit

Permalink
[SYNC] Sync phnt and update KNSoft.Precomp4C
Browse files Browse the repository at this point in the history
  • Loading branch information
RatinCN committed Sep 29, 2024
1 parent 993d3bb commit 237742e
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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引入库。
10 changes: 9 additions & 1 deletion Source/Include/KNSoft/NDK/NT/Ex/SysInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions Source/KNSoft.NDK/KNSoft.NDK.vcxproj
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion Source/KNSoft.NDK/KNSoft.NDK.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion Source/KNSoft.NDK/packages.config
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 237742e

Please sign in to comment.