From 8672feeb0af6f4b9f7f6855923fcc02e41212f79 Mon Sep 17 00:00:00 2001
From: Joseph mendoza <josephsmendoza@gmail.com>
Date: Sat, 21 Dec 2019 01:42:38 -0800
Subject: [PATCH] [efi] leave .efi files in efi/boot/ uncompressed on NTFS

* While compressed EFI bootloaders are not an issue for UEFI:NTFS, some UEFI firmwares
  embed an NTFS driver that doesn't support NTFS compression.
  To address that, also uncompress the EFI bootloaders on NTFS.
* Closes #1424
---
 src/iso.c    |  2 +-
 src/rufus.rc | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/iso.c b/src/iso.c
index d2566828..32e3af51 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -1015,7 +1015,7 @@ out:
 				fclose(fd);
 		} else if (HAS_BOOTMGR(img_report) && enable_ntfs_compression) {
 			// bootmgr might need to be uncompressed: https://github.com/pbatard/rufus/issues/1381
-			RunCommand("compact /u bootmgr bootmgr.efi", dest_dir, TRUE);
+			RunCommand("compact /u bootmgr* efi/boot/*.efi", dest_dir, TRUE);
 		}
 	}
 	if (p_iso != NULL)
diff --git a/src/rufus.rc b/src/rufus.rc
index 962bc9a0..9005d8bc 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.9.1592"
+CAPTION "Rufus 3.9.1593"
 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,9,1592,0
- PRODUCTVERSION 3,9,1592,0
+ FILEVERSION 3,9,1593,0
+ PRODUCTVERSION 3,9,1593,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.9.1592"
+            VALUE "FileVersion", "3.9.1593"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.9.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.9.1592"
+            VALUE "ProductVersion", "3.9.1593"
         END
     END
     BLOCK "VarFileInfo"