More cleanup

Signed-off-by: Alan Jowett <[email protected]>
microsoft · Nov 19, 2024 · fe9f2a7 · fe9f2a7
1 parent 2cbb88d
commit fe9f2a7
Show file tree

Hide file tree

Showing 15 changed files with 9 additions and 31 deletions.
diff --git a/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj b/ebpf_extensions/neteventebpfext/sys/neteventebpfext.vcxproj
@@ -48,7 +48,6 @@
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
     <RootNamespace>EbpfDriver</RootNamespace>
     <ProjectName>neteventebpfext</ProjectName>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

diff --git a/ebpf_extensions/neteventebpfext/user/neteventebpfext_user.vcxproj b/ebpf_extensions/neteventebpfext/user/neteventebpfext_user.vcxproj
@@ -24,7 +24,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{AAAB234B-F0E9-4326-91E8-87B98367ACC1}</ProjectGuid>
     <RootNamespace>neteventebpfextunit</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>neteventebpfext_user</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/ebpf_extensions/ntosebpfext/sys/ntosebpfext.vcxproj b/ebpf_extensions/ntosebpfext/sys/ntosebpfext.vcxproj
@@ -32,7 +32,6 @@
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
     <RootNamespace>EbpfDriver</RootNamespace>
     <ProjectName>ntosebpfext</ProjectName>
-    <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

diff --git a/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj b/ebpf_extensions/ntosebpfext/user/ntosebpfext_user.vcxproj
@@ -20,7 +20,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{630bb78f-6211-41d8-8e3a-096e22e169ef}</ProjectGuid>
     <RootNamespace>ntosebpfextunit</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>ntosebpfext_user</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/external/usersim b/external/usersim
diff --git a/scripts/setup_build/setup_build.vcxproj b/scripts/setup_build/setup_build.vcxproj
@@ -45,7 +45,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{231ee32b-eba4-4fe5-a55b-db18f539d403}</ProjectGuid>
     <RootNamespace>setupbuild</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

diff --git a/tests/neteventebpfext/neteventebpfext_unit/neteventebpfext_unit.vcxproj b/tests/neteventebpfext/neteventebpfext_unit/neteventebpfext_unit.vcxproj
@@ -24,7 +24,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{32DA760D-1A43-4940-BECE-59AE0B817ED9}</ProjectGuid>
     <RootNamespace>neteventebpfextunit</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>neteventebpfext_unit</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/tests/ntosebpfext/ntosebpfext_unit/ntosebpfext_unit.vcxproj b/tests/ntosebpfext/ntosebpfext_unit/ntosebpfext_unit.vcxproj
@@ -20,7 +20,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{e619b985-44b3-4292-a585-5cd0c4315ed3}</ProjectGuid>
     <RootNamespace>ntosebpfextunit</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>ntosebpfext_unit</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/tools/netevent_ebpf_ext_export_program_info/netevent_ebpf_ext_export_program_info.vcxproj b/tools/netevent_ebpf_ext_export_program_info/netevent_ebpf_ext_export_program_info.vcxproj
@@ -32,7 +32,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{61896FC2-D314-468E-887B-7B1EBC7F0FEB}</ProjectGuid>
     <RootNamespace>encodeprograminfo</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>netevent_ebpf_ext_export_program_info</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -115,7 +114,7 @@
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser;$(WdkContentRoot)\Include\$(WindowsTargetPlatformVersion)\km</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -135,7 +134,7 @@ $(OutDir)netevent_ebpf_ext_export_program_info.exe</Command>
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser;$(WdkContentRoot)\Include\$(WindowsTargetPlatformVersion)\km</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -155,7 +154,7 @@ $(OutDir)netevent_ebpf_ext_export_program_info.exe</Command>
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser;$(WdkContentRoot)\Include\$(WindowsTargetPlatformVersion)\km</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -175,7 +174,7 @@ $(OutDir)netevent_ebpf_ext_export_program_info.exe</Command>
     <ClCompile>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser;$(WdkContentRoot)\Include\$(WindowsTargetPlatformVersion)\km</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -197,7 +196,7 @@ $(OutDir)netevent_ebpf_ext_export_program_info.exe</Command>
     <ClCompile>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)include;$(SolutionDir)libs\include\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)include\user;$(SolutionDir)neteventebpfext;$(SolutionDir)neteventebpfext\user;$(SolutionDir)external\usersim\cxplat\inc;$(SolutionDir)external\usersim\cxplat\inc\winuser;$(WdkContentRoot)\Include\$(WindowsTargetPlatformVersion)\km</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>

