Update usersim to latest (#2717)

Temporarily add usersim/src to paths. This will get cleaned up in 2308 as part of issue #2677 Signed-off-by: Dave Thaler <[email protected]>
microsoft · Jul 31, 2023 · afab46c · afab46c
1 parent b7d222d
commit afab46c
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 15 deletions.
diff --git a/ebpf-for-windows.sln b/ebpf-for-windows.sln
@@ -216,8 +216,11 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ebpf_stress_tests_km", "tests\stress\km\ebpf_stress_tests_km.vcxproj", "{4F082524-9496-44FA-8CBA-4BC0BDC62568}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usersim", "external\usersim\src\usersim.vcxproj", "{030A7AC6-14DC-45CF-AF34-891057AB1402}"
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbtf", "external\ebpf-verifier\build\external\libbtf\libbtf\libbtf.vcxproj", "{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usersim_dll_skeleton", "external\usersim\usersim_dll_skeleton\usersim_dll_skeleton.vcxproj", "{1937DB41-F3EB-4955-A636-6386DCB394F6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM64 = Debug|ARM64
@@ -2705,6 +2708,48 @@ Global
 		{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64
 		{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|x64
 		{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|ARM64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|ARM64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|x64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|x64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|x86.ActiveCfg = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Debug|x86.Build.0 = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.FuzzerDebug|ARM64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.FuzzerDebug|ARM64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.FuzzerDebug|x64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.FuzzerDebug|x64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.FuzzerDebug|x86.ActiveCfg = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.FuzzerDebug|x86.Build.0 = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.MinSizeRel|ARM64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.MinSizeRel|ARM64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.MinSizeRel|x64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.MinSizeRel|x64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.MinSizeRel|x86.ActiveCfg = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.MinSizeRel|x86.Build.0 = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyDebug|ARM64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyDebug|ARM64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyDebug|x64.ActiveCfg = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyDebug|x64.Build.0 = Debug|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyDebug|x86.ActiveCfg = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyDebug|x86.Build.0 = Debug|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyRelease|ARM64.ActiveCfg = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyRelease|ARM64.Build.0 = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyRelease|x64.ActiveCfg = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyRelease|x64.Build.0 = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyRelease|x86.ActiveCfg = Release|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.NativeOnlyRelease|x86.Build.0 = Release|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Release|ARM64.ActiveCfg = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Release|ARM64.Build.0 = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Release|x64.ActiveCfg = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Release|x64.Build.0 = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Release|x86.ActiveCfg = Release|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.Release|x86.Build.0 = Release|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.RelWithDebInfo|ARM64.ActiveCfg = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.RelWithDebInfo|ARM64.Build.0 = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.RelWithDebInfo|x64.ActiveCfg = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.RelWithDebInfo|x64.Build.0 = Release|x64
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.RelWithDebInfo|x86.ActiveCfg = Release|Win32
+		{1937DB41-F3EB-4955-A636-6386DCB394F6}.RelWithDebInfo|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -2772,6 +2817,7 @@ Global
 		{4F082524-9496-44FA-8CBA-4BC0BDC62568} = {492C9B22-9237-4996-9E33-CA14D3533616}
 		{030A7AC6-14DC-45CF-AF34-891057AB1402} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
 		{249E3FBC-0098-3E3E-80AE-C8F8EF6AB0E5} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
+		{1937DB41-F3EB-4955-A636-6386DCB394F6} = {69CDB6A1-434D-4BC9-9BFF-D12DF7EDBB6B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3D5F862D-74C6-4357-9F95-0B152E33B7B8}

diff --git a/external/usersim b/external/usersim
diff --git a/netebpfext/user/netebpfext_user.vcxproj b/netebpfext/user/netebpfext_user.vcxproj
@@ -73,7 +73,7 @@
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;USER_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\usersim\inc;$(OutputPath);$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\user;$(SolutionDir)netebpfext;$(SolutionDir)netebpfext\user;$(SolutionDir)libs\thunk;$(SolutionDir)tests\libs\util;$(SolutionDir)external\catch2\src;$(SolutionDir)external\catch2\build\generated-includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)external\usersim\src;$(OutputPath);$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\user;$(SolutionDir)netebpfext;$(SolutionDir)netebpfext\user;$(SolutionDir)libs\thunk;$(SolutionDir)tests\libs\util;$(SolutionDir)external\catch2\src;$(SolutionDir)external\catch2\build\generated-includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:strictStrings- %(AdditionalOptions)</AdditionalOptions>
       <CompileAs>CompileAsCpp</CompileAs>
       <DisableSpecificWarnings>4505</DisableSpecificWarnings>
@@ -88,7 +88,7 @@
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;USER_MODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\usersim\inc;$(OutputPath);$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\user;$(SolutionDir)netebpfext;$(SolutionDir)netebpfext\user;$(SolutionDir)libs\thunk;$(SolutionDir)tests\libs\util;$(SolutionDir)external\catch2\src;$(SolutionDir)external\catch2\build\generated-includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)external\usersim\src;$(OutputPath);$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\user;$(SolutionDir)netebpfext;$(SolutionDir)netebpfext\user;$(SolutionDir)libs\thunk;$(SolutionDir)tests\libs\util;$(SolutionDir)external\catch2\src;$(SolutionDir)external\catch2\build\generated-includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/Zc:strictStrings- %(AdditionalOptions)</AdditionalOptions>
       <CompileAs>CompileAsCpp</CompileAs>
       <DisableSpecificWarnings>4505</DisableSpecificWarnings>
@@ -106,7 +106,7 @@
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\usersim\inc;$(OutputPath);$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\user;$(SolutionDir)netebpfext;$(SolutionDir)netebpfext\user;$(SolutionDir)libs\thunk;$(SolutionDir)tests\libs\util;$(SolutionDir)external\catch2\src;$(SolutionDir)external\catch2\build\generated-includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)include;$(SolutionDir)libs\platform;$(SolutionDir)libs\platform\user;$(SolutionDir)external\usersim\inc;$(SolutionDir)external\usersim\src;$(OutputPath);$(SolutionDir)external\ebpf-verifier\src;$(SolutionDir)include\user;$(SolutionDir)netebpfext;$(SolutionDir)netebpfext\user;$(SolutionDir)libs\thunk;$(SolutionDir)tests\libs\util;$(SolutionDir)external\catch2\src;$(SolutionDir)external\catch2\build\generated-includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
       <AdditionalOptions>/Zc:strictStrings- %(AdditionalOptions)</AdditionalOptions>
       <DisableSpecificWarnings>4505</DisableSpecificWarnings>
+10 −0		.github/CODEOWNERS
+1 −0		CMakeLists.txt
+5 −4		README.md
+0 −28		inc/ntddk.h
+18 −0		inc/usersim/rtl.h
+0 −114		inc/wdf.h
+4 −2		sample/CMakeLists.txt
+9 −7		sample/sample.vcxproj
+3 −0		src/CMakeLists.txt
+0 −0		src/ndis.h
+2 −0		src/platform_user.cpp
+24 −0		src/rtl.cpp
+3 −4		src/usersim.vcxproj
+3 −6		src/usersim.vcxproj.filters
+36 −5		src/wdf.cpp
+29 −0		src/wdf.h
+1 −1		tests/nmr_test.cpp
+14 −0		tests/rtl_test.cpp
+26 −0		usersim.sln
+6 −0		usersim_dll_skeleton/CMakeLists.txt
+63 −0		usersim_dll_skeleton/dll_skeleton.c
+67 −0		usersim_dll_skeleton/dll_skeleton.h
+146 −0		usersim_dll_skeleton/usersim_dll_skeleton.vcxproj
+27 −0		usersim_dll_skeleton/usersim_dll_skeleton.vcxproj.filters