[core] add a notice about MBR and >2TB partitions

* Also fix Boot Options not displaying when no drive is plugged in advanced mode

res/loc/ChangeLog.txt

@@ -6,10 +6,15 @@ https://github.com/pbatard/rufus/wiki/Localization#Editing_a_translation
 Or simply download the latest pollock.exe from https://rufus.ie/locale/ and follow
 its directions. 
 
-o v3.x
+o v3.5
   - *NEW*      MSG_127 "Do not show this message again"
-  - *NEW*      MSG_128 "Important notice about Secure Boot"
+  - *NEW*      MSG_128 "Important notice about %s" where %s will be one of "MBR", "Secure Boot", "Windows To Go"
   - *NEW*      MSG_129 "You have just created a media that includes the UEFI:NTFS bootloader (...)"
+  - *NEW*      MSG_130 "Windows image selection"
+  - *NEW*      MSG_131 "This ISO contains multiple Windows images.\nPlease select the image you wish to use for this installation:"
+  - *NEW*      MSG_132 "Another program or process is accessing this drive. Do you want to format it anyway?"
+  - *NEW*      MSG_133 "Rufus has detected that you are attempting to create a Windows To Go media based on a 1809 ISO. (...)"
+  - *NEW*      MSG_134 "Because MBR has been selected for the partition scheme, Rufus can only create a partition up to 2 TB (...)"
 
 o v3.2 (2018.07.20)
 	The following appears in Advanced format options → Check device for bad blocks → dropdown menu with

res/loc/po/fr-FR.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.2\n"
 "Report-Msgid-Bugs-To: pete@akeo.ie\n"
-"POT-Creation-Date: 2019-01-30 17:11+0000\n"
-"PO-Revision-Date: 2019-01-30 17:12+0000\n"
+"POT-Creation-Date: 2019-02-01 12:29+0000\n"
+"PO-Revision-Date: 2019-02-01 12:29+0000\n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -892,7 +892,7 @@ msgid ""
 "\n"
 "Because of a *MICROSOFT BUG*, this media will crash during Windows boot (Blue Screen Of Death), unless you manually replace the file 'WppRecorder.sys' with a 1803 version.\n"
 "\n"
-"Also note that the reason Rufus cannot automatically fix this for you is that 'WppRecorder.sys' is a Microsoft copyrighted file, so we cannot legally embed a copy of the file in the application...your target is of BIOS or UEFI type before you start creating the drive, as it may fail to boot otherwise."
+"Also note that the reason Rufus cannot automatically fix this for you is that 'WppRecorder.sys' is a Microsoft copyrighted file, so we cannot legally embed a copy of the file in the application..."
 msgstr ""
 "Rufus a détecté que vous êtes en train de créer un média 'Windows To Go' à partir d'une ISO 1809.\n"
 "\n"
@@ -900,6 +900,20 @@ msgstr ""
 "\n"
 "Veuillez aussi noter que la raison pour laquelle Rufus ne peut pas corriger ce problème pour vous est que le fichier 'WppRecorder.sys' est sujet au copyright de Microsoft, donc nous ne pouvons pas légalement en produire une copie avec cette application..."
 
+#. • MSG_134
+msgid ""
+"Because MBR has been selected for the partition scheme, Rufus can only create a partition up to 2 TB on this media, which will leave %s of disk space unavailable.\n"
+"\n"
+"Are you sure you want to continue?"
+msgstr ""
+"Parce que MBR a été sélectionné pour le schéma de partition, Rufus peut seulement créer une partition sur ce média occupant jusqu’à 2 To, ce qui laissera %s d’espace disque non-disponible.\n"
+"\n"
+"Etes-vous sûr de vouloir continuer ?"
+
+#. • MSG_150
+msgid "Type of computer you plan to use this bootable drive with. It is your responsibility to determine whether your target is of BIOS or UEFI type before you start creating the drive, as it may fail to boot otherwise."
+msgstr "Type d'ordinateur avec lequel vous comptez utiliser ce disque démarrable. Il est de votre responsabilité de déterminer s'il s'agit d'un type BIOS ou UEFI avant de commencer a créer votre périphérique, car il risque de ne pas démarrer sinon."
+
 #. • MSG_151
 #.
 #. You shouldn't translate 'Legacy Mode' as this is an option that usually appears in English in the UEFI settings.

