From 3cd6d18ef876fd5b39b087e56772a1e48fdc4d7a Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 7 Nov 2022 17:42:54 +0000
Subject: [PATCH 1/2] [ui] fix 'Image option'/'Persistent partition size' title
 not toggling when switching ISOs

---
 src/rufus.rc | 10 +++++-----
 src/ui.c     |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/rufus.rc b/src/rufus.rc
index 4dd9e2af..500d298a 100644
--- 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.21.1941"
+CAPTION "Rufus 3.21.1942"
 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,21,1941,0
- PRODUCTVERSION 3,21,1941,0
+ FILEVERSION 3,21,1942,0
+ PRODUCTVERSION 3,21,1942,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.21.1941"
+            VALUE "FileVersion", "3.21.1942"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.21.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.21.1941"
+            VALUE "ProductVersion", "3.21.1942"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/ui.c b/src/ui.c
index 9b46b4e5..be9fcd40 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -792,6 +792,7 @@ void ToggleImageOptions(void)
 		((!has_wintogo) && (image_options & IMOP_WINTOGO))) {
 		image_options ^= IMOP_WINTOGO;
 		if (image_options & IMOP_WINTOGO) {
+			SetWindowTextU(GetDlgItem(hMainDialog, IDS_IMAGE_OPTION_TXT), image_option_txt);
 			// Set the Windows To Go selection in the dropdown
 			IGNORE_RETVAL(ComboBox_SetCurSel(hImageOption, imop_win_sel));
 		}

From 4cfe1c9947b437a0a274ca18c1d28afa8a160a80 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 7 Nov 2022 17:45:42 +0000
Subject: [PATCH 2/2] [iso] fix UEFI:NTFS not being installed for ISOs that
 have a >4GB file, when MBR is selected

* GPT was fine but MBR led to the creation of EFI bootable images using NTFS as the file
  system, but without the UEFI:NTFS partition (e.g. UwUntu-22.10-desktop-amd64.iso).
---
 src/format.c |  2 +-
 src/rufus.rc | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/format.c b/src/format.c
index 5d3b5ce2..ee40fd06 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1451,7 +1451,7 @@ DWORD WINAPI FormatThread(void* param)
 		extra_partitions = XP_ESP | XP_MSR;
 	else if ( ((fs_type == FS_NTFS) || (fs_type == FS_EXFAT)) &&
 			  ((boot_type == BT_UEFI_NTFS) || ((boot_type == BT_IMAGE) && IS_EFI_BOOTABLE(img_report) &&
-			   ((target_type == TT_UEFI) || (windows_to_go) || (allow_dual_uefi_bios)))) )
+			   ((target_type == TT_UEFI) || (windows_to_go) || (allow_dual_uefi_bios) || (img_report.has_4GB_file)))) )
 		extra_partitions = XP_UEFI_NTFS;
 	else if ((boot_type == BT_IMAGE) && !write_as_image && HAS_PERSISTENCE(img_report) && persistence_size)
 		extra_partitions = XP_CASPER;
diff --git a/src/rufus.rc b/src/rufus.rc
index 500d298a..e83f5d32 100644
--- 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.21.1942"
+CAPTION "Rufus 3.21.1943"
 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,21,1942,0
- PRODUCTVERSION 3,21,1942,0
+ FILEVERSION 3,21,1943,0
+ PRODUCTVERSION 3,21,1943,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.21.1942"
+            VALUE "FileVersion", "3.21.1943"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.21.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.21.1942"
+            VALUE "ProductVersion", "3.21.1943"
         END
     END
     BLOCK "VarFileInfo"