[core] fix Large FAT32 not being used in ISO → ESP mode

* Not using our own FAT32 formatting may result in access errors due to Microsoft's hare-brain handling of ESP access. * Also update upcoming translations and copyright year.
2023-01-09 23:16:36 +00:00 · 2023-01-09 23:16:36 +00:00 · 3fbc465d31
parent ac7b171eca
commit 3fbc465d31
7 changed files with 28 additions and 18 deletions
--- a/res/loc/ChangeLog.txt
+++ b/res/loc/ChangeLog.txt
@ -7,6 +7,7 @@ Or simply download https://files.akeo.ie/pollock/pollock-1.4.exe and follow its

 o v3.22 (2023.??.??)
  // MSG_294 can be tested by launching Rufus from the commandline with option -z61
+  - *UPDATED*  MSG_144 "Temporarily banned by Microsoft for requesting too many downloads (...)" -> "Download of Windows ISOs is unavailable due to Microsoft having altered their website to prevent it."
  - *UPDATED*  MSG_294 "This version of Windows is no longer supported by Rufus." -> added "\nThe last version of Rufus compatible with this platform is v%d.%d."
  - *NEW*      MSG_323 "Unable to open or read '%s'"
  - *NEW*      MSG_325 "Applying Windows customization: %s"
@ -19,6 +20,7 @@ o v3.22 (2023.??.??)
  - *NEW*      MSG_332 "Prevent Windows To Go from accessing internal disks"
  - *NEW*      MSG_333 "Create a local account with username:"
  - *NEW*      MSG_334 "Set regional options to the same values as this user's"
+  - *NEW*      MSG_335 "Disable BitLocker automatic device encryption"

 o v3.14 (2021.03.31)
  - *UPDATED*  MSG_068 "Error while partitioning drive." -> "Could not partition drive."
--- a/res/loc/po/fr-FR.po
+++ b/res/loc/po/fr-FR.po
@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 3.14\n"
 "Report-Msgid-Bugs-To: pete@akeo.ie\n"
-"POT-Creation-Date: 2022-11-22 13:30+0000\n"
-"PO-Revision-Date: 2022-11-22 13:32+0000\n"
+"POT-Creation-Date: 2023-01-09 23:02+0000\n"
+"PO-Revision-Date: 2023-01-09 23:07+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@ -13,7 +13,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Rufus-LanguageName: French (Français)\n"
 "X-Rufus-LCID: 0x040c, 0x080c, 0x0c0c, 0x100c, 0x140c, 0x180c, 0x1c0c, 0x200c, 0x240c, 0x280c, 0x2c0c, 0x300c, 0x340c, 0x380c, 0xe40c\n"
-"X-Generator: Poedit 3.2\n"
+"X-Generator: Poedit 3.2.2\n"

 #. • IDD_DIALOG → IDS_DRIVE_PROPERTIES_TXT
 msgid "Drive Properties"
@ -947,8 +947,8 @@ msgid "Download using a browser"
 msgstr "Télécharger avec un navigateur"

 #. • MSG_144
-msgid "Temporarily banned by Microsoft for requesting too many downloads - Please try again later..."
-msgstr "Temporairement banni par Microsoft pour trop de téléchargements - Veuillez réessayer plus tard..."
+msgid "Download of Windows ISOs is unavailable due to Microsoft having altered their website to prevent it."
+msgstr "Le téléchargement des ISOs de Windows n'est pas disponible car Microsoft a modifié son site web pour les empêcher."

 #. • MSG_145
 msgid "PowerShell 3.0 or later is required to run this script."
@ -1835,3 +1835,7 @@ msgstr "Créer un compte local avec le nom :"
 #. • MSG_334
 msgid "Set regional options to the same values as this user's"
 msgstr "Définir les options régionales avec les mêmes valeurs que celles de cet utilisateur"
+
+#. • MSG_335
+msgid "Disable BitLocker automatic device encryption"
+msgstr "Désactiver l'encryption automatique BitLocker"
--- a/res/loc/rufus.loc
+++ b/res/loc/rufus.loc
@ -345,7 +345,7 @@ t MSG_140 "Continue"
 t MSG_141 "Back"
 t MSG_142 "Please wait..."
 t MSG_143 "Download using a browser"
-t MSG_144 "Temporarily banned by Microsoft for requesting too many downloads - Please try again later..."
+t MSG_144 "Download of Windows ISOs is unavailable due to Microsoft having altered their website to prevent it."
 t MSG_145 "PowerShell 3.0 or later is required to run this script."
 t MSG_146 "Do you want to go online and download it?"
 t MSG_148 "Running download script..."
@ -592,6 +592,7 @@ t MSG_331 "Disable data collection (Skip privacy questions)"
 t MSG_332 "Prevent Windows To Go from accessing internal disks"
 t MSG_333 "Create a local account with username:"
 t MSG_334 "Set regional options to the same values as this user's"
+t MSG_335 "Disable BitLocker automatic device encryption"

 #########################################################################
 l "ar-SA" "Arabic (العربية)" 0x0401, 0x0801, 0x0c01, 0x1001, 0x1401, 0x1801, 0x1c01, 0x2001, 0x2401, 0x2801, 0x2c01, 0x3001, 0x3401, 0x3801, 0x3c01, 0x4001
