1 files changed, 128 insertions, 60 deletions
diff --git a/src/Format/Format.vcproj b/src/Format/Format.vcproj
index b5b6a4ad..72adc4d9 100644
--- a/src/Format/Format.vcproj
+++ b/src/Format/Format.vcproj
@@ -25,7 +25,7 @@
 			IntermediateDirectory="Debug"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -105,12 +105,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
+			Name="Debug|x64"
+			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -126,21 +126,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 				TypeLibraryName="$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalOptions="/w34189"
-				Optimization="2"
+				Optimization="0"
 				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
-				PreprocessorDefinitions="VOLFORMAT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				RuntimeLibrary="0"
+				PreprocessorDefinitions="VOLFORMAT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
 				BufferSecurityCheck="true"
 				UsePrecompiledHeader="0"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)/"
 				WarningLevel="4"
-				DebugInformationFormat="0"
+				DebugInformationFormat="3"
 				DisableSpecificWarnings="4057;4100;4127;4201;4204;4701;4706"
 			/>
 			<Tool
@@ -154,19 +154,17 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib setupapi.lib ..\Crypto\Release\crypto.lib"
+				AdditionalDependencies="comctl32.lib setupapi.lib ..\Crypto\x64\Debug\crypto.lib"
 				OutputFile="$(OutDir)/VeraCryptFormat.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="false"
-				GenerateMapFile="true"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/Format.pdb"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -189,16 +187,16 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="copy Release\VeraCryptFormat.exe &quot;..\Release\Setup Files\VeraCrypt Format.exe&quot;"
+				CommandLine="md &quot;..\Debug\Setup Files&quot; 2&gt;NUL:&#x0D;&#x0A;copy $(TargetPath) &quot;..\Debug\Setup Files\VeraCrypt Format-x64.exe&quot; &gt;NUL:&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -214,21 +212,21 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 				TypeLibraryName="$(SolutionDir)/$(ProjectName)/$(ProjectName).tlb"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				AdditionalOptions="/w34189"
+				Optimization="2"
 				AdditionalIncludeDirectories="..\Common;..\Crypto;..\;..\PKCS11"
-				PreprocessorDefinitions="VOLFORMAT;WIN32;DEBUG;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				PreprocessorDefinitions="VOLFORMAT;WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NON_CONFORMING_SWPRINTFS"
+				RuntimeLibrary="0"
 				BufferSecurityCheck="true"
 				UsePrecompiledHeader="0"
+				AssemblerOutput="2"
+				AssemblerListingLocation="$(IntDir)/"
 				WarningLevel="4"
-				DebugInformationFormat="3"
+				DebugInformationFormat="0"
 				DisableSpecificWarnings="4057;4100;4127;4201;4204;4701;4706"
 			/>
 			<Tool
@@ -242,17 +240,19 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="comctl32.lib setupapi.lib ..\Crypto\x64\Debug\crypto.lib"
+				AdditionalDependencies="comctl32.lib setupapi.lib ..\Crypto\Release\crypto.lib"
 				OutputFile="$(OutDir)/VeraCryptFormat.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateManifest="false"
 				IgnoreAllDefaultLibraries="false"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/Format.pdb"
+				GenerateDebugInformation="false"
+				GenerateMapFile="true"
 				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="2"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -275,7 +275,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
-				CommandLine="md &quot;..\Debug\Setup Files&quot; 2&gt;NUL:&#x0D;&#x0A;copy $(TargetPath) &quot;..\Debug\Setup Files\VeraCrypt Format-x64.exe&quot; &gt;NUL:&#x0D;&#x0A;"
+				CommandLine="copy Release\VeraCryptFormat.exe &quot;..\Release\Setup Files\VeraCrypt Format.exe&quot;"
 			/>
 		</Configuration>
 		<Configuration
@@ -284,7 +284,7 @@
 			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
-			CharacterSet="2"
+			CharacterSet="1"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -396,7 +396,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -404,7 +404,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -432,7 +432,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Release|Win32"
+					Name="Debug|x64"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -440,7 +440,7 @@
 					/>
 				</FileConfiguration>
 				<FileConfiguration
-					Name="Debug|x64"
+					Name="Release|Win32"
 					>
 					<Tool
 						Name="VCCLCompilerTool"
@@ -495,7 +495,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -503,7 +503,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -531,7 +531,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -539,7 +539,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -587,7 +587,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -595,7 +595,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						>
 						<Tool
 							Name="VCCLCompilerTool"
@@ -751,11 +751,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Common\Resource.h"
+				RelativePath=".\resource.h"
 				>
 			</File>
 			<File
-				RelativePath=".\resource.h"
+				RelativePath="..\Common\Resource.h"
 				>
 			</File>
 			<File
@@ -797,6 +797,38 @@
 			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
 			>
 			<File
+				RelativePath="..\Boot\Windows\Release_Serpent_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
+				RelativePath="..\Boot\Windows\Rescue_Twofish_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
+				RelativePath="..\Boot\Windows\Rescue_Serpent_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
+				RelativePath="..\Boot\Windows\Rescue_AES_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
+				RelativePath="..\Boot\Windows\Rescue_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
+				RelativePath="..\Boot\Windows\Release_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
+				RelativePath="..\Boot\Windows\Release_AES_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
+				RelativePath="..\Boot\Windows\Release_Twofish_SHA2\BootSector.bin"
+				>
+			</File>
+			<File
 				RelativePath=".\Format.manifest"
 				>
 			</File>
@@ -810,6 +842,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Common\VeraCrypt_mounted.ico"
+				>
+			</File>
+			<File
 				RelativePath="..\Common\VeraCrypt_Volume.ico"
 				>
 			</File>
@@ -821,35 +857,35 @@
 				Name="Common"
 				>
 				<File
-					RelativePath="..\Boot\Windows\Rescue\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Release_AES\BootLoader.com.gz"
 					>
 				</File>
 				<File
-					RelativePath="..\Boot\Windows\Rescue_Twofish\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Release\BootLoader.com.gz"
 					>
 				</File>
 				<File
-					RelativePath="..\Boot\Windows\Release_Serpent\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Release_Twofish\BootLoader.com.gz"
 					>
 				</File>
 				<File
-					RelativePath="..\Boot\Windows\Release_AES\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Rescue_Serpent\BootLoader.com.gz"
 					>
 				</File>
 				<File
-					RelativePath="..\Boot\Windows\Release\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Rescue_AES\BootLoader.com.gz"
 					>
 				</File>
 				<File
-					RelativePath="..\Boot\Windows\Release_Twofish\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Rescue\BootLoader.com.gz"
 					>
 				</File>
 				<File
-					RelativePath="..\Boot\Windows\Rescue_Serpent\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Rescue_Twofish\BootLoader.com.gz"
 					>
 				</File>
 				<File
-					RelativePath="..\Boot\Windows\Rescue_AES\BootLoader.com.gz"
+					RelativePath="..\Boot\Windows\Release_Serpent\BootLoader.com.gz"
 					>
 				</File>
 				<File
@@ -896,7 +932,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Release|Win32"
+						Name="Debug|x64"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -904,7 +940,7 @@
 						/>
 					</FileConfiguration>
 					<FileConfiguration
-						Name="Debug|x64"
+						Name="Release|Win32"
 						ExcludedFromBuild="true"
 						>
 						<Tool
@@ -950,6 +986,38 @@
 				</File>
 			</Filter>
 		</Filter>
+		<File
+			RelativePath="..\Boot\Windows\Release_Serpent_SHA2\BootLoader.com.gz"
+			>
+		</File>
+		<File
+			RelativePath="..\Boot\Windows\Release_Twofish_SHA2\BootLoader.com.gz"
+			>
+		</File>
+		<File
+			RelativePath="..\Boot\Windows\Rescue_SHA2\BootLoader.com.gz"
+			>
+		</File>
+		<File
+			RelativePath="..\Boot\Windows\Rescue_AES_SHA2\BootLoader.com.gz"
+			>
+		</File>
+		<File
+			RelativePath="..\Boot\Windows\Rescue_Serpent_SHA2\BootLoader.com.gz"
+			>
+		</File>
+		<File
+			RelativePath="..\Boot\Windows\Rescue_Twofish_SHA2\BootLoader.com.gz"
+			>
+		</File>
+		<File
+			RelativePath="..\Boot\Windows\Release_SHA2\BootLoader.com.gz"
+			>
+		</File>
+		<File
+			RelativePath="..\Boot\Windows\Release_AES_SHA2\BootLoader.com.gz"
+			>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>