diff --git a/.azure/azure-pipelines.ci.yml b/.azure/azure-pipelines.ci.yml index fe6261c28..53bb9e76e 100644 --- a/.azure/azure-pipelines.ci.yml +++ b/.azure/azure-pipelines.ci.yml @@ -73,12 +73,6 @@ stages: displayName: Build Windows Drivers - Non Tested dependsOn: [] jobs: - - template: ./templates/build-config-winkernel.yml - parameters: - arch: x86 - - template: ./templates/build-config-winkernel.yml - parameters: - arch: arm - template: ./templates/build-config-winkernel.yml parameters: arch: arm64 diff --git a/.azure/obtemplates/build-winkernel.yml b/.azure/obtemplates/build-winkernel.yml index a80a599dc..e3e784545 100644 --- a/.azure/obtemplates/build-winkernel.yml +++ b/.azure/obtemplates/build-winkernel.yml @@ -15,12 +15,6 @@ jobs: - script: scripts\onebranch-build-kernel.cmd ${{ parameters.config }} x64 displayName: x64 target: windows_build_container2 - - script: scripts\onebranch-build-kernel.cmd ${{ parameters.config }} x86 - displayName: x86 - target: windows_build_container2 - - script: scripts\onebranch-build-kernel.cmd ${{ parameters.config }} ARM - displayName: ARM - target: windows_build_container2 - script: scripts\onebranch-build-kernel.cmd ${{ parameters.config }} ARM64 displayName: ARM64 target: windows_build_container2 diff --git a/msquic.kernel.sln b/msquic.kernel.sln index ade12fb84..6e5368d21 100644 --- a/msquic.kernel.sln +++ b/msquic.kernel.sln @@ -30,280 +30,144 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "secnetperfdriver.kernel", " EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|ARM = Release|ARM Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|ARM.ActiveCfg = Debug|ARM - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|ARM.Build.0 = Debug|ARM - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|ARM.Deploy.0 = Debug|ARM {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|ARM64.ActiveCfg = Debug|ARM64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|ARM64.Build.0 = Debug|ARM64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|ARM64.Deploy.0 = Debug|ARM64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|x64.ActiveCfg = Debug|x64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|x64.Build.0 = Debug|x64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|x64.Deploy.0 = Debug|x64 - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|x86.ActiveCfg = Debug|Win32 - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|x86.Build.0 = Debug|Win32 - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Debug|x86.Deploy.0 = Debug|Win32 - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|ARM.ActiveCfg = Release|ARM - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|ARM.Build.0 = Release|ARM - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|ARM.Deploy.0 = Release|ARM {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|ARM64.ActiveCfg = Release|ARM64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|ARM64.Build.0 = Release|ARM64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|ARM64.Deploy.0 = Release|ARM64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|x64.ActiveCfg = Release|x64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|x64.Build.0 = Release|x64 {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|x64.Deploy.0 = Release|x64 - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|x86.ActiveCfg = Release|Win32 - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|x86.Build.0 = Release|Win32 - {5F99F713-BF5F-44EB-90FE-FEA03906BBA9}.Release|x86.Deploy.0 = Release|Win32 - {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|ARM.ActiveCfg = Debug|ARM - {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|ARM.Build.0 = Debug|ARM - {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|ARM.Deploy.0 = Debug|ARM {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|ARM64.ActiveCfg = Debug|ARM64 {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|ARM64.Build.0 = Debug|ARM64 {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|ARM64.Deploy.0 = Debug|ARM64 {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|x64.ActiveCfg = Debug|x64 {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|x64.Build.0 = Debug|x64 {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|x64.Deploy.0 = Debug|x64 - {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|x86.ActiveCfg = Debug|Win32 - {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|x86.Build.0 = Debug|Win32 - {E862BE76-298B-4021-8105-A3E115FA2900}.Debug|x86.Deploy.0 = Debug|Win32 - {E862BE76-298B-4021-8105-A3E115FA2900}.Release|ARM.ActiveCfg = Release|ARM - {E862BE76-298B-4021-8105-A3E115FA2900}.Release|ARM.Build.0 = Release|ARM - {E862BE76-298B-4021-8105-A3E115FA2900}.Release|ARM.Deploy.0 = Release|ARM {E862BE76-298B-4021-8105-A3E115FA2900}.Release|ARM64.ActiveCfg = Release|ARM64 {E862BE76-298B-4021-8105-A3E115FA2900}.Release|ARM64.Build.0 = Release|ARM64 {E862BE76-298B-4021-8105-A3E115FA2900}.Release|ARM64.Deploy.0 = Release|ARM64 {E862BE76-298B-4021-8105-A3E115FA2900}.Release|x64.ActiveCfg = Release|x64 {E862BE76-298B-4021-8105-A3E115FA2900}.Release|x64.Build.0 = Release|x64 {E862BE76-298B-4021-8105-A3E115FA2900}.Release|x64.Deploy.0 = Release|x64 - {E862BE76-298B-4021-8105-A3E115FA2900}.Release|x86.ActiveCfg = Release|Win32 - {E862BE76-298B-4021-8105-A3E115FA2900}.Release|x86.Build.0 = Release|Win32 - {E862BE76-298B-4021-8105-A3E115FA2900}.Release|x86.Deploy.0 = Release|Win32 - {A295E4D7-A50A-4771-8383-608258C23442}.Debug|ARM.ActiveCfg = Debug|ARM - {A295E4D7-A50A-4771-8383-608258C23442}.Debug|ARM.Build.0 = Debug|ARM - {A295E4D7-A50A-4771-8383-608258C23442}.Debug|ARM.Deploy.0 = Debug|ARM {A295E4D7-A50A-4771-8383-608258C23442}.Debug|ARM64.ActiveCfg = Debug|ARM64 {A295E4D7-A50A-4771-8383-608258C23442}.Debug|ARM64.Build.0 = Debug|ARM64 {A295E4D7-A50A-4771-8383-608258C23442}.Debug|ARM64.Deploy.0 = Debug|ARM64 {A295E4D7-A50A-4771-8383-608258C23442}.Debug|x64.ActiveCfg = Debug|x64 {A295E4D7-A50A-4771-8383-608258C23442}.Debug|x64.Build.0 = Debug|x64 {A295E4D7-A50A-4771-8383-608258C23442}.Debug|x64.Deploy.0 = Debug|x64 - {A295E4D7-A50A-4771-8383-608258C23442}.Debug|x86.ActiveCfg = Debug|Win32 - {A295E4D7-A50A-4771-8383-608258C23442}.Debug|x86.Build.0 = Debug|Win32 - {A295E4D7-A50A-4771-8383-608258C23442}.Debug|x86.Deploy.0 = Debug|Win32 - {A295E4D7-A50A-4771-8383-608258C23442}.Release|ARM.ActiveCfg = Release|ARM - {A295E4D7-A50A-4771-8383-608258C23442}.Release|ARM.Build.0 = Release|ARM - {A295E4D7-A50A-4771-8383-608258C23442}.Release|ARM.Deploy.0 = Release|ARM {A295E4D7-A50A-4771-8383-608258C23442}.Release|ARM64.ActiveCfg = Release|ARM64 {A295E4D7-A50A-4771-8383-608258C23442}.Release|ARM64.Build.0 = Release|ARM64 {A295E4D7-A50A-4771-8383-608258C23442}.Release|ARM64.Deploy.0 = Release|ARM64 {A295E4D7-A50A-4771-8383-608258C23442}.Release|x64.ActiveCfg = Release|x64 {A295E4D7-A50A-4771-8383-608258C23442}.Release|x64.Build.0 = Release|x64 {A295E4D7-A50A-4771-8383-608258C23442}.Release|x64.Deploy.0 = Release|x64 - {A295E4D7-A50A-4771-8383-608258C23442}.Release|x86.ActiveCfg = Release|Win32 - {A295E4D7-A50A-4771-8383-608258C23442}.Release|x86.Build.0 = Release|Win32 - {A295E4D7-A50A-4771-8383-608258C23442}.Release|x86.Deploy.0 = Release|Win32 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|ARM.ActiveCfg = Debug|ARM - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|ARM.Build.0 = Debug|ARM - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|ARM.Deploy.0 = Debug|ARM {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|ARM64.ActiveCfg = Debug|ARM64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|ARM64.Build.0 = Debug|ARM64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|ARM64.Deploy.0 = Debug|ARM64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|x64.ActiveCfg = Debug|x64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|x64.Build.0 = Debug|x64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|x64.Deploy.0 = Debug|x64 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|x86.ActiveCfg = Debug|Win32 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|x86.Build.0 = Debug|Win32 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Debug|x86.Deploy.0 = Debug|Win32 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|ARM.ActiveCfg = Release|ARM - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|ARM.Build.0 = Release|ARM - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|ARM.Deploy.0 = Release|ARM {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|ARM64.ActiveCfg = Release|ARM64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|ARM64.Build.0 = Release|ARM64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|ARM64.Deploy.0 = Release|ARM64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|x64.ActiveCfg = Release|x64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|x64.Build.0 = Release|x64 {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|x64.Deploy.0 = Release|x64 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|x86.ActiveCfg = Release|Win32 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|x86.Build.0 = Release|Win32 - {C31B028C-E91C-4CF7-A8E7-F385B2AF5F85}.Release|x86.Deploy.0 = Release|Win32 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|ARM.ActiveCfg = Debug|ARM - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|ARM.Build.0 = Debug|ARM - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|ARM.Deploy.0 = Debug|ARM {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|ARM64.ActiveCfg = Debug|ARM64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|ARM64.Build.0 = Debug|ARM64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|ARM64.Deploy.0 = Debug|ARM64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|x64.ActiveCfg = Debug|x64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|x64.Build.0 = Debug|x64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|x64.Deploy.0 = Debug|x64 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|x86.ActiveCfg = Debug|Win32 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|x86.Build.0 = Debug|Win32 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Debug|x86.Deploy.0 = Debug|Win32 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|ARM.ActiveCfg = Release|ARM - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|ARM.Build.0 = Release|ARM - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|ARM.Deploy.0 = Release|ARM {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|ARM64.ActiveCfg = Release|ARM64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|ARM64.Build.0 = Release|ARM64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|ARM64.Deploy.0 = Release|ARM64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|x64.ActiveCfg = Release|x64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|x64.Build.0 = Release|x64 {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|x64.Deploy.0 = Release|x64 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|x86.ActiveCfg = Release|Win32 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|x86.Build.0 = Release|Win32 - {49E98DF4-7BC5-4E0B-8F13-295380652F94}.Release|x86.Deploy.0 = Release|Win32 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|ARM.ActiveCfg = Debug|ARM - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|ARM.Build.0 = Debug|ARM - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|ARM.Deploy.0 = Debug|ARM {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|ARM64.ActiveCfg = Debug|ARM64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|ARM64.Build.0 = Debug|ARM64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|ARM64.Deploy.0 = Debug|ARM64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|x64.ActiveCfg = Debug|x64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|x64.Build.0 = Debug|x64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|x64.Deploy.0 = Debug|x64 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|x86.ActiveCfg = Debug|Win32 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|x86.Build.0 = Debug|Win32 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Debug|x86.Deploy.0 = Debug|Win32 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|ARM.ActiveCfg = Release|ARM - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|ARM.Build.0 = Release|ARM - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|ARM.Deploy.0 = Release|ARM {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|ARM64.ActiveCfg = Release|ARM64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|ARM64.Build.0 = Release|ARM64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|ARM64.Deploy.0 = Release|ARM64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x64.ActiveCfg = Release|x64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x64.Build.0 = Release|x64 {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x64.Deploy.0 = Release|x64 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x86.ActiveCfg = Release|Win32 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x86.Build.0 = Release|Win32 - {C1ADB76F-7005-4516-BADB-2A60797EF912}.Release|x86.Deploy.0 = Release|Win32 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM.ActiveCfg = Debug|ARM - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM.Build.0 = Debug|ARM - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM.Deploy.0 = Debug|ARM {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM64.ActiveCfg = Debug|ARM64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM64.Build.0 = Debug|ARM64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|ARM64.Deploy.0 = Debug|ARM64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x64.ActiveCfg = Debug|x64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x64.Build.0 = Debug|x64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x64.Deploy.0 = Debug|x64 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x86.ActiveCfg = Debug|Win32 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x86.Build.0 = Debug|Win32 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Debug|x86.Deploy.0 = Debug|Win32 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM.ActiveCfg = Release|ARM - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM.Build.0 = Release|ARM - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM.Deploy.0 = Release|ARM {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM64.ActiveCfg = Release|ARM64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM64.Build.0 = Release|ARM64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|ARM64.Deploy.0 = Release|ARM64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x64.ActiveCfg = Release|x64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x64.Build.0 = Release|x64 {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x64.Deploy.0 = Release|x64 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x86.ActiveCfg = Release|Win32 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x86.Build.0 = Release|Win32 - {11633785-79CC-4C7D-AB6A-AECDF29A1FA7}.Release|x86.Deploy.0 = Release|Win32 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM.ActiveCfg = Debug|ARM - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM.Build.0 = Debug|ARM - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM.Deploy.0 = Debug|ARM {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM64.ActiveCfg = Debug|ARM64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM64.Build.0 = Debug|ARM64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|ARM64.Deploy.0 = Debug|ARM64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x64.ActiveCfg = Debug|x64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x64.Build.0 = Debug|x64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x64.Deploy.0 = Debug|x64 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x86.ActiveCfg = Debug|Win32 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x86.Build.0 = Debug|Win32 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Debug|x86.Deploy.0 = Debug|Win32 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM.ActiveCfg = Release|ARM - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM.Build.0 = Release|ARM - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM.Deploy.0 = Release|ARM {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM64.ActiveCfg = Release|ARM64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM64.Build.0 = Release|ARM64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|ARM64.Deploy.0 = Release|ARM64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x64.ActiveCfg = Release|x64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x64.Build.0 = Release|x64 {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x64.Deploy.0 = Release|x64 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x86.ActiveCfg = Release|Win32 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x86.Build.0 = Release|Win32 - {2BE64DBF-60E6-4FE8-96B0-5F2526405096}.Release|x86.Deploy.0 = Release|Win32 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|ARM.ActiveCfg = Debug|ARM - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|ARM.Build.0 = Debug|ARM - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|ARM.Deploy.0 = Debug|ARM {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|ARM64.ActiveCfg = Debug|ARM64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|ARM64.Build.0 = Debug|ARM64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|ARM64.Deploy.0 = Debug|ARM64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|x64.ActiveCfg = Debug|x64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|x64.Build.0 = Debug|x64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|x64.Deploy.0 = Debug|x64 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|x86.ActiveCfg = Debug|Win32 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|x86.Build.0 = Debug|Win32 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Debug|x86.Deploy.0 = Debug|Win32 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|ARM.ActiveCfg = Release|ARM - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|ARM.Build.0 = Release|ARM - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|ARM.Deploy.0 = Release|ARM {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|ARM64.ActiveCfg = Release|ARM64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|ARM64.Build.0 = Release|ARM64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|ARM64.Deploy.0 = Release|ARM64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|x64.ActiveCfg = Release|x64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|x64.Build.0 = Release|x64 {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|x64.Deploy.0 = Release|x64 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|x86.ActiveCfg = Release|Win32 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|x86.Build.0 = Release|Win32 - {E2DDB0A8-594D-424D-9ADD-4EF211F7FC3F}.Release|x86.Deploy.0 = Release|Win32 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|ARM.ActiveCfg = Debug|ARM - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|ARM.Build.0 = Debug|ARM - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|ARM.Deploy.0 = Debug|ARM {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|ARM64.ActiveCfg = Debug|ARM64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|ARM64.Build.0 = Debug|ARM64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|ARM64.Deploy.0 = Debug|ARM64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|x64.ActiveCfg = Debug|x64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|x64.Build.0 = Debug|x64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|x64.Deploy.0 = Debug|x64 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|x86.ActiveCfg = Debug|Win32 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|x86.Build.0 = Debug|Win32 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Debug|x86.Deploy.0 = Debug|Win32 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|ARM.ActiveCfg = Release|ARM - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|ARM.Build.0 = Release|ARM - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|ARM.Deploy.0 = Release|ARM {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|ARM64.ActiveCfg = Release|ARM64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|ARM64.Build.0 = Release|ARM64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|ARM64.Deploy.0 = Release|ARM64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|x64.ActiveCfg = Release|x64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|x64.Build.0 = Release|x64 {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|x64.Deploy.0 = Release|x64 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|x86.ActiveCfg = Release|Win32 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|x86.Build.0 = Release|Win32 - {C8491270-B0BE-440C-B88D-7B441A8CB67E}.Release|x86.Deploy.0 = Release|Win32 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|ARM.ActiveCfg = Debug|ARM - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|ARM.Build.0 = Debug|ARM - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|ARM.Deploy.0 = Debug|ARM {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|ARM64.Build.0 = Debug|ARM64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|ARM64.Deploy.0 = Debug|ARM64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|x64.ActiveCfg = Debug|x64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|x64.Build.0 = Debug|x64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|x64.Deploy.0 = Debug|x64 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|x86.ActiveCfg = Debug|Win32 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|x86.Build.0 = Debug|Win32 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Debug|x86.Deploy.0 = Debug|Win32 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|ARM.ActiveCfg = Release|ARM - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|ARM.Build.0 = Release|ARM - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|ARM.Deploy.0 = Release|ARM {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|ARM64.ActiveCfg = Release|ARM64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|ARM64.Build.0 = Release|ARM64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|ARM64.Deploy.0 = Release|ARM64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|x64.ActiveCfg = Release|x64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|x64.Build.0 = Release|x64 {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|x64.Deploy.0 = Release|x64 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|x86.ActiveCfg = Release|Win32 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|x86.Build.0 = Release|Win32 - {1862CCD7-31D7-4869-A409-5B9B5EDF19BB}.Release|x86.Deploy.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/scripts/prepare-package.ps1 b/scripts/prepare-package.ps1 index 444fdccde..dfebcf694 100644 --- a/scripts/prepare-package.ps1 +++ b/scripts/prepare-package.ps1 @@ -25,6 +25,8 @@ $Configs = [System.Tuple]::Create("Debug","chk"), [System.Tuple]::Create("Releas $Archs = [System.Tuple]::Create("ARM","arm","arm"), [System.Tuple]::Create("ARM64","arm64","arm64"), ` [System.Tuple]::Create("Win32","x86","x86"), [System.Tuple]::Create("x64","x64","amd64") +$SkipKernelArchs = @("Win32", "ARM") + function Force-Copy($Source, $Destination) { New-Item -Path $Destination -ItemType Directory -Force | Out-Null Copy-Item $Source $Destination -Force | Out-Null @@ -51,14 +53,16 @@ foreach ($Config in $Configs) { Force-Copy (Join-Path $InputDir "secnetperf.exe") (Join-Path $PlatformPackageDir "bin/user") Force-Copy (Join-Path $InputDir "secnetperf.pdb") (Join-Path $PlatformPackageDir "bin/user") - $InputDir = Join-Path $ArtifactsDir "bin/winkernel/$($Arch.Item1)_$($Config.Item1)_schannel" - Force-Copy (Join-Path $InputDir "msquic.lib") (Join-Path $PlatformPackageDir "lib/kernel") - Force-Copy (Join-Path $InputDir "msquic.sys") (Join-Path $PlatformPackageDir "bin/kernel") - Force-Copy (Join-Path $InputDir "msquic.pdb") (Join-Path $PlatformPackageDir "bin/kernel") - Force-Copy (Join-Path $InputDir "msquictest.sys") (Join-Path $PlatformPackageDir "bin/kernel") - Force-Copy (Join-Path $InputDir "msquictest.pdb") (Join-Path $PlatformPackageDir "bin/kernel") - Force-Copy (Join-Path $InputDir "secnetperfdrv.sys") (Join-Path $PlatformPackageDir "bin/kernel") - Force-Copy (Join-Path $InputDir "secnetperfdrv.pdb") (Join-Path $PlatformPackageDir "bin/kernel") + if (!$SkipKernelArchs.Contains($Arch.Item1)) { + $InputDir = Join-Path $ArtifactsDir "bin/winkernel/$($Arch.Item1)_$($Config.Item1)_schannel" + Force-Copy (Join-Path $InputDir "msquic.lib") (Join-Path $PlatformPackageDir "lib/kernel") + Force-Copy (Join-Path $InputDir "msquic.sys") (Join-Path $PlatformPackageDir "bin/kernel") + Force-Copy (Join-Path $InputDir "msquic.pdb") (Join-Path $PlatformPackageDir "bin/kernel") + Force-Copy (Join-Path $InputDir "msquictest.sys") (Join-Path $PlatformPackageDir "bin/kernel") + Force-Copy (Join-Path $InputDir "msquictest.pdb") (Join-Path $PlatformPackageDir "bin/kernel") + Force-Copy (Join-Path $InputDir "secnetperfdrv.sys") (Join-Path $PlatformPackageDir "bin/kernel") + Force-Copy (Join-Path $InputDir "secnetperfdrv.pdb") (Join-Path $PlatformPackageDir "bin/kernel") + } } # Special case chpe diff --git a/src/bin/winkernel/msquic.kernel.vcxproj b/src/bin/winkernel/msquic.kernel.vcxproj index 76b31c4af..a57d7708c 100644 --- a/src/bin/winkernel/msquic.kernel.vcxproj +++ b/src/bin/winkernel/msquic.kernel.vcxproj @@ -5,14 +5,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -21,14 +13,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/bin/winkernel/msquicpriv.kernel.vcxproj b/src/bin/winkernel/msquicpriv.kernel.vcxproj index 9775798d1..694c41787 100644 --- a/src/bin/winkernel/msquicpriv.kernel.vcxproj +++ b/src/bin/winkernel/msquicpriv.kernel.vcxproj @@ -5,14 +5,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -21,14 +13,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/core/core.kernel.vcxproj b/src/core/core.kernel.vcxproj index 084c33d76..c3e6b3e8d 100644 --- a/src/core/core.kernel.vcxproj +++ b/src/core/core.kernel.vcxproj @@ -1,14 +1,6 @@  - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/inc/msquic.h b/src/inc/msquic.h index 0d07986c9..1983af337 100644 --- a/src/inc/msquic.h +++ b/src/inc/msquic.h @@ -1394,6 +1394,17 @@ typedef struct QUIC_API_TABLE { #define QUIC_API_VERSION_1 1 // Not supported any more #define QUIC_API_VERSION_2 2 // Current latest +#if defined(_KERNEL_MODE) && !defined(_WIN64) + +// +// 32 bit kernel mode is no longer supported, so shim behavior in 32 bit kernel +// mode +// +#define MsQuicClose(QuicApi) UNREFERENCED_PARAMETER((QuicApi)) +#define MsQuicOpenVersion(Version, QuicApi) QUIC_STATUS_NOT_SUPPORTED + +#else + // // Opens the API library and initializes it if this is the first call for the // process. It returns API function table for the rest of the API's functions. @@ -1411,6 +1422,19 @@ MsQuicOpenVersion( _Out_ _Pre_defensive_ const void** QuicApi ); +// +// Cleans up the function table returned from MsQuicOpenVersion and releases the +// reference on the API. +// +_IRQL_requires_max_(PASSIVE_LEVEL) +void +QUIC_API +MsQuicClose( + _In_ _Pre_defensive_ const void* QuicApi + ); + +#endif + // // Version specific helpers that wrap MsQuicOpenVersion. // @@ -1441,17 +1465,6 @@ MsQuicOpen2( #endif // defined(__cplusplus) -// -// Cleans up the function table returned from MsQuicOpenVersion and releases the -// reference on the API. -// -_IRQL_requires_max_(PASSIVE_LEVEL) -void -QUIC_API -MsQuicClose( - _In_ _Pre_defensive_ const void* QuicApi - ); - #if defined(__cplusplus) } #endif diff --git a/src/manifest/manifest.kernel.vcxproj b/src/manifest/manifest.kernel.vcxproj index dbd1d14bc..2bb9eeafc 100644 --- a/src/manifest/manifest.kernel.vcxproj +++ b/src/manifest/manifest.kernel.vcxproj @@ -1,14 +1,6 @@  - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/perf/bin/secnetperfdriver.kernel.vcxproj b/src/perf/bin/secnetperfdriver.kernel.vcxproj index 78187ac3b..6e96cc598 100644 --- a/src/perf/bin/secnetperfdriver.kernel.vcxproj +++ b/src/perf/bin/secnetperfdriver.kernel.vcxproj @@ -1,14 +1,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/perf/bin/secnetperfdriverpriv.kernel.vcxproj b/src/perf/bin/secnetperfdriverpriv.kernel.vcxproj index 3db8c232f..f2c77365a 100644 --- a/src/perf/bin/secnetperfdriverpriv.kernel.vcxproj +++ b/src/perf/bin/secnetperfdriverpriv.kernel.vcxproj @@ -1,14 +1,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/perf/lib/perflib.kernel.vcxproj b/src/perf/lib/perflib.kernel.vcxproj index 734701f02..7f56d6119 100644 --- a/src/perf/lib/perflib.kernel.vcxproj +++ b/src/perf/lib/perflib.kernel.vcxproj @@ -1,14 +1,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/platform/platform.kernel.vcxproj b/src/platform/platform.kernel.vcxproj index 0c74b4818..3948c564f 100644 --- a/src/platform/platform.kernel.vcxproj +++ b/src/platform/platform.kernel.vcxproj @@ -1,14 +1,6 @@  - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/test/bin/winkernel/msquictest.kernel.vcxproj b/src/test/bin/winkernel/msquictest.kernel.vcxproj index ce1398797..0e00bc3c9 100644 --- a/src/test/bin/winkernel/msquictest.kernel.vcxproj +++ b/src/test/bin/winkernel/msquictest.kernel.vcxproj @@ -1,14 +1,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/test/bin/winkernel/msquictestpriv.kernel.vcxproj b/src/test/bin/winkernel/msquictestpriv.kernel.vcxproj index 28629dc64..ffdf75609 100644 --- a/src/test/bin/winkernel/msquictestpriv.kernel.vcxproj +++ b/src/test/bin/winkernel/msquictestpriv.kernel.vcxproj @@ -1,14 +1,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64 diff --git a/src/test/lib/testlib.kernel.vcxproj b/src/test/lib/testlib.kernel.vcxproj index 2d0b89ad4..f6ef0058d 100644 --- a/src/test/lib/testlib.kernel.vcxproj +++ b/src/test/lib/testlib.kernel.vcxproj @@ -1,14 +1,6 @@ - - Debug - Win32 - - - Release - Win32 - Debug x64 @@ -17,14 +9,6 @@ Release x64 - - Debug - ARM - - - Release - ARM - Debug ARM64