Large cleanup of ctl headers.

Author: keith-horton

FwDiagnose/FirewallRules.cpp

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #include <algorithm>
 #include <vector>
 #include <string>

FwDiagnose/FirewallRules.h

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #pragma once
 #include <vector>
 #include "NormalizedFirewallRule.h"

FwDiagnose/FwDiagnose.cpp

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #include <algorithm>
 #include <iostream>
 #include <numeric>
@@ -9,7 +12,6 @@
 #include "firewall.h"
 #include "FirewallRules.h"
 #include "NormalizedFirewallRule.h"
-#include "ctWmiInitialize.hpp"
 #include "WfpCounters.h"
 
 #include <wil/stl.h>

FwDiagnose/FwDiagnose.h

@@ -1,7 +1,9 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #pragma once
 #include <string>
 #include <chrono>
-
 #include <Windows.h>
 
 bool DebugPrintEnabled() noexcept;

FwDiagnose/FwDiagnose.vcxproj

@@ -251,14 +251,18 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\ctl\ctString.hpp" />
+    <ClInclude Include="..\ctl\ctEtwReader.hpp" />
+    <ClInclude Include="..\ctl\ctEtwRecord.hpp" />
+    <ClInclude Include="..\ctl\ctMath.hpp" />
+    <ClInclude Include="..\ctl\ctNetAdapterAddresses.hpp" />
+    <ClInclude Include="..\ctl\ctPerformanceCounter.hpp" />
+    <ClInclude Include="..\ctl\ctRandom.hpp" />
+    <ClInclude Include="..\ctl\ctSockaddr.hpp" />
+    <ClInclude Include="..\ctl\ctSocketExtensions.hpp" />
+    <ClInclude Include="..\ctl\ctThreadIocp.hpp" />
     <ClInclude Include="..\ctl\ctThreadpoolQueue.hpp" />
-    <ClInclude Include="..\ctl\ctWmiClassObject.hpp" />
-    <ClInclude Include="..\ctl\ctWmiEnumerate.hpp" />
-    <ClInclude Include="..\ctl\ctWmiInitialize.hpp" />
+    <ClInclude Include="..\ctl\ctTimer.hpp" />
     <ClInclude Include="..\ctl\ctWmiInstance.hpp" />
-    <ClInclude Include="..\ctl\ctWmiPerformance.hpp" />
-    <ClInclude Include="..\ctl\ctWmiProperties.hpp" />
     <ClInclude Include="..\ctl\ctWmiService.hpp" />
     <ClInclude Include="..\ctl\ctWmiVariant.hpp" />
     <ClInclude Include="firewall.h" />

FwDiagnose/NormalizedFirewallRule.h

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #pragma once
 
 #include <string>

FwDiagnose/WfpCallouts.cpp

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #include <algorithm>
 #include <string>
 #include <windows.h>

FwDiagnose/WfpCounters.cpp

@@ -1,19 +1,22 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #include <memory>
 #include <vector>
 
 #include <Windows.h>
 #include <fwpmu.h>
 
-#include <ctWmiPerformance.hpp>
+#include "ctPerformanceCounter.hpp"
 
 #include "WfpCounters.h"
 
 #include <wil/stl.h>
 #include <wil/resource.h>
 
 const static ctl::ctWmiService* g_wmi = nullptr;
-static ctl::ctWmiPerformance* g_wmi_performance = nullptr;
-static std::shared_ptr<ctl::ctWmiPerformanceCounter<ULONGLONG>>* g_wfp_filter_count;
+static ctl::ctPerformanceCounter* g_wmi_performance = nullptr;
+static std::shared_ptr<ctl::ctPerformanceCounterCounter<ULONGLONG>>* g_wfp_filter_count;
 
 static HANDLE g_wfp_engineHandle = nullptr;
 HANDLE GetFwpmEngineHandle()
@@ -33,14 +36,14 @@ HANDLE GetFwpmEngineHandle()
 void InitializeWfpPerfCounters()
 {
 	g_wmi = new ctl::ctWmiService(L"root\\cimv2");
-	g_wmi_performance = new ctl::ctWmiPerformance(*g_wmi);
-	g_wfp_filter_count = new std::shared_ptr<ctl::ctWmiPerformanceCounter<ULONGLONG>>();
+	g_wmi_performance = new ctl::ctPerformanceCounter(*g_wmi);
+	g_wfp_filter_count = new std::shared_ptr<ctl::ctPerformanceCounterCounter<ULONGLONG>>();
 
 	*g_wfp_filter_count = ctCreatePerfCounter<ULONGLONG>(
 		*g_wmi,
 		ctl::ctWmiEnumClassName::WfpFilterCount,
 		L"Total",
-		ctl::ctWmiPerformanceCollectionType::Detailed);
+		ctl::ctPerformanceCounterCollectionType::Detailed);
 	g_wmi_performance->add_counter(*g_wfp_filter_count);
 }
 

FwDiagnose/WfpCounters.h

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 // ReSharper disable CppInconsistentNaming
 // ReSharper disable IdentifierTypo
 #pragma once

FwDiagnose/WfpFilters.cpp

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
 #include <algorithm>
 #include <ranges>
 #include <string>
@@ -11,7 +14,6 @@
 #include <wil/stl.h>
 #include <wil/resource.h>
 
-
 static std::vector<FilterDetails> g_all_filters;
 
 /*