Merge branch 'master' into ObjManagerPlus

DartVanya · Sep 16, 2024 · d01f1be · d01f1be
2 parents 8dbe1a7 + 724d112
commit d01f1be
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 25 deletions.
diff --git a/SystemInformer/SystemInformer.vcxproj b/SystemInformer/SystemInformer.vcxproj
@@ -150,7 +150,6 @@
       <OmitFramePointers>true</OmitFramePointers>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>setupapi.lib;cfgmgr32.lib;aclui.lib;comctl32.lib;dnsapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;wbemuuid.lib;windowscodecs.lib;winhttp.lib;winsta.lib;kphlib_um.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -198,7 +197,6 @@
       <OmitFramePointers>true</OmitFramePointers>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>setupapi.lib;cfgmgr32.lib;aclui.lib;comctl32.lib;dnsapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;wbemuuid.lib;windowscodecs.lib;winhttp.lib;winsta.lib;kphlib_um.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -285,7 +283,6 @@
       <CallingConvention>StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <SDLCheck>true</SDLCheck>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <IntelJCCErratum>true</IntelJCCErratum>
@@ -299,7 +296,6 @@
       <BuildStlModules>false</BuildStlModules>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>setupapi.lib;cfgmgr32.lib;aclui.lib;comctl32.lib;dnsapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;wbemuuid.lib;windowscodecs.lib;winhttp.lib;winsta.lib;kphlib_um.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -357,7 +353,6 @@
       <OmitFramePointers>true</OmitFramePointers>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Link>
       <AdditionalDependencies>setupapi.lib;cfgmgr32.lib;aclui.lib;comctl32.lib;dnsapi.lib;noarg.obj;noenv.obj;ntdll.lib;phlib.lib;userenv.lib;wbemuuid.lib;windowscodecs.lib;winhttp.lib;winsta.lib;kphlib_um.lib;%(AdditionalDependencies)</AdditionalDependencies>

diff --git a/kphlib/kphdyn.c b/kphlib/kphdyn.c
@@ -79,7 +79,7 @@ CONST BYTE KphDynConfig[] =
     0x79, 0x20, 0x8c, 0xcb, 0xa3, 0xe3, 0x53, 0x4e,
     0x8b, 0x2e, 0xc1, 0x9c, 0x0a, 0x53, 0x1a, 0x14,
     0x65, 0x71, 0xc4, 0x66, 0x4a, 0x82, 0x8a, 0xf3,
-    0x67, 0x50, 0xfa, 0xb7, 0x3a, 0x25, 0x61, 0xce,
+    0x67, 0x50, 0xfa, 0xb7, 0x3a, 0x25, 0x61, 0xcf,
     0x06, 0x00, 0x00, 0x00, 0x00, 0x64, 0x86, 0x1a,
     0x3c, 0x9f, 0x55, 0x00, 0x20, 0x85, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x86, 0x7c,
@@ -494,6 +494,8 @@ CONST BYTE KphDynConfig[] =
     0x37, 0x7a, 0x66, 0x00, 0xf0, 0x81, 0x00, 0xba,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x86, 0x9d,
     0x6f, 0xac, 0x66, 0x00, 0xf0, 0x81, 0x00, 0xba,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x86, 0x43,
+    0xd3, 0xba, 0x66, 0x00, 0xf0, 0x81, 0x00, 0xba,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x86, 0x4c,
     0xba, 0xcc, 0x58, 0x00, 0x90, 0x88, 0x00, 0x7c,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x64, 0x86, 0x7d,

diff --git a/kphlib/kphdyn.xml b/kphlib/kphdyn.xml
@@ -214,6 +214,7 @@ THIS IS AN AUTOGENERATED FILE, DO NOT MODIFY
     <data arch="amd64" version="10.0.14393.7070" file="ntoskrnl.exe" hash="b813d5aaad910281eb33d25bdb6423789f48b5fc2b35bac8e2418a468580d94f" timestamp="0x66626a96" size="0x00820000">10</data>
     <data arch="amd64" version="10.0.14393.7155" file="ntoskrnl.exe" hash="dfd0308f3f936b5420933cde7fb5ffb3e9c0fabe507fae48c980457d8d32408c" timestamp="0x667a37ec" size="0x0081f000">10</data>
     <data arch="amd64" version="10.0.14393.7254" file="ntoskrnl.exe" hash="0552cfc3a14f5f1da40df3e0279e18f9a2ac9ae4805f6b4b939125c6700e13ee" timestamp="0x66ac6f9d" size="0x0081f000">10</data>
+    <data arch="amd64" version="10.0.14393.7330" file="ntoskrnl.exe" hash="47b594c9cff6a9988dfaee89420bb8dc157258605bde21319169b5c3a3cae055" timestamp="0x66bad343" size="0x0081f000">10</data>
     <data arch="amd64" version="10.0.15063.0" file="ntoskrnl.exe" hash="8373267ef4dceb7999ccfa9c3c47e75c2623f5aa16a5e46baf2a394faaf5d77f" timestamp="0x58ccba4c" size="0x00889000">2</data>
     <data arch="amd64" version="10.0.15063.13" file="ntoskrnl.exe" hash="fc859fabda7455b5057721a9872e77d348520a9693e3164b2826c026aff55f35" timestamp="0x58dc8f7d" size="0x00889000">2</data>
     <data arch="amd64" version="10.0.15063.296" file="ntoskrnl.exe" hash="3fd464b08e01baf92e91b17d4003d638f5ff52b8d9be5fe6db7277c9c616e8ca" timestamp="0x5902843e" size="0x00889000">2</data>

