Skip to content

Commit 246faa2

Browse files
keith-hortonkeith-horton
committed
Updates
1 parent e535c3c commit 246faa2

File tree

5 files changed

+188
-3234
lines changed

5 files changed

+188
-3234
lines changed

‎FwDiagnose/FwDiagnose.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ struct NormalizedString
6060
containsNonAsciiCharacters = containsNonAsciiCharacters || rhs.containsNonAsciiCharacters;
6161
}
6262

63-
// manaully copying strings only when asked for explicitly
63+
// manually copying strings only when asked for explicitly
6464
// not using copy constructor or copy assignment operator
6565

6666
static NormalizedString Copy(const NormalizedString& other)

‎FwDiagnose/FwDiagnose.vcxproj‎

Lines changed: 81 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.250303.1\build\native\Microsoft.Windows.CppWinRT.props')" />
44
<ItemGroup Label="ProjectConfigurations">
5+
<ProjectConfiguration Include="Debug|ARM64">
6+
<Configuration>Debug</Configuration>
7+
<Platform>ARM64</Platform>
8+
</ProjectConfiguration>
59
<ProjectConfiguration Include="Debug|Win32">
610
<Configuration>Debug</Configuration>
711
<Platform>Win32</Platform>
812
</ProjectConfiguration>
13+
<ProjectConfiguration Include="Release|ARM64">
14+
<Configuration>Release</Configuration>
15+
<Platform>ARM64</Platform>
16+
</ProjectConfiguration>
917
<ProjectConfiguration Include="Release|Win32">
1018
<Configuration>Release</Configuration>
1119
<Platform>Win32</Platform>
@@ -46,13 +54,26 @@
4654
<PlatformToolset>v143</PlatformToolset>
4755
<CharacterSet>Unicode</CharacterSet>
4856
</PropertyGroup>
57+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
58+
<ConfigurationType>Application</ConfigurationType>
59+
<UseDebugLibraries>true</UseDebugLibraries>
60+
<PlatformToolset>v143</PlatformToolset>
61+
<CharacterSet>Unicode</CharacterSet>
62+
</PropertyGroup>
4963
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5064
<ConfigurationType>Application</ConfigurationType>
5165
<UseDebugLibraries>false</UseDebugLibraries>
5266
<PlatformToolset>v143</PlatformToolset>
5367
<WholeProgramOptimization>true</WholeProgramOptimization>
5468
<CharacterSet>Unicode</CharacterSet>
5569
</PropertyGroup>
70+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
71+
<ConfigurationType>Application</ConfigurationType>
72+
<UseDebugLibraries>false</UseDebugLibraries>
73+
<PlatformToolset>v143</PlatformToolset>
74+
<WholeProgramOptimization>true</WholeProgramOptimization>
75+
<CharacterSet>Unicode</CharacterSet>
76+
</PropertyGroup>
5677
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
5778
<ImportGroup Label="ExtensionSettings">
5879
</ImportGroup>
@@ -67,9 +88,15 @@
6788
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6889
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
6990
</ImportGroup>
91+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="PropertySheets">
92+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
93+
</ImportGroup>
7094
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7195
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
7296
</ImportGroup>
97+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="PropertySheets">
98+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
99+
</ImportGroup>
73100
<PropertyGroup Label="UserMacros" />
74101
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
75102
<ClCompile>
@@ -133,6 +160,27 @@
133160
<AdditionalDependencies>fwpuclnt.lib; wbemuuid.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
134161
</Link>
135162
</ItemDefinitionGroup>
163+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
164+
<ClCompile>
165+
<WarningLevel>Level4</WarningLevel>
166+
<SDLCheck>true</SDLCheck>
167+
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_MSVC_STL_HARDENING=1;_MSVC_STL_DESTRUCTOR_TOMBSTONES=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
168+
<ConformanceMode>true</ConformanceMode>
169+
<LanguageStandard>stdcpplatest</LanguageStandard>
170+
<TreatWarningAsError>true</TreatWarningAsError>
171+
<CallingConvention>StdCall</CallingConvention>
172+
<UseStandardPreprocessor>true</UseStandardPreprocessor>
173+
<OmitDefaultLibName>
174+
</OmitDefaultLibName>
175+
<AdditionalIncludeDirectories>..\ctl</AdditionalIncludeDirectories>
176+
</ClCompile>
177+
<Link>
178+
<SubSystem>Console</SubSystem>
179+
<GenerateDebugInformation>true</GenerateDebugInformation>
180+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
181+
<AdditionalDependencies>fwpuclnt.lib; wbemuuid.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
182+
</Link>
183+
</ItemDefinitionGroup>
136184
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
137185
<ClCompile>
138186
<WarningLevel>Level4</WarningLevel>
@@ -155,6 +203,29 @@
155203
<AdditionalDependencies>fwpuclnt.lib; wbemuuid.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
156204
</Link>
157205
</ItemDefinitionGroup>
206+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
207+
<ClCompile>
208+
<WarningLevel>Level4</WarningLevel>
209+
<FunctionLevelLinking>true</FunctionLevelLinking>
210+
<IntrinsicFunctions>true</IntrinsicFunctions>
211+
<SDLCheck>true</SDLCheck>
212+
<PreprocessorDefinitions>WIN32_LEAN_AND_MEAN;_MSVC_STL_HARDENING=1;_MSVC_STL_DESTRUCTOR_TOMBSTONES=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
213+
<ConformanceMode>true</ConformanceMode>
214+
<LanguageStandard>stdcpplatest</LanguageStandard>
215+
<TreatWarningAsError>true</TreatWarningAsError>
216+
<CallingConvention>StdCall</CallingConvention>
217+
<UseStandardPreprocessor>true</UseStandardPreprocessor>
218+
<OmitDefaultLibName>
219+
</OmitDefaultLibName>
220+
<AdditionalIncludeDirectories>..\ctl</AdditionalIncludeDirectories>
221+
</ClCompile>
222+
<Link>
223+
<SubSystem>Console</SubSystem>
224+
<GenerateDebugInformation>true</GenerateDebugInformation>
225+
<TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
226+
<AdditionalDependencies>fwpuclnt.lib; wbemuuid.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
227+
</Link>
228+
</ItemDefinitionGroup>
158229
<ItemGroup>
159230
<ClCompile Include="FirewallRules.cpp" />
160231
<ClCompile Include="FwDiagnose.cpp" />
@@ -168,16 +239,16 @@
168239
<None Include="packages.config" />
169240
</ItemGroup>
170241
<ItemGroup>
171-
<ClInclude Include="ctl\ctString.hpp" />
172-
<ClInclude Include="ctl\ctThreadpoolQueue.hpp" />
173-
<ClInclude Include="ctl\ctWmiClassObject.hpp" />
174-
<ClInclude Include="ctl\ctWmiEnumerate.hpp" />
175-
<ClInclude Include="ctl\ctWmiInitialize.hpp" />
176-
<ClInclude Include="ctl\ctWmiInstance.hpp" />
177-
<ClInclude Include="ctl\ctWmiPerformance.hpp" />
178-
<ClInclude Include="ctl\ctWmiProperties.hpp" />
179-
<ClInclude Include="ctl\ctWmiService.hpp" />
180-
<ClInclude Include="ctl\ctWmiVariant.hpp" />
242+
<ClInclude Include="..\ctl\ctString.hpp" />
243+
<ClInclude Include="..\ctl\ctThreadpoolQueue.hpp" />
244+
<ClInclude Include="..\ctl\ctWmiClassObject.hpp" />
245+
<ClInclude Include="..\ctl\ctWmiEnumerate.hpp" />
246+
<ClInclude Include="..\ctl\ctWmiInitialize.hpp" />
247+
<ClInclude Include="..\ctl\ctWmiInstance.hpp" />
248+
<ClInclude Include="..\ctl\ctWmiPerformance.hpp" />
249+
<ClInclude Include="..\ctl\ctWmiProperties.hpp" />
250+
<ClInclude Include="..\ctl\ctWmiService.hpp" />
251+
<ClInclude Include="..\ctl\ctWmiVariant.hpp" />
181252
<ClInclude Include="firewall.h" />
182253
<ClInclude Include="FirewallRules.h" />
183254
<ClInclude Include="FwDiagnose.h" />

‎FwDiagnose/WfpCounters.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,10 +241,12 @@ uint32_t SortedLayerValue(const GUID& layer) noexcept
241241
{
242242
return layer_priority;
243243
}
244+
++layer_priority;
244245
if (layer == FWPM_LAYER_STREAM_PACKET_V4)
245246
{
246247
return layer_priority;
247248
}
249+
++layer_priority;
248250
if (layer == FWPM_LAYER_STREAM_PACKET_V6)
249251
{
250252
return layer_priority;

0 commit comments

Comments
 (0)