res/loc/rufus.loc

@@ -337,7 +337,9 @@ t MSG_132 "Another program or process is accessing this drive. Do you want to fo
 t MSG_133 "Rufus has detected that you are attempting to create a Windows To Go media based on a 1809 ISO.\n\n"
 	"Because of a *MICROSOFT BUG*, this media will crash during Windows boot (Blue Screen Of Death), unless you manually replace the file 'WppRecorder.sys' with a 1803 version.\n\n"
 	"Also note that the reason Rufus cannot automatically fix this for you is that 'WppRecorder.sys' is a Microsoft copyrighted file, so we cannot legally embed a copy of the file in the application..."
-t MSG_150 "Type of computer you plan to use this bootable drive with. It is your responsibility to determine whether 
+t MSG_134 "Because MBR has been selected for the partition scheme, Rufus can only create a partition up to 2 TB on this media, which will leave %s of disk space unavailable.\n\n"
+	"Are you sure you want to continue?"
+t MSG_150 "Type of computer you plan to use this bootable drive with. It is your responsibility to determine whether "
 	"your target is of BIOS or UEFI type before you start creating the drive, as it may fail to boot otherwise."
 # You shouldn't translate 'Legacy Mode' as this is an option that usually appears in English in the UEFI settings.
 t MSG_151 "'UEFI-CSM' means that the device will only boot in BIOS emulation mode (also known as 'Legacy Mode') under UEFI, and not in native UEFI mode."
@@ -4270,6 +4272,7 @@ t MSG_130 "Sélection d'image Windows"
 t MSG_131 "Cette ISO contient plusieurs images Windows.\nVeuillez sélectioner l'image que vous souhaitez utiliser pour cette installation :"
 t MSG_132 "Ce lecteur est utilisé par une autre application ou un autre processus. Voulez-vous quand même le formater ?"
 t MSG_133 "Rufus a détecté que vous êtes en train de créer un média 'Windows To Go' à partir d'une ISO 1809.\n\nA cause d'un *BUG MICROSOFT*, ce média va planter durant le démarrage de Windows (Blue Screen Of Death), à moins que vous ne remplaciez le fichier 'WppRecorder.sys' par la version 1803.\n\nVeuillez aussi noter que la raison pour laquelle Rufus ne peut pas corriger ce problème pour vous est que le fichier 'WppRecorder.sys' est sujet au copyright de Microsoft, donc nous ne pouvons pas légalement en produire une copie avec cette application..."
+t MSG_134 "Parce que MBR a été sélectionné pour le schéma de partition, Rufus peut seulement créer une partition sur ce média occupant jusqu’à 2 To, ce qui laissera %s d’espace disque non-disponible.\n\nEtes-vous sûr de vouloir continuer ?"
 t MSG_150 "Type d'ordinateur avec lequel vous comptez utiliser ce disque démarrable. Il est de votre responsabilité de déterminer s'il s'agit d'un type BIOS ou UEFI avant de commencer a créer votre périphérique, car il risque de ne pas démarrer sinon."
 t MSG_151 "'UEFI-CSM' signifie que le périphérique démarrera seulement en mode émulation BIOS (i.e. 'Legacy Mode') sous UEFI, et non pas en mode UEFI natif."
 t MSG_152 "'non CSM' signifie que le périphérique démarrera seulement en mode UEFI natif, et non pas en mode émulation BIOS (i.e. 'Legacy Mode')."

src/rufus.c