diff --git a/kphlib/kphlib_um.vcxproj b/kphlib/kphlib_um.vcxproj
@@ -147,7 +147,6 @@
       <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <BuildStlModules>false</BuildStlModules>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
@@ -177,7 +176,6 @@
       <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <BuildStlModules>false</BuildStlModules>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
@@ -234,7 +232,6 @@
       <CallingConvention>StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <IntelJCCErratum>true</IntelJCCErratum>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -274,7 +271,6 @@
       <LanguageStandard_C Condition="'$(MSBuildVersion)' &gt;= '17.11'">stdclatest</LanguageStandard_C>
       <AdditionalOptions>/utf-8 /d1nodatetime /guard:xfg %(AdditionalOptions)</AdditionalOptions>
       <BuildStlModules>false</BuildStlModules>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <GuardEHContMetadata>true</GuardEHContMetadata>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>

diff --git a/phlib/phlib.vcxproj b/phlib/phlib.vcxproj
@@ -132,7 +132,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <ConformanceMode>true</ConformanceMode>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <TargetMachine>MachineX86</TargetMachine>
@@ -164,7 +163,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <ConformanceMode>true</ConformanceMode>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <GuardEHContMetadata>true</GuardEHContMetadata>
     </ClCompile>
     <Lib>
@@ -218,7 +216,6 @@
       <CallingConvention>StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <IntelJCCErratum>true</IntelJCCErratum>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -266,7 +263,6 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
       <ConformanceMode>true</ConformanceMode>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
     </ClCompile>
     <Lib>
       <TargetMachine>MachineX64</TargetMachine>

diff --git a/plugins/Plugins.props b/plugins/Plugins.props
@@ -105,7 +105,6 @@
     <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
         <ClCompile>
             <CallingConvention>StdCall</CallingConvention>
-            <EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
         </ClCompile>
         <Link>
             <AdditionalLibraryDirectories>$(SolutionDir)..\sdk\lib\i386;$(SolutionDir)..\tools\thirdparty\bin\$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@@ -118,7 +117,6 @@
     <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
         <ClCompile>
             <CallingConvention>StdCall</CallingConvention>
-            <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
         </ClCompile>
         <Link>
             <AdditionalLibraryDirectories>$(SolutionDir)..\sdk\lib\amd64;$(SolutionDir)..\tools\thirdparty\bin\$(Configuration)$(PlatformArchitecture);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

diff --git a/tools/CustomCmdTool/CustomCmdTool.vcxproj b/tools/CustomCmdTool/CustomCmdTool.vcxproj
@@ -153,7 +153,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>

diff --git a/tools/CustomSetupTool/CustomSetupTool.vcxproj b/tools/CustomSetupTool/CustomSetupTool.vcxproj
@@ -99,7 +99,6 @@
       <SDLCheck>true</SDLCheck>
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <StringPooling>true</StringPooling>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>

diff --git a/tools/CustomSignTool/CustomSignTool.vcxproj b/tools/CustomSignTool/CustomSignTool.vcxproj
@@ -165,7 +165,6 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CallingConvention>StdCall</CallingConvention>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <TreatWarningAsError>true</TreatWarningAsError>
       <LanguageStandard>stdcpplatest</LanguageStandard>
       <LanguageStandard_C Condition="'$(MSBuildVersion)' &lt; '17.11'">stdc17</LanguageStandard_C>

diff --git a/tools/peview/peview.vcxproj b/tools/peview/peview.vcxproj
@@ -252,7 +252,6 @@
       <WarningLevel>Level3</WarningLevel>
       <CallingConvention>StdCall</CallingConvention>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <TreatWarningAsError>true</TreatWarningAsError>
       <StringPooling>true</StringPooling>
       <ControlFlowGuard>Guard</ControlFlowGuard>

diff --git a/tools/tests/phlib-test/phlib-test.vcxproj b/tools/tests/phlib-test/phlib-test.vcxproj
@@ -196,7 +196,6 @@
       <CallingConvention>StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <StringPooling>true</StringPooling>
     </ClCompile>
     <Link>

diff --git a/tools/thirdparty/thirdparty.vcxproj b/tools/thirdparty/thirdparty.vcxproj
@@ -127,7 +127,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <OmitFramePointers>true</OmitFramePointers>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Lib>
@@ -156,7 +155,6 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <OmitFramePointers>true</OmitFramePointers>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <GuardEHContMetadata>true</GuardEHContMetadata>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
@@ -203,7 +201,6 @@
       <CallingConvention>StdCall</CallingConvention>
       <TreatWarningAsError>true</TreatWarningAsError>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <ControlFlowGuard>Guard</ControlFlowGuard>
       <IntelJCCErratum>true</IntelJCCErratum>
       <LanguageStandard>stdcpplatest</LanguageStandard>
@@ -249,7 +246,6 @@
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
       <UseStandardPreprocessor>true</UseStandardPreprocessor>
     </ClCompile>
     <Lib>