diff --git a/TrEE/Miniport/TrEEMiniportSample.vcxproj b/TrEE/Miniport/TrEEMiniportSample.vcxproj index 7a2265b67..5bf025b50 100644 --- a/TrEE/Miniport/TrEEMiniportSample.vcxproj +++ b/TrEE/Miniport/TrEEMiniportSample.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -59,6 +67,14 @@ WindowsKernelModeDriver10.0 Driver + + Windows10 + False + Universal + KMDF + WindowsKernelModeDriver10.0 + Driver + Windows10 True @@ -67,6 +83,14 @@ WindowsKernelModeDriver10.0 Driver + + Windows10 + True + Universal + KMDF + WindowsKernelModeDriver10.0 + Driver + Windows10 False @@ -96,9 +120,15 @@ + + + + + + @@ -115,9 +145,15 @@ TrEEMiniportSample + + TrEEMiniportSample + TrEEMiniportSample + + TrEEMiniportSample + TrEEMiniportSample @@ -175,6 +211,25 @@ sha256 + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\treeclxstub.lib + + + sha256 + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) @@ -194,6 +249,25 @@ sha256 + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\treeclxstub.lib + + + sha256 + + %(AdditionalIncludeDirectories);$(DDK_INC_PATH) @@ -250,4 +324,4 @@ - \ No newline at end of file + diff --git a/TrEE/TrEESample.sln b/TrEE/TrEESample.sln index bed07a5c4..be19abc12 100644 --- a/TrEE/TrEESample.sln +++ b/TrEE/TrEESample.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 @@ -11,6 +11,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TrEEMiniportSample", "Minip EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 Debug|Arm = Debug|Arm Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 @@ -19,6 +21,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {420587AA-51DE-4966-B692-C428836BF8B2}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {420587AA-51DE-4966-B692-C428836BF8B2}.Debug|ARM64.Build.0 = Debug|ARM64 + {C1B22B3C-BE1A-40CE-82D0-8AE1628C297C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C1B22B3C-BE1A-40CE-82D0-8AE1628C297C}.Debug|ARM64.Build.0 = Debug|ARM64 + {420587AA-51DE-4966-B692-C428836BF8B2}.Release|ARM64.ActiveCfg = Release|ARM64 + {420587AA-51DE-4966-B692-C428836BF8B2}.Release|ARM64.Build.0 = Release|ARM64 + {C1B22B3C-BE1A-40CE-82D0-8AE1628C297C}.Release|ARM64.ActiveCfg = Release|ARM64 + {C1B22B3C-BE1A-40CE-82D0-8AE1628C297C}.Release|ARM64.Build.0 = Release|ARM64 {C1B22B3C-BE1A-40CE-82D0-8AE1628C297C}.Debug|Arm.ActiveCfg = Debug|Arm {C1B22B3C-BE1A-40CE-82D0-8AE1628C297C}.Debug|Arm.Build.0 = Debug|Arm {C1B22B3C-BE1A-40CE-82D0-8AE1628C297C}.Debug|Win32.ActiveCfg = Debug|Win32 diff --git a/network/ndis/mux/driver/60/novlan/mux.vcxproj b/network/ndis/mux/driver/60/novlan/mux.vcxproj index 758f450fb..4f034725a 100644 --- a/network/ndis/mux/driver/60/novlan/mux.vcxproj +++ b/network/ndis/mux/driver/60/novlan/mux.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 @@ -110,6 +146,29 @@ %(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 @@ -133,6 +192,29 @@ %(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 @@ -199,6 +281,26 @@ sha256 + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + false + + + %(AdditionalIncludeDirectories);.. + + + %(AdditionalIncludeDirectories);.. + + + + + %(AdditionalIncludeDirectories);.. + + + sha256 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib @@ -218,6 +320,25 @@ sha256 + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib + + + %(AdditionalIncludeDirectories);.. + + + %(AdditionalIncludeDirectories);.. + + + + + %(AdditionalIncludeDirectories);.. + + + sha256 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\ndis.lib @@ -309,4 +430,4 @@ - \ No newline at end of file + diff --git a/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj b/network/ndis/mux/driver/60/vlan/muxvlan.vcxproj index eb2ff4747..dbe45a1fe 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 @@ -321,4 +448,4 @@ - \ No newline at end of file + diff --git a/network/ndis/mux/mux.sln b/network/ndis/mux/mux.sln index bf78d7a4c..57f4dd41c 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 dc1e2897f..1075f28ab 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 + diff --git a/network/trans/WFPSampler/WFPSampler.sln b/network/trans/WFPSampler/WFPSampler.sln index d0bea94ab..7967b899d 100644 --- a/network/trans/WFPSampler/WFPSampler.sln +++ b/network/trans/WFPSampler/WFPSampler.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 VisualStudioVersion = 12.0 @@ -34,12 +34,34 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WFPSampler", "exe\WFPSample EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 Debug|Win32 = Debug|Win32 Release|Win32 = Release|Win32 Debug|x64 = Debug|x64 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|ARM64.Build.0 = Debug|ARM64 + {6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Debug|ARM64.Build.0 = Debug|ARM64 + {909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Debug|ARM64.Build.0 = Debug|ARM64 + {E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Debug|ARM64.Build.0 = Debug|ARM64 + {778259E7-3481-41CC-891C-375F6FAE1F19}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {778259E7-3481-41CC-891C-375F6FAE1F19}.Debug|ARM64.Build.0 = Debug|ARM64 + {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Release|ARM64.ActiveCfg = Release|ARM64 + {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Release|ARM64.Build.0 = Release|ARM64 + {6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Release|ARM64.ActiveCfg = Release|ARM64 + {6F3E7DC1-C828-463C-BC9E-290B56D0F58C}.Release|ARM64.Build.0 = Release|ARM64 + {909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Release|ARM64.ActiveCfg = Release|ARM64 + {909C6B51-0D92-440A-9FEB-B7A2715D8EDE}.Release|ARM64.Build.0 = Release|ARM64 + {E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Release|ARM64.ActiveCfg = Release|ARM64 + {E5EAD883-D15D-42DA-BCF6-78484F91BEC2}.Release|ARM64.Build.0 = Release|ARM64 + {778259E7-3481-41CC-891C-375F6FAE1F19}.Release|ARM64.ActiveCfg = Release|ARM64 + {778259E7-3481-41CC-891C-375F6FAE1F19}.Release|ARM64.Build.0 = Release|ARM64 {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|Win32.ActiveCfg = Debug|Win32 {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Debug|Win32.Build.0 = Debug|Win32 {26F918E9-6CA9-4AC8-BBCA-418F3165DCE1}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/network/trans/WFPSampler/exe/WFPSampler.vcxproj b/network/trans/WFPSampler/exe/WFPSampler.vcxproj index 75ea912a7..a3139ae9d 100644 --- a/network/trans/WFPSampler/exe/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/exe/WFPSampler.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -34,6 +42,14 @@ WindowsApplicationForDrivers10.0 Application + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + Application + Windows10 True @@ -42,6 +58,14 @@ WindowsApplicationForDrivers10.0 Application + + Windows10 + True + Universal + + WindowsApplicationForDrivers10.0 + Application + Windows10 False @@ -65,9 +89,15 @@ + + + + + + @@ -78,9 +108,15 @@ WFPSampler + + WFPSampler + WFPSampler + + WFPSampler + WFPSampler @@ -109,6 +145,28 @@ %(IgnoreSpecificDefaultLibraries) + + + Sync + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib + %(IgnoreSpecificDefaultLibraries) + + Sync @@ -131,6 +189,28 @@ %(IgnoreSpecificDefaultLibraries) + + + Sync + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib;.\..\lib\$(IntDir)\WFPSampler.lib + %(IgnoreSpecificDefaultLibraries) + + Sync @@ -205,4 +285,4 @@ - \ No newline at end of file + diff --git a/network/trans/WFPSampler/lib/WFPSampler.vcxproj b/network/trans/WFPSampler/lib/WFPSampler.vcxproj index 0db02cd77..ccd688325 100644 --- a/network/trans/WFPSampler/lib/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/lib/WFPSampler.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -35,6 +43,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 True @@ -43,6 +59,14 @@ WindowsApplicationForDrivers10.0 StaticLibrary + + Windows10 + True + Universal + + WindowsApplicationForDrivers10.0 + StaticLibrary + Windows10 False @@ -66,9 +90,15 @@ + + + + + + @@ -79,9 +109,15 @@ WFPSampler + + WFPSampler + WFPSampler + + WFPSampler + WFPSampler @@ -109,6 +145,27 @@ %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib + + + Sync + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + + + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib + + Sync @@ -130,6 +187,27 @@ %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib + + + Sync + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;UM_NDIS630 + %(AdditionalIncludeDirectories);..\inc;..\idl;$(SDK_INC_PATH);.\$(IntDir) + + + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;kernel32.lib;setupapi.lib;rpcrt4.lib;fwpuclnt.lib;ws2_32.lib + + Sync @@ -210,4 +288,4 @@ - \ No newline at end of file + diff --git a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj index 0b7f6a0c2..ee6af85a0 100644 --- a/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj +++ b/network/trans/WFPSampler/svc/WFPSamplerService.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -35,6 +43,15 @@ Application Spectre + + Windows10 + False + Desktop + + WindowsApplicationForDrivers10.0 + Application + Spectre + Windows10 True @@ -44,6 +61,15 @@ Application Spectre + + Windows10 + True + Desktop + + WindowsApplicationForDrivers10.0 + Application + Spectre + Windows10 False @@ -69,9 +95,15 @@ + + + + + + @@ -82,9 +114,15 @@ WFPSamplerService + + WFPSamplerService + WFPSamplerService + + WFPSamplerService + WFPSamplerService @@ -114,6 +152,29 @@ libcmt.lib;libcmtd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) + + + Sync + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + MultiThreaded + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(AdditionalOptions) /integritycheck + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib + libcmt.lib;libcmtd.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) + + Sync @@ -138,6 +199,30 @@ libcmt.lib;msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) + + + Sync + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + MultiThreadedDebug + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE + %(AdditionalIncludeDirectories);..\inc;..\lib;$(SDK_INC_PATH);.\$(IntDir);.\..\lib\$(IntDir) + + + %(AdditionalOptions) /integritycheck /VERBOSE:LIB + %(AdditionalDependencies);advapi32.lib;comctl32.lib;kernel32.lib;netapi32.lib;ole32.lib;oleaut32.lib;user32.lib;uuid.lib;ntdll.lib;setupapi.lib;rpcrt4.lib;rpcns4.lib;fwpuclnt.lib;ws2_32.lib;oneCoreUap.lib;.\..\lib\$(IntDir)\WFPSampler.lib + false + libcmt.lib;msvcrt.lib;msvcrtd.lib;%(IgnoreSpecificDefaultLibraries) + + Sync @@ -218,4 +303,4 @@ - \ No newline at end of file + diff --git a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj index d3678f47d..6e6cdd8c7 100644 --- a/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj +++ b/network/trans/WFPSampler/sys/WFPSamplerCalloutDriver.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -36,6 +44,14 @@ WindowsKernelModeDriver10.0 Driver + + Windows10 + False + Universal + KMDF + WindowsKernelModeDriver10.0 + Driver + Windows10 True @@ -44,6 +60,14 @@ WindowsKernelModeDriver10.0 Driver + + Windows10 + True + Windows Driver + KMDF + WindowsKernelModeDriver10.0 + Driver + Windows10 False @@ -67,9 +91,15 @@ + + + + + + @@ -108,9 +138,15 @@ WFPSamplerCalloutDriver + + WFPSamplerCalloutDriver + WFPSamplerCalloutDriver + + WFPSamplerCalloutDriver + WFPSamplerCalloutDriver @@ -136,6 +172,25 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)\WFPSampler.lib + + + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)\WFPSampler.lib + + true @@ -155,6 +210,25 @@ %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)WFPSampler.lib + + + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;.\..\syslib;$(DDK_INC_PATH) + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(DDK_LIB_PATH)\WDMSec.lib;UUID.lib;.\..\syslib\$(IntDir)WFPSampler.lib + + true @@ -211,6 +285,21 @@ %(IgnoreSpecificDefaultLibraries) + + + + + + + sha256 + + + true + + + %(IgnoreSpecificDefaultLibraries) + + @@ -226,6 +315,21 @@ %(IgnoreSpecificDefaultLibraries) + + + + + + + sha256 + + + true + + + %(IgnoreSpecificDefaultLibraries) + + @@ -260,4 +364,4 @@ - \ No newline at end of file + diff --git a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj index 186ad19ab..d627cb269 100644 --- a/network/trans/WFPSampler/syslib/WFPSampler.vcxproj +++ b/network/trans/WFPSampler/syslib/WFPSampler.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -37,6 +45,14 @@ WindowsKernelModeDriver10.0 StaticLibrary + + Windows10 + False + Desktop + KMDF + WindowsKernelModeDriver10.0 + StaticLibrary + Windows10 True @@ -45,6 +61,14 @@ WindowsKernelModeDriver10.0 StaticLibrary + + Windows10 + True + Universal + KMDF + WindowsKernelModeDriver10.0 + StaticLibrary + Windows10 False @@ -68,9 +92,15 @@ + + + + + + @@ -92,9 +122,15 @@ WFPSampler + + WFPSampler + WFPSampler + + WFPSampler + WFPSampler @@ -125,6 +161,30 @@ sha256 + + + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + + + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib + + + sha256 + + true @@ -149,6 +209,30 @@ sha256 + + + true + Level4 + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + + + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + + + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN;UNICODE;_UNICODE;NDIS630 + %(AdditionalIncludeDirectories);..\inc;$(DDK_INC_PATH);$(IFSKIT_INC_PATH) + + + %(AdditionalDependencies);$(DDK_LIB_PATH)\NTOSKrnl.lib;$(DDK_LIB_PATH)\FwpKClnt.lib;$(DDK_LIB_PATH)\NetIO.lib;$(DDK_LIB_PATH)\NDIS.lib;$(SDK_LIB_PATH)\UUID.lib + + + sha256 + + true @@ -210,4 +294,4 @@ - \ No newline at end of file + diff --git a/network/wlan/WDI/COMMON/common.vcxproj b/network/wlan/WDI/COMMON/common.vcxproj index e6f6a9410..2469edb55 100644 --- a/network/wlan/WDI/COMMON/common.vcxproj +++ b/network/wlan/WDI/COMMON/common.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug x64 @@ -39,11 +47,21 @@ True Windows Driver + + Windows10 + True + Windows Driver + Windows10 False Windows Driver + + Windows10 + False + Windows Driver + DbgengKernelDebugger DbgengRemoteDebugger @@ -56,6 +74,14 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); + + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_ReferencesPath_ARM64); + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(NETFXKitsDir)Lib\um\ARM64 + $(WindowsSDK_MetadataPath); + $(VC_SourcePath); + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_ARM64); + $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_ReferencesPath_x64); @@ -64,6 +90,14 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); + + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_ReferencesPath_ARM64); + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(NETFXKitsDir)Lib\um\ARM64 + $(WindowsSDK_MetadataPath); + $(VC_SourcePath); + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_ARM64); + $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\; @@ -112,6 +146,54 @@ sha256 + + + $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\; + true + Disabled + Default + false + Neither + false + false + false + _X64_;DBG;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions) + false + false + false + false + false + true + false + EnableFastChecks + MultiThreadedDebugDLL + Default + false + true + true + true + NotUsing + Cdecl + Default + false + false + false + Prompt + true + + + $(OutDir)$(TargetName)$(TargetExt) + + + true + + + false + + + sha256 + + true @@ -160,10 +242,58 @@ sha256 + + + true + $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\; + true + Disabled + Default + false + Neither + false + false + false + _X64_;DBG;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions) + false + false + false + false + false + true + false + EnableFastChecks + MultiThreadedDebugDLL + Default + false + true + true + true + NotUsing + Cdecl + Default + false + false + false + Prompt + + + $(OutDir)$(TargetName)$(TargetExt) + + + true + + + false + + + sha256 + + - @@ -262,4 +392,4 @@ - \ No newline at end of file + diff --git a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj index cfc0e2fab..5629dcd1d 100644 --- a/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj +++ b/network/wlan/WDI/PLATFORM/NDIS6/SDIO/sdio.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug x64 @@ -36,12 +44,24 @@ Windows Driver true + + Windows10 + True + Windows Driver + true + Windows10 False Windows Driver true + + Windows10 + False + Windows Driver + true + DbgengKernelDebugger DbgengRemoteDebugger @@ -59,6 +79,19 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); + + http://timestamp.verisign.com/scripts/timstamp.dll + true + 10_NI_ARM64;$(Inf2CatWindowsVersionList) + true + .sys + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_ReferencesPath_ARM64); + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(NETFXKitsDir)Lib\um\ARM64 + $(WindowsSDK_MetadataPath); + $(VC_SourcePath); + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_ARM64); + .sys $(VC_IncludePath);$(WindowsSDK_IncludePath); @@ -72,6 +105,19 @@ true http://timestamp.verisign.com/scripts/timstamp.dll + + .sys + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_ReferencesPath_ARM64); + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(NETFXKitsDir)Lib\um\ARM64 + $(WindowsSDK_MetadataPath); + $(VC_SourcePath); + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_ARM64); + true + 10_NI_ARM64;$(Inf2CatWindowsVersionList) + true + http://timestamp.verisign.com/scripts/timstamp.dll + true @@ -125,6 +171,59 @@ sha256 + + + true + $(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6; + None + true + true + Disabled + Default + false + Neither + false + false + false + _X64_;DBG;NDIS60_MINIPORT;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions) + false + false + false + false + false + true + false + EnableFastChecks + MultiThreadedDebugDLL + Default + false + true + true + true + NotUsing + Cdecl + Default + false + false + false + Prompt + + + $(OutDir)$(TargetName)$(TargetExt) + $(SolutionDir)COMMON\$(Configuration)\$(Platform)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\$(Platform)\NdisComm.lib;$(SolutionDir)\LIB\x64\hal.lib;$(SolutionDir)\LIB\x64\rtklibcom.lib;$(WindowsSDK_LibraryPath_x64)km\x64\ndis.lib;$(WindowsSDK_LibraryPath_x64)km\x64\ntoskrnl.lib;$(WindowsSDK_LibraryPath_x64)km\x64\sdbus.lib;$(WindowsSDK_LibraryPath_x64)km\x64\wlan\1.0\TlvGeneratorParser.lib; + + $(AdditionalOptions) /IGNORE:4099 + + + true + + + false + + + sha256 + + $(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6; @@ -178,6 +277,59 @@ sha256 + + + $(WindowsSdkDir)Include\km\;$(WindowsSdkDir)Include\shared\;$(WindowsSdkDir)Include\wdf\kmdf\1.15\;$(WindowsSdkDir)Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)PLATFORM\NDIS6\SDIO;$(SolutionDir)COMMON\;$(SolutionDir)PLATFORM\NDIS6; + None + true + true + Disabled + Default + false + Neither + false + false + false + _X64_;NDIS60_MINIPORT;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions) + false + false + false + false + false + true + false + EnableFastChecks + MultiThreadedDebugDLL + Default + false + true + true + true + NotUsing + Cdecl + Default + false + false + false + Prompt + true + + + $(OutDir)$(TargetName)$(TargetExt) + + $(AdditionalOptions) /IGNORE:4099 + $(SolutionDir)COMMON\$(Configuration)\$(Platform)\common.lib;$(SolutionDir)PLATFORM\NdisComm\$(Configuration)\$(Platform)\NdisComm.lib;$(SolutionDir)\LIB\x64\hal.lib;$(SolutionDir)\LIB\x64\rtklibcom.lib;$(WindowsSDK_LibraryPath_x64)km\x64\ndis.lib;$(WindowsSDK_LibraryPath_x64)km\x64\ntoskrnl.lib;$(WindowsSDK_LibraryPath_x64)km\x64\sdbus.lib;$(WindowsSDK_LibraryPath_x64)km\x64\wlan\1.0\TlvGeneratorParser.lib; + + + true + + + false + + + sha256 + + @@ -262,4 +414,4 @@ - \ No newline at end of file + diff --git a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj index a7bdea255..d6bfad459 100644 --- a/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj +++ b/network/wlan/WDI/PLATFORM/NdisComm/NdisComm.vcxproj @@ -1,6 +1,14 @@ - + + + Debug + ARM64 + + + Release + ARM64 + Debug x64 @@ -36,11 +44,21 @@ True Windows Driver + + Windows10 + True + Windows Driver + Windows10 False Windows Driver + + Windows10 + False + Windows Driver + DbgengKernelDebugger DbgengRemoteDebugger @@ -53,6 +71,14 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); + + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_ReferencesPath_ARM64); + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(NETFXKitsDir)Lib\um\ARM64 + $(WindowsSDK_MetadataPath); + $(VC_SourcePath); + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_ARM64); + $(VC_IncludePath);$(WindowsSDK_IncludePath); $(VC_ReferencesPath_x64); @@ -61,6 +87,14 @@ $(VC_SourcePath); $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_x64); + + $(VC_IncludePath);$(WindowsSDK_IncludePath); + $(VC_ReferencesPath_ARM64); + $(VC_LibraryPath_ARM64);$(WindowsSDK_LibraryPath_ARM64);$(NETFXKitsDir)Lib\um\ARM64 + $(WindowsSDK_MetadataPath); + $(VC_SourcePath); + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(MSBuild_ExecutablePath);$(VC_LibraryPath_ARM64); + true @@ -111,6 +145,56 @@ sha256 + + + true + $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\; + None + true + true + Disabled + Default + false + Neither + false + false + false + _X64_;DBG;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions) + false + false + false + false + false + true + false + EnableFastChecks + MultiThreadedDebugDLL + Default + false + true + true + true + NotUsing + Cdecl + Default + false + false + false + Prompt + + + $(OutDir)$(TargetName)$(TargetExt) + + + true + + + false + + + sha256 + + true @@ -161,10 +245,60 @@ sha256 + + + true + $(WindowsSdkDir)\Include\km\;$(WindowsSdkDir)\Include\shared\;$(WindowsSdkDir)\Include\wdf\kmdf\1.15\;$(WindowsSdkDir)\Include\km\crt\;$(SolutionDir)HEADER;$(SolutionDir)PLATFORM\NDIS6\;$(SolutionDir)PLATFORM\NdisComm\;$(SolutionDir)PLATFORM\NDIS6\SDIO\;$(SolutionDir)HAL\;$(SolutionDir)HAL\phydm\;$(SolutionDir)HAL\rtl8723B\;$(SolutionDir)HAL\rtl8723B\rtl8723bs\;$(SolutionDir)HAL\phydm\rtl8723b\;$(SolutionDir)COMMON\; + None + true + true + Disabled + Default + false + Neither + false + false + false + _X64_;USE_KLOCKS=1;BINARY_COMPATIBLE=0;NDIS650_MINIPORT=1;NDIS640_MINIPORT=1;NDIS630_MINIPORT=1;NDIS620_MINIPORT=1;NDIS61_MINIPORT=1;NDIS_MINIPORT_DRIVER;%(PreprocessorDefinitions) + false + false + false + false + false + true + false + EnableFastChecks + MultiThreadedDebugDLL + Default + false + true + true + true + NotUsing + Cdecl + Default + false + false + Prompt + false + + + $(OutDir)$(TargetName)$(TargetExt) + + + true + + + false + + + sha256 + + - @@ -197,4 +331,4 @@ - \ No newline at end of file + diff --git a/network/wlan/WDI/windows.msbuild.rtwssample.sln b/network/wlan/WDI/windows.msbuild.rtwssample.sln index 291992f10..19494d3d4 100644 --- a/network/wlan/WDI/windows.msbuild.rtwssample.sln +++ b/network/wlan/WDI/windows.msbuild.rtwssample.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.5.33530.505 @@ -15,10 +15,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NdisComm", "PLATFORM\NdisCo EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM64 = Debug|ARM64 + Release|ARM64 = Release|ARM64 Debug|x64 = Debug|x64 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|ARM64.Build.0 = Debug|ARM64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Debug|ARM64.Build.0 = Debug|ARM64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Debug|ARM64.Build.0 = Debug|ARM64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|ARM64.ActiveCfg = Release|ARM64 + {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Release|ARM64.Build.0 = Release|ARM64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Release|ARM64.ActiveCfg = Release|ARM64 + {956B060D-1055-4584-9CF4-9FE14C428545}.Release|ARM64.Build.0 = Release|ARM64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|ARM64.ActiveCfg = Release|ARM64 + {C0A51792-1338-4294-ADAA-EDC4EE30CF05}.Release|ARM64.Build.0 = Release|ARM64 {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.ActiveCfg = Debug|x64 {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.Build.0 = Debug|x64 {105EA485-B9B6-48AE-B8B0-96BBEA575973}.Debug|x64.Deploy.0 = Debug|x64 diff --git a/smartcrd/pscr/pscr.inx b/smartcrd/pscr/pscr.inx index ad9040fe0..93ea8f4b9 100644 Binary files a/smartcrd/pscr/pscr.inx and b/smartcrd/pscr/pscr.inx differ diff --git a/storage/miniports/lsi_u3/src/lsi_u3.inf b/storage/miniports/lsi_u3/src/lsi_u3.inf index 8a36e3d1b..821c95552 100644 Binary files a/storage/miniports/lsi_u3/src/lsi_u3.inf and b/storage/miniports/lsi_u3/src/lsi_u3.inf differ diff --git a/util/samples_add_arm64_target/samples_add_arm64_target.ps1 b/util/samples_add_arm64_target/samples_add_arm64_target.ps1 new file mode 100644 index 000000000..eb6bb41f1 --- /dev/null +++ b/util/samples_add_arm64_target/samples_add_arm64_target.ps1 @@ -0,0 +1,168 @@ +$folderPath = "..\.." + +# Get all .sln files recursively +$slnFiles = Get-ChildItem -Path $folderPath -Filter "*.sln" -Recurse + +foreach ($slnFile in $slnFiles) { + # Read the contents of the .sln file + $slnContent = Get-Content -Path $slnFile.FullName + + # Check if Debug|ARM64 configuration already exists + $debugArm64Exists = $slnContent -match "Debug\|ARM64" + + if (-not $debugArm64Exists) { + $slnNewContent = "" + $ids = @() + $projectFiles = @{} + $inNestedProjects = $false + foreach ($line in $slnContent) { + $line = $line.TrimEnd() + # Find if line matches Project("") = "", "", "" + if ($line -match "Project\(`"(.*)`"\) = `"(.*?)`", `"(.*?)`", `"(.*?)`"") { + # Get and add it to the array + $id = $matches[4] + $projectFile = $matches[3] + $ids += $id + $projectFiles.Add($id, $projectFile) + } + if ($inNestedProjects) { + if ($line -match "EndGlobalSection") { + $inNestedProjects = $false + } else { + # Find if line matches " = " and remove it from the array + if ($line -match "(.*) = (.*)") { + $childId = $matches[2] + $ids = $ids -ne $childId + } + } + } + # Find line in $slnContent where "GlobalSection(SolutionConfigurationPlatforms) = preSolution" exists + if ($line -match "GlobalSection\(NestedProjects\) = preSolution") { + $inNestedProjects = $true + } + } + if ($ids.Count -eq 0) { + continue + } + foreach ($line in $slnContent) { + $line = $line.TrimEnd() + $slnNewContent += "$line`r`n" + # Find line in $slnContent where "GlobalSection(SolutionConfigurationPlatforms) = preSolution" exists + if ($line -match "GlobalSection\(SolutionConfigurationPlatforms\) = preSolution") { + # Append text after that line + $slnNewContent += "`t`tDebug|ARM64 = Debug|ARM64`r`n" + $slnNewContent += "`t`tRelease|ARM64 = Release|ARM64`r`n" + } + # Add new configuration to "GlobalSection(ProjectConfigurationPlatforms) = postSolution" + if ($line -match "GlobalSection\(ProjectConfigurationPlatforms\) = postSolution") { + $configurations = @("Debug", "Release") + foreach ($configuration in $configurations) + { + foreach ($id in $ids) { + # Append text after that line + $slnNewContent += "`t`t$id.$configuration|ARM64.ActiveCfg = $configuration|ARM64`r`n" + # Ignore some projects that were intentionally not build for ARM64 + if ($id -eq '{50458BE9-A423-44C1-AF44-21D4B5233063}') { # 60\netvmini60.vcxproj; NDIS version not supported + continue + } + if ($id -eq '{062B87F8-6021-4BE2-B677-3AEF2456CBA0}') { # 620\netvmini620.vcxproj; NDIS version not supported + continue + } + if ($id -eq '{65A3C0DB-248E-4365-83D2-E4DE6E764C6C}') { # SampleDSM.vcxproj; mpio.lib not supported + continue + } + $slnNewContent += "`t`t$id.$configuration|ARM64.Build.0 = $configuration|ARM64`r`n" + #$slnNewContent += "`t`t$id.$configuration|ARM64.Deploy.0 = $configuration|ARM64`r`n" + } + } + } + } + # Write the updated contents back to the .sln file + $slnNewContent | Set-Content -Path $slnFile.FullName -NoNewline + #$slnNewContent | Set-Content -Path "test.sln" + + foreach ($id in $ids) { + $projectFile = $projectFiles[$id] + $projectFilePath = Join-Path -Path $slnFile.DirectoryName -ChildPath $projectFile + $projectContent = Get-Content -Path $projectFilePath + $projectNewContent = "" + # Check if Debug|ARM64 configuration already exists + $debugArm64Exists = $projectContent -match "" + # Override for testing + #$debugArm64Exists = $false + if (-not $debugArm64Exists) + { + $insideGroup = $false + $noEntryPoint = $false + $groupType = "" + foreach ($line in $projectContent) { + $line = $line.TrimEnd() + if ([string]::IsNullOrWhiteSpace($line)) + { + continue + } + $projectNewContent += "$line`r`n" + if ($line -match "") { + $projectNewContent += " `r`n" + $projectNewContent += " Debug`r`n" + $projectNewContent += " ARM64`r`n" + $projectNewContent += " `r`n" + $projectNewContent += " `r`n" + $projectNewContent += " Release`r`n" + $projectNewContent += " ARM64`r`n" + $projectNewContent += " `r`n" + } + if ($insideGroup) + { + # Remove BufferSecurityCheck from ARM64 configurations if no EntryPoint is defined + if ($line -match "false" -and $noEntryPoint) + { + $newItemDefinitionGroupContent += " false`r`n" + $noEntryPoint = $false + } + if ($line -match "true") { + $noEntryPoint = $true + } + # Remove "/CETCOMPAT" linker option from ARM64 configurations + $line = $line.Replace('/CETCOMPAT', '') + $line = $line.Replace('true', 'false') + # Adjust NDIS version + if ($line -match '' -and $line -notmatch 'NDIS6[3-9]\d') + { + $line = $line -replace 'NDIS6[0-2]\d*', 'NDIS630' + $line = $line -replace 'NDIS_SUPPORT_NDIS6[0-2]\d*', 'NDIS_SUPPORT_NDIS630' + $line = $line -replace 'NDIS_SUPPORT_NDIS6[^\d]', 'NDIS_SUPPORT_NDIS630' + } + # Adjust ARM64 specific paths + if ($line -match '<(ReferencePath|LibraryPath|ExcludePath)>') + { + $line = $line -replace 'x64', 'ARM64' + } + # Adjust Inf2Cat version + if ($line -match "") + { + $line = $line -replace '10_([A-Z]+_)?x64', '10_NI_ARM64' + } + # Add missing condition for ARM64 in usbview sample + $line = $line.Replace("", "") + $line = $line.Replace("", "") + $newItemDefinitionGroupContent += $line + "`r`n" + if ($line -match "") { + $insideGroup = $false + $projectNewContent += $newItemDefinitionGroupContent + } + } + if ($line -match '<(ItemDefinitionGroup|PropertyGroup|ImportGroup) .*Condition=".*==.(.*)\|x64.".*>') { + $groupType = $matches[1] + #$configuration = $matches[2] + $insideGroup = $true + $noEntryPoint = $false + $newItemDefinitionGroupContent = $line.Replace('x64', 'ARM64') + "`r`n" + } + } + $projectNewContent | Set-Content -Path $projectFilePath -NoNewline + #$projectNewContent | Set-Content -Path "test.vcxproj" + } + } + } +}