@ -4131,7 +4132,7 @@ t MSG_140 "Continuer"
 t MSG_141 "Retour"
 t MSG_142 "Veuillez patienter..."
 t MSG_143 "Télécharger avec un navigateur"
-t MSG_144 "Temporairement banni par Microsoft pour trop de téléchargements - Veuillez réessayer plus tard..."
+t MSG_144 "Le téléchargement des ISOs de Windows n'est pas disponible car Microsoft a modifié son site web pour les empêcher."
 t MSG_145 "PowerShell 3.0 ou ultérieur est nécessaire pour lancer ce script."
 t MSG_146 "Voulez-vous aller en ligne pour le télécharger ?"
 t MSG_148 "Execution du script de téléchargement..."
@ -4315,6 +4316,7 @@ t MSG_331 "Désactiver la collecte de données (Supprime les questions de confid
 t MSG_332 "Empêcher Windows To Go d'accéder aux disques internes"
 t MSG_333 "Créer un compte local avec le nom :"
 t MSG_334 "Définir les options régionales avec les mêmes valeurs que celles de cet utilisateur"
+t MSG_335 "Désactiver l'encryption automatique BitLocker"

 #########################################################################
 l "de-DE" "German (Deutsch)" 0x0407, 0x0807, 0x0c07, 0x1007, 0x1407
--- a/src/format.c
+++ b/src/format.c
@ -1,7 +1,7 @@
 /*
 * Rufus: The Reliable USB Formatting Utility
 * Formatting function calls
- * Copyright © 2011-2022 Pete Batard <pete@akeo.ie>
+ * Copyright © 2011-2023 Pete Batard <pete@akeo.ie>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -355,7 +355,7 @@ static BOOL FormatNativeVds(DWORD DriveIndex, uint64_t PartitionOffset, DWORD Cl
 	VolumeName = GetLogicalName(DriveIndex, PartitionOffset, TRUE, TRUE);
 	wVolumeName = utf8_to_wchar(VolumeName);
 	if (wVolumeName == NULL) {
-		uprintf("Could not read volume name (%s)", VolumeName);
+		uprintf("Could not read volume name");
 		FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | ERROR_GEN_FAILURE;
 		goto out;
 	}
@ -1721,6 +1721,8 @@ DWORD WINAPI FormatThread(void* param)
 		Flags |= FP_QUICK;
 	if ((fs_type == FS_NTFS) && (enable_ntfs_compression))
 		Flags |= FP_COMPRESSION;
+	if (write_as_esp)
+		Flags |= FP_LARGE_FAT32;

 	ret = FormatPartition(DriveIndex, partition_offset[PI_MAIN], ClusterSize, fs_type, label, Flags);
 	if (!ret) {
--- a/src/localization_data.sh
+++ b/src/localization_data.sh
@ -12,7 +12,7 @@ cat > cmd.sed <<\_EOF
 1i /*\
 * Rufus: The Reliable USB Formatting Utility\
 * Localization tables - autogenerated from resource.h\
- * Copyright © 2013-2022 Pete Batard <pete@akeo.ie>\
+ * Copyright © 2013-2023 Pete Batard <pete@akeo.ie>\
 *\
 * This program is free software: you can redistribute it and/or modify\
 * it under the terms of the GNU General Public License as published by\
--- a/src/rufus.rc
+++ b/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.22.1954"
+CAPTION "Rufus 3.22.1955"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
    LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -396,8 +396,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,22,1954,0
- PRODUCTVERSION 3,22,1954,0
+ FILEVERSION 3,22,1955,0
+ PRODUCTVERSION 3,22,1955,0
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@ -415,13 +415,13 @@ BEGIN
            VALUE "Comments", "https://rufus.ie"
            VALUE "CompanyName", "Akeo Consulting"
            VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.22.1954"
+            VALUE "FileVersion", "3.22.1955"
            VALUE "InternalName", "Rufus"
-            VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
+            VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)"
            VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
            VALUE "OriginalFilename", "rufus-3.22.exe"
            VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.22.1954"
+            VALUE "ProductVersion", "3.22.1955"
        END
    END
    BLOCK "VarFileInfo"
--- a/src/stdlg.c
+++ b/src/stdlg.c
@ -1,7 +1,7 @@
 /*
 * Rufus: The Reliable USB Formatting Utility
 * Standard Dialog Routines (Browse for folder, About, etc)
- * Copyright © 2011-2022 Pete Batard <pete@akeo.ie>
+ * Copyright © 2011-2023 Pete Batard <pete@akeo.ie>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@ -595,7 +595,7 @@ INT_PTR CALLBACK AboutCallback(HWND hDlg, UINT message, WPARAM wParam, LPARAM lP
 		ResizeButtonHeight(hDlg, IDOK);
 		static_sprintf(about_blurb, about_blurb_format, lmprintf(MSG_174|MSG_RTF),
 			lmprintf(MSG_175|MSG_RTF, rufus_version[0], rufus_version[1], rufus_version[2]),
-			"Copyright © 2011-2022 Pete Batard",
+			"Copyright © 2011-2023 Pete Batard",
 			lmprintf(MSG_176|MSG_RTF), lmprintf(MSG_177|MSG_RTF), lmprintf(MSG_178|MSG_RTF));
 		for (i = 0; i < ARRAYSIZE(hEdit); i++) {
 			hEdit[i] = GetDlgItem(hDlg, edit_id[i]);