From a21b2270e8db93d231fa0a3d60776043c9a0f9bc Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 4 Dec 2021 23:55:41 +0100 Subject: Windows: Implement TESTSIGNING build configuration that allows running under Windows Vista,7, 8 and 8.1. --- src/Common/BootEncryption.cpp | 6 +- src/Common/BootEncryption.h | 10 --- src/Common/Dlgcode.c | 54 ++++++++++++- src/Common/Dlgcode.h | 24 ++++++ src/Common/Tcdefs.h | 2 + src/ExpandVolume/ExpandVolume.vcxproj | 144 ++++++++++++++++++++++++++++++++++ src/Format/Format.vcxproj | 132 +++++++++++++++++++++++++++++++ src/Mount/Mount.vcxproj | 136 ++++++++++++++++++++++++++++++++ src/Setup/Portable.vcxproj | 61 ++++++++++++++ src/Setup/Setup.c | 50 ++++++------ src/Setup/Setup.vcxproj | 61 ++++++++++++++ src/Signing/sign_TESTSIGNING.bat | 59 ++++++++++++++ src/VeraCrypt.sln | 37 +++++++++ 13 files changed, 735 insertions(+), 41 deletions(-) create mode 100644 src/Signing/sign_TESTSIGNING.bat (limited to 'src') diff --git a/src/Common/BootEncryption.cpp b/src/Common/BootEncryption.cpp index c8fc90bf..c3ce07ab 100644 --- a/src/Common/BootEncryption.cpp +++ b/src/Common/BootEncryption.cpp @@ -2218,7 +2218,6 @@ namespace VeraCrypt #endif // !SETUP - NtQuerySystemInformationFn NtQuerySystemInformationPtr = NULL; EfiBootConf::EfiBootConf() : passwordType (0), passwordMsg ("Password: "), @@ -2510,14 +2509,13 @@ namespace VeraCrypt ULONG len; NTSTATUS res; WCHAR tempBuf[1024]; + NtQuerySystemInformationFn NtQuerySystemInformationPtr = (NtQuerySystemInformationFn) GetProcAddress (GetModuleHandle (L"ntdll.dll"), "NtQuerySystemInformation"); memset(tempBuf, 0, sizeof(tempBuf)); // Load NtQuerySystemInformation function point if (!NtQuerySystemInformationPtr) { - NtQuerySystemInformationPtr = (NtQuerySystemInformationFn) GetProcAddress (GetModuleHandle (L"ntdll.dll"), "NtQuerySystemInformation"); - if (!NtQuerySystemInformationPtr) - throw SystemException (SRC_POS); + throw SystemException (SRC_POS); } res = NtQuerySystemInformationPtr((SYSTEM_INFORMATION_CLASS)SYSPARTITIONINFORMATION, tempBuf, sizeof(tempBuf), &len); diff --git a/src/Common/BootEncryption.h b/src/Common/BootEncryption.h index decacb8b..7f5c3b16 100644 --- a/src/Common/BootEncryption.h +++ b/src/Common/BootEncryption.h @@ -18,16 +18,6 @@ #include "Exception.h" #include "Platform/PlatformBase.h" #include "Volumes.h" -#include - -#define SYSPARTITIONINFORMATION 0x62 - -typedef NTSTATUS (WINAPI *NtQuerySystemInformationFn)( - SYSTEM_INFORMATION_CLASS SystemInformationClass, - PVOID SystemInformation, - ULONG SystemInformationLength, - PULONG ReturnLength -); typedef ULONG (WINAPI *RtlNtStatusToDosErrorFn)( NTSTATUS Status diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index 6462e319..049dc288 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -166,6 +166,8 @@ BOOL bHistory = FALSE; #ifndef SETUP BOOL bLanguageSetInSetup = FALSE; +#else +extern BOOL bMakePackage; #endif // Status of detection of hidden sectors (whole-system-drive encryption). @@ -3259,12 +3261,36 @@ void InitApp (HINSTANCE hInstance, wchar_t *lpszCommandLine) RemoteSession = GetSystemMetrics (SM_REMOTESESSION) != 0; +#ifndef VC_SKIP_OS_DRIVER_REQ_CHECK // OS version check: from version 1.25, only Windows XP, Windows 10 and Windows 11 are supported because of new driver signing requirements if (!(IsOSVersionAtLeast(WIN_10, 0) || (nCurrentOS == WIN_XP) || (nCurrentOS == WIN_XP64))) { MessageBoxW (NULL, GetString ("UNSUPPORTED_OS"), lpszTitle, MB_ICONSTOP); exit (1); } +#else + // in TESTSIGNING mode, we support only Windows Vista, Windows 7, Windows 8/8.1 + if ( !IsOSVersionAtLeast(WIN_VISTA, 0) +#ifndef SETUP + || IsOSVersionAtLeast(WIN_10, 0) +#else + || (IsOSVersionAtLeast(WIN_10, 0) && !bMakePackage) +#endif + ) + { + MessageBoxW (NULL, L"TESTSIGNING version of VeraCrypt targets only Windows Vista, Windows 7 and Windows 8/8.1.\n\nPlease use the standard version of VeraCrypt instead.", lpszTitle, MB_ICONSTOP); + exit (1); + } + else if ( !IsTestSigningModeEnabled() +#ifdef SETUP + && !bMakePackage +#endif + ) + { + MessageBoxW (NULL, L"Test-Signing Mode, which is required to run VeraCrypt TESTSIGNING binaries, is not enabled in Windows.\n\nExecution aborted!", lpszTitle, MB_ICONSTOP); + exit (1); + } +#endif else { // Service pack check & warnings about critical MS issues @@ -14035,7 +14061,7 @@ INT_PTR SecureDesktopDialogBoxParam( #endif -#ifdef NDEBUG +#if !defined(NDEBUG) && !defined(VC_SKIP_OS_DRIVER_REQ_CHECK) static BOOL InitializeWintrust() { if (!hWinTrustLib) @@ -14086,7 +14112,7 @@ static void FinalizeWintrust() BOOL VerifyModuleSignature (const wchar_t* path) { -#ifdef NDEBUG +#if !defined(NDEBUG) && !defined (VC_SKIP_OS_DRIVER_REQ_CHECK) BOOL bResult = FALSE; HRESULT hResult; GUID gActionID = WINTRUST_ACTION_GENERIC_VERIFY_V2; @@ -15233,3 +15259,27 @@ BOOL GetHibernateStatus (BOOL& bHibernateEnabled, BOOL& bHiberbootEnabled) return bResult; } +/* return TRUE if Windows is in Test Signing mode */ +/* ref: https://social.msdn.microsoft.com/Forums/Windowsapps/en-US/e6c1be93-7003-4594-b8e4-18ab4a75d273/detecting-testsigning-onoff-via-api */ +BOOL IsTestSigningModeEnabled () +{ + BOOL bEnabled = FALSE; + NtQuerySystemInformationFn NtQuerySystemInformationPtr = (NtQuerySystemInformationFn) GetProcAddress (GetModuleHandle (L"ntdll.dll"), "NtQuerySystemInformation"); + if(NtQuerySystemInformationPtr) + { + SYSTEM_CODEINTEGRITY_INFORMATION info = {0}; + ULONG cbReturnedData = 0; + info.Length = sizeof(info); + if ( (NtQuerySystemInformationPtr((SYSTEM_INFORMATION_CLASS) SYSTEMCODEINTEGRITYINFORMATION, &info, sizeof(info), &cbReturnedData) >= 0) + && (cbReturnedData == sizeof(info)) + ) + { + if ((info.CodeIntegrityOptions & (CODEINTEGRITY_OPTION_TESTSIGN | CODEINTEGRITY_OPTION_ENABLED)) == (CODEINTEGRITY_OPTION_TESTSIGN | CODEINTEGRITY_OPTION_ENABLED)) + { + bEnabled = TRUE; + } + } + } + + return bEnabled; +} diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h index 6370c2a7..3d521a21 100644 --- a/src/Common/Dlgcode.h +++ b/src/Common/Dlgcode.h @@ -18,6 +18,7 @@ #include "Apidrvr.h" #include "Keyfiles.h" #include "Wipe.h" +#include #ifdef __cplusplus extern "C" { @@ -250,6 +251,28 @@ typedef enum BitLockerEncryptionStatus BL_Status_Protected } BitLockerEncryptionStatus; +#ifndef CODEINTEGRITY_OPTION_ENABLED + +#define CODEINTEGRITY_OPTION_ENABLED 0x01 +#define CODEINTEGRITY_OPTION_TESTSIGN 0x02 + +typedef struct _SYSTEM_CODEINTEGRITY_INFORMATION { + ULONG Length; + ULONG CodeIntegrityOptions; +} SYSTEM_CODEINTEGRITY_INFORMATION, *PSYSTEM_CODEINTEGRITY_INFORMATION; + +#endif + +#define SYSPARTITIONINFORMATION 0x62 +#define SYSTEMCODEINTEGRITYINFORMATION 0x67 + +typedef NTSTATUS (WINAPI *NtQuerySystemInformationFn)( + SYSTEM_INFORMATION_CLASS SystemInformationClass, + PVOID SystemInformation, + ULONG SystemInformationLength, + PULONG ReturnLength +); + #define DEFAULT_VOL_CREATION_WIZARD_MODE WIZARD_MODE_FILE_CONTAINER @@ -560,6 +583,7 @@ BOOL BufferHasPattern (const unsigned char* buffer, size_t bufferLen, const void BOOL EnableProcessProtection(); void SafeOpenURL (LPCWSTR szUrl); BitLockerEncryptionStatus GetBitLockerEncryptionStatus(WCHAR driveLetter); +BOOL IsTestSigningModeEnabled (); #ifdef _WIN64 void GetAppRandomSeed (unsigned char* pbRandSeed, size_t cbRandSeed); #endif diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index d7dc73d2..d25bf7d5 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -59,6 +59,8 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #ifdef VC_EFI_CUSTOM_MODE #define VERSION_STRING_SUFFIX "-CustomEFI" +#elif defined(VC_SKIP_OS_DRIVER_REQ_CHECK) +#define VERSION_STRING_SUFFIX "-TESTSIGNING" #else #define VERSION_STRING_SUFFIX "" #endif diff --git a/src/ExpandVolume/ExpandVolume.vcxproj b/src/ExpandVolume/ExpandVolume.vcxproj index 5fe967bb..bb00fcd4 100644 --- a/src/ExpandVolume/ExpandVolume.vcxproj +++ b/src/ExpandVolume/ExpandVolume.vcxproj @@ -17,6 +17,14 @@ ReleaseCustomEFI x64 + + Release_SkipOsDriverReqCheck + Win32 + + + Release_SkipOsDriverReqCheck + x64 + Release Win32 @@ -37,6 +45,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -52,6 +65,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -69,6 +87,10 @@ + + + + @@ -81,6 +103,10 @@ + + + + @@ -101,26 +127,36 @@ true true Release\ + Release\ Release\ Release\ + Release\ Release\ false + false false true + true true $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false + false false true + true true VeraCryptExpander VeraCryptExpander + VeraCryptExpander VeraCryptExpander VeraCryptExpander VeraCryptExpander + VeraCryptExpander VeraCryptExpander @@ -277,6 +313,50 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: copy Release\VeraCryptExpander.exe "..\Release\Setup Files\" + + + %(AdditionalIncludeDirectories) + $(SolutionDir)/Mount/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + VCEXPANDER;TCMOUNT;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level3 + ProgramDatabase + 4311;4131;%(DisableSpecificWarnings) + + + ..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptExpander.exe + false + mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX86 + RequireAdministrator + + + VeraCryptExpander.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCryptExpander.exe "..\Release\Setup Files\" + + %(AdditionalIncludeDirectories) @@ -372,6 +452,54 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: WIN64;%(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + X64 + $(SolutionDir)/Mount/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\pkcs11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + VCEXPANDER;TCMOUNT;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level3 + ProgramDatabase + 4311;4131;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptExpander.exe + false + mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX64 + RequireAdministrator + + + VeraCryptExpander.manifest;%(AdditionalManifestFiles) + + + copy $(TargetPath) "..\Release\Setup Files\VeraCryptExpander-x64.exe" + + + WIN64;%(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories) @@ -452,8 +580,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -466,16 +596,20 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -485,8 +619,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -508,8 +644,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -556,12 +694,16 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: $(SolutionDir)/Mount $(SolutionDir)/Mount/%(Filename)_h.h $(SolutionDir)/Mount + $(SolutionDir)/Mount $(SolutionDir)/Mount $(SolutionDir)/Mount/%(Filename)_h.h + $(SolutionDir)/Mount/%(Filename)_h.h $(SolutionDir)/Mount/%(Filename)_h.h $(SolutionDir)/Mount + $(SolutionDir)/Mount $(SolutionDir)/Mount $(SolutionDir)/Mount/%(Filename)_h.h + $(SolutionDir)/Mount/%(Filename)_h.h $(SolutionDir)/Mount/%(Filename)_h.h @@ -571,8 +713,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: true true true + true true true + true true diff --git a/src/Format/Format.vcxproj b/src/Format/Format.vcxproj index 204654e1..d80f4618 100644 --- a/src/Format/Format.vcxproj +++ b/src/Format/Format.vcxproj @@ -17,6 +17,14 @@ ReleaseCustomEFI x64 + + Release_SkipOsDriverReqCheck + Win32 + + + Release_SkipOsDriverReqCheck + x64 + Release Win32 @@ -37,6 +45,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -52,6 +65,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -69,6 +87,10 @@ + + + + @@ -81,6 +103,10 @@ + + + + @@ -101,26 +127,36 @@ true true Release\ + Release\ Release\ Release\ + Release\ Release\ false + false false true + true true $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false + false false true + true true VeraCryptFormat VeraCryptFormat + VeraCryptFormat VeraCryptFormat VeraCryptFormat VeraCryptFormat + VeraCryptFormat VeraCryptFormat @@ -245,6 +281,46 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL: copy Release\VeraCryptFormat.exe "..\Release\Setup Files\VeraCrypt Format.exe" + + + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + VOLFORMAT;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + ProgramDatabase + 4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings) + + + ..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptFormat.exe + false + mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX86 + + + Format.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCryptFormat.exe "..\Release\Setup Files\VeraCrypt Format.exe" + + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb @@ -332,6 +408,50 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL: WIN64;%(PreprocessorDefinitions) + + + X64 + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + VOLFORMAT;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + ProgramDatabase + 4057;4100;4127;4201;4204;4701;4706;4131;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptFormat.exe + false + mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX64 + + + Format.manifest;%(AdditionalManifestFiles) + + + copy $(TargetPath) "..\Release\Setup Files\VeraCrypt Format-x64.exe" + + + WIN64;%(PreprocessorDefinitions) + + X64 @@ -382,16 +502,20 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -404,16 +528,20 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -425,8 +553,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -530,8 +660,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL: true true true + true true true + true true diff --git a/src/Mount/Mount.vcxproj b/src/Mount/Mount.vcxproj index 73a6641e..8989f650 100644 --- a/src/Mount/Mount.vcxproj +++ b/src/Mount/Mount.vcxproj @@ -17,6 +17,14 @@ ReleaseCustomEFI x64 + + Release_SkipOsDriverReqCheck + Win32 + + + Release_SkipOsDriverReqCheck + x64 + Release Win32 @@ -37,6 +45,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -52,6 +65,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -69,6 +87,10 @@ + + + + @@ -81,6 +103,10 @@ + + + + @@ -101,26 +127,36 @@ true true Release\ + Release\ Release\ Release\ + Release\ Release\ false + false false true + true true $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ $(Platform)\$(Configuration)\ false + false false true + true true VeraCrypt VeraCrypt + VeraCrypt VeraCrypt VeraCrypt VeraCrypt + VeraCrypt VeraCrypt @@ -266,6 +302,49 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL: copy Release\VeraCrypt.exe "..\Release\Setup Files" + + + %(AdditionalIncludeDirectories) + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + TCMOUNT;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + ProgramDatabase + 4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings) + + + ..\Crypto\Release\crypto.lib;..\Common\Release\Zip.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCrypt.exe + false + mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX86 + + + Mount.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCrypt.exe "..\Release\Setup Files" + + %(AdditionalIncludeDirectories) @@ -359,6 +438,53 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL: WIN64;%(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + X64 + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + TCMOUNT;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + ProgramDatabase + 4057;4100;4127;4201;4701;4706;4131;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Release\crypto.lib;..\Common\x64\Release\Zip.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCrypt.exe + false + mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX64 + + + Mount.manifest;%(AdditionalManifestFiles) + + + copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-x64.exe" + + + WIN64;%(PreprocessorDefinitions) + + %(AdditionalIncludeDirectories) @@ -415,8 +541,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -429,16 +557,20 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -448,8 +580,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL: CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -556,8 +690,10 @@ copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL: true true true + true true true + true true diff --git a/src/Setup/Portable.vcxproj b/src/Setup/Portable.vcxproj index e864515b..1a8e4a46 100644 --- a/src/Setup/Portable.vcxproj +++ b/src/Setup/Portable.vcxproj @@ -9,6 +9,10 @@ ReleaseCustomEFI Win32 + + Release_SkipOsDriverReqCheck + Win32 + Release Win32 @@ -25,6 +29,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -42,6 +51,10 @@ + + + + @@ -59,15 +72,20 @@ true true PortableRelease\ + PortableRelease\ PortableRelease\ PortableRelease\ + PortableRelease\ PortableRelease\ false + false false true + true true VeraCryptPortable VeraCryptPortable + VeraCryptPortable VeraCryptPortable @@ -145,6 +163,44 @@ copy PortableDebug\VeraCryptPortable.exe "..\Debug\Setup Files\VeraCrypt Portabl copy PortableRelease\VeraCryptPortable.exe "..\Release\Setup Files\VeraCrypt Portable.exe" + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + SETUP;PORTABLE;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + ProgramDatabase + 4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings) + + + /IGNORE:4089 %(AdditionalOptions) + mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptPortable.exe + AsInvoker + user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX86 + + + Portable.manifest;%(AdditionalManifestFiles) + + + copy PortableRelease\VeraCryptPortable.exe "..\Release\Setup Files\VeraCrypt Portable.exe" + + /w34189 %(AdditionalOptions) @@ -192,11 +248,13 @@ copy PortableDebug\VeraCryptPortable.exe "..\Debug\Setup Files\VeraCrypt Portabl CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -205,11 +263,13 @@ copy PortableDebug\VeraCryptPortable.exe "..\Debug\Setup Files\VeraCrypt Portabl CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -253,6 +313,7 @@ copy PortableDebug\VeraCryptPortable.exe "..\Debug\Setup Files\VeraCrypt Portabl true true + true true diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c index 4b850999..6423b6b0 100644 --- a/src/Setup/Setup.c +++ b/src/Setup/Setup.c @@ -2944,31 +2944,6 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpsz SelfExtractStartupInit(); -#ifdef PORTABLE - lpszTitle = L"VeraCrypt Portable"; -#else - lpszTitle = L"VeraCrypt Setup"; -#endif - /* Call InitApp to initialize the common code */ - InitApp (hInstance, NULL); - -#ifndef PORTABLE - if (IsAdmin () != TRUE) - if (MessageBoxW (NULL, GetString ("SETUP_ADMIN"), lpszTitle, MB_YESNO | MB_ICONQUESTION) != IDYES) - { - FinalizeApp (); - exit (1); - } -#endif - /* Setup directory */ - { - wchar_t *s; - GetModuleFileName (NULL, SetupFilesDir, ARRAYSIZE (SetupFilesDir)); - s = wcsrchr (SetupFilesDir, L'\\'); - if (s) - s[1] = 0; - } - /* Parse command line arguments */ if (lpszCommandLine[0] == L'/') @@ -3001,6 +2976,31 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpsz } } +#ifdef PORTABLE + lpszTitle = L"VeraCrypt Portable"; +#else + lpszTitle = L"VeraCrypt Setup"; +#endif + /* Call InitApp to initialize the common code */ + InitApp (hInstance, NULL); + +#ifndef PORTABLE + if (IsAdmin () != TRUE) + if (MessageBoxW (NULL, GetString ("SETUP_ADMIN"), lpszTitle, MB_YESNO | MB_ICONQUESTION) != IDYES) + { + FinalizeApp (); + exit (1); + } +#endif + /* Setup directory */ + { + wchar_t *s; + GetModuleFileName (NULL, SetupFilesDir, ARRAYSIZE (SetupFilesDir)); + s = wcsrchr (SetupFilesDir, L'\\'); + if (s) + s[1] = 0; + } + if (bMakePackage) { /* Create self-extracting package */ diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj index 30c7e167..622e84ef 100644 --- a/src/Setup/Setup.vcxproj +++ b/src/Setup/Setup.vcxproj @@ -9,6 +9,10 @@ ReleaseCustomEFI Win32 + + Release_SkipOsDriverReqCheck + Win32 + Release Win32 @@ -25,6 +29,11 @@ Unicode Windows7.1SDK + + Application + Unicode + Windows7.1SDK + Application Unicode @@ -42,6 +51,10 @@ + + + + @@ -59,15 +72,20 @@ true true Release\ + Release\ Release\ Release\ + Release\ Release\ false + false false true + true true VeraCryptSetup VeraCryptSetup + VeraCryptSetup VeraCryptSetup @@ -146,6 +164,44 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt COMReg.exe" >NU copy Release\VeraCryptSetup.exe "..\Release\Setup Files\VeraCrypt Setup.exe" && copy Release\VeraCryptSetup.exe "..\Release\Setup Files\VeraCrypt COMReg.exe" + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;..\Common\zlib;..\Common\libzip;%(AdditionalIncludeDirectories) + SETUP;VC_SKIP_OS_DRIVER_REQ_CHECK;WIN32;HAVE_CONFIG_H;ZIP_STATIC;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + ProgramDatabase + 4057;4100;4127;4201;4505;4701;4706;4131;%(DisableSpecificWarnings) + + + /IGNORE:4089 %(AdditionalOptions) + mpr.lib;..\Common\Release\Zip.lib;..\Crypto\Release\crypto.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptSetup.exe + RequireAdministrator + user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs) + true + true + Windows + true + true + true + true + MachineX86 + + + Setup.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCryptSetup.exe "..\Release\Setup Files\VeraCrypt Setup.exe" && copy Release\VeraCryptSetup.exe "..\Release\Setup Files\VeraCrypt COMReg.exe" + + /w34189 %(AdditionalOptions) @@ -194,11 +250,13 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt COMReg.exe" >NU CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -207,11 +265,13 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt COMReg.exe" >NU CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp CompileAsCpp CompileAsCpp + CompileAsCpp CompileAsCpp @@ -257,6 +317,7 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt COMReg.exe" >NU true true + true true diff --git a/src/Signing/sign_TESTSIGNING.bat b/src/Signing/sign_TESTSIGNING.bat new file mode 100644 index 00000000..4cd1f2a5 --- /dev/null +++ b/src/Signing/sign_TESTSIGNING.bat @@ -0,0 +1,59 @@ +PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip + +set VC_VERSION=1.25.4-TESTSIGNING +set VC_VERSION_NBRE=1.25.4 +set SIGNINGPATH=%~dp0 +cd %SIGNINGPATH% + +rem sign using SHA-256 +signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\veracrypt-arm64.sys" + +signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe" "..\Release\Setup Files\VeraCryptSetup.dll" + +rem create setup and MSI +cd "..\Release\Setup Files\" +copy ..\..\LICENSE . +copy ..\..\License.txt . +copy ..\..\NOTICE . +copy ..\..\Resources\Texts\License.rtf . +copy ..\..\Common\VeraCrypt.ico . +copy ..\..\Setup\VeraCrypt_setup_background.bmp . +copy ..\..\Setup\VeraCrypt_setup.bmp . +copy ..\..\Setup\Setup.ico . +del *.xml +rmdir /S /Q Languages +mkdir Languages +copy /V /Y ..\..\..\Translations\*.xml Languages\. +del Languages.zip +7z a -y Languages.zip Languages +rmdir /S /Q docs +mkdir docs\html\en +mkdir docs\EFI-DCS +copy /V /Y ..\..\..\doc\html\* docs\html\en\. +copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\. +copy "..\..\..\doc\EFI-DCS\*.pdf" docs\EFI-DCS\. +del docs.zip +7z a -y docs.zip docs +"VeraCrypt Setup.exe" /p +"VeraCrypt Portable.exe" /p + +del LICENSE +del License.txt +del NOTICE +del License.rtf +del VeraCrypt.ico +del VeraCrypt_setup_background.bmp +del VeraCrypt_setup.bmp +del Setup.ico +del "VeraCrypt User Guide.chm" +del Languages.zip +del docs.zip +rmdir /S /Q Languages +rmdir /S /Q docs + +cd %SIGNINGPATH% + +rem sign Setup using SHA-256 +signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt Setup %VC_VERSION%.exe" "..\Release\Setup Files\VeraCrypt Portable %VC_VERSION%.exe" + +pause diff --git a/src/VeraCrypt.sln b/src/VeraCrypt.sln index c7a31445..e17d710c 100644 --- a/src/VeraCrypt.sln +++ b/src/VeraCrypt.sln @@ -41,6 +41,8 @@ Global All CustomEFI|x64 = All CustomEFI|x64 All Debug|Win32 = All Debug|Win32 All Debug|x64 = All Debug|x64 + All_SkipOsDriverReqCheck|Win32 = All_SkipOsDriverReqCheck|Win32 + All_SkipOsDriverReqCheck|x64 = All_SkipOsDriverReqCheck|x64 All|Win32 = All|Win32 All|x64 = All|x64 Boot Loader|Win32 = Boot Loader|Win32 @@ -91,6 +93,10 @@ Global {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|Win32.Build.0 = Debug|Win32 {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|x64.ActiveCfg = Debug|x64 {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All Debug|x64.Build.0 = Debug|x64 + {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release|Win32 + {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release|Win32 + {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release|x64 + {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All_SkipOsDriverReqCheck|x64.Build.0 = Release|x64 {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|Win32.ActiveCfg = Release|Win32 {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|Win32.Build.0 = Release|Win32 {993245CF-6B70-47EE-91BB-39F8FC6DC0E7}.All|x64.ActiveCfg = Release|x64 @@ -164,6 +170,9 @@ Global {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All Debug|Win32.ActiveCfg = Debug|Win32 {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All Debug|Win32.Build.0 = Debug|Win32 {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All Debug|x64.ActiveCfg = Debug|Win32 + {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release|Win32 + {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release|Win32 + {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release|Win32 {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All|Win32.ActiveCfg = Release|Win32 {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All|Win32.Build.0 = Release|Win32 {EF5EF444-18D0-40D7-8DFA-775EC4448602}.All|x64.ActiveCfg = Release|Win32 @@ -222,6 +231,10 @@ Global {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|Win32.Build.0 = Debug|Win32 {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|x64.ActiveCfg = Debug|x64 {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All Debug|x64.Build.0 = Debug|x64 + {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release_SkipOsDriverReqCheck|Win32 + {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release_SkipOsDriverReqCheck|Win32 + {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release_SkipOsDriverReqCheck|x64 + {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All_SkipOsDriverReqCheck|x64.Build.0 = Release_SkipOsDriverReqCheck|x64 {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|Win32.ActiveCfg = Release|Win32 {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|Win32.Build.0 = Release|Win32 {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}.All|x64.ActiveCfg = Release|x64 @@ -296,6 +309,10 @@ Global {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|Win32.Build.0 = Debug|Win32 {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|x64.ActiveCfg = Debug|x64 {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All Debug|x64.Build.0 = Debug|x64 + {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release_SkipOsDriverReqCheck|Win32 + {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release_SkipOsDriverReqCheck|Win32 + {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release_SkipOsDriverReqCheck|x64 + {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All_SkipOsDriverReqCheck|x64.Build.0 = Release_SkipOsDriverReqCheck|x64 {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|Win32.ActiveCfg = Release|Win32 {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|Win32.Build.0 = Release|Win32 {E4C40F94-E7F9-4981-86E4-186B46F993F3}.All|x64.ActiveCfg = Release|x64 @@ -368,6 +385,9 @@ Global {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All Debug|Win32.ActiveCfg = Debug|Win32 {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All Debug|Win32.Build.0 = Debug|Win32 {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All Debug|x64.ActiveCfg = Debug|Win32 + {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release_SkipOsDriverReqCheck|Win32 + {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release_SkipOsDriverReqCheck|Win32 + {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release_SkipOsDriverReqCheck|Win32 {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All|Win32.ActiveCfg = Release|Win32 {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All|Win32.Build.0 = Release|Win32 {DF5F654D-BD44-4E31-B92E-B68074DC37A8}.All|x64.ActiveCfg = Release|Win32 @@ -422,6 +442,9 @@ Global {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All Debug|Win32.ActiveCfg = Release|Win32 {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All Debug|Win32.Build.0 = Release|Win32 {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All Debug|x64.ActiveCfg = Release Loader|Win32 + {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release|Win32 + {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release|Win32 + {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release|Win32 {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All|Win32.ActiveCfg = Release|Win32 {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All|Win32.Build.0 = Release|Win32 {8B7F059F-E4C7-4E11-88F5-EE8B8433072E}.All|x64.ActiveCfg = Release|Win32 @@ -476,6 +499,10 @@ Global {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|Win32.Build.0 = Debug|Win32 {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|x64.ActiveCfg = Debug|x64 {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All Debug|x64.Build.0 = Debug|x64 + {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release_SkipOsDriverReqCheck|Win32 + {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release_SkipOsDriverReqCheck|Win32 + {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release_SkipOsDriverReqCheck|x64 + {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All_SkipOsDriverReqCheck|x64.Build.0 = Release_SkipOsDriverReqCheck|x64 {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|Win32.ActiveCfg = Release|Win32 {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|Win32.Build.0 = Release|Win32 {9715FF1D-599B-4BBC-AD96-BEF6E08FF827}.All|x64.ActiveCfg = Release|x64 @@ -561,6 +588,10 @@ Global {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|Win32.Build.0 = Debug|Win32 {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|x64.ActiveCfg = Debug|x64 {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All Debug|x64.Build.0 = Debug|x64 + {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release|Win32 + {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release|Win32 + {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release|x64 + {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All_SkipOsDriverReqCheck|x64.Build.0 = Release|x64 {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|Win32.ActiveCfg = Release|Win32 {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|Win32.Build.0 = Release|Win32 {6316EE71-0210-4CA4-BCC7-CFB7A3C090FC}.All|x64.ActiveCfg = Release|x64 @@ -628,6 +659,9 @@ Global {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All Debug|Win32.ActiveCfg = Debug|Win32 {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All Debug|Win32.Build.0 = Debug|Win32 {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All Debug|x64.ActiveCfg = Debug|Win32 + {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release_SkipOsDriverReqCheck|Win32 + {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release_SkipOsDriverReqCheck|Win32 + {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release_SkipOsDriverReqCheck|Win32 {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All|Win32.ActiveCfg = Release|Win32 {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All|Win32.Build.0 = Release|Win32 {60698D56-DB83-4D19-9C87-9DFB6A6F8C87}.All|x64.ActiveCfg = Release|Win32 @@ -694,6 +728,9 @@ Global {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All Debug|Win32.ActiveCfg = Debug|Win32 {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All Debug|Win32.Build.0 = Debug|Win32 {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All Debug|x64.ActiveCfg = Debug|Win32 + {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All_SkipOsDriverReqCheck|Win32.ActiveCfg = Release|Win32 + {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All_SkipOsDriverReqCheck|Win32.Build.0 = Release|Win32 + {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All_SkipOsDriverReqCheck|x64.ActiveCfg = Release|Win32 {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All|Win32.ActiveCfg = Release|Win32 {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All|Win32.Build.0 = Release|Win32 {ADD324E2-ADC8-402E-87EB-03E4E26B1B49}.All|x64.ActiveCfg = Release|Win32 -- cgit v1.2.3