From 42373efcfdbad2a96896846ba3c151154dd35b84 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 17 Jun 2016 15:43:20 +0200 Subject: [PATCH] Windows: Use Visual C++ 2010 instead of Visual C++ 2008. --- README.md | 6 +- src/Boot/Windows/Boot.vcxproj | 273 +++++++++++ src/Boot/Windows/Boot.vcxproj.filters | 148 ++++++ src/Boot/Windows/Boot.vcxproj.user | 3 + src/Crypto/Crypto.vcxproj | 241 ++++++++++ src/Crypto/Crypto.vcxproj.filters | 98 ++++ src/Crypto/Crypto.vcxproj.user | 3 + src/Driver/BuildDriver.cmd | 7 + src/Driver/Driver.vcxproj | 264 +++++++++++ src/Driver/Driver.vcxproj.filters | 199 ++++++++ src/Driver/Driver.vcxproj.user | 3 + src/ExpandVolume/ExpandVolume.vcxproj | 444 ++++++++++++++++++ src/ExpandVolume/ExpandVolume.vcxproj.filters | 275 +++++++++++ src/ExpandVolume/ExpandVolume.vcxproj.user | 3 + src/Format/Format.vcxproj | 416 ++++++++++++++++ src/Format/Format.vcxproj.filters | 344 ++++++++++++++ src/Format/Format.vcxproj.user | 3 + src/Mount/Mount.vcxproj | 441 +++++++++++++++++ src/Mount/Mount.vcxproj.filters | 356 ++++++++++++++ src/Mount/Mount.vcxproj.user | 3 + src/Readme.txt | 6 +- src/Setup/Setup.vcxproj | 221 +++++++++ src/Setup/Setup.vcxproj.filters | 165 +++++++ src/Setup/Setup.vcxproj.user | 3 + src/VeraCrypt.sln | 47 +- 25 files changed, 3928 insertions(+), 44 deletions(-) create mode 100644 src/Boot/Windows/Boot.vcxproj create mode 100644 src/Boot/Windows/Boot.vcxproj.filters create mode 100644 src/Boot/Windows/Boot.vcxproj.user create mode 100644 src/Crypto/Crypto.vcxproj create mode 100644 src/Crypto/Crypto.vcxproj.filters create mode 100644 src/Crypto/Crypto.vcxproj.user create mode 100644 src/Driver/Driver.vcxproj create mode 100644 src/Driver/Driver.vcxproj.filters create mode 100644 src/Driver/Driver.vcxproj.user create mode 100644 src/ExpandVolume/ExpandVolume.vcxproj create mode 100644 src/ExpandVolume/ExpandVolume.vcxproj.filters create mode 100644 src/ExpandVolume/ExpandVolume.vcxproj.user create mode 100644 src/Format/Format.vcxproj create mode 100644 src/Format/Format.vcxproj.filters create mode 100644 src/Format/Format.vcxproj.user create mode 100644 src/Mount/Mount.vcxproj create mode 100644 src/Mount/Mount.vcxproj.filters create mode 100644 src/Mount/Mount.vcxproj.user create mode 100644 src/Setup/Setup.vcxproj create mode 100644 src/Setup/Setup.vcxproj.filters create mode 100644 src/Setup/Setup.vcxproj.user diff --git a/README.md b/README.md index 99ba5bfe..017cc966 100644 --- a/README.md +++ b/README.md @@ -43,9 +43,9 @@ I. Windows Requirements for Building VeraCrypt for Windows: ------------------------------------------------ -- Microsoft Visual C++ 2008 SP1 (Professional Edition or compatible) +- Microsoft Visual C++ 2010 SP1 (Professional Edition or compatible) - Microsoft Visual C++ 1.52 (available from MSDN Subscriber Downloads) -- Microsoft Windows SDK for Windows 7 (configured for Visual C++) +- Microsoft Windows SDK for Windows 7.1 (configured for Visual C++ 2010) - Microsoft Windows SDK for Windows 8.1 (needed for SHA-256 code signing) - Microsoft Windows Driver Kit 7.1.0 (build 7600.16385.1) - RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) 2.20 @@ -94,7 +94,7 @@ Instructions for Building VeraCrypt for Windows: environment variable 'PKCS11_INC' pointing to the directory where the PKCS #11 header files are installed. -4) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2008. +4) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2010. 5) Select 'All' as the active solution configuration. diff --git a/src/Boot/Windows/Boot.vcxproj b/src/Boot/Windows/Boot.vcxproj new file mode 100644 index 00000000..68d5d270 --- /dev/null +++ b/src/Boot/Windows/Boot.vcxproj @@ -0,0 +1,273 @@ + + + + + Release Loader + Win32 + + + Release + Win32 + + + + {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} + Boot + MakeFileProj + + + + Makefile + + + Makefile + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(Configuration)\ + $(Configuration)\ + md Release 2>NUL: +nmake.exe /nologo RELEASE=1 + +md Release_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2 + +md Release_AES 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES + +md Release_AES_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2 + +md Release_Serpent 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT + +md Release_Serpent_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2 + +md Release_Twofish 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH + +md Release_Twofish_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2 + +md Release_Camellia 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA + +md Release_Camellia_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA SINGLE_PRF=SHA2 + +md Rescue 2>NUL: +nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 + +md Rescue_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2 + +md Rescue_AES 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 + +md Rescue_AES_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2 + +md Rescue_Serpent 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 + +md Rescue_Serpent_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2 + +md Rescue_Twofish 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 + +md Rescue_Twofish_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2 + +md Rescue_Camellia 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 + +md Rescue_Camellia_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 SINGLE_PRF=SHA2 + del /q /s Release >NUL: +md Release 2>NUL: +nmake.exe /nologo RELEASE=1 + +del /q /s Release_SHA2 >NUL: +md Release_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_PRF=SHA2 + +del /q /s Release_AES >NUL: +md Release_AES 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES + +del /q /s Release_AES_SHA2 >NUL: +md Release_AES_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES SINGLE_PRF=SHA2 + +del /q /s Release_Serpent >NUL: +md Release_Serpent 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT + +del /q /s Release_Serpent_SHA2 >NUL: +md Release_Serpent_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT SINGLE_PRF=SHA2 + +del /q /s Release_Twofish >NUL: +md Release_Twofish 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH + +del /q /s Release_Twofish_SHA2 >NUL: +md Release_Twofish_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH SINGLE_PRF=SHA2 + +del /q /s Release_Camellia >NUL: +md Release_Camellia 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA + +del /q /s Release_Camellia_SHA2 >NUL: +md Release_Camellia_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA SINGLE_PRF=SHA2 + +del /q /s Rescue >NUL: +md Rescue 2>NUL: +nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 + +del /q /s Rescue_SHA2 >NUL: +md Rescue_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 RESCUE_DISK=1 SINGLE_PRF=SHA2 + +del /q /s Rescue_AES >NUL: +md Rescue_AES 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 + +del /q /s Rescue_AES_SHA2 >NUL: +md Rescue_AES_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES RESCUE_DISK=1 SINGLE_PRF=SHA2 + +del /q /s Rescue_Serpent >NUL: +md Rescue_Serpent 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 + +del /q /s Rescue_Serpent_SHA2 >NUL: +md Rescue_Serpent_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT RESCUE_DISK=1 SINGLE_PRF=SHA2 + +del /q /s Rescue_Twofish >NUL: +md Rescue_Twofish 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 + +del /q /s Rescue_Twofish_SHA2 >NUL: +md Rescue_Twofish_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH RESCUE_DISK=1 SINGLE_PRF=SHA2 + +del /q /s Rescue_Camellia >NUL: +md Rescue_Camellia 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 + +del /q /s Rescue_Camellia_SHA2 >NUL: +md Rescue_Camellia_SHA2 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=CAMELLIA RESCUE_DISK=1 SINGLE_PRF=SHA2 + del /q /s Release Release_AES Release_Serpent Release_Twofish Release_Camellia Rescue Rescue_AES Rescue_Serpent Rescue_Twofish Rescue_Camellia >NUL: +del /q /s Release_SHA2 Release_AES_SHA2 Release_Serpent_SHA2 Release_Twofish_SHA2 Release_Camellia_SHA2 Rescue_SHA2 Rescue_AES_SHA2 Rescue_Serpent_SHA2 Rescue_Twofish_SHA2 Rescue_Camellia_SHA2 >NUL: + + Release\BootLoader.com + WIN32;NDEBUG;$(NMakePreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(MSVC16_ROOT)\Include;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(Configuration)\ + $(Configuration)\ + md Release 2>NUL: +nmake.exe /nologo RELEASE=1 + +md Release_AES 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES + +md Release_Serpent 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT + +md Release_Twofish 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH + del /q /s Release >NUL: +md Release 2>NUL: +nmake.exe /nologo RELEASE=1 + +del /q /s Release_AES >NUL: +md Release_AES 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=AES + +del /q /s Release_Serpent >NUL: +md Release_Serpent 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=SERPENT + +del /q /s Release_Twofish >NUL: +md Release_Twofish 2>NUL: +nmake.exe /nologo RELEASE=1 SINGLE_CIPHER=TWOFISH + del /q /s Release Release_AES Release_Serpent Release_Twofish >NUL: + Release\BootLoader.com + WIN32;NDEBUG;$(NMakePreprocessorDefinitions) + $(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(MSVC16_ROOT)\Include;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Boot/Windows/Boot.vcxproj.filters b/src/Boot/Windows/Boot.vcxproj.filters new file mode 100644 index 00000000..1a60ac81 --- /dev/null +++ b/src/Boot/Windows/Boot.vcxproj.filters @@ -0,0 +1,148 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {851ac58e-36e0-4dfa-a208-6da2330f5959} + + + {76da5bdb-fe11-430a-8667-2fe7f9ac3667} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {732efef1-4474-4845-aa74-17b852cc0f2e} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + + + Source Files + + + Source Files + + + Source Files\Crypto + + + Source Files\Crypto + + + Build Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/src/Boot/Windows/Boot.vcxproj.user b/src/Boot/Windows/Boot.vcxproj.user new file mode 100644 index 00000000..ace9a86a --- /dev/null +++ b/src/Boot/Windows/Boot.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Crypto/Crypto.vcxproj b/src/Crypto/Crypto.vcxproj new file mode 100644 index 00000000..8810adf1 --- /dev/null +++ b/src/Crypto/Crypto.vcxproj @@ -0,0 +1,241 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {993245CF-6B70-47EE-91BB-39F8FC6DC0E7} + Crypto + Win32Proj + + + + StaticLibrary + Unicode + Windows7.1SDK + + + StaticLibrary + Unicode + Windows7.1SDK + + + StaticLibrary + Unicode + Windows7.1SDK + + + StaticLibrary + Unicode + Windows7.1SDK + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + Debug\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + Release\ + Release\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + + + + Disabled + $(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories) + WIN32;DEBUG;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + Default + MultiThreadedDebug + false + + + Level4 + ProgramDatabase + 4100;4127;4201;%(DisableSpecificWarnings) + + + $(OutDir)Crypto.lib + + + + + X64 + + + Disabled + $(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories) + WIN32;DEBUG;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + Default + MultiThreadedDebug + false + + + Level4 + ProgramDatabase + 4100;4127;4201;%(DisableSpecificWarnings) + + + $(OutDir)Crypto.lib + + + + + MaxSpeed + $(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + + + 4100;4127;4201;%(DisableSpecificWarnings) + + + $(OutDir)Crypto.lib + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + X64 + + + MaxSpeed + $(ProjectDir)\..;$(ProjectDir)\..\Common;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + + + 4100;4127;4201;%(DisableSpecificWarnings) + + + $(OutDir)Crypto.lib + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox --prefix _ -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + + + true + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + true + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + + + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + true + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox --prefix _ -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + true + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox --prefix _ -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)" + + $(TargetDir)\%(Filename).obj;%(Outputs) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} + false + + + + + + \ No newline at end of file diff --git a/src/Crypto/Crypto.vcxproj.filters b/src/Crypto/Crypto.vcxproj.filters new file mode 100644 index 00000000..41b640f3 --- /dev/null +++ b/src/Crypto/Crypto.vcxproj.filters @@ -0,0 +1,98 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/Crypto/Crypto.vcxproj.user b/src/Crypto/Crypto.vcxproj.user new file mode 100644 index 00000000..ace9a86a --- /dev/null +++ b/src/Crypto/Crypto.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Driver/BuildDriver.cmd b/src/Driver/BuildDriver.cmd index 42f715dc..db413157 100644 --- a/src/Driver/BuildDriver.cmd +++ b/src/Driver/BuildDriver.cmd @@ -103,6 +103,13 @@ pushd . call %TC_WINDDK_ROOT%\bin\setenv %TC_WINDDK_ROOT% %TC_BUILD_TYPE% %TC_BUILD_ARCH% no_oacr || exit /B %errorlevel% popd +if "%TC_ARG_ARCH%"=="-x64" ( + @call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" 32bit No64bit + @set "PATH=%VSINSTALLDIR%Common7\IDE;%VSINSTALLDIR%VC\bin\amd64;%PATH%" +) else ( + @call "%VS100COMNTOOLS%VCVarsQueryRegistry.bat" No32bit 64bit + @set "PATH=PATH=%VSINSTALLDIR%Common7\IDE;%VSINSTALLDIR%VC\bin;%PATH%" +) :: Build diff --git a/src/Driver/Driver.vcxproj b/src/Driver/Driver.vcxproj new file mode 100644 index 00000000..bc95ffe1 --- /dev/null +++ b/src/Driver/Driver.vcxproj @@ -0,0 +1,264 @@ + + + + + Debug x64 + Win32 + + + Debug x86 + Win32 + + + Debug + Win32 + + + Release x64 + Win32 + + + Release x86 + Win32 + + + Release + Win32 + + + + {EF5EF444-18D0-40D7-8DFA-775EC4448602} + Driver + MakeFileProj + + + + Makefile + + + Makefile + + + Makefile + + + Makefile + + + Makefile + + + Makefile + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + Debug\ + echo ------ Building veracrypt.sys: Debug x86 ------ +cmd.exe /c BuildDriver.cmd -build -debug -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" +if errorlevel 1 exit %errorlevel% +echo. +echo ------ Building veracrypt.sys: Debug x64 ------ +BuildDriver.cmd -build -debug -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + echo ------ Rebuilding veracrypt.sys: Debug x86 ------ +cmd.exe /c BuildDriver.cmd -rebuild -debug -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" +if errorlevel 1 exit %errorlevel% +echo. +echo ------ Rebuilding veracrypt.sys: Debug x64 ------ +BuildDriver.cmd -rebuild -debug -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + echo ------ Cleaning veracrypt.sys: Debug x86 ------ +cmd.exe /c BuildDriver.cmd -clean -debug -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" +if errorlevel 1 exit %errorlevel% +echo. +echo ------ Cleaning veracrypt.sys: Debug x64 ------ +BuildDriver.cmd -clean -debug -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + + DEBUG;_DEBUG;TC_WINDOWS_DRIVER;$(NMakePreprocessorDefinitions) + $(ProjectDir);$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(WINDDK_ROOT)\inc\ddk;$(WINDDK_ROOT)\inc\api;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + Release\ + Release\ + echo ------ Building veracrypt.sys: Release x86 ------ +cmd.exe /c BuildDriver.cmd -build -release -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" +if errorlevel 1 exit %errorlevel% +echo. +echo ------ Building veracrypt.sys: Release x64 ------ +BuildDriver.cmd -build -release -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + echo ------ Rebuilding veracrypt.sys: Release x86 ------ +cmd.exe /c BuildDriver.cmd -rebuild -release -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" +if errorlevel 1 exit %errorlevel% +echo. +echo ------ Rebuilding veracrypt.sys: Release x64 ------ +BuildDriver.cmd -rebuild -release -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + echo ------ Cleaning veracrypt.sys: Release x86 ------ +cmd.exe /c BuildDriver.cmd -clean -release -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" +if errorlevel 1 exit %errorlevel% +echo. +echo ------ Cleaning veracrypt.sys: Release x64 ------ +BuildDriver.cmd -clean -release -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + + TC_WINDOWS_DRIVER;$(NMakePreprocessorDefinitions) + $(ProjectDir);$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(WINDDK_ROOT)\inc\ddk;$(WINDDK_ROOT)\inc\api;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(Configuration)\ + $(Configuration)\ + BuildDriver.cmd -build -release -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + BuildDriver.cmd -rebuild -release -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + BuildDriver.cmd -clean -release -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + + TC_WINDOWS_DRIVER;$(NMakePreprocessorDefinitions) + $(ProjectDir);$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(WINDDK_ROOT)\inc\ddk;$(WINDDK_ROOT)\inc\api;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(Configuration)\ + $(Configuration)\ + if exist $(SolutionDir)\Mount\Debug\VeraCrypt.exe ( copy $(SolutionDir)\Mount\Debug\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\i386\VeraCrypt.exe >NUL: +) else ( copy $(SolutionDir)\Mount\Release\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\i386\VeraCrypt.exe >NUL: ) + +BuildDriver.cmd -build -debug -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + if exist $(SolutionDir)\Mount\Debug\VeraCrypt.exe ( copy $(SolutionDir)\Mount\Debug\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\i386\VeraCrypt.exe >NUL: +) else ( copy $(SolutionDir)\Mount\Release\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\i386\VeraCrypt.exe >NUL: ) + +BuildDriver.cmd -rebuild -debug -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + BuildDriver.cmd -clean -debug -x86 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + $(ProjectDir)\obj_driver_debug\i386\VeraCrypt.exe + DEBUG;_DEBUG;TC_WINDOWS_DRIVER;$(NMakePreprocessorDefinitions) + $(ProjectDir);$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(WINDDK_ROOT)\inc\ddk;$(WINDDK_ROOT)\inc\api;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(Configuration)\ + $(Configuration)\ + BuildDriver.cmd -build -release -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + BuildDriver.cmd -rebuild -release -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + BuildDriver.cmd -clean -release -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + + TC_WINDOWS_DRIVER;$(NMakePreprocessorDefinitions) + $(ProjectDir);$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(WINDDK_ROOT)\inc\ddk;$(WINDDK_ROOT)\inc\api;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + $(Configuration)\ + $(Configuration)\ + if exist $(SolutionDir)\Mount\Debug\VeraCrypt.exe ( copy $(SolutionDir)\Mount\Debug\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\amd64\VeraCrypt.exe >NUL: +) else ( copy $(SolutionDir)\Mount\Release\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\amd64\VeraCrypt.exe >NUL: ) + +BuildDriver.cmd -build -debug -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + if exist $(SolutionDir)\Mount\Debug\VeraCrypt.exe ( copy $(SolutionDir)\Mount\Debug\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\amd64\VeraCrypt.exe >NUL: +) else ( copy $(SolutionDir)\Mount\Release\VeraCrypt.exe $(ProjectDir)\obj_driver_debug\amd64\VeraCrypt.exe >NUL: ) + +BuildDriver.cmd -rebuild -debug -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + BuildDriver.cmd -clean -debug -x64 "$(SolutionDir)\Common" "$(SolutionDir)\Crypto" "$(ProjectDir)" + $(ProjectDir)\obj_driver_debug\amd64\VeraCrypt.exe + DEBUG;_DEBUG;TC_WINDOWS_DRIVER;$(NMakePreprocessorDefinitions) + $(ProjectDir);$(SolutionDir);$(SolutionDir)\Common;$(SolutionDir)\Crypto;$(WINDDK_ROOT)\inc\ddk;$(WINDDK_ROOT)\inc\api;$(NMakeIncludeSearchPath) + $(NMakeForcedIncludes) + $(NMakeAssemblySearchPath) + $(NMakeForcedUsingAssemblies) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} + false + + + + + + \ No newline at end of file diff --git a/src/Driver/Driver.vcxproj.filters b/src/Driver/Driver.vcxproj.filters new file mode 100644 index 00000000..73f45952 --- /dev/null +++ b/src/Driver/Driver.vcxproj.filters @@ -0,0 +1,199 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {d1f5a533-0da8-4ea8-a749-2fd9725c3666} + + + {93a4143b-9d2d-4bab-9532-3f00fe0ae55a} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {0e1fab74-bfc9-4968-87d7-a46cde3b4fb6} + + + {0385fc55-db3b-4dde-aa34-8396d25af075} + + + {6d92b0d0-a99e-46f0-a1d0-9297ae3795f5} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + + + Source Files\Crypto + + + Source Files\Crypto + + + Source Files\Crypto + + + Build Files + + + Build Files + + + Build Files + + + Build Files\Common + + + Build Files\Common + + + Build Files\Crypto + + + Build Files\Crypto + + + Build Files\Crypto + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/Driver/Driver.vcxproj.user b/src/Driver/Driver.vcxproj.user new file mode 100644 index 00000000..ace9a86a --- /dev/null +++ b/src/Driver/Driver.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/ExpandVolume/ExpandVolume.vcxproj b/src/ExpandVolume/ExpandVolume.vcxproj new file mode 100644 index 00000000..346282d1 --- /dev/null +++ b/src/ExpandVolume/ExpandVolume.vcxproj @@ -0,0 +1,444 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9715FF1D-599B-4BBC-AD96-BEF6E08FF827} + ExpandVolume + Win32Proj + + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + Debug\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + Release\ + Release\ + false + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + true + VeraCryptExpander + VeraCryptExpander + VeraCryptExpander + VeraCryptExpander + + + + + + + + %(AdditionalIncludeDirectories) + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + Disabled + ..\Common;..\Crypto;..\;..\pkcs11;%(AdditionalIncludeDirectories) + VCEXPANDER;TCMOUNT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebug + true + false + + + + + + + Level3 + EditAndContinue + 4311;%(DisableSpecificWarnings) + + + ..\Crypto\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptExpander.exe + false + mpr.dll;%(DelayLoadDLLs) + true + $(OutDir)ExpandVolume.pdb + Windows + false + true + MachineX86 + RequireAdministrator + + + VeraCryptExpander.manifest;%(AdditionalManifestFiles) + + + md "..\Debug\Setup Files" 2>NUL: +copy Debug\VeraCryptExpander.exe "..\Debug\Setup Files" >NUL: + + + + + + + + + + %(AdditionalIncludeDirectories) + X64 + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + Disabled + ..\Common;..\Crypto;..\;..\pkcs11;%(AdditionalIncludeDirectories) + VCEXPANDER;TCMOUNT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebug + true + false + + + + + + + Level3 + ProgramDatabase + 4311;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptExpander.exe + false + mpr.dll;%(DelayLoadDLLs) + true + $(OutDir)ExpandVolume.pdb + Windows + false + true + MachineX64 + RequireAdministrator + + + VeraCryptExpander.manifest;%(AdditionalManifestFiles) + + + md "..\Debug\Setup Files" 2>NUL: +copy $(TargetPath) "..\Debug\Setup Files\VeraCryptExpander-x64.exe" >NUL: + + + + + + %(AdditionalIncludeDirectories) + $(SolutionDir)/Mount/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\pkcs11;%(AdditionalIncludeDirectories) + VCEXPANDER;TCMOUNT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level3 + + + 4311;%(DisableSpecificWarnings) + + + ..\Crypto\Release\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptExpander.exe + false + mpr.dll;%(DelayLoadDLLs) + false + true + Windows + true + true + false + true + MachineX86 + RequireAdministrator + + + VeraCryptExpander.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCryptExpander.exe "..\Release\Setup Files\" + + + + + %(AdditionalIncludeDirectories) + X64 + $(SolutionDir)/Mount/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\pkcs11;%(AdditionalIncludeDirectories) + VCEXPANDER;TCMOUNT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level3 + + + 4311;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Release\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptExpander.exe + false + mpr.dll;%(DelayLoadDLLs) + false + true + Windows + true + true + false + true + MachineX64 + RequireAdministrator + + + VeraCryptExpander.manifest;%(AdditionalManifestFiles) + + + copy $(TargetPath) "..\Release\Setup Files\VeraCryptExpander-x64.exe" + + + + + {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} + false + + + {993245cf-6b70-47ee-91bb-39f8fc6dc0e7} + true + true + + + {ef5ef444-18d0-40d7-8dfa-775ec4448602} + false + + + {9dc1abe2-d18b-48fb-81d2-8c50adc57bcf} + false + + + {e4c40f94-e7f9-4981-86e4-186b46f993f3} + false + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(SolutionDir)/Mount + $(SolutionDir)/Mount/%(Filename)_h.h + $(SolutionDir)/Mount + $(SolutionDir)/Mount/%(Filename)_h.h + $(SolutionDir)/Mount + $(SolutionDir)/Mount/%(Filename)_h.h + $(SolutionDir)/Mount + $(SolutionDir)/Mount/%(Filename)_h.h + + + + + + true + true + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ExpandVolume/ExpandVolume.vcxproj.filters b/src/ExpandVolume/ExpandVolume.vcxproj.filters new file mode 100644 index 00000000..c84fd9d8 --- /dev/null +++ b/src/ExpandVolume/ExpandVolume.vcxproj.filters @@ -0,0 +1,275 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {72ac1543-f2dc-4c01-8803-65822dc01862} + + + {1d0126bc-b4d1-4ed2-a244-52cb9dc1e516} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {ece6c790-f488-400d-b92d-64f73ce9f990} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Mount + + + Source Files\Mount + + + Source Files\Mount + + + Source Files\Mount + + + + + Source Files\Common + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files\Mount + + + + + Resource Files + + + Resource Files\Common + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files\Common + + + + + Resource Files + + + \ No newline at end of file diff --git a/src/ExpandVolume/ExpandVolume.vcxproj.user b/src/ExpandVolume/ExpandVolume.vcxproj.user new file mode 100644 index 00000000..ace9a86a --- /dev/null +++ b/src/ExpandVolume/ExpandVolume.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Format/Format.vcxproj b/src/Format/Format.vcxproj new file mode 100644 index 00000000..75f876b1 --- /dev/null +++ b/src/Format/Format.vcxproj @@ -0,0 +1,416 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF} + Format + Win32Proj + + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + Debug\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + Release\ + Release\ + false + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + true + VeraCryptFormat + VeraCryptFormat + VeraCryptFormat + VeraCryptFormat + + + + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + Disabled + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + VOLFORMAT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + + + Level4 + EditAndContinue + 4057;4100;4127;4201;4204;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptFormat.exe + false + mpr.dll;%(DelayLoadDLLs) + true + $(OutDir)Format.pdb + Windows + false + true + MachineX86 + + + Format.manifest;%(AdditionalManifestFiles) + + + md "..\Debug\Setup Files" 2>NUL: +copy Debug\VeraCryptFormat.exe "..\Debug\Setup Files\VeraCrypt Format.exe" >NUL: + + + + + + X64 + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + Disabled + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + VOLFORMAT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + + + Level4 + ProgramDatabase + 4057;4100;4127;4201;4204;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptFormat.exe + false + mpr.dll;%(DelayLoadDLLs) + true + $(OutDir)Format.pdb + Windows + false + true + MachineX64 + + + Format.manifest;%(AdditionalManifestFiles) + + + md "..\Debug\Setup Files" 2>NUL: +copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt Format-x64.exe" >NUL: + + + + + + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + VOLFORMAT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + + + 4057;4100;4127;4201;4204;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\Release\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptFormat.exe + false + mpr.dll;%(DelayLoadDLLs) + false + true + Windows + true + true + false + true + MachineX86 + + + Format.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCryptFormat.exe "..\Release\Setup Files\VeraCrypt Format.exe" + + + + + X64 + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + VOLFORMAT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + + + 4057;4100;4127;4201;4204;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Release\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptFormat.exe + false + mpr.dll;%(DelayLoadDLLs) + false + true + Windows + true + true + false + true + MachineX64 + + + Format.manifest;%(AdditionalManifestFiles) + + + copy $(TargetPath) "..\Release\Setup Files\VeraCrypt Format-x64.exe" + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + + + {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} + false + + + {993245cf-6b70-47ee-91bb-39f8fc6dc0e7} + false + + + {ef5ef444-18d0-40d7-8dfa-775ec4448602} + false + + + + + + \ No newline at end of file diff --git a/src/Format/Format.vcxproj.filters b/src/Format/Format.vcxproj.filters new file mode 100644 index 00000000..4f0e81eb --- /dev/null +++ b/src/Format/Format.vcxproj.filters @@ -0,0 +1,344 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {c45e7f30-87b6-4c8e-9035-9a00f8b2ecb7} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {881fda51-0ca5-4603-9de7-c618932554b4} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + + + Source Files + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files\Common + + + \ No newline at end of file diff --git a/src/Format/Format.vcxproj.user b/src/Format/Format.vcxproj.user new file mode 100644 index 00000000..ace9a86a --- /dev/null +++ b/src/Format/Format.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Mount/Mount.vcxproj b/src/Mount/Mount.vcxproj new file mode 100644 index 00000000..9a56b49e --- /dev/null +++ b/src/Mount/Mount.vcxproj @@ -0,0 +1,441 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E4C40F94-E7F9-4981-86E4-186B46F993F3} + Mount + Win32Proj + + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + Debug\ + true + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + Release\ + Release\ + false + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + true + VeraCrypt + VeraCrypt + VeraCrypt + VeraCrypt + + + + %(AdditionalIncludeDirectories) + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + Disabled + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + TCMOUNT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebug + true + false + + + + + + + Level4 + EditAndContinue + 4057;4100;4127;4201;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCrypt.exe + false + mpr.dll;%(DelayLoadDLLs) + true + $(OutDir)Mount.pdb + Windows + false + true + MachineX86 + + + Mount.manifest;%(AdditionalManifestFiles) + + + md "..\Debug\Setup Files" 2>NUL: +copy Debug\VeraCrypt.exe "..\Debug\Setup Files" >NUL: + + + + + + %(AdditionalIncludeDirectories) + X64 + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + Disabled + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + TCMOUNT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + Sync + EnableFastChecks + MultiThreadedDebug + true + false + + + + + + + Level4 + ProgramDatabase + 4057;4100;4127;4201;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Debug\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCrypt.exe + false + mpr.dll;%(DelayLoadDLLs) + true + $(OutDir)Mount.pdb + Windows + false + true + MachineX64 + + + Mount.manifest;%(AdditionalManifestFiles) + + + md "..\Debug\Setup Files" 2>NUL: +copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-x64.exe" >NUL: + + + + + + %(AdditionalIncludeDirectories) + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + TCMOUNT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + + + 4057;4100;4127;4201;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\Release\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCrypt.exe + false + mpr.dll;%(DelayLoadDLLs) + false + true + Windows + true + true + false + true + MachineX86 + + + Mount.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCrypt.exe "..\Release\Setup Files" + + + + + %(AdditionalIncludeDirectories) + X64 + $(SolutionDir)/$(ProjectName)/$(ProjectName).tlb + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + TCMOUNT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + + + 4057;4100;4127;4201;4701;4706;%(DisableSpecificWarnings) + + + ..\Crypto\x64\Release\crypto.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCrypt.exe + false + mpr.dll;%(DelayLoadDLLs) + false + true + Windows + true + true + false + true + MachineX64 + + + Mount.manifest;%(AdditionalManifestFiles) + + + copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-x64.exe" + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + true + true + + + + + {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} + false + + + {993245cf-6b70-47ee-91bb-39f8fc6dc0e7} + false + + + {ef5ef444-18d0-40d7-8dfa-775ec4448602} + false + + + {9dc1abe2-d18b-48fb-81d2-8c50adc57bcf} + false + + + + + + \ No newline at end of file diff --git a/src/Mount/Mount.vcxproj.filters b/src/Mount/Mount.vcxproj.filters new file mode 100644 index 00000000..b29330c4 --- /dev/null +++ b/src/Mount/Mount.vcxproj.filters @@ -0,0 +1,356 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {8f7b640f-31e5-4198-be7c-09501ffebedf} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {f805ede6-c210-4210-95ce-e33edb12bc27} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + + + Source Files + + + + + Source Files\Common + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files\Common + + + \ No newline at end of file diff --git a/src/Mount/Mount.vcxproj.user b/src/Mount/Mount.vcxproj.user new file mode 100644 index 00000000..ace9a86a --- /dev/null +++ b/src/Mount/Mount.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/Readme.txt b/src/Readme.txt index 99ba5bfe..017cc966 100644 --- a/src/Readme.txt +++ b/src/Readme.txt @@ -43,9 +43,9 @@ I. Windows Requirements for Building VeraCrypt for Windows: ------------------------------------------------ -- Microsoft Visual C++ 2008 SP1 (Professional Edition or compatible) +- Microsoft Visual C++ 2010 SP1 (Professional Edition or compatible) - Microsoft Visual C++ 1.52 (available from MSDN Subscriber Downloads) -- Microsoft Windows SDK for Windows 7 (configured for Visual C++) +- Microsoft Windows SDK for Windows 7.1 (configured for Visual C++ 2010) - Microsoft Windows SDK for Windows 8.1 (needed for SHA-256 code signing) - Microsoft Windows Driver Kit 7.1.0 (build 7600.16385.1) - RSA Security Inc. PKCS #11 Cryptographic Token Interface (Cryptoki) 2.20 @@ -94,7 +94,7 @@ Instructions for Building VeraCrypt for Windows: environment variable 'PKCS11_INC' pointing to the directory where the PKCS #11 header files are installed. -4) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2008. +4) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2010. 5) Select 'All' as the active solution configuration. diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj new file mode 100644 index 00000000..5d651249 --- /dev/null +++ b/src/Setup/Setup.vcxproj @@ -0,0 +1,221 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {DF5F654D-BD44-4E31-B92E-B68074DC37A8} + Setup + Win32Proj + + + + Application + Unicode + Windows7.1SDK + + + Application + Unicode + Windows7.1SDK + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + Debug\ + Debug\ + true + true + true + Release\ + Release\ + false + true + VeraCryptSetup + VeraCryptSetup + + + + Disabled + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + SETUP;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + + + Level4 + EditAndContinue + 4057;4100;4127;4201;4505;4701;4706;%(DisableSpecificWarnings) + + + /NODEFAULTLIB:LIBCMTD %(AdditionalOptions) + libcmtd.lib;atlsd.lib;mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptSetup.exe + RequireAdministrator + user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs) + true + $(OutDir)Setup.pdb + Windows + false + true + MachineX86 + + + Setup.manifest;%(AdditionalManifestFiles) + + + md "..\Debug\Setup Files" 2>NUL: +copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt Setup.exe" >NUL: + + + + + + /w34189 %(AdditionalOptions) + MaxSpeed + ..\Common;..\Crypto;..\;..\PKCS11;%(AdditionalIncludeDirectories) + SETUP;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS;_ATL_NO_DEFAULT_LIBS;%(PreprocessorDefinitions) + MultiThreaded + true + + + All + $(IntDir) + Level4 + + + 4057;4100;4127;4201;4505;4701;4706;%(DisableSpecificWarnings) + + + /IGNORE:4089 %(AdditionalOptions) + mpr.lib;%(AdditionalDependencies) + $(OutDir)VeraCryptSetup.exe + RequireAdministrator + user32.dll;gdi32.dll;advapi32.dll;shell32.dll;ole32.dll;oleaut32.dll;mpr.dll;%(DelayLoadDLLs) + false + true + Windows + true + true + false + true + MachineX86 + + + Setup.manifest;%(AdditionalManifestFiles) + + + copy Release\VeraCryptSetup.exe "..\Release\Setup Files\VeraCrypt Setup.exe" + + + + + + + + CompileAsCpp + CompileAsCpp + + + CompileAsCpp + CompileAsCpp + + + + + + CompileAsCpp + CompileAsCpp + + + CompileAsCpp + CompileAsCpp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + true + + + + + {8b7f059f-e4c7-4e11-88f5-ee8b8433072e} + false + + + {9715ff1d-599b-4bbc-ad96-bef6e08ff827} + false + + + {9dc1abe2-d18b-48fb-81d2-8c50adc57bcf} + false + + + {e4c40f94-e7f9-4981-86e4-186b46f993f3} + false + + + + + + \ No newline at end of file diff --git a/src/Setup/Setup.vcxproj.filters b/src/Setup/Setup.vcxproj.filters new file mode 100644 index 00000000..60259901 --- /dev/null +++ b/src/Setup/Setup.vcxproj.filters @@ -0,0 +1,165 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {6073052c-2d95-47a0-95d8-5960d4c1d1c0} + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + {a540fb0a-850b-4cb9-85f9-ade0112ebb50} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + Source Files\Common + + + + + Source Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + Resource Files\Common + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Resource Files + + + + + Resource Files + + + Resource Files\Common + + + \ No newline at end of file diff --git a/src/Setup/Setup.vcxproj.user b/src/Setup/Setup.vcxproj.user new file mode 100644 index 00000000..ace9a86a --- /dev/null +++ b/src/Setup/Setup.vcxproj.user @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/VeraCrypt.sln b/src/VeraCrypt.sln index c5b77d86..69731bd8 100644 --- a/src/VeraCrypt.sln +++ b/src/VeraCrypt.sln @@ -1,47 +1,18 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto\Crypto.vcproj", "{993245CF-6B70-47EE-91BB-39F8FC6DC0E7}" - ProjectSection(ProjectDependencies) = postProject - {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} = {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} - EndProjectSection +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypto", "Crypto\Crypto.vcxproj", "{993245CF-6B70-47EE-91BB-39F8FC6DC0E7}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Driver", "Driver\Driver.vcproj", "{EF5EF444-18D0-40D7-8DFA-775EC4448602}" - ProjectSection(ProjectDependencies) = postProject - {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} = {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Driver", "Driver\Driver.vcxproj", "{EF5EF444-18D0-40D7-8DFA-775EC4448602}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Format", "Format\Format.vcproj", "{9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}" - ProjectSection(ProjectDependencies) = postProject - {EF5EF444-18D0-40D7-8DFA-775EC4448602} = {EF5EF444-18D0-40D7-8DFA-775EC4448602} - {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} = {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} - {993245CF-6B70-47EE-91BB-39F8FC6DC0E7} = {993245CF-6B70-47EE-91BB-39F8FC6DC0E7} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Format", "Format\Format.vcxproj", "{9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mount", "Mount\Mount.vcproj", "{E4C40F94-E7F9-4981-86E4-186B46F993F3}" - ProjectSection(ProjectDependencies) = postProject - {EF5EF444-18D0-40D7-8DFA-775EC4448602} = {EF5EF444-18D0-40D7-8DFA-775EC4448602} - {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} = {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} - {993245CF-6B70-47EE-91BB-39F8FC6DC0E7} = {993245CF-6B70-47EE-91BB-39F8FC6DC0E7} - {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF} = {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mount", "Mount\Mount.vcxproj", "{E4C40F94-E7F9-4981-86E4-186B46F993F3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Setup", "Setup\Setup.vcproj", "{DF5F654D-BD44-4E31-B92E-B68074DC37A8}" - ProjectSection(ProjectDependencies) = postProject - {9715FF1D-599B-4BBC-AD96-BEF6E08FF827} = {9715FF1D-599B-4BBC-AD96-BEF6E08FF827} - {E4C40F94-E7F9-4981-86E4-186B46F993F3} = {E4C40F94-E7F9-4981-86E4-186B46F993F3} - {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} = {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} - {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF} = {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Setup", "Setup\Setup.vcxproj", "{DF5F654D-BD44-4E31-B92E-B68074DC37A8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Boot", "Boot\Windows\Boot.vcproj", "{8B7F059F-E4C7-4E11-88F5-EE8B8433072E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Boot", "Boot\Windows\Boot.vcxproj", "{8B7F059F-E4C7-4E11-88F5-EE8B8433072E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExpandVolume", "ExpandVolume\ExpandVolume.vcproj", "{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}" - ProjectSection(ProjectDependencies) = postProject - {EF5EF444-18D0-40D7-8DFA-775EC4448602} = {EF5EF444-18D0-40D7-8DFA-775EC4448602} - {E4C40F94-E7F9-4981-86E4-186B46F993F3} = {E4C40F94-E7F9-4981-86E4-186B46F993F3} - {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} = {8B7F059F-E4C7-4E11-88F5-EE8B8433072E} - {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF} = {9DC1ABE2-D18B-48FB-81D2-8C50ADC57BCF} - EndProjectSection +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ExpandVolume", "ExpandVolume\ExpandVolume.vcxproj", "{9715FF1D-599B-4BBC-AD96-BEF6E08FF827}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution