1 files changed, 6 insertions, 61 deletions
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index bf9f9854..f8b466af 100644
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
@@ -1106,24 +1106,6 @@ BOOL SwitchWizardToSysEncMode (void)
 							if (AskWarnYesNoString ((wstring (GetString ("SYSDRIVE_NON_STANDARD_PARTITIONS")) + L"\n\n" + GetString ("ASK_ENCRYPT_PARTITION_INSTEAD_OF_DRIVE")).c_str(), MainDlg) == IDYES)
 								bWholeSysDrive = FALSE;
 						}
-
-						if (!IsOSAtLeast (WIN_VISTA) && bWholeSysDrive)
-						{
-							if (BootEncObj->SystemDriveContainsExtendedPartition())
-							{
-								bWholeSysDrive = FALSE;
-
-								Error ("WDE_UNSUPPORTED_FOR_EXTENDED_PARTITIONS", MainDlg);
-
-								if (AskYesNo ("ASK_ENCRYPT_PARTITION_INSTEAD_OF_DRIVE", MainDlg) == IDNO)
-								{
-									ChangeWizardMode (WIZARD_MODE_NONSYS_DEVICE);
-									return FALSE;
-								}
-							}
-							else
-								Warning ("WDE_EXTENDED_PARTITIONS_WARNING", MainDlg);
-						}
 					}
 					else if (BootEncObj->SystemPartitionCoversWholeDrive()
 						&& !bWholeSysDrive)
@@ -5102,7 +5084,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 					}
 
 					//exFAT support added starting from Vista SP1
-					if (IsOSVersionAtLeast (WIN_VISTA, 1) && dataAreaSize >= TC_MIN_EXFAT_FS_SIZE && dataAreaSize <= TC_MAX_EXFAT_FS_SIZE)
+					if (dataAreaSize >= TC_MIN_EXFAT_FS_SIZE && dataAreaSize <= TC_MAX_EXFAT_FS_SIZE)
 					{
 						AddComboPair (GetDlgItem (hwndDlg, IDC_FILESYS), L"exFAT", FILESYS_EXFAT);
 						bEXFATallowed = TRUE;
@@ -6424,13 +6406,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 					}
 				}
 
-				/* Verify that the volume would not be too large for the operating system */
-				if (!IsOSAtLeast (WIN_VISTA)
-					&& nVolumeSize > 2 * BYTES_PER_TB)
-				{
-					AbortProcess ("VOLUME_TOO_LARGE_FOR_WINXP");
-				}
-
 				if (volumePassword.Length > 0)
 				{
 					// Check password length (check also done for outer volume which is not the case in TrueCrypt).
@@ -6456,12 +6431,9 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			else
 				StringCbCatW (szRescueDiskISO, sizeof(szRescueDiskISO), L"\\VeraCrypt Rescue Disk.iso");
 
-			if (IsOSAtLeast (WIN_VISTA))
-			{
-				// Availability of in-place encryption (which is pre-selected by default whenever
-				// possible) makes partition-hosted volume creation safer.
-				bWarnDeviceFormatAdvanced = FALSE;
-			}
+			// Availability of in-place encryption (which is pre-selected by default whenever
+			// possible) makes partition-hosted volume creation safer.
+			bWarnDeviceFormatAdvanced = FALSE;
 
 #ifdef _DEBUG
 			// For faster testing
@@ -7238,21 +7210,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 							if (AskWarnYesNoString ((wstring (GetString ("SYSDRIVE_NON_STANDARD_PARTITIONS")) + L"\n\n" + GetString ("ASK_ENCRYPT_PARTITION_INSTEAD_OF_DRIVE")).c_str(), MainDlg) == IDYES)
 								bWholeSysDrive = FALSE;
 						}
-
-						if (!IsOSAtLeast (WIN_VISTA) && bWholeSysDrive)
-						{
-							if (BootEncObj->SystemDriveContainsExtendedPartition())
-							{
-								Error ("WDE_UNSUPPORTED_FOR_EXTENDED_PARTITIONS", MainDlg);
-
-								if (AskYesNo ("ASK_ENCRYPT_PARTITION_INSTEAD_OF_DRIVE", MainDlg) == IDNO)
-									return 1;
-
-								bWholeSysDrive = FALSE;
-							}
-							else
-								Warning ("WDE_EXTENDED_PARTITIONS_WARNING", hwndDlg);
-						}
 					}
 
 					if (!bWholeSysDrive && BootEncObj->SystemPartitionCoversWholeDrive())
@@ -7310,8 +7267,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 
 				if (bHiddenOS)
 				{
-					if (IsOSAtLeast (WIN_7)
-						&& BootEncObj->GetSystemDriveConfiguration().ExtraBootPartitionPresent
+					if (BootEncObj->GetSystemDriveConfiguration().ExtraBootPartitionPresent
 						&& AskWarnYesNo ("CONFIRM_HIDDEN_OS_EXTRA_BOOT_PARTITION", hwndDlg) == IDNO)
 					{
 						TextInfoDialogBox (TC_TBXID_EXTRA_BOOT_PARTITION_REMOVAL_INSTRUCTIONS);
@@ -7680,13 +7636,6 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						}
 					}
 
-					/* Verify that the volume would not be too large for the operating system */
-
-					if (!IsOSAtLeast (WIN_VISTA)
-						&& nUIVolumeSize * nMultiplier > 2 * BYTES_PER_TB)
-					{
-						Warning ("VOLUME_TOO_LARGE_FOR_WINXP", hwndDlg);
-					}
 				}
 
 				if (bHiddenVol && !bHiddenVolHost)	// If it's a hidden volume
@@ -9289,7 +9238,7 @@ void ExtractCommandLine (HWND hwndDlg, wchar_t *lpszCommandLine)
 							CmdVolumeFilesystem = FILESYS_FAT;
 						else if (_wcsicmp(szTmp, L"NTFS") == 0)
 							CmdVolumeFilesystem = FILESYS_NTFS;
-						else if (IsOSVersionAtLeast (WIN_VISTA, 1) && _wcsicmp(szTmp, L"EXFAT") == 0)
+						else if (_wcsicmp(szTmp, L"EXFAT") == 0)
 							CmdVolumeFilesystem = FILESYS_EXFAT;
 						else if (IsOSVersionAtLeast (WIN_10, 0) && _wcsicmp(szTmp, L"ReFS") == 0)
 							CmdVolumeFilesystem = FILESYS_REFS;
@@ -10650,10 +10599,6 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpsz
 
 	InitApp (hInstance, lpszCommandLine);
 
-	// Write block size greater than 64 KB causes a performance drop when writing to files on XP/Vista
-	if (!IsOSAtLeast (WIN_7))
-		FormatWriteBufferSize = 64 * 1024;
-
 #if TC_MAX_VOLUME_SECTOR_SIZE > 64 * 1024
 #error TC_MAX_VOLUME_SECTOR_SIZE > 64 * 1024
 #endif