Skip to content

Commit e97d8ac

Browse files
benyamin-codezbenyamin-codez
committed
[vioscsi] Raise NTDDI version
Background: The NTDDI_VERSION has not historically been set in the vioscsi.vcxproj file as PreprocessorDefinitions. Both the Win10 Release and Win11 Release targets are presently compiling with NTDDI_VERSION=NTDDI_WINTHRESHOLD, which is equivalent to Windows 10, version 1507, build 10240, dev codename Threshold 1. This PR refactors vioscsi.vcxproj to specify: 1. The preferred NTDDI_VERSION as PreprocessorDefinitions, where we are using (a) NTDDI_WINTHRESHOLD (equiv. Windows 10, version 1507, build 10240, dev codename Threshold 1) for Win10 Release targets; and (b) NTDDI_WIN10_CO (equiv. Windows 10/11, version 21H2, build 19044/22000 dev codename Cobalt) for Win11 Release targets. Signed-off-by: benyamin-codez <115509179+benyamin-codez@users.noreply.github.com>
1 parent 2bcf04f commit e97d8ac

1 file changed

Lines changed: 37 additions & 12 deletions

File tree

‎vioscsi/vioscsi.vcxproj‎

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@
3333
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
3434
<Configuration>Win10 Release</Configuration>
3535
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
36+
<DisableTracing Condition="'$(FORCE_RUN_UNCHECKED)' != ''">true</DisableTracing>
37+
<LimitPathsWPP Condition="'$(RUN_WPP_ALL_PATHS)' == ''">WPPColdPathOnly</LimitPathsWPP>
38+
<UseDebugTracing Condition="'$(FORCE_RUN_DEBUG)' != ''">true</UseDebugTracing>
3639
<SignMode>Off</SignMode>
3740
</PropertyGroup>
3841
<PropertyGroup Label="Globals">
@@ -127,6 +130,22 @@
127130
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128131
</ResourceCompile>
129132
</ItemDefinitionGroup>
133+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Win10 Release'">
134+
<ClCompile>
135+
<PreprocessorDefinitions Condition="'$(DisableTracing)'=='true'">%(PreprocessorDefinitions);RUN_UNCHECKED=1</PreprocessorDefinitions>
136+
<PreprocessorDefinitions Condition="'$(LimitPathsWPP)'=='WPPColdPathOnly'">%(PreprocessorDefinitions);RUN_COLD_PATH_ONLY=1</PreprocessorDefinitions>
137+
<PreprocessorDefinitions Condition="'$(UseDebugTracing)'!='true'">%(PreprocessorDefinitions);EVENT_TRACING=1</PreprocessorDefinitions>
138+
<PreprocessorDefinitions>%(PreprocessorDefinitions);NTDDI_VERSION=NTDDI_WINTHRESHOLD</PreprocessorDefinitions>
139+
</ClCompile>
140+
</ItemDefinitionGroup>
141+
<ItemDefinitionGroup Condition="'$(Configuration)'=='Win11 Release'">
142+
<ClCompile>
143+
<PreprocessorDefinitions Condition="'$(DisableTracing)'=='true'">%(PreprocessorDefinitions);RUN_UNCHECKED=1</PreprocessorDefinitions>
144+
<PreprocessorDefinitions Condition="'$(LimitPathsWPP)'=='WPPColdPathOnly'">%(PreprocessorDefinitions);RUN_COLD_PATH_ONLY=1</PreprocessorDefinitions>
145+
<PreprocessorDefinitions Condition="'$(UseDebugTracing)'!='true'">%(PreprocessorDefinitions);EVENT_TRACING=1</PreprocessorDefinitions>
146+
<PreprocessorDefinitions>%(PreprocessorDefinitions);NTDDI_VERSION=NTDDI_WIN10_CO</PreprocessorDefinitions>
147+
</ClCompile>
148+
</ItemDefinitionGroup>
130149
<ItemDefinitionGroup>
131150
<CustomBuildStep>
132151
<Command>
@@ -165,28 +184,34 @@
165184
<Outputs>$(ProjectDir)Install\$(TargetOS)\$(TargetArch)\$(TargetName).DVL.XML;$(ProjectDir)Install\$(TargetOS)\$(TargetArch)\$(TargetName).DVL-win10.XML</Outputs>
166185
</CustomBuildStep>
167186
<ClCompile>
168-
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">true</WppEnabled>
169-
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32'">true</WppEnabled>
187+
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32' And '$(DisableTracing)'!='true' And '$(UseDebugTracing)'!='true'">true</WppEnabled>
188+
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32' And '$(DisableTracing)'!='true' And '$(UseDebugTracing)'!='true'">true</WppEnabled>
170189
<WppGenerateUsingTemplateFile Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">{km-StorDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
171190
<WppGenerateUsingTemplateFile Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32'">{km-StorDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
172-
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">trace.h</WppScanConfigurationData>
173-
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32'">trace.h</WppScanConfigurationData>
191+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32' And '$(LimitPathsWPP)'=='WPPColdPathOnly'">wpp_cold_path.h</WppScanConfigurationData>
192+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32' And '$(LimitPathsWPP)'!='WPPColdPathOnly'">wpp_all_paths.h</WppScanConfigurationData>
193+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32' And '$(LimitPathsWPP)'=='WPPColdPathOnly'">wpp_cold_path.h</WppScanConfigurationData>
194+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32' And '$(LimitPathsWPP)'!='WPPColdPathOnly'">wpp_all_paths.h</WppScanConfigurationData>
174195
</ClCompile>
175196
<ClCompile>
176-
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">true</WppEnabled>
177-
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64'">true</WppEnabled>
197+
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64' And '$(DisableTracing)'!='true' And '$(UseDebugTracing)'!='true'">true</WppEnabled>
198+
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64' And '$(DisableTracing)'!='true' And '$(UseDebugTracing)'!='true'">true</WppEnabled>
178199
<WppGenerateUsingTemplateFile Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">{km-StorDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
179200
<WppGenerateUsingTemplateFile Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64'">{km-StorDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
180-
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">trace.h</WppScanConfigurationData>
181-
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64'">trace.h</WppScanConfigurationData>
201+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64' And '$(LimitPathsWPP)'=='WPPColdPathOnly'">wpp_cold_path.h</WppScanConfigurationData>
202+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64' And '$(LimitPathsWPP)'!='WPPColdPathOnly'">wpp_all_paths.h</WppScanConfigurationData>
203+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64' And '$(LimitPathsWPP)'=='WPPColdPathOnly'">wpp_cold_path.h</WppScanConfigurationData>
204+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64' And '$(LimitPathsWPP)'!='WPPColdPathOnly'">wpp_all_paths.h</WppScanConfigurationData>
182205
</ClCompile>
183206
<ClCompile>
184-
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64'">true</WppEnabled>
185-
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64'">true</WppEnabled>
207+
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64' And '$(DisableTracing)'!='true' And '$(UseDebugTracing)'!='true'">true</WppEnabled>
208+
<WppEnabled Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64' And '$(DisableTracing)'!='true' And '$(UseDebugTracing)'!='true'">true</WppEnabled>
186209
<WppGenerateUsingTemplateFile Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64'">{km-StorDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
187210
<WppGenerateUsingTemplateFile Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64'">{km-StorDefault.tpl}*.tmh</WppGenerateUsingTemplateFile>
188-
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64'">trace.h</WppScanConfigurationData>
189-
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64'">trace.h</WppScanConfigurationData>
211+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64' And '$(LimitPathsWPP)'=='WPPColdPathOnly'">wpp_cold_path.h</WppScanConfigurationData>
212+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64' And '$(LimitPathsWPP)'!='WPPColdPathOnly'">wpp_all_paths.h</WppScanConfigurationData>
213+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64' And '$(LimitPathsWPP)'=='WPPColdPathOnly'">wpp_cold_path.h</WppScanConfigurationData>
214+
<WppScanConfigurationData Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64' And '$(LimitPathsWPP)'!='WPPColdPathOnly'">wpp_all_paths.h</WppScanConfigurationData>
190215
</ClCompile>
191216
</ItemDefinitionGroup>
192217
<ItemGroup>

0 commit comments

Comments
 (0)