diff --git a/Balloon/app/blnsvr.vcxproj b/Balloon/app/blnsvr.vcxproj index 77ec24df3..2d9c98075 100644 --- a/Balloon/app/blnsvr.vcxproj +++ b/Balloon/app/blnsvr.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {B953395B-010B-432C-AFCD-6C4F6553905F} @@ -28,6 +40,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + Application false @@ -36,6 +56,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + Application false @@ -44,6 +72,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + @@ -56,33 +92,59 @@ + + + + + + + + + false objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + false + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + false objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ true + + false + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + true + false objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ true + + false + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + true + Level3 @@ -104,6 +166,27 @@ kernel32.lib + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;UNIVERSAL;%(PreprocessorDefinitions) + true + ..\sys\ + MultiThreaded + + + Console + true + true + true + OneCoreUAP.lib;wbemuuid.lib + kernel32.lib + + Level3 @@ -125,6 +208,27 @@ kernel32.lib + + + Level3 + Use + MaxSpeed + true + true + NDEBUG;_CONSOLE;UNIVERSAL;%(PreprocessorDefinitions) + true + ..\sys\ + MultiThreaded + + + Console + true + true + true + OneCoreUAP.lib;wbemuuid.lib + kernel32.lib + + Level3 @@ -146,6 +250,27 @@ kernel32.lib + + + Level3 + Use + MaxSpeed + true + true + NDEBUG;_CONSOLE;UNIVERSAL;%(PreprocessorDefinitions) + true + ..\sys\ + MultiThreaded + + + Console + true + true + true + OneCoreUAP.lib;wbemuuid.lib + kernel32.lib + + diff --git a/Balloon/balloon.sln b/Balloon/balloon.sln index 8f2e613ef..06b9383e1 100644 --- 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 index 745db3ef5..4482e2642 100644 --- 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" %* diff --git a/Balloon/sys/balloon.vcxproj b/Balloon/sys/balloon.vcxproj index 90a915f76..8481f4964 100644 --- a/Balloon/sys/balloon.vcxproj +++ b/Balloon/sys/balloon.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {B3402316-94F7-4526-AD07-870DEE0E660C} @@ -40,16 +52,31 @@ WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Driver KMDF @@ -72,16 +99,31 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + balloon + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + balloon objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + balloon + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + balloon objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + balloon + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + dvl @@ -113,8 +155,8 @@ - - + + diff --git a/NetKVM/CoInstaller/netkvmco-vs2015.vcxproj b/NetKVM/CoInstaller/netkvmco-vs2015.vcxproj index b17319d1a..aae4199ea 100644 --- a/NetKVM/CoInstaller/netkvmco-vs2015.vcxproj +++ b/NetKVM/CoInstaller/netkvmco-vs2015.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + Application @@ -47,14 +59,26 @@ Desktop Windows10 + + Desktop + Windows10 + Desktop Windows10 + + Desktop + Windows10 + Desktop Windows10 + + Desktop + Windows10 + @@ -63,12 +87,21 @@ + + + + + + + + + @@ -88,6 +121,16 @@ false + + + MultiThreaded + true + true + Cdecl + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN=1;NETCO_EXPORTS + false + + true @@ -97,6 +140,15 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN=1;NETCO_EXPORTS + + + true + true + MultiThreaded + Cdecl + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN=1;NETCO_EXPORTS + + true @@ -106,6 +158,15 @@ %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN=1;NETCO_EXPORTS + + + true + true + MultiThreaded + Cdecl + %(PreprocessorDefinitions);WIN32_LEAN_AND_MEAN=1;NETCO_EXPORTS + + diff --git a/NetKVM/NetKVM-VS2015.sln b/NetKVM/NetKVM-VS2015.sln index 56f3cb382..ecc06f63b 100644 --- a/NetKVM/NetKVM-VS2015.sln +++ b/NetKVM/NetKVM-VS2015.sln @@ -30,6 +30,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 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -39,6 +42,11 @@ Global {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -47,6 +55,11 @@ Global {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -55,23 +68,42 @@ 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|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|x86.ActiveCfg = Win11 Release|Win32 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|ARM64.ActiveCfg = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|ARM64.Build.0 = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x64.ActiveCfg = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x64.Build.0 = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x86.ActiveCfg = Header|Win32 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x86.Build.0 = Header|Win32 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|ARM64.ActiveCfg = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|ARM64.Build.0 = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|x64.ActiveCfg = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|x64.Build.0 = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|x86.ActiveCfg = Header|Win32 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x64.Build.0 = Win10 Release|x64 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x64.Build.0 = Win10 Release|x64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/NetKVM/NetKVM-VS2015.vcxproj b/NetKVM/NetKVM-VS2015.vcxproj index 75427747b..9b8e978f6 100644 --- a/NetKVM/NetKVM-VS2015.vcxproj +++ b/NetKVM/NetKVM-VS2015.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141} @@ -38,6 +50,17 @@ netkvm.inx $(ProjectDir)Install + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + WDM + 1 + objfre_win11_x86\i386 + netkvm.inx + $(ProjectDir)Install + Windows10 false @@ -49,6 +72,17 @@ netkvm.inx $(ProjectDir)Install + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + WDM + 1 + objfre_win11_amd64\amd64 + netkvm.inx + $(ProjectDir)Install + Windows10 false @@ -60,6 +94,17 @@ netkvm.inx $(ProjectDir)Install + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + WDM + 1 + objfre_win11_arm64\arm64 + netkvm.inx + $(ProjectDir)Install + @@ -80,9 +125,15 @@ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + Server10_$(DDKPlatform) + + Server10_$(DDKPlatform) + dvl @@ -117,6 +168,12 @@ false + + + %(PreprocessorDefinitions);NDIS685_MINIPORT=1;NTDDI_VERSION=0xA0000004 + false + + diff --git a/NetKVM/NotifyObject/notifyobject.vcxproj b/NetKVM/NotifyObject/notifyobject.vcxproj index f9cbc8c58..238fa4672 100644 --- a/NetKVM/NotifyObject/notifyobject.vcxproj +++ b/NetKVM/NotifyObject/notifyobject.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC} @@ -42,16 +54,31 @@ Desktop + + Windows10 + Desktop + + Windows10 Desktop + + Windows10 + Desktop + + Windows10 Desktop + + Windows10 + Desktop + + @@ -60,12 +87,21 @@ + + + + + + + + + @@ -75,6 +111,14 @@ %(AdditionalOptions) -i $(IntDir) -N + + + %(AdditionalOptions) -no_format_opt + + + %(AdditionalOptions) -i $(IntDir) -N + + %(AdditionalOptions) -no_format_opt @@ -83,21 +127,44 @@ %(AdditionalOptions) -i $(IntDir) -N + + + %(AdditionalOptions) -no_format_opt + + + %(AdditionalOptions) -i $(IntDir) -N + + Sync true + + + Sync + true + + Sync true + + + Sync + true + + $(PlatformTarget)\$(ConfigurationName)\ + + $(PlatformTarget)\$(ConfigurationName)\ + diff --git a/NetKVM/ProtocolService/ProtocolService.vcxproj b/NetKVM/ProtocolService/ProtocolService.vcxproj index 9b4bcb23c..8daef38f4 100644 --- a/NetKVM/ProtocolService/ProtocolService.vcxproj +++ b/NetKVM/ProtocolService/ProtocolService.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -50,6 +62,13 @@ Application Unicode + + Windows10 + false + WindowsApplicationForDrivers10.0 + Application + Unicode + Windows10 false @@ -57,6 +76,13 @@ Application Unicode + + Windows10 + false + WindowsApplicationForDrivers10.0 + Application + Unicode + Windows10 false @@ -64,6 +90,13 @@ Application Unicode + + Windows10 + false + WindowsApplicationForDrivers10.0 + Application + Unicode + @@ -74,14 +107,26 @@ $(PlatformTarget)\$(ConfigurationName)\ $(Platform)\$(ConfigurationName)\ + + $(PlatformTarget)\$(ConfigurationName)\ + $(Platform)\$(ConfigurationName)\ + $(PlatformTarget)\$(ConfigurationName)\ $(Platform)\$(ConfigurationName)\ + + $(PlatformTarget)\$(ConfigurationName)\ + $(Platform)\$(ConfigurationName)\ + $(PlatformTarget)\$(ConfigurationName)\ $(Platform)\$(ConfigurationName)\ + + $(PlatformTarget)\$(ConfigurationName)\ + $(Platform)\$(ConfigurationName)\ + %(AdditionalOptions) -i $(IntDir) -N @@ -105,6 +150,22 @@ echo _RHEL_RELEASE_VERSION_=$(_RHEL_RELEASE_VERSION_) echo _BUILD_MAJOR_VERSION_=$(_BUILD_MAJOR_VERSION_) echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) + + + + + + WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WINAPI_PARTITION_DESKTOP=1;WINAPI_PARTITION_SYSTEM=1;WINAPI_PARTITION_APP=1;WINAPI_PARTITION_PC_APP=1;%(PreprocessorDefinitions) + + + %(AdditionalDependencies);onecoreuap.lib + mainCRTStartup + + + echo _NT_TARGET_MAJ=$(_NT_TARGET_MAJ) +echo _RHEL_RELEASE_VERSION_=$(_RHEL_RELEASE_VERSION_) +echo _BUILD_MAJOR_VERSION_=$(_BUILD_MAJOR_VERSION_) +echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) @@ -121,6 +182,22 @@ echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) echo _RHEL_RELEASE_VERSION_=$(_RHEL_RELEASE_VERSION_) echo _BUILD_MAJOR_VERSION_=$(_BUILD_MAJOR_VERSION_) echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) + + + + + + WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WINAPI_PARTITION_DESKTOP=1;WINAPI_PARTITION_SYSTEM=1;WINAPI_PARTITION_APP=1;WINAPI_PARTITION_PC_APP=1;%(PreprocessorDefinitions) + + + %(AdditionalDependencies);onecoreuap.lib + mainCRTStartup + + + echo _NT_TARGET_MAJ=$(_NT_TARGET_MAJ) +echo _RHEL_RELEASE_VERSION_=$(_RHEL_RELEASE_VERSION_) +echo _BUILD_MAJOR_VERSION_=$(_BUILD_MAJOR_VERSION_) +echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) @@ -137,6 +214,22 @@ echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) echo _RHEL_RELEASE_VERSION_=$(_RHEL_RELEASE_VERSION_) echo _BUILD_MAJOR_VERSION_=$(_BUILD_MAJOR_VERSION_) echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) + + + + + + WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP;WINAPI_PARTITION_DESKTOP=1;WINAPI_PARTITION_SYSTEM=1;WINAPI_PARTITION_APP=1;WINAPI_PARTITION_PC_APP=1;%(PreprocessorDefinitions) + + + %(AdditionalDependencies);onecoreuap.lib + mainCRTStartup + + + echo _NT_TARGET_MAJ=$(_NT_TARGET_MAJ) +echo _RHEL_RELEASE_VERSION_=$(_RHEL_RELEASE_VERSION_) +echo _BUILD_MAJOR_VERSION_=$(_BUILD_MAJOR_VERSION_) +echo _BUILD_MINOR_VERSION_=$(_BUILD_MINOR_VERSION_) diff --git a/NetKVM/buildAll.bat b/NetKVM/buildAll.bat index 252e59c99..008bc1f7f 100755 --- a/NetKVM/buildAll.bat +++ b/NetKVM/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat netkvm-vs2015.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat netkvm-vs2015.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat netkvm-vs2015.sln "Win10" %* +call ..\tools\build.bat netkvm-vs2015.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat NetKVM-VS2015.vcxproj "Win10_SDV" %* +call ..\tools\build.bat NetKVM-VS2015.vcxproj "Win11_SDV" %* diff --git a/Tools/Driver.Common.props b/Tools/Driver.Common.props index eeebad0be..8bac40ac0 100644 --- a/Tools/Driver.Common.props +++ b/Tools/Driver.Common.props @@ -49,10 +49,18 @@ Common property definitions used by all drivers: <_NT_TARGET_MAJ>100 Win10 - Universal + Universal $(TargetArch).$(INF_ARCH_FOR_WIN10) + + <_NT_TARGET_MAJ>100 + Win11 + Universal + $(TargetArch).$(INF_ARCH_FOR_WIN10) + + + diff --git a/Tools/Driver.PackOne.targets b/Tools/Driver.PackOne.targets index 26bbbf496..7114808c0 100755 --- a/Tools/Driver.PackOne.targets +++ b/Tools/Driver.PackOne.targets @@ -45,7 +45,7 @@ Related features: - + @@ -79,6 +79,14 @@ Related features: Server10_ARM64 + + + 10_X64,Server10_X64 + + + Server10_ARM64 + + /uselocaltime @@ -113,6 +121,7 @@ Related features: true + false diff --git a/Tools/SetVsEnv.bat b/Tools/SetVsEnv.bat index 75422387e..e5e7ce982 100644 --- a/Tools/SetVsEnv.bat +++ b/Tools/SetVsEnv.bat @@ -3,10 +3,16 @@ if "%CODEQL_HOME%"=="" set CODEQL_HOME=c:\codeql-home set CODEQL_BIN=%CODEQL_HOME%\codeql\codeql.cmd if not "%EnterpriseWDK%"=="" goto ready -if "%EWDK11_DIR%"=="" set EWDK11_DIR=c:\ewdk11 -:: call :add_path "%EWDK11_DIR%\Program Files\Microsoft Visual Studio\2019\BuildTools\VC\Redist\MSVC\14.28.29910\onecore\x86\Microsoft.VC142.OPENMP\vcomp140.dll" -call %EWDK11_DIR%\BuildEnv\SetupBuildEnv.cmd -goto :eof +if "%1"=="Win11" ( + if "%EWDK11_22H2_DIR%"=="" set EWDK11_22H2_DIR=c:\ewdk11_22h2 + call %EWDK11_22H2_DIR%\BuildEnv\SetupBuildEnv.cmd + goto :eof +) else ( + if "%EWDK11_DIR%"=="" set EWDK11_DIR=c:\ewdk11 + :: call :add_path "%EWDK11_DIR%\Program Files\Microsoft Visual Studio\2019\BuildTools\VC\Redist\MSVC\14.28.29910\onecore\x86\Microsoft.VC142.OPENMP\vcomp140.dll" + call %EWDK11_DIR%\BuildEnv\SetupBuildEnv.cmd + goto :eof +) :add_path echo %path% | findstr /i /c:"%~dp1" diff --git a/Tools/build.bat b/Tools/build.bat index d5e57e75c..c3306217a 100644 --- a/Tools/build.bat +++ b/Tools/build.bat @@ -24,7 +24,7 @@ rem This is a list of supported build target specifications A_B where A is the rem VS project configuration name and B is the corresponding platform identifier rem used in log file names and intermediate directory names. Either of the two can rem be used in the command line argument. -set SUPPORTED_BUILD_SPECS=Win10_win10 +set SUPPORTED_BUILD_SPECS=Win10_win10 Win11_win11 set BUILD_TARGETS=%~2 set BUILD_DIR=%~dp1 @@ -160,18 +160,14 @@ if %BUILD_ARCH%==amd64 set BUILD_ARCH=x64 set TARGET_VS_CONFIG="%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%|%BUILD_ARCH%" pushd %BUILD_DIR% -call "%~dp0\SetVsEnv.bat" x86 +call "%~dp0\SetVsEnv.bat" %TARGET_PROJ_CONFIG% if /I "!TAG!"=="SDV" ( echo Running SDV for %BUILD_FILE%, configuration %TARGET_VS_CONFIG% call :runsdv "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH% if exist "%CODEQL_BIN%" ( - if "%TARGET_PROJ_CONFIG%"=="Win10" ( - echo Running CodeQL for %BUILD_FILE%, configuration %TARGET_VS_CONFIG% - call :runql "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH% - ) else ( - echo Skipping CodeQL for %BUILD_FILE%, configuration %TARGET_VS_CONFIG% - ) + echo Running CodeQL for %BUILD_FILE%, configuration %TARGET_VS_CONFIG% + call :runql "%TARGET_PROJ_CONFIG% %BUILD_FLAVOR%" %BUILD_ARCH% ) else ( echo CodeQL binary is missing! ) diff --git a/Tools/signAll.bat b/Tools/signAll.bat index c18637fff..b3eacb6c6 100644 --- a/Tools/signAll.bat +++ b/Tools/signAll.bat @@ -1,4 +1,29 @@ @echo off -call "%~dp0\SetVsEnv.bat" x86 -for /r "%~dp0\..\" %%i in (*.sys) do "signtool.exe" sign /fd SHA256 /f "%~dp0\VirtIOTestCert.pfx" "%%i" -for /r "%~dp0\..\" %%i in (*.cat) do "signtool.exe" sign /fd SHA256 /f "%~dp0\VirtIOTestCert.pfx" "%%i" + +setlocal +echo Loading Windows 10 build env +call "%~dp0\SetVsEnv.bat" Win10 +for /r "%~dp0\..\" %%i in (*.sys) do call :sign_if_win10 "%%i" +for /r "%~dp0\..\" %%i in (*.cat) do call :sign_if_win10 "%%i" +endlocal + +setlocal +echo Loading Windows 11 build env +call "%~dp0\SetVsEnv.bat" Win10 +for /r "%~dp0\..\" %%i in (*.sys) do call :sign_if_win11 "%%i" +for /r "%~dp0\..\" %%i in (*.cat) do call :sign_if_win11 "%%i" +endlocal + +exit /B 0 + +:sign_if_win10 +echo "%~1" | findstr /i /c:win10 +if errorlevel 1 goto :eof +"signtool.exe" sign /fd SHA256 /f "%~dp0\VirtIOTestCert.pfx" "%~1" +goto :eof + +:sign_if_win11 +echo "%~1" | findstr /i /c:win11 +if errorlevel 1 goto :eof +"signtool.exe" sign /fd SHA256 /f "%~dp0\VirtIOTestCert.pfx" "%~1" +goto :eof \ No newline at end of file diff --git a/VirtIO/VirtioLib.sln b/VirtIO/VirtioLib.sln index 39167b7f0..1c13ca018 100644 --- a/VirtIO/VirtioLib.sln +++ b/VirtIO/VirtioLib.sln @@ -15,6 +15,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 @@ -25,6 +28,12 @@ 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|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 @@ -33,6 +42,12 @@ 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|x64.Deploy.0 = Win11 Release|x64 + {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/VirtIO/VirtioLib.vcxproj b/VirtIO/VirtioLib.vcxproj index 1eff8d74f..92a3c8b44 100644 --- a/VirtIO/VirtioLib.vcxproj +++ b/VirtIO/VirtioLib.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -60,14 +72,26 @@ Windows10 WindowsKernelModeDriver10.0 + + Windows10 + WindowsKernelModeDriver10.0 + Windows10 WindowsKernelModeDriver10.0 + + Windows10 + WindowsKernelModeDriver10.0 + Windows10 WindowsKernelModeDriver10.0 + + Windows10 + WindowsKernelModeDriver10.0 + @@ -79,14 +103,26 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + /kernel %(AdditionalOptions) diff --git a/VirtIO/WDF/VirtioLib-WDF.vcxproj b/VirtIO/WDF/VirtioLib-WDF.vcxproj index 51bab2217..09c2b8591 100644 --- a/VirtIO/WDF/VirtioLib-WDF.vcxproj +++ b/VirtIO/WDF/VirtioLib-WDF.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -52,16 +64,31 @@ WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + @@ -73,14 +100,26 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + /kernel %(AdditionalOptions) diff --git a/VirtIO/buildAll.bat b/VirtIO/buildAll.bat index 9a9bd3ebc..382113de6 100644 --- a/VirtIO/buildAll.bat +++ b/VirtIO/buildAll.bat @@ -1,4 +1,4 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat VirtioLib.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat VirtioLib.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat VirtioLib.sln "Win10" %* \ No newline at end of file +call ..\tools\build.bat VirtioLib.sln "Win10 Win11" %* \ No newline at end of file diff --git a/buildAll.bat b/buildAll.bat index e2dd30b27..50a1c143e 100755 --- a/buildAll.bat +++ b/buildAll.bat @@ -1,36 +1,36 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call tools\build.bat virtio-win.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call tools\build.bat virtio-win.sln "Win10 Win11" ARM64 if errorlevel 1 goto :fail -call tools\build.bat virtio-win.sln "Win10" %* +call tools\build.bat virtio-win.sln "Win10 Win11" %* if errorlevel 1 goto :fail -call tools\build.bat NetKVM\NetKVM-VS2015.vcxproj "Win10_SDV" %* +call tools\build.bat NetKVM\NetKVM-VS2015.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat vioscsi\vioscsi.vcxproj "Win10_SDV" %* +call tools\build.bat vioscsi\vioscsi.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat viostor\viostor.vcxproj "Win10_SDV" %* +call tools\build.bat viostor\viostor.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail if "%VIRTIO_WIN_SDV_2022%"=="" goto :nosdv2022 -call tools\build.bat Balloon\sys\balloon.vcxproj "Win10_SDV" %* +call tools\build.bat Balloon\sys\balloon.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat fwcfg64\fwcfg.vcxproj "Win10_SDV" %* +call tools\build.bat fwcfg64\fwcfg.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat ivshmem\ivshmem.vcxproj "Win10_SDV" %* +call tools\build.bat ivshmem\ivshmem.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat pvpanic\pvpanic\pvpanic.vcxproj "Win10_SDV" %* +call tools\build.bat pvpanic\pvpanic\pvpanic.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat viorng\viorng\viorng.vcxproj "Win10_SDV" %* +call tools\build.bat viorng\viorng\viorng.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat vioserial\sys\vioser.vcxproj "Win10_SDV" %* +call tools\build.bat vioserial\sys\vioser.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat viosock\sys\viosock.vcxproj "Win10_SDV" %* +call tools\build.bat viosock\sys\viosock.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat viofs\pci\viofs.vcxproj "Win10_SDV" %* +call tools\build.bat viofs\pci\viofs.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat vioinput\hidpassthrough\hidpassthrough.vcxproj "Win10_SDV" %* +call tools\build.bat vioinput\hidpassthrough\hidpassthrough.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail -call tools\build.bat vioinput\sys\vioinput.vcxproj "Win10_SDV" %* +call tools\build.bat vioinput\sys\vioinput.vcxproj "Win11_SDV" %* if errorlevel 1 goto :fail diff --git a/fwcfg64/buildAll.bat b/fwcfg64/buildAll.bat index c422f7014..032388897 100644 --- a/fwcfg64/buildAll.bat +++ b/fwcfg64/buildAll.bat @@ -1,4 +1,4 @@ @echo off -call ..\tools\build.bat fwcfg.sln "Win10" %* +call ..\tools\build.bat fwcfg.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat fwcfg.vcxproj "Win10_SDV" %* +call ..\tools\build.bat fwcfg.vcxproj "Win11_SDV" %* diff --git a/fwcfg64/fwcfg.sln b/fwcfg64/fwcfg.sln index aab28d76e..89053d55f 100644 --- a/fwcfg64/fwcfg.sln +++ b/fwcfg64/fwcfg.sln @@ -10,6 +10,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 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -18,6 +21,13 @@ Global {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|x64.Build.0 = Win10 Release|x64 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/fwcfg64/fwcfg.vcxproj b/fwcfg64/fwcfg.vcxproj index 9b5010e3f..d568cad03 100644 --- a/fwcfg64/fwcfg.vcxproj +++ b/fwcfg64/fwcfg.vcxproj @@ -13,6 +13,18 @@ Win10 Release Win32 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {D9EF1144-4779-444C-ADD6-F733B749A862} @@ -34,6 +46,14 @@ KMDF 15 + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + 15 + Windows10 false @@ -42,6 +62,14 @@ KMDF 15 + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + 15 + Windows10 false @@ -50,6 +78,14 @@ KMDF 15 + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + 15 + @@ -64,16 +100,31 @@ objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + DbgengKernelDebugger + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + DbgengKernelDebugger objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + DbgengKernelDebugger + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + DbgengKernelDebugger objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + DbgengKernelDebugger + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + dvl @@ -93,6 +144,15 @@ true + + + true + trace.h + true + true + true + + true @@ -102,6 +162,15 @@ true + + + true + trace.h + true + true + true + + true @@ -111,6 +180,15 @@ true + + + true + trace.h + true + true + true + + diff --git a/ivshmem/buildAll.bat b/ivshmem/buildAll.bat index c5e26c0c1..cb16430dd 100755 --- a/ivshmem/buildAll.bat +++ b/ivshmem/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat ivshmem.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat ivshmem.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat ivshmem.sln "Win10" %* +call ..\tools\build.bat ivshmem.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat ivshmem.vcxproj "Win10_SDV" %* +call ..\tools\build.bat ivshmem.vcxproj "Win11_SDV" %* diff --git a/ivshmem/ivshmem.sln b/ivshmem/ivshmem.sln index 5f794a9f5..54cc93f43 100755 --- a/ivshmem/ivshmem.sln +++ b/ivshmem/ivshmem.sln @@ -15,6 +15,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 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -26,12 +29,24 @@ Global {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x64.Build.0 = Win10 Release|x64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ivshmem/ivshmem.vcxproj b/ivshmem/ivshmem.vcxproj index ac22ce4f1..f65730286 100755 --- a/ivshmem/ivshmem.vcxproj +++ b/ivshmem/ivshmem.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -47,6 +59,14 @@ KMDF 15 + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + 15 + Windows10 false @@ -55,6 +75,14 @@ KMDF 15 + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + 15 + Windows10 false @@ -63,6 +91,14 @@ KMDF 15 + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + 15 + @@ -79,6 +115,13 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + DbgengKernelDebugger + true + ivshmem + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + DbgengKernelDebugger true @@ -86,6 +129,13 @@ objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + DbgengKernelDebugger + true + ivshmem + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + DbgengKernelDebugger true @@ -93,6 +143,13 @@ objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + DbgengKernelDebugger + true + ivshmem + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + dvl @@ -114,6 +171,14 @@ true + + + false + false + trace.h + true + + false @@ -122,6 +187,14 @@ true + + + false + false + trace.h + true + + diff --git a/ivshmem/test/ivshmem-test.vcxproj b/ivshmem/test/ivshmem-test.vcxproj index ff1c8af6a..172baac43 100644 --- a/ivshmem/test/ivshmem-test.vcxproj +++ b/ivshmem/test/ivshmem-test.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99} @@ -29,6 +41,13 @@ true Unicode + + Application + false + AutoVSToolset + true + Unicode + Application false @@ -36,12 +55,25 @@ true Unicode + + Application + false + AutoVSToolset + true + Unicode + Application false true Unicode + + Application + false + true + Unicode + @@ -50,25 +82,46 @@ + + + + + + false objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + false + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + false objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + false + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + false objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + false + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + diff --git a/pvpanic/PVPanic Package/PVPanic Package.vcxproj b/pvpanic/PVPanic Package/PVPanic Package.vcxproj index 95b64e6fe..c530e4e7c 100644 --- a/pvpanic/PVPanic Package/PVPanic Package.vcxproj +++ b/pvpanic/PVPanic Package/PVPanic Package.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA} @@ -38,14 +50,26 @@ Windows10 false + + Windows10 + false + Windows10 false + + Windows10 + false + Windows10 false + + Windows10 + false + @@ -57,14 +81,25 @@ $(ProjectDir)..\Install\win10\x86\ + + $(ProjectDir)..\Install\win11\x86\ + $(ProjectDir)..\Install\win10\amd64\ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + $(ProjectDir)..\Install\win11\amd64\ + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + $(ProjectDir)..\Install\win10\arm64\ Server10_$(DDKPlatform) + + $(ProjectDir)..\Install\win11\arm64\ + Server10_$(DDKPlatform) + $(OutDir) $(Platform)\$(Configuration.Replace(' ',''))\ diff --git a/pvpanic/buildAll.bat b/pvpanic/buildAll.bat index ab99e4344..c122c1d3e 100644 --- a/pvpanic/buildAll.bat +++ b/pvpanic/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat pvpanic.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat pvpanic.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat pvpanic.sln "Win10" %* +call ..\tools\build.bat pvpanic.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat pvpanic\pvpanic.vcxproj "Win10_SDV" +call ..\tools\build.bat pvpanic\pvpanic.vcxproj "Win11_SDV" diff --git a/pvpanic/pvpanic.sln b/pvpanic/pvpanic.sln index 206ab5674..78edbc3ce 100644 --- a/pvpanic/pvpanic.sln +++ b/pvpanic/pvpanic.sln @@ -11,6 +11,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 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -20,6 +23,11 @@ Global {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -27,6 +35,11 @@ Global {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pvpanic/pvpanic/pvpanic.vcxproj b/pvpanic/pvpanic/pvpanic.vcxproj index e609320ac..8c1002412 100644 --- a/pvpanic/pvpanic/pvpanic.vcxproj +++ b/pvpanic/pvpanic/pvpanic.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {cdabf347-89ab-4e09-a93f-324d4efbc74f} @@ -32,16 +44,31 @@ false WindowsKernelModeDriver10.0 + + Windows10 + false + WindowsKernelModeDriver10.0 + Windows10 false WindowsKernelModeDriver10.0 + + Windows10 + false + WindowsKernelModeDriver10.0 + Windows10 false WindowsKernelModeDriver10.0 + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver KMDF @@ -64,6 +91,9 @@ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + dvl diff --git a/viocrypt/buildAll.bat b/viocrypt/buildAll.bat index 6842fd412..cf31e3cc2 100644 --- a/viocrypt/buildAll.bat +++ b/viocrypt/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viocrypt.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viocrypt.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat viocrypt.sln "Win10" %* +call ..\tools\build.bat viocrypt.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat sys\viocrypt.vcxproj "Win10_SDV" %* +call ..\tools\build.bat sys\viocrypt.vcxproj "Win11_SDV" %* diff --git a/viocrypt/dll/viocrypt-prov.vcxproj b/viocrypt/dll/viocrypt-prov.vcxproj index f47e1a1d7..a2ed74c71 100644 --- a/viocrypt/dll/viocrypt-prov.vcxproj +++ b/viocrypt/dll/viocrypt-prov.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B} @@ -31,18 +43,36 @@ true Unicode + + DynamicLibrary + false + true + Unicode + DynamicLibrary false true Unicode + + DynamicLibrary + false + true + Unicode + DynamicLibrary false true Unicode + + DynamicLibrary + false + true + Unicode + @@ -56,12 +86,21 @@ false + + false + false + + false + false + + false + Level3 @@ -80,6 +119,24 @@ $(TargetName).def + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;VIOCRYPTPROV_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + $(TargetName).def + + Level3 @@ -98,6 +155,24 @@ $(TargetName).def + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_WINDOWS;_USRDLL;VIOCRYPTPROV_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + $(TargetName).def + + Level3 @@ -116,6 +191,24 @@ $(TargetName).def + + + Level3 + + + MaxSpeed + true + true + NDEBUG;_WINDOWS;_USRDLL;VIOCRYPTPROV_EXPORTS;%(PreprocessorDefinitions) + + + Windows + true + true + true + $(TargetName).def + + diff --git a/viocrypt/package/package.vcxproj b/viocrypt/package/package.vcxproj index 7be0aad9e..ad0d0b821 100644 --- a/viocrypt/package/package.vcxproj +++ b/viocrypt/package/package.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {8B100A20-3269-428E-8995-91CEC80756F9} @@ -39,14 +51,26 @@ Windows10 false + + Windows10 + false + Windows10 false + + Windows10 + false + Windows10 false + + Windows10 + false + @@ -58,14 +82,25 @@ $(ProjectDir)..\Install\win10\x86\ + + $(ProjectDir)..\Install\win11\x86\ + $(ProjectDir)..\Install\win10\amd64\ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + $(ProjectDir)..\Install\win11\amd64\ + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + $(ProjectDir)..\Install\win10\arm64\ $(Inf2CatWindowsVersionList) + + $(ProjectDir)..\Install\win11\arm64\ + $(Inf2CatWindowsVersionList) + $(OutDir) $(Platform)\$(Configuration.Replace(' ',''))\ diff --git a/viocrypt/sys/viocrypt.vcxproj b/viocrypt/sys/viocrypt.vcxproj index 385bf5181..25e3d1cea 100644 --- a/viocrypt/sys/viocrypt.vcxproj +++ b/viocrypt/sys/viocrypt.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1} @@ -33,6 +45,14 @@ KMDF Universal + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + Windows10 false @@ -41,6 +61,14 @@ KMDF Universal + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + Windows10 false @@ -49,6 +77,14 @@ KMDF Universal + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + KMDF + Universal + Driver KMDF @@ -83,8 +119,11 @@ virtiolib.lib;virtiolib_wdf.lib;%(AdditionalDependencies) ..\..\VirtIO\objfre_win10_x86\i386;..\..\VirtIO\WDF\objfre_win10_x86\i386;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_x86\i386;..\..\VirtIO\WDF\objfre_win11_x86\i386;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_arm64\arm64;..\..\VirtIO\WDF\objfre_win10_arm64\arm64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_arm64\arm64;..\..\VirtIO\WDF\objfre_win11_arm64\arm64;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_amd64\amd64;..\..\VirtIO\WDF\objfre_win10_amd64\amd64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_amd64\amd64;..\..\VirtIO\WDF\objfre_win11_amd64\amd64;%(AdditionalLibraryDirectories) @@ -113,6 +152,9 @@ 10_$(DDKPlatform) + + 10_$(DDKPlatform) + diff --git a/viocrypt/test/viocrypt-test.vcxproj b/viocrypt/test/viocrypt-test.vcxproj index e40506342..9db2d1d91 100644 --- a/viocrypt/test/viocrypt-test.vcxproj +++ b/viocrypt/test/viocrypt-test.vcxproj @@ -9,6 +9,14 @@ Win10 Release x64 + + Win11 Release + Win32 + + + Win11 Release + x64 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F} @@ -30,6 +38,13 @@ Unicode Dynamic + + Application + false + true + Unicode + Dynamic + Application false @@ -37,6 +52,13 @@ Unicode Dynamic + + Application + false + true + Unicode + Dynamic + @@ -44,16 +66,28 @@ + + + + + + false + + false + false + + false + Level3 diff --git a/viocrypt/viocrypt.sln b/viocrypt/viocrypt.sln index 90a96d8f1..c5c16f35e 100644 --- a/viocrypt/viocrypt.sln +++ b/viocrypt/viocrypt.sln @@ -29,6 +29,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 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -37,6 +40,11 @@ Global {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|x64.Build.0 = Win10 Release|x64 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -46,6 +54,13 @@ Global {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -55,12 +70,24 @@ Global {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|ARM64.ActiveCfg = Win10 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|ARM64.Build.0 = Win10 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x64.Build.0 = Win10 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|ARM64.ActiveCfg = Win11 Release|x64 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|ARM64.Build.0 = Win11 Release|x64 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -70,6 +97,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|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -79,6 +113,13 @@ 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|ARM64.Deploy.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|x64.Deploy.0 = Win11 Release|x64 + {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viofs/VirtFS Package/VirtFS Package.vcxproj b/viofs/VirtFS Package/VirtFS Package.vcxproj index a3798a613..c54dfc7ca 100644 --- a/viofs/VirtFS Package/VirtFS Package.vcxproj +++ b/viofs/VirtFS Package/VirtFS Package.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806} @@ -37,14 +49,25 @@ false + + false + Windows10 false + + Windows10 + false + Windows10 false + + Windows10 + false + @@ -56,13 +79,23 @@ $(ProjectDir)..\Install\win10\x86\ + + $(ProjectDir)..\Install\win11\x86\ + $(ProjectDir)..\Install\win10\amd64\ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + $(ProjectDir)..\Install\win11\amd64\ + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + $(ProjectDir)..\Install\win10\arm64\ + + $(ProjectDir)..\Install\win11\arm64\ + $(OutDir) $(Platform)\$(Configuration.Replace(' ',''))\ diff --git a/viofs/buildAll.bat b/viofs/buildAll.bat index f641f4c5c..b9e58e8f5 100644 --- a/viofs/buildAll.bat +++ b/viofs/buildAll.bat @@ -1,4 +1,4 @@ @echo off -call ..\tools\build.bat viofs.sln "Win10" %* +call ..\tools\build.bat viofs.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat pci\viofs.vcxproj "Win10_SDV" %* +call ..\tools\build.bat pci\viofs.vcxproj "Win11_SDV" %* diff --git a/viofs/pci/viofs.vcxproj b/viofs/pci/viofs.vcxproj index a72ec519a..4aaa48a99 100644 --- a/viofs/pci/viofs.vcxproj +++ b/viofs/pci/viofs.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {209e8947-494d-4104-b44b-530cb68a6494} @@ -34,18 +46,36 @@ false 15 + + Windows10 + WindowsKernelModeDriver10.0 + false + 15 + Windows10 WindowsKernelModeDriver10.0 false 15 + + Windows10 + WindowsKernelModeDriver10.0 + false + 15 + Windows10 WindowsKernelModeDriver10.0 false 15 + + Windows10 + WindowsKernelModeDriver10.0 + false + 15 + Driver KMDF @@ -69,6 +99,9 @@ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + dvl @@ -90,8 +123,11 @@ true true ..\..\VirtIO\objfre_win10_x86\i386;..\..\VirtIO\WDF\objfre_win10_x86\i386;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_x86\i386;..\..\VirtIO\WDF\objfre_win11_x86\i386;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_amd64\amd64;..\..\VirtIO\WDF\objfre_win10_amd64\amd64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_amd64\amd64;..\..\VirtIO\WDF\objfre_win11_amd64\amd64;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_arm64\arm64;..\..\VirtIO\WDF\objfre_win10_arm64\arm64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_arm64\arm64;..\..\VirtIO\WDF\objfre_win11_arm64\arm64;%(AdditionalLibraryDirectories) diff --git a/viofs/svc/virtiofs.vcxproj b/viofs/svc/virtiofs.vcxproj index 053c6d9ea..4ce574b89 100644 --- a/viofs/svc/virtiofs.vcxproj +++ b/viofs/svc/virtiofs.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + 15.0 @@ -30,16 +42,31 @@ false true + + Application + false + true + Application false true + + Application + false + true + Application false true + + Application + false + true + @@ -47,25 +74,46 @@ + + + + + + + + + false $(Platform)\$(Configuration.Replace(' ',''))\ + + false + $(Platform)\$(Configuration.Replace(' ',''))\ + false $(Platform)\$(Configuration.Replace(' ',''))\ + + false + $(Platform)\$(Configuration.Replace(' ',''))\ + false $(Platform)\$(Configuration.Replace(' ',''))\ + + false + $(Platform)\$(Configuration.Replace(' ',''))\ + NotUsing @@ -91,6 +139,31 @@ winfsp-$(PlatformTarget).dll + + + NotUsing + Level4 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + ..\shared;$(MSBuildProgramFiles32)\WinFsp\inc;%(AdditionalIncludeDirectories) + false + MultiThreaded + + + Console + true + true + true + $(MSBuildProgramFiles32)\WinFsp\lib + CfgMgr32.lib;netapi32.lib;wtsapi32.lib;setupapi.lib;winfsp-$(PlatformTarget).lib;%(AdditionalDependencies) + winfsp-$(PlatformTarget).dll + + NotUsing @@ -116,6 +189,31 @@ winfsp-a64.dll + + + NotUsing + Level4 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + ..\shared;$(MSBuildProgramFiles32)\WinFsp\inc;%(AdditionalIncludeDirectories) + false + MultiThreaded + + + Console + true + true + true + $(MSBuildProgramFiles32)\WinFsp\lib + CfgMgr32.lib;netapi32.lib;wtsapi32.lib;setupapi.lib;winfsp-a64.lib;%(AdditionalDependencies) + winfsp-a64.dll + + NotUsing @@ -141,6 +239,31 @@ winfsp-$(PlatformTarget).dll + + + NotUsing + Level4 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + false + MultiThreaded + ..\shared;$(MSBuildProgramFiles32)\WinFsp\inc;%(AdditionalIncludeDirectories) + + + Console + true + true + true + CfgMgr32.lib;netapi32.lib;wtsapi32.lib;setupapi.lib;winfsp-$(PlatformTarget).lib;%(AdditionalDependencies) + $(MSBuildProgramFiles32)\WinFsp\lib + winfsp-$(PlatformTarget).dll + + stdcpplatest diff --git a/viofs/viofs.sln b/viofs/viofs.sln index d68c10d4e..64567fce2 100644 --- a/viofs/viofs.sln +++ b/viofs/viofs.sln @@ -27,6 +27,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 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -37,6 +40,12 @@ Global {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -45,24 +54,45 @@ Global {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|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|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 {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x64.Build.0 = Win10 Release|x64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viogpu/buildAll.bat b/viogpu/buildAll.bat index 28c7ee5a5..5647a6ed8 100755 --- a/viogpu/buildAll.bat +++ b/viogpu/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viogpu.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viogpu.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat viogpu.sln "Win10" %* +call ..\tools\build.bat viogpu.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat viogpudo\viogpudo.vcxproj "Win10_SDV" %* +call ..\tools\build.bat viogpudo\viogpudo.vcxproj "Win11_SDV" %* diff --git a/viogpu/viogpu.sln b/viogpu/viogpu.sln index 96b7637f5..868349fa1 100755 --- a/viogpu/viogpu.sln +++ b/viogpu/viogpu.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28307.168 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.34031.81 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "viogpudo", "viogpudo\viogpudo.vcxproj", "{BDE07E9E-2041-4853-8B74-7CF591C255E7}" ProjectSection(ProjectDependencies) = postProject @@ -23,6 +23,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 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -31,24 +34,44 @@ Global {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|x64.Build.0 = Win10 Release|x64 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|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|x86.ActiveCfg = Win11 Release|Win32 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x64.Build.0 = Win10 Release|x64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viogpu/viogpuap/viogpuap.vcxproj b/viogpu/viogpuap/viogpuap.vcxproj index 96fa57e61..d2e3f2b4f 100755 --- a/viogpu/viogpuap/viogpuap.vcxproj +++ b/viogpu/viogpuap/viogpuap.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + 15.0 @@ -30,6 +42,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + Application false @@ -38,6 +58,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + Application false @@ -46,6 +74,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + @@ -55,29 +91,54 @@ + + + + + + + + + false objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + false + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + false objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + false + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + false objfre_win10_x86\i386\ $(TargetName.Replace(' ','')) objfre_win10_x86\i386\ + + false + objfre_win11_x86\i386\ + $(TargetName.Replace(' ','')) + objfre_win11_x86\i386\ + NotUsing @@ -101,6 +162,29 @@ kernel32.lib + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + ..\shared;$(DDK_INC_PATH);%(AdditionalIncludeDirectories) + MultiThreaded + + + Console + true + true + true + user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Userenv.lib;Wtsapi32.lib;OneCoreUAP.lib;%(AdditionalDependencies) + kernel32.lib + + NotUsing @@ -125,6 +209,30 @@ kernel32.lib + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + ..\shared;$(DDK_INC_PATH);%(AdditionalIncludeDirectories) + MultiThreaded + Sync + + + Console + true + true + true + user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Userenv.lib;Wtsapi32.lib;OneCoreUAP.lib;%(AdditionalDependencies) + kernel32.lib + + NotUsing @@ -153,6 +261,35 @@ kernel32.lib + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\shared;$(DDK_INC_PATH);%(AdditionalIncludeDirectories) + MultiThreaded + true + Guard + false + + + 4603;4627;4986;4987;4996;%(DisableSpecificWarnings) + + + Console + true + true + true + user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Userenv.lib;Wtsapi32.lib;OneCoreUAP.lib;%(AdditionalDependencies) + kernel32.lib + + diff --git a/viogpu/viogpudo/viogpudo.vcxproj b/viogpu/viogpudo/viogpudo.vcxproj index 4dbc228ab..7a8f994f5 100755 --- a/viogpu/viogpudo/viogpudo.vcxproj +++ b/viogpu/viogpudo/viogpudo.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7} @@ -33,6 +45,15 @@ 1 Universal + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + WDM + 1 + Universal + Windows10 false @@ -42,6 +63,15 @@ 1 Universal + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + WDM + 1 + Universal + Windows10 false @@ -51,6 +81,15 @@ 1 Universal + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + WDM + 1 + Universal + @@ -66,18 +105,36 @@ objfre_win10_x86\i386\ viogpudo + + DbgengKernelDebugger + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + viogpudo + viogpudo DbgengKernelDebugger objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + viogpudo + DbgengKernelDebugger + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + DbgengKernelDebugger objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ viogpudo + + DbgengKernelDebugger + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + viogpudo + dvl @@ -106,6 +163,24 @@ + + + %(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)\displib.lib;virtiolib.lib + ..\..\VirtIO\$(OutDir);%(AdditionalLibraryDirectories) + + + $(IntDir);%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);..\common;..\shared;..\..\VirtIO;..\viogpudo\; + VIOGPU_DOD=1;%(PreprocessorDefinitions) + true + ..\viogpudo\trace.h + + + false + + + + + %(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)\displib.lib;virtiolib.lib @@ -119,12 +194,31 @@ + + + %(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)\displib.lib;virtiolib.lib + ..\..\VirtIO\$(OutDir);%(AdditionalLibraryDirectories) + + + $(IntDir);%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);..\common;..\shared;..\..\VirtIO;..\viogpudo\; + VIOGPU_DOD=1;%(PreprocessorDefinitions) + true + trace.h + + + %(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)\displib.lib ..\..\VirtIO\objfre_win10_x86\amd64\ + + + %(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)\displib.lib + ..\..\VirtIO\objfre_win11_x86\amd64\ + + $(IntDir);%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);..\common;..\shared;..\..\VirtIO;..\viogpudo\; @@ -139,6 +233,19 @@ + + + $(IntDir);%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);..\common;..\shared;..\..\VirtIO;..\viogpudo\; + VIOGPU_DOD=1;%(PreprocessorDefinitions) + true + trace.h + + + %(AdditionalDependencies);$(KernelBufferOverflowLib);$(DDK_LIB_PATH)ntoskrnl.lib;$(DDK_LIB_PATH)hal.lib;$(DDK_LIB_PATH)wmilib.lib;$(DDK_LIB_PATH)\displib.lib;virtiolib.lib + ..\..\VirtIO\$(OutDir);%(AdditionalLibraryDirectories) + + + diff --git a/viogpu/viogpusc/viogpusc.vcxproj b/viogpu/viogpusc/viogpusc.vcxproj index eb5807f40..130694c0c 100755 --- a/viogpu/viogpusc/viogpusc.vcxproj +++ b/viogpu/viogpusc/viogpusc.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + 15.0 @@ -31,6 +43,15 @@ 1 Windows10 + + Application + false + WindowsUserModeDriver10.0 + true + Unicode + 1 + Windows10 + Application false @@ -40,6 +61,15 @@ 1 Windows10 + + Application + false + WindowsUserModeDriver10.0 + true + Unicode + 1 + Windows10 + Application false @@ -49,6 +79,15 @@ 1 Windows10 + + Application + false + WindowsUserModeDriver10.0 + true + Unicode + 1 + Windows10 + @@ -58,12 +97,21 @@ + + + + + + + + + false @@ -71,18 +119,36 @@ objfre_win10_amd64\amd64\ vgpusrv + + false + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + vgpusrv + false objfre_win10_x86\i386\ objfre_win10_x86\i386\ vgpusrv + + false + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + vgpusrv + false objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ vgpusrv + + false + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + vgpusrv + NotUsing @@ -109,6 +175,32 @@ kernel32.lib + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\shared;$(DDK_INC_PATH);%(AdditionalIncludeDirectories) + Sync + MultiThreaded + + + Console + true + true + true + user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Userenv.lib;Wtsapi32.lib;OneCoreUAP.lib;%(AdditionalDependencies) + + + kernel32.lib + + NotUsing @@ -135,6 +227,32 @@ kernel32.lib + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\shared;$(DDK_INC_PATH);%(AdditionalIncludeDirectories) + Sync + MultiThreaded + + + Console + true + true + true + user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Userenv.lib;Wtsapi32.lib;OneCoreUAP.lib;%(AdditionalDependencies) + + + kernel32.lib + + NotUsing @@ -161,6 +279,32 @@ kernel32.lib + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + pch.h + ..\shared;$(DDK_INC_PATH);%(AdditionalIncludeDirectories) + Sync + MultiThreaded + + + Console + true + true + true + user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Userenv.lib;Wtsapi32.lib;OneCoreUAP.lib;%(AdditionalDependencies) + + + kernel32.lib + + @@ -173,8 +317,11 @@ Create + Create Create + Create Create + Create @@ -182,8 +329,11 @@ ..\shared; + ..\shared; ..\shared; + ..\shared; ..\shared; + ..\shared; diff --git a/vioinput/buildAll.bat b/vioinput/buildAll.bat index 036565991..7080bbfa8 100755 --- a/vioinput/buildAll.bat +++ b/vioinput/buildAll.bat @@ -1,8 +1,8 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat vioinput.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat vioinput.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat vioinput.sln "Win10" %* +call ..\tools\build.bat vioinput.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat sys\vioinput.vcxproj "Win10_SDV" %* +call ..\tools\build.bat sys\vioinput.vcxproj "Win11_SDV" %* if errorlevel 1 goto :eof -call ..\tools\build.bat hidpassthrough\hidpassthrough.vcxproj "Win10_SDV" %* \ No newline at end of file +call ..\tools\build.bat hidpassthrough\hidpassthrough.vcxproj "Win11_SDV" %* \ No newline at end of file diff --git a/vioinput/hidpassthrough/hidpassthrough.vcxproj b/vioinput/hidpassthrough/hidpassthrough.vcxproj index d40de8fed..24f860a37 100644 --- a/vioinput/hidpassthrough/hidpassthrough.vcxproj +++ b/vioinput/hidpassthrough/hidpassthrough.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096} @@ -30,12 +42,21 @@ Windows10 + + Windows10 + Windows10 + + Windows10 + Windows10 + + Windows10 + diff --git a/vioinput/package/package.vcxproj b/vioinput/package/package.vcxproj index 3d6cde601..cebbd422d 100644 --- a/vioinput/package/package.vcxproj +++ b/vioinput/package/package.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -45,6 +57,14 @@ Package true + + Windows10 + false + WindowsKernelModeDriver10.0 + Utility + Package + true + Windows10 false @@ -53,6 +73,14 @@ Package true + + Windows10 + false + WindowsKernelModeDriver10.0 + Utility + Package + true + Windows10 false @@ -61,11 +89,19 @@ Package true + + Windows10 + false + WindowsKernelModeDriver10.0 + Utility + Package + true + - + . @@ -80,13 +116,23 @@ $(ProjectDir)..\Install\win10\x86\ + + $(ProjectDir)..\Install\win11\x86\ + $(ProjectDir)..\Install\win10\amd64\ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + $(ProjectDir)..\Install\win11\amd64\ + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + $(ProjectDir)..\Install\win10\arm64\ + + $(ProjectDir)..\Install\win11\arm64\ + DbgengKernelDebugger diff --git a/vioinput/sys/vioinput.vcxproj b/vioinput/sys/vioinput.vcxproj index d84764f53..6792ac205 100755 --- a/vioinput/sys/vioinput.vcxproj +++ b/vioinput/sys/vioinput.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {230231c1-a0c2-4a37-b32b-e247a92311f4} @@ -36,16 +48,31 @@ WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Driver KMDF @@ -87,8 +114,11 @@ true true ..\..\VirtIO\objfre_win10_x86\i386;..\..\VirtIO\WDF\objfre_win10_x86\i386;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_x86\i386;..\..\VirtIO\WDF\objfre_win11_x86\i386;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_arm64\arm64;..\..\VirtIO\WDF\objfre_win10_arm64\arm64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_arm64\arm64;..\..\VirtIO\WDF\objfre_win11_arm64\arm64;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_amd64\amd64;..\..\VirtIO\WDF\objfre_win10_amd64\amd64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_amd64\amd64;..\..\VirtIO\WDF\objfre_win11_amd64\amd64;%(AdditionalLibraryDirectories) virtiolib.lib;virtiolib_wdf.lib;ntstrsafe.lib;wdmsec.lib;%(AdditionalDependencies) diff --git a/vioinput/vioinput.sln b/vioinput/vioinput.sln index d2e59fe2e..951c2ba86 100644 --- a/vioinput/vioinput.sln +++ b/vioinput/vioinput.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31702.278 @@ -27,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 @@ -37,6 +39,12 @@ 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|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 @@ -45,6 +53,12 @@ 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|x64.Deploy.0 = Win11 Release|x64 + {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -53,6 +67,12 @@ Global {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -61,6 +81,12 @@ Global {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -69,6 +95,12 @@ Global {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viorng/VirtRNG Package/VirtRNG Package.vcxproj b/viorng/VirtRNG Package/VirtRNG Package.vcxproj index e9be9303a..1c006595a 100755 --- a/viorng/VirtRNG Package/VirtRNG Package.vcxproj +++ b/viorng/VirtRNG Package/VirtRNG Package.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF} @@ -38,14 +50,26 @@ false Windows10 + + false + Windows10 + Windows10 false + + Windows10 + false + Windows10 false + + Windows10 + false + @@ -58,15 +82,28 @@ Universal $(ProjectDir)..\Install\win10\x86\ + + Universal + $(ProjectDir)..\Install\win11\x86\ + Universal $(ProjectDir)..\Install\win10\amd64\ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + Universal + $(ProjectDir)..\Install\win11\amd64\ + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + Universal $(ProjectDir)..\Install\win10\arm64\ + + Universal + $(ProjectDir)..\Install\win11\arm64\ + $(OutDir) $(Platform)\$(Configuration.Replace(' ',''))\ diff --git a/viorng/buildAll.bat b/viorng/buildAll.bat index f95d126d6..31db07e44 100755 --- a/viorng/buildAll.bat +++ b/viorng/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viorng.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viorng.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat viorng.sln "Win10" %* +call ..\tools\build.bat viorng.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat viorng\viorng.vcxproj "Win10_SDV" %* +call ..\tools\build.bat viorng\viorng.vcxproj "Win11_SDV" %* diff --git a/viorng/cng/um/viorngum.vcxproj b/viorng/cng/um/viorngum.vcxproj index 69ae5d63e..ecc8136ca 100755 --- a/viorng/cng/um/viorngum.vcxproj +++ b/viorng/cng/um/viorngum.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -41,6 +53,9 @@ true + + true + diff --git a/viorng/test/viorngtest.vcxproj b/viorng/test/viorngtest.vcxproj index ba41d8362..aa0ba7a0f 100644 --- a/viorng/test/viorngtest.vcxproj +++ b/viorng/test/viorngtest.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + 15.0 @@ -30,6 +42,13 @@ Unicode Windows10 + + Application + false + true + Unicode + Windows10 + Application false @@ -37,6 +56,13 @@ Unicode Windows10 + + Application + false + true + Unicode + Windows10 + Application false @@ -44,6 +70,13 @@ Unicode Windows10 + + Application + false + true + Unicode + Windows10 + @@ -52,23 +85,42 @@ + + + + + + + + + false $(Platform)\$(Configuration.Replace(' ',''))\ $(Platform)\$(Configuration.Replace(' ',''))\ + + false + $(Platform)\$(Configuration.Replace(' ',''))\ + $(Platform)\$(Configuration.Replace(' ',''))\ + false $(Platform)\$(Configuration.Replace(' ',''))\ $(Platform)\$(Configuration.Replace(' ',''))\ + + false + $(Platform)\$(Configuration.Replace(' ',''))\ + $(Platform)\$(Configuration.Replace(' ',''))\ + true @@ -77,6 +129,11 @@ $(Platform)\$(Configuration.Replace(' ',''))\ $(Platform)\$(Configuration.Replace(' ',''))\ + + false + $(Platform)\$(Configuration.Replace(' ',''))\ + $(Platform)\$(Configuration.Replace(' ',''))\ + Use @@ -96,6 +153,25 @@ true + + + Use + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + + Use @@ -115,6 +191,25 @@ true + + + Use + Level3 + MaxSpeed + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + + Use @@ -149,14 +244,36 @@ true + + + Use + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + pch.h + + + Console + true + true + true + + Create + Create Create + Create Create + Create diff --git a/viorng/viorng.sln b/viorng/viorng.sln index 4b117528c..e9b7b8612 100644 --- a/viorng/viorng.sln +++ b/viorng/viorng.sln @@ -1,4 +1,3 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.31702.278 @@ -33,6 +32,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 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -42,6 +44,12 @@ Global {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|x64.Build.0 = Win10 Release|x64 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -49,12 +57,23 @@ Global {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|x64.Build.0 = Win10 Release|x64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -62,6 +81,12 @@ Global {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|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|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -69,6 +94,12 @@ Global {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|ARM64.Deploy.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 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -76,6 +107,12 @@ Global {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viorng/viorng/viorng.vcxproj b/viorng/viorng/viorng.vcxproj index 2c5fb4cc2..a1d50a74d 100755 --- a/viorng/viorng/viorng.vcxproj +++ b/viorng/viorng/viorng.vcxproj @@ -13,6 +13,18 @@ Win10 Release x64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838} @@ -35,6 +47,13 @@ 15 Universal + + Windows10 + WindowsKernelModeDriver10.0 + false + 15 + Universal + Windows10 WindowsKernelModeDriver10.0 @@ -42,6 +61,13 @@ 15 Universal + + Windows10 + WindowsKernelModeDriver10.0 + false + 15 + Universal + Windows10 WindowsKernelModeDriver10.0 @@ -49,6 +75,13 @@ 15 Universal + + Windows10 + WindowsKernelModeDriver10.0 + false + 15 + Universal + Driver KMDF @@ -72,6 +105,9 @@ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + dvl @@ -93,8 +129,11 @@ true true ..\..\VirtIO\objfre_win10_x86\i386;..\..\VirtIO\WDF\objfre_win10_x86\i386;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_x86\i386;..\..\VirtIO\WDF\objfre_win11_x86\i386;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_amd64\amd64;..\..\VirtIO\WDF\objfre_win10_amd64\amd64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_amd64\amd64;..\..\VirtIO\WDF\objfre_win11_amd64\amd64;%(AdditionalLibraryDirectories) ..\..\VirtIO\objfre_win10_arm64\arm64;..\..\VirtIO\WDF\objfre_win10_arm64\arm64;%(AdditionalLibraryDirectories) + ..\..\VirtIO\objfre_win11_arm64\arm64;..\..\VirtIO\WDF\objfre_win11_arm64\arm64;%(AdditionalLibraryDirectories) diff --git a/vioscsi/buildAll.bat b/vioscsi/buildAll.bat index ab1e70df6..f074bc9bb 100755 --- a/vioscsi/buildAll.bat +++ b/vioscsi/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat vioscsi.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat vioscsi.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat vioscsi.sln "Win10" %* +call ..\tools\build.bat vioscsi.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat vioscsi.vcxproj "Win10_SDV" %* +call ..\tools\build.bat vioscsi.vcxproj "Win11_SDV" %* diff --git a/vioscsi/vioscsi.sln b/vioscsi/vioscsi.sln index 0548d6452..05fda2dac 100644 --- a/vioscsi/vioscsi.sln +++ b/vioscsi/vioscsi.sln @@ -17,6 +17,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 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 @@ -28,6 +31,13 @@ Global {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -37,6 +47,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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/vioscsi/vioscsi.vcxproj b/vioscsi/vioscsi.vcxproj index 0997ab28b..61dcf3728 100755 --- a/vioscsi/vioscsi.vcxproj +++ b/vioscsi/vioscsi.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48} @@ -40,14 +52,26 @@ Windows10 WindowsKernelModeDriver10.0 + + Windows10 + WindowsKernelModeDriver10.0 + Windows10 WindowsKernelModeDriver10.0 + + Windows10 + WindowsKernelModeDriver10.0 + Windows10 WindowsKernelModeDriver10.0 + + Windows10 + WindowsKernelModeDriver10.0 + @@ -65,14 +89,26 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + dvl @@ -104,18 +140,27 @@ true + true {km-StorDefault.tpl}*.tmh + {km-StorDefault.tpl}*.tmh trace.h + trace.h true + true {km-StorDefault.tpl}*.tmh + {km-StorDefault.tpl}*.tmh trace.h + trace.h true + true {km-StorDefault.tpl}*.tmh + {km-StorDefault.tpl}*.tmh trace.h + trace.h diff --git a/vioserial/app/vioser-test.vcxproj b/vioserial/app/vioser-test.vcxproj index 103c4d4fd..0881ab9d3 100644 --- a/vioserial/app/vioser-test.vcxproj +++ b/vioserial/app/vioser-test.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -45,6 +57,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + Application false @@ -53,6 +73,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + Application false @@ -61,6 +89,14 @@ Unicode Windows10 + + Application + false + WindowsApplicationForDrivers10.0 + true + Unicode + Windows10 + @@ -75,18 +111,36 @@ objfre_win10_x86\i386\ $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)win + + false + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)win + false objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)win + + false + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + $(VC_IncludePath);$(WindowsSDK_IncludePath);$(ProjectDir)win + false objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ $(IncludePath);$(UM_IncludePath);$(KIT_SHARED_IncludePath);$(ProjectDir)win + + false + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + $(IncludePath);$(UM_IncludePath);$(KIT_SHARED_IncludePath);$(ProjectDir)win + Level3 diff --git a/vioserial/buildAll.bat b/vioserial/buildAll.bat index 1a4d0e0c5..fcc4e3513 100755 --- a/vioserial/buildAll.bat +++ b/vioserial/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat vioser.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat vioser.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat vioser.sln "Win10" %* +call ..\tools\build.bat vioser.sln "Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat sys\vioser.vcxproj "Win10_SDV" %* +call ..\tools\build.bat sys\vioser.vcxproj "Win11_SDV" %* diff --git a/vioserial/sys/vioser.vcxproj b/vioserial/sys/vioser.vcxproj index 6109c13d0..3f8a7f4b7 100755 --- a/vioserial/sys/vioser.vcxproj +++ b/vioserial/sys/vioser.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {023DE679-5B3F-423F-88C4-714A12F3D864} @@ -37,16 +49,32 @@ Desktop 15 + + Windows10 + WindowsKernelModeDriver10.0 + Desktop + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Windows10 WindowsKernelModeDriver10.0 15 + + Windows10 + WindowsKernelModeDriver10.0 + 15 + Driver KMDF @@ -68,14 +96,26 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + dvl diff --git a/vioserial/vioser.sln b/vioserial/vioser.sln index 249a678d8..26662eb28 100644 --- a/vioserial/vioser.sln +++ b/vioserial/vioser.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,12 @@ 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|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 +53,12 @@ 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|x64.Deploy.0 = Win11 Release|x64 + {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -52,12 +67,23 @@ Global {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x64.Build.0 = Win10 Release|x64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viosock/ViosockPackage/ViosockPackage.vcxproj b/viosock/ViosockPackage/ViosockPackage.vcxproj index 180672015..7d84132d0 100644 --- a/viosock/ViosockPackage/ViosockPackage.vcxproj +++ b/viosock/ViosockPackage/ViosockPackage.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -60,13 +72,23 @@ $(ProjectDir)..\Install\win10\x86\ + + $(ProjectDir)..\Install\win11\x86\ + $(ProjectDir)..\Install\win10\amd64\ Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + + $(ProjectDir)..\Install\win11\amd64\ + Server10_$(DDKPlatform);$(Inf2CatWindowsVersionList) + $(ProjectDir)..\Install\win10\ARM64\ + + $(ProjectDir)..\Install\win11\ARM64\ + $(OutDir) $(PlatformTarget)\$(ConfigurationName)\ diff --git a/viosock/buildAll.bat b/viosock/buildAll.bat index b3c13287d..a250f4999 100644 --- a/viosock/buildAll.bat +++ b/viosock/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viosock.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viosock.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat viosock.sln "Win10" %* +call ..\tools\build.bat viosock.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat sys\viosock.vcxproj "Win10_SDV" %* +call ..\tools\build.bat sys\viosock.vcxproj "Win11_SDV" %* diff --git a/viosock/lib/viosocklib.vcxproj b/viosock/lib/viosocklib.vcxproj index f640538a6..03244c477 100644 --- a/viosock/lib/viosocklib.vcxproj +++ b/viosock/lib/viosocklib.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC} diff --git a/viosock/sys/viosock.vcxproj b/viosock/sys/viosock.vcxproj index c36cc083e..9d10e8be3 100644 --- a/viosock/sys/viosock.vcxproj +++ b/viosock/sys/viosock.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05} @@ -48,14 +60,26 @@ Windows10 15 + + Windows10 + 15 + Windows10 15 + + Windows10 + 15 + Windows10 15 + + Windows10 + 15 + Driver KMDF @@ -87,14 +111,26 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + dvl diff --git a/viosock/viosock-test/viosock-test.vcxproj b/viosock/viosock-test/viosock-test.vcxproj index 1d1b40858..946528c88 100644 --- a/viosock/viosock-test/viosock-test.vcxproj +++ b/viosock/viosock-test/viosock-test.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + 15.0 @@ -32,6 +44,10 @@ Windows10 true + + Windows10 + true + @@ -48,6 +64,9 @@ false + + false + Use diff --git a/viosock/viosock.sln b/viosock/viosock.sln index ae01b039a..d27453e5a 100644 --- a/viosock/viosock.sln +++ b/viosock/viosock.sln @@ -49,6 +49,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 @@ -57,36 +60,67 @@ Global {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|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|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 {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|x64.Build.0 = Win10 Release|x64 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x64.Build.0 = Win10 Release|x64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x86.Build.0 = Win11 Release|Win32 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x64.Build.0 = Win10 Release|x64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x64.Build.0 = Win10 Release|x64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -96,6 +130,13 @@ Global {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 {96FDD976-0035-4E24-A61B-E93BED675101}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {96FDD976-0035-4E24-A61B-E93BED675101}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {96FDD976-0035-4E24-A61B-E93BED675101}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -104,6 +145,13 @@ Global {96FDD976-0035-4E24-A61B-E93BED675101}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {96FDD976-0035-4E24-A61B-E93BED675101}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {96FDD976-0035-4E24-A61B-E93BED675101}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {96FDD976-0035-4E24-A61B-E93BED675101}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {96FDD976-0035-4E24-A61B-E93BED675101}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {96FDD976-0035-4E24-A61B-E93BED675101}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {96FDD976-0035-4E24-A61B-E93BED675101}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {96FDD976-0035-4E24-A61B-E93BED675101}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {96FDD976-0035-4E24-A61B-E93BED675101}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {96FDD976-0035-4E24-A61B-E93BED675101}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viosock/viosocklib-test/viosocklib-test.vcxproj b/viosock/viosocklib-test/viosocklib-test.vcxproj index 157a3cc3f..82fa54a9b 100644 --- a/viosock/viosocklib-test/viosocklib-test.vcxproj +++ b/viosock/viosocklib-test/viosocklib-test.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + 15.0 @@ -31,15 +43,27 @@ true + + true + Windows10 + + Windows10 + Windows10 + + Windows10 + Windows10 + + Windows10 + @@ -56,6 +80,9 @@ false + + false + Use diff --git a/viosock/wsk/wsk.vcxproj b/viosock/wsk/wsk.vcxproj index dd9617f70..a89026973 100644 --- a/viosock/wsk/wsk.vcxproj +++ b/viosock/wsk/wsk.vcxproj @@ -25,6 +25,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + @@ -65,6 +77,9 @@ Windows10 + + Windows10 + Windows10 @@ -79,6 +94,10 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + objchk_win10_x86\i386\ objchk_win10_x86\i386\ @@ -87,6 +106,10 @@ objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + objchk_win10_amd64\amd64\ objchk_win10_amd64\amd64\ @@ -95,6 +118,10 @@ objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + objchk_win10_arm64\arm64\ objchk_win10_arm64\arm64\ diff --git a/viostor/buildAll.bat b/viostor/buildAll.bat index d86e6802c..8123443ea 100644 --- a/viostor/buildAll.bat +++ b/viostor/buildAll.bat @@ -1,6 +1,6 @@ @echo off -if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viostor.sln Win10 ARM64 +if "%VIRTIO_WIN_NO_ARM%"=="" call ..\tools\build.bat viostor.sln "Win10 Win11" ARM64 if errorlevel 1 goto :eof -call ..\tools\build.bat viostor.sln "Win10" %* +call ..\tools\build.bat viostor.sln "Win10 Win11" %* if errorlevel 1 goto :eof -call ..\tools\build.bat viostor.vcxproj "Win10_SDV" %* +call ..\tools\build.bat viostor.vcxproj "Win11_SDV" %* diff --git a/viostor/viostor.sln b/viostor/viostor.sln index 6594ffa77..59fb24fc0 100644 --- a/viostor/viostor.sln +++ b/viostor/viostor.sln @@ -17,6 +17,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 @@ -27,6 +30,12 @@ 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|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 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -35,6 +44,12 @@ Global {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/viostor/viostor.vcxproj b/viostor/viostor.vcxproj index 0fb18a80c..d0c7a8399 100644 --- a/viostor/viostor.vcxproj +++ b/viostor/viostor.vcxproj @@ -13,6 +13,18 @@ Win10 Release ARM64 + + Win11 Release + ARM64 + + + Win11 Release + Win32 + + + Win11 Release + x64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4} @@ -36,16 +48,31 @@ WindowsKernelModeDriver10.0 viostor.inx + + Windows10 + WindowsKernelModeDriver10.0 + viostor.inx + Windows10 WindowsKernelModeDriver10.0 viostor.inx + + Windows10 + WindowsKernelModeDriver10.0 + viostor.inx + Windows10 WindowsKernelModeDriver10.0 viostor.inx + + Windows10 + WindowsKernelModeDriver10.0 + viostor.inx + Driver Miniport @@ -67,14 +94,26 @@ objfre_win10_x86\i386\ objfre_win10_x86\i386\ + + objfre_win11_x86\i386\ + objfre_win11_x86\i386\ + objfre_win10_amd64\amd64\ objfre_win10_amd64\amd64\ + + objfre_win11_amd64\amd64\ + objfre_win11_amd64\amd64\ + objfre_win10_arm64\arm64\ objfre_win10_arm64\arm64\ + + objfre_win11_arm64\arm64\ + objfre_win11_arm64\arm64\ + dvl @@ -102,6 +141,14 @@ %(AdditionalDependencies);storport.lib + + + %(PreprocessorDefinitions) + + + %(AdditionalDependencies);storport.lib + + @@ -115,20 +162,29 @@ true + true virtio_stor_trace.h + virtio_stor_trace.h {km-StorDefault.tpl}*.tmh + {km-StorDefault.tpl}*.tmh true + true virtio_stor_trace.h + virtio_stor_trace.h {km-StorDefault.tpl}*.tmh + {km-StorDefault.tpl}*.tmh true + true virtio_stor_trace.h + virtio_stor_trace.h {km-StorDefault.tpl}*.tmh + {km-StorDefault.tpl}*.tmh @@ -157,4 +213,4 @@ - + \ No newline at end of file diff --git a/virtio-win.sln b/virtio-win.sln index 24f6c122f..6ebe03ed8 100755 --- a/virtio-win.sln +++ b/virtio-win.sln @@ -205,6 +205,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 @@ -213,108 +216,198 @@ Global {01D87C47-437A-4A16-8FD9-33FA5C99339E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|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|x86.ActiveCfg = Win11 Release|x64 {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 {EC1B7990-EA6A-45FE-836C-2F050F6BB632}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|x64 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x64.Build.0 = Win10 Release|x64 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {DAD407F3-186A-48FC-88CE-E236AF3165C4}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x64.Build.0 = Win10 Release|x64 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {EF30BBDE-57AE-48F8-BACD-3C3F8C45E64C}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x64.Build.0 = Win10 Release|x64 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {023DE679-5B3F-423F-88C4-714A12F3D864}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {023DE679-5B3F-423F-88C4-714A12F3D864}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|x64.Build.0 = Win10 Release|x64 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {1530C86E-90C0-4270-B3A2-0FB90152CA48}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|x64.Build.0 = Win10 Release|x64 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {EF874D69-710D-4B5D-AFDA-4A3E912B5838}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|x64.Build.0 = Win10 Release|x64 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {4471A5F4-C884-4EBA-8241-FEBBECE181CF}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {E81CB0C6-F255-4A79-B972-8E49D15D957E}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x64.Build.0 = Win10 Release|x64 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {230231C1-A0C2-4A37-B32B-E247A92311F4}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|x64.Build.0 = Win10 Release|x64 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {CDABF347-89AB-4E09-A93F-324D4EFBC74F}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x64.Build.0 = Win10 Release|x64 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {3E9E272D-6299-4B69-A49E-6D286EAB8CCA}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|x64.Build.0 = Win10 Release|x64 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {29D5D8BA-071A-464F-89DF-C0B4EE99F141}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|x64.Build.0 = Win10 Release|x64 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {7F794CE4-EFAC-4C54-AEEC-7873510C36EA}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {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 {B3402316-94F7-4526-AD07-870DEE0E660C}.Win10 Release|x64.Build.0 = Win10 Release|x64 {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}.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|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|x86.ActiveCfg = Win11 Release|x64 {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 + {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|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|ARM64.ActiveCfg = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|ARM64.Build.0 = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x64.ActiveCfg = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x64.Build.0 = Header|x64 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x86.ActiveCfg = Header|Win32 {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win10 Release|x86.Build.0 = Header|Win32 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|ARM64.ActiveCfg = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|ARM64.Build.0 = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|x64.ActiveCfg = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|x64.Build.0 = Header|x64 + {09672FE6-A18C-4B3B-B1DC-1C7C1F61F9B4}.Win11 Release|x86.ActiveCfg = Header|x64 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x64.Build.0 = Win10 Release|x64 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {EC5DCAF5-3514-4E61-8201-10F5F060E096}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 @@ -322,45 +415,83 @@ Global {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {03CA149C-ACBD-430E-A663-30D3A335F8A4}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x64.Build.0 = Win10 Release|x64 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {87AEE822-FF8B-4743-A567-8B46F4FA6D99}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x64.Build.0 = Win10 Release|x64 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {92C73575-146D-4C39-A9CA-7B9081EB6FD1}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|x64.Build.0 = Win10 Release|x64 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {F93779E1-51C1-4D12-9DC6-28FF6EB5589B}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|ARM64.ActiveCfg = Win10 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x64.Build.0 = Win10 Release|x64 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|ARM64.ActiveCfg = Win11 Release|Win32 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {DD9D3949-C1BC-426F-BFDA-D9310B8F9E3F}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x64.Build.0 = Win10 Release|x64 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {8B100A20-3269-428E-8995-91CEC80756F9}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {8B100A20-3269-428E-8995-91CEC80756F9}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|x64.Build.0 = Win10 Release|x64 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {D9EF1144-4779-444C-ADD6-F733B749A862}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {D9EF1144-4779-444C-ADD6-F733B749A862}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {8CB5D2D4-F3EA-4568-89A8-DCD332BDCF4E}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x64.Build.0 = Win10 Release|x64 @@ -368,11 +499,20 @@ Global {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {209E8947-494D-4104-B44B-530CB68A6494}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {209E8947-494D-4104-B44B-530CB68A6494}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x64.Build.0 = Win10 Release|x64 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {9D87E5A8-84AE-4775-90B5-CC75CA420670}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x64.Build.0 = Win10 Release|x64 @@ -380,23 +520,43 @@ Global {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {B415038E-1FD4-4001-AEAB-CFA2177B1806}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x64.Build.0 = Win10 Release|x64 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {92E3B437-C258-47FB-8856-D3FEA56A3BCC}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x64.Build.0 = Win10 Release|x64 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {3149C26A-F437-42BD-A40D-D10A695F93EF}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x64.Build.0 = Win10 Release|x64 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x86.ActiveCfg = Win11 Release|Win32 + {315D93F9-0F5C-4ACD-AFB1-96B1E62559BC}.Win11 Release|x86.Build.0 = Win11 Release|Win32 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -406,45 +566,82 @@ Global {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {C65DA065-5828-45CF-89DB-FC4F21BC9E05}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x64.Build.0 = Win10 Release|x64 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {2CFBBF52-9646-4E42-9E43-9CEE50735254}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 - {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x64.Build.0 = Win10 Release|x64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x86.Build.0 = Win10 Release|Win32 {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win10 Release|x86.Deploy.0 = Win10 Release|Win32 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {3F2854A7-A604-4006-A79B-9EAFC63015B8}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x64.Build.0 = Win10 Release|x64 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {5E68CCE9-F95D-4A6C-A5AD-DBA7CE0CA63A}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|x64.Build.0 = Win10 Release|x64 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {BDE07E9E-2041-4853-8B74-7CF591C255E7}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x64.Build.0 = Win10 Release|x64 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {8C2B5F43-18E2-41B6-AEBC-8B6704F7FCC6}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x64.ActiveCfg = Win10 Release|x64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x64.Build.0 = Win10 Release|x64 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {D572573A-7D73-404D-8DFA-7727278C242E}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {D572573A-7D73-404D-8DFA-7727278C242E}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|ARM64.ActiveCfg = Win10 Release|ARM64 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|ARM64.Build.0 = Win10 Release|ARM64 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|ARM64.Deploy.0 = Win10 Release|ARM64 @@ -453,6 +650,13 @@ Global {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|x64.Deploy.0 = Win10 Release|x64 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|x86.ActiveCfg = Win10 Release|Win32 {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win10 Release|x86.Build.0 = Win10 Release|Win32 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|ARM64.ActiveCfg = Win11 Release|ARM64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|ARM64.Build.0 = Win11 Release|ARM64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|ARM64.Deploy.0 = Win11 Release|ARM64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x64.ActiveCfg = Win11 Release|x64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x64.Build.0 = Win11 Release|x64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x64.Deploy.0 = Win11 Release|x64 + {4BEE8BEA-413F-4262-BC96-B03B509241E4}.Win11 Release|x86.ActiveCfg = Win11 Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE