Add Windows 11 target

Update build scripts to use EWDK 11 21H2 for Win10 target and EWDK 11 22H2 for Win11 target Signed-off-by: Kostiantyn Kostiuk <konstantin@daynix.com>
kostyanf14 · Dec 19, 2023 · 4c4d181 · 4c4d181
1 parent d68cf27
commit 4c4d181
Show file tree

Hide file tree

Showing 77 changed files with 2,936 additions and 85 deletions.
diff --git a/Balloon/app/blnsvr.vcxproj b/Balloon/app/blnsvr.vcxproj
@@ -13,6 +13,18 @@
       <Configuration>Win10 Release</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Win11 Release|ARM64">
+      <Configuration>Win11 Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win11 Release|Win32">
+      <Configuration>Win11 Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Win11 Release|x64">
+      <Configuration>Win11 Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B953395B-010B-432C-AFCD-6C4F6553905F}</ProjectGuid>
@@ -28,6 +40,14 @@
     <CharacterSet>Unicode</CharacterSet>
     <TargetVersion>Windows10</TargetVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <TargetVersion>Windows10</TargetVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -36,6 +56,14 @@
     <CharacterSet>Unicode</CharacterSet>
     <TargetVersion>Windows10</TargetVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <TargetVersion>Windows10</TargetVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
@@ -44,6 +72,14 @@
     <CharacterSet>Unicode</CharacterSet>
     <TargetVersion>Windows10</TargetVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>WindowsApplicationForDrivers10.0</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <TargetVersion>Windows10</TargetVersion>
+  </PropertyGroup>
   <Import Project="$(MSBuildProjectDirectory)\..\..\Tools\Driver.Common.props" />
   <Import Project="$(MSBuildProjectDirectory)\blnsvr.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -56,33 +92,59 @@
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>objfre_win10_x86\i386\</OutDir>
     <IntDir>objfre_win10_x86\i386\</IntDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>objfre_win11_x86\i386\</OutDir>
+    <IntDir>objfre_win11_x86\i386\</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>objfre_win10_amd64\amd64\</OutDir>
     <IntDir>objfre_win10_amd64\amd64\</IntDir>
     <ApiValidator_Enable>true</ApiValidator_Enable>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>objfre_win11_amd64\amd64\</OutDir>
+    <IntDir>objfre_win11_amd64\amd64\</IntDir>
+    <ApiValidator_Enable>true</ApiValidator_Enable>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>objfre_win10_arm64\arm64\</OutDir>
     <IntDir>objfre_win10_arm64\arm64\</IntDir>
     <ApiValidator_Enable>true</ApiValidator_Enable>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>objfre_win11_arm64\arm64\</OutDir>
+    <IntDir>objfre_win11_arm64\arm64\</IntDir>
+    <ApiValidator_Enable>true</ApiValidator_Enable>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -104,6 +166,27 @@
       <IgnoreSpecificDefaultLibraries>kernel32.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;UNIVERSAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\sys\</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>OneCoreUAP.lib;wbemuuid.lib</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>kernel32.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|x64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -125,6 +208,27 @@
       <IgnoreSpecificDefaultLibraries>kernel32.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;UNIVERSAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\sys\</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>OneCoreUAP.lib;wbemuuid.lib</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>kernel32.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Release|ARM64'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -146,6 +250,27 @@
       <IgnoreSpecificDefaultLibraries>kernel32.lib</IgnoreSpecificDefaultLibraries>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win11 Release|ARM64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;UNIVERSAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>..\sys\</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>OneCoreUAP.lib;wbemuuid.lib</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>kernel32.lib</IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <Text Include="ReadMe.txt" />
   </ItemGroup>

diff --git a/Balloon/balloon.sln b/Balloon/balloon.sln
@@ -26,6 +26,9 @@ Global
 		Win10 Release|ARM64 = Win10 Release|ARM64
 		Win10 Release|x64 = Win10 Release|x64
 		Win10 Release|x86 = Win10 Release|x86
+		Win11 Release|ARM64 = Win11 Release|ARM64
+		Win11 Release|x64 = Win11 Release|x64
+		Win11 Release|x86 = Win11 Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64
@@ -36,6 +39,13 @@ Global
 		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32
 		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x86.Build.0 = Win10 Release|Win32
 		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32
+		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64
+		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64
+		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64
+		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win11 Release|x64.ActiveCfg = Win11 Release|x64
+		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win11 Release|x64.Build.0 = Win11 Release|x64
+		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win11 Release|x64.Deploy.0 = Win11 Release|x64
+		{01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32
 		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64
 		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64
 		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x64.ActiveCfg = Win10 Release|x64
@@ -44,6 +54,11 @@ Global
 		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32
 		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x86.Build.0 = Win10 Release|Win32
 		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32
+		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64
+		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64
+		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|x64.ActiveCfg = Win11 Release|x64
+		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|x64.Build.0 = Win11 Release|x64
+		{EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32
 		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64
 		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64
 		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win10 Release|x64.ActiveCfg = Win10 Release|x64
@@ -52,13 +67,25 @@ Global
 		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32
 		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win10 Release|x86.Build.0 = Win10 Release|Win32
 		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32
+		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64
+		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64
+		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64
+		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win11 Release|x64.ActiveCfg = Win11 Release|x64
+		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win11 Release|x64.Build.0 = Win11 Release|x64
+		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win11 Release|x64.Deploy.0 = Win11 Release|x64
+		{B3402316-94F7-4526-AD07-870DEE0E660C}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32
 		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64
 		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64
 		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win10 Release|x64.ActiveCfg = Win10 Release|x64
 		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win10 Release|x64.Build.0 = Win10 Release|x64
 		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32
 		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win10 Release|x86.Build.0 = Win10 Release|Win32
-		EndGlobalSection
+		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64
+		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64
+		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win11 Release|x64.ActiveCfg = Win11 Release|x64
+		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win11 Release|x64.Build.0 = Win11 Release|x64
+		{B953395B-010B-432C-AFCD-6C4F6553905F}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32
+	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection

diff --git a/Balloon/buildAll.bat b/Balloon/buildAll.bat
@@ -1,6 +1,6 @@
 @echo off
-if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat balloon.sln Win10 ARM64
+if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat balloon.sln "Win10 Win11" ARM64
 if errorlevel 1 goto :eof
-call ..\tools\build.bat balloon.sln "Win10" %*
+call ..\tools\build.bat balloon.sln "Win10 Win11" %*
 if errorlevel 1 goto :eof
-call ..\tools\build.bat sys\balloon.vcxproj "Win10_SDV" %*
+call ..\tools\build.bat sys\balloon.vcxproj "Win11_SDV" %*