diff --git a/tools/netevent_monitor/netevent_monitor.vcxproj b/tools/netevent_monitor/netevent_monitor.vcxproj
@@ -28,7 +28,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{1132BFD8-EECA-4372-B08E-D349D86FE616}</ProjectGuid>
     <RootNamespace>netevent_monitor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ClangFlags>-g -target bpf -O2 -Werror</ClangFlags>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/tools/ntos_ebpf_ext_export_program_info/ntos_ebpf_ext_export_program_info.vcxproj b/tools/ntos_ebpf_ext_export_program_info/ntos_ebpf_ext_export_program_info.vcxproj
@@ -20,7 +20,6 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{fa9bb88d-8259-40c1-9422-bdedf9e9ce68}</ProjectGuid>
     <RootNamespace>encodeprograminfo</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>ntos_ebpf_ext_export_program_info</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

diff --git a/tools/onebranch/onebranch.vcxproj b/tools/onebranch/onebranch.vcxproj
@@ -27,8 +27,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{988a1731-f674-472f-8063-84d6dea8988d}</ProjectGuid>
     <RootNamespace>onebranch</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
+    </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>

diff --git a/tools/process_monitor_bpf/process_monitor_bpf.vcxproj b/tools/process_monitor_bpf/process_monitor_bpf.vcxproj
@@ -20,8 +20,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{3DBF8A96-3883-448A-8BD3-B8C913A27F09}</ProjectGuid>
     <RootNamespace>process_monitor</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ClangFlags>-g -target bpf -O2 -Werror</ClangFlags>
+      <ClangFlags>-g -target bpf -O2 -Werror</ClangFlags>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

diff --git a/tools/utils/utils.vcxproj b/tools/utils/utils.vcxproj
@@ -19,8 +19,7 @@
     <Keyword>Win32Proj</Keyword>
     <ProjectGuid>{52440d8b-c623-48c4-a2a3-527245139e19}</ProjectGuid>
     <RootNamespace>utils</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
+    </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>

diff --git a/wdk.props b/wdk.props
@@ -16,13 +16,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.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('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.props'))" />
-    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(Platform).$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.$(Platform).props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.SDK.CPP.$(Platform).$(WDKVersion)\build\native\Microsoft.Windows.SDK.cpp.$(Platform).props'))" />
-    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.WDK.$(Platform).$(WDKVersion)\build\native\Microsoft.Windows.WDK.$(Platform).props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.WDK.$(Platform).$(WDKVersion)\build\native\Microsoft.Windows.WDK.$(Platform).props'))" />
-  </Target>
 </Project>
+31 −3		CMakeLists.txt
+1 −1		README.md
+1 −0		cxplat/cxplat_test/CMakeLists.txt
+42 −0		cxplat/cxplat_test/cxplat_processor_test.cpp
+9 −1		cxplat/cxplat_test/cxplat_test.vcxproj
+3 −0		cxplat/cxplat_test/cxplat_test.vcxproj.filters
+51 −0		cxplat/cxplat_test/cxplat_time_test.cpp
+1 −0		cxplat/inc/cxplat.h
+55 −0		cxplat/inc/cxplat_processor.h
+15 −0		cxplat/inc/cxplat_time.h
+1 −0		cxplat/src/cxplat_winkernel/CMakeLists.txt
+3 −1		cxplat/src/cxplat_winkernel/cxplat_winkernel.vcxproj
+3 −0		cxplat/src/cxplat_winkernel/cxplat_winkernel.vcxproj.filters
+8 −0		cxplat/src/cxplat_winkernel/packages.config
+76 −0		cxplat/src/cxplat_winkernel/processor_winkernel.c
+37 −0		cxplat/src/cxplat_winkernel/time_winkernel.c
+2 −0		cxplat/src/cxplat_winuser/CMakeLists.txt
+3 −1		cxplat/src/cxplat_winuser/cxplat_winuser.vcxproj
+3 −0		cxplat/src/cxplat_winuser/cxplat_winuser.vcxproj.filters
+88 −0		cxplat/src/cxplat_winuser/processor_winuser.cpp
+43 −0		cxplat/src/cxplat_winuser/time_winuser.cpp
+1 −1		external/Catch2
+8 −0		packages.config
+4 −3		sample/sample.vcxproj
+2 −1		setup_build/setup_build.vcxproj
+1 −1		src/framework.h
+5 −4		src/usersim.vcxproj
+4 −3		tests/tests.vcxproj
+7 −3		usersim_dll_skeleton/usersim_dll_skeleton.vcxproj
+3 −0		usersim_dll_skeleton/usersim_dll_skeleton.vcxproj.filters
+26 −0		wdk.props