From d7e977e1f16ae141f88da84dfb269c67495b66eb Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 3 Jan 2017 16:56:30 +0000
Subject: [PATCH] [core] enable FAT32 for Windows install when dual UEFI+BIOS
 is enabled

---
 src/format.c |  4 ++++
 src/rufus.c  |  2 +-
 src/rufus.rc | 10 +++++-----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/format.c b/src/format.c
index 4050a13c..fb682b11 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1106,6 +1106,10 @@ static BOOL WritePBR(HANDLE hLogicalVolume)
 				if (!write_fat_32_ros_br(fp, 0)) break;
 			} else if ((bt == BT_ISO) && HAS_KOLIBRIOS(img_report)) {
 				if (!write_fat_32_kos_br(fp, 0)) break;
+			} else if ((bt == BT_ISO) && HAS_BOOTMGR(img_report)) {
+				if (!write_fat_32_pe_br(fp, 0)) break;
+			} else if ((bt == BT_ISO) && HAS_WINPE(img_report)) {
+				if (!write_fat_32_nt_br(fp, 0)) break;
 			} else {
 				if (!write_fat_32_br(fp, 0)) break;
 			}
diff --git a/src/rufus.c b/src/rufus.c
index 4266af3a..47d5a61f 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1323,7 +1323,7 @@ static BOOL BootCheck(void)
 					 (!HAS_SYSLINUX(img_report) || (SL_MAJOR(img_report.sl_version) <= 5)))
 				 || ((IS_FAT(fs)) && (!HAS_SYSLINUX(img_report)) && (!allow_dual_uefi_bios) && !IS_EFI_BOOTABLE(img_report) &&
 					 (!HAS_REACTOS(img_report)) && !HAS_KOLIBRIOS(img_report) && (!HAS_GRUB(img_report)))
-				 || ((IS_FAT(fs)) && (HAS_WINDOWS(img_report) || HAS_INSTALL_WIM(img_report))) ) {
+				 || ((IS_FAT(fs)) && (HAS_WINDOWS(img_report) || HAS_INSTALL_WIM(img_report)) && (!allow_dual_uefi_bios)) ) {
 			// Incompatible FS and ISO
 			MessageBoxExU(hMainDialog, lmprintf(MSG_096), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid);
 			return FALSE;
diff --git a/src/rufus.rc b/src/rufus.rc
index e2593735..871b4579 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.12.1013"
+CAPTION "Rufus 2.12.1014"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,12,1013,0
- PRODUCTVERSION 2,12,1013,0
+ FILEVERSION 2,12,1014,0
+ PRODUCTVERSION 2,12,1014,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.12.1013"
+            VALUE "FileVersion", "2.12.1014"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.12.1013"
+            VALUE "ProductVersion", "2.12.1014"
         END
     END
     BLOCK "VarFileInfo"