@@ -282,6 +282,9 @@ static void SetPartitionSchemeAndTargetSystem(BOOL only_target)
 	}
 
 	if (!only_target) {
+		// Override partition type selection to GPT for drives larger than 2TB
+		if (SelectedDrive.DiskSize > 2 * TB)
+			selected_pt = PARTITION_STYLE_GPT;
 		// Try to reselect the current drive's partition scheme
 		int preferred_pt = SelectedDrive.PartitionStyle;
 		if (allowed_partition_scheme[PARTITION_STYLE_MBR]) 
@@ -2114,21 +2117,8 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 			set_selected_fs = (HIWORD(wParam) == CBN_SELCHANGE);
 			fs = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem)); 
 			SetClusterSizes(fs);
-			if (fs < 0) {
-				EnableBootOptions(TRUE, TRUE);
-				SetMBRProps();
-				// Remove the SysLinux and ReactOS options if they exists
-				if (ComboBox_GetItemData(hBootType, ComboBox_GetCount(hBootType)-1) == (BT_MAX-1)) {
-					for (i=BT_SYSLINUX_V4; i<BT_MAX; i++)
-						IGNORE_RETVAL(ComboBox_DeleteString(hBootType,  ComboBox_GetCount(hBootType)-1));
-					IGNORE_RETVAL(ComboBox_SetCurSel(hBootType, 1));
-				}
-				break;
-			} else {
-				// Try to keep track of user selection
-				if (set_selected_fs)
-					selected_fs = fs;
-			}
+			if (set_selected_fs && (fs > 0))
+				selected_fs = fs;
 			EnableMBRBootOptions(TRUE, FALSE);
 			SetMBRProps();
 			break;
@@ -2517,6 +2507,12 @@ static INT_PTR CALLBACK MainCallback(HWND hDlg, UINT message, WPARAM wParam, LPA
 		if (wParam != 0)
 			goto aborted_start;
 
+		if ((pt == PARTITION_STYLE_MBR) && (SelectedDrive.DiskSize > 2 * TB)) {
+			if (MessageBoxExU(hMainDialog, lmprintf(MSG_134, SizeToHumanReadable(SelectedDrive.DiskSize - 2 * TB, FALSE, FALSE)),
+				lmprintf(MSG_128, "MBR"), MB_YESNO | MB_ICONWARNING | MB_IS_RTL, selected_langid) != IDYES)
+				goto aborted_start;
+		}
+
 		if (!zero_drive) {
 			// Display a warning about UDF formatting times
 			if (fs == FS_UDF) {

src/rufus.rc

@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.5.1443"
+CAPTION "Rufus 3.5.1444"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,5,1443,0
- PRODUCTVERSION 3,5,1443,0
+ FILEVERSION 3,5,1444,0
+ PRODUCTVERSION 3,5,1444,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.5.1443"
+            VALUE "FileVersion", "3.5.1444"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.5.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.5.1443"
+            VALUE "ProductVersion", "3.5.1444"
         END
     END
     BLOCK "VarFileInfo"

src/ui.c

@@ -68,14 +68,17 @@ static float previous_end;
 // Set the combo selection according to the data
 void SetComboEntry(HWND hDlg, int data)
 {
-	int i;
-	for (i = 0; i < ComboBox_GetCount(hDlg); i++) {
+	int i, nb_entries = ComboBox_GetCount(hDlg);
+
+	if (nb_entries <= 0)
+		return;
+	for (i = 0; i < nb_entries; i++) {
 		if (ComboBox_GetItemData(hDlg, i) == data) {
 			IGNORE_RETVAL(ComboBox_SetCurSel(hDlg, i));
-			break;
+			return;
 		}
 	}
-	if (i == ComboBox_GetCount(hDlg))
+	if (i == nb_entries)
 		IGNORE_RETVAL(ComboBox_SetCurSel(hDlg, 0));
 }