From 8daf2be4e9c294ede7b62da67155de63f0d59f19 Mon Sep 17 00:00:00 2001 From: Adonais Romero González Date: Thu, 22 Feb 2024 11:00:09 -0800 Subject: Add ARM64 support on remaining network samples. (#1125) * Added ARM64 as a new project configuration in both Debug and Release modes. * Set up properties for the ARM64 platform, including target version, debug libraries, driver target platform, driver type, and platform toolset. * Included additional dependencies for the ARM64 build. * Added ARM64 to the list of platforms for which the mux.dll file is packaged. * Remove /CETCOMPAT as it's not compatible with ARM64 --- network/ndis/mux/driver/60/novlan/mux.vcxproj | 128 ++++++++++++++++++++++ network/ndis/mux/driver/60/vlan/muxvlan.vcxproj | 139 +++++++++++++++++++++++- network/ndis/mux/mux.sln | 16 ++- network/ndis/mux/notifyob/mux.vcxproj | 120 +++++++++++++++++++- 4 files changed, 398 insertions(+), 5 deletions(-) (limited to 'network/ndis') diff --git a/network/ndis/mux/driver/60/novlan/mux.vcxproj b/network/ndis/mux/driver/60/novlan/mux.vcxproj index 758f450f..07cf9c24 100644 --- a/network/ndis/mux/driver/60/novlan/mux.vcxproj +++ b/network/ndis/mux/driver/60/novlan/mux.vcxproj @@ -17,6 +17,14 @@ Release x64 + + Debug + ARM64 + + + Release + ARM64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308} @@ -42,6 +50,22 @@ WindowsKernelModeDriver10.0 Driver + + Windows10 + False + Universal + WDM + WindowsKernelModeDriver10.0 + Driver + + + Windows10 + True + Universal + WDM + WindowsKernelModeDriver10.0 + Driver + Windows10 False @@ -68,6 +92,12 @@ + + + + + + @@ -81,6 +111,12 @@ mux + + mux + + + mux + mux @@ -133,6 +169,52 @@ %(PreprocessorDefinitions);NDIS60 + + + %(AdditionalOptions) /GS + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + true + Level4 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + + + + + %(AdditionalOptions) /GS + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + true + Level4 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + + %(AdditionalOptions) /GS @@ -218,6 +300,44 @@ sha256 + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + + %(AdditionalIncludeDirectories);.. + + + %(AdditionalIncludeDirectories);.. + + + + + %(AdditionalIncludeDirectories);.. + + + sha256 + + + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + + %(AdditionalIncludeDirectories);.. + + + %(AdditionalIncludeDirectories);.. + + + + + %(AdditionalIncludeDirectories);.. + + + sha256 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib @@ -296,6 +416,14 @@ + + + + + + + + diff --git a/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj b/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj index eb2ff474..34eca349 100644 --- a/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj +++ b/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -34,6 +42,14 @@ WindowsKernelModeDriver10.0 Driver + + Windows10 + False + Universal + WDM + WindowsKernelModeDriver10.0 + Driver + Windows10 True @@ -42,6 +58,14 @@ WindowsKernelModeDriver10.0 Driver + + Windows10 + True + Universal + WDM + WindowsKernelModeDriver10.0 + Driver + Windows10 False @@ -65,9 +89,15 @@ + + + + + + @@ -78,9 +108,15 @@ mux + + mux + mux + + mux + mux @@ -113,6 +149,32 @@ %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + + + %(AdditionalOptions) /GS + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + true + Level4 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + + %(AdditionalOptions) /GS @@ -139,6 +201,32 @@ %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + + + %(AdditionalOptions) /GS + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + true + Level4 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + + + %(PreprocessorDefinitions);NDIS_MINIPORT_DRIVER + %(PreprocessorDefinitions);NDIS_WDM + %(PreprocessorDefinitions);NDIS630_MINIPORT + %(PreprocessorDefinitions);NDIS630 + %(PreprocessorDefinitions);IEEE_VLAN_SUPPORT=1 + + %(AdditionalOptions) /GS @@ -211,6 +299,26 @@ sha256 + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + false + + + %(AdditionalIncludeDirectories);.. + + + %(AdditionalIncludeDirectories);.. + + + + + %(AdditionalIncludeDirectories);.. + + + sha256 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib @@ -230,6 +338,25 @@ sha256 + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + + %(AdditionalIncludeDirectories);.. + + + %(AdditionalIncludeDirectories);.. + + + + + %(AdditionalIncludeDirectories);.. + + + sha256 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib @@ -308,6 +435,14 @@ + + + + + + + + @@ -321,4 +456,4 @@ - \ No newline at end of file + diff --git a/network/ndis/mux/mux.sln b/network/ndis/mux/mux.sln index bf78d7a4..57f4dd41 100644 --- a/network/ndis/mux/mux.sln +++ b/network/ndis/mux/mux.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 @@ -27,12 +27,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mux", "notifyob\mux.vcxproj EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|ARM64.Build.0 = Debug|ARM64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Debug|ARM64.Build.0 = Debug|ARM64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Debug|ARM64.Build.0 = Debug|ARM64 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Release|ARM64.ActiveCfg = Release|ARM64 + {015D7470-0FC8-4597-A67E-BD9C754F0681}.Release|ARM64.Build.0 = Release|ARM64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Release|ARM64.ActiveCfg = Release|ARM64 + {B2DE2C37-B3F2-491E-94AE-402A7B4D3308}.Release|ARM64.Build.0 = Release|ARM64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Release|ARM64.ActiveCfg = Release|ARM64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Release|ARM64.Build.0 = Release|ARM64 {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|Win32.ActiveCfg = Debug|Win32 {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|Win32.Build.0 = Debug|Win32 {015D7470-0FC8-4597-A67E-BD9C754F0681}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/network/ndis/mux/notifyob/mux.vcxproj b/network/ndis/mux/notifyob/mux.vcxproj index dc1e2897..1075f28a 100644 --- a/network/ndis/mux/notifyob/mux.vcxproj +++ b/network/ndis/mux/notifyob/mux.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -34,6 +42,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 True @@ -42,6 +58,14 @@ WindowsApplicationForDrivers10.0 DynamicLibrary + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + DynamicLibrary + Windows10 False @@ -65,9 +89,15 @@ + + + + + + @@ -78,9 +108,15 @@ mux + + mux + mux + + mux + mux @@ -104,6 +140,23 @@ _DllMainCRTStartup + + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL + true + Level4 + + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL + + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL @@ -121,6 +174,23 @@ _DllMainCRTStartup + + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL + true + Level4 + + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL + + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL + + + _DllMainCRTStartup@12 + _DllMainCRTStartup + + %(PreprocessorDefinitions);WIN32;DISABLE_PROTOCOLS_TO_PHYSICAL @@ -163,6 +233,14 @@ %(AdditionalOptions) -i $(IntDir) -N + + + %(AdditionalOptions) -no_format_opt + + + %(AdditionalOptions) -i $(IntDir) -N + + %(AdditionalOptions) -no_format_opt @@ -171,6 +249,14 @@ %(AdditionalOptions) -i $(IntDir) -N + + + %(AdditionalOptions) -no_format_opt + + + %(AdditionalOptions) -i $(IntDir) -N + + %(AdditionalOptions) -no_format_opt @@ -193,12 +279,24 @@ true + + + Sync + true + + Sync true + + + Sync + true + + Sync @@ -214,9 +312,15 @@ Static + + Static + Static + + Static + Static @@ -229,12 +333,24 @@ mux.def + + + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;setupapi.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib + mux.def + + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;setupapi.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib mux.def + + + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;setupapi.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib + mux.def + + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;setupapi.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib @@ -270,4 +386,4 @@ - \ No newline at end of file + -- cgit v1.3.1