From 365449fcce7ea693feffd53dbd0e6ad9b6059068 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Wed, 22 Mar 2023 16:52:39 +0000
Subject: [PATCH] [iso] revert processing of menu.lst

* Usage scenario is too limited and the cost of doing so is simply too high.
* This reverts the relevant changes from 737db33f9cad0e3ab0473cb67cb66b0e61188082.
---
 ChangeLog.txt |  2 +-
 src/iso.c     |  7 +++----
 src/rufus.rc  | 10 +++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7b5f034d..3f73c33d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,5 @@
 o Version 3.22 (2022.03.??)
-    Add SHA-1 and SHA-256 x86 acceleration on CPUs that support it
+    Add SHA-1 and SHA-256 x86 acceleration on CPUs that support it (courtesy of Jeffrey Walton)
     Add an option to disable BitLocker device encryption in the Windows User Experience dialog
     Add a cheat mode (Ctrl-P) to preserve the log between sessions
     Fix potential media creation errors by forcing the unmount of stale WIM images
diff --git a/src/iso.c b/src/iso.c
index af8c2980..e2ed8a4e 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -103,7 +103,7 @@ static const char* wininst_name[] = { "install.wim", "install.esd", "install.swm
 // If the disc was mastered properly, GRUB/EFI will take care of itself
 static const char* grub_dirname[] = { "/boot/grub/i386-pc", "/boot/grub2/i386-pc" };
 static const char* grub_cfg[] = { "grub.cfg", "loopback.cfg" };
-static const char* menu_cfg[] = { "menu.cfg", "menu.lst" };
+static const char* menu_cfg = "menu.cfg";
 // NB: Do not alter the order of the array below without validating hardcoded indexes in check_iso_props
 static const char* syslinux_cfg[] = { "isolinux.cfg", "syslinux.cfg", "extlinux.conf", "txt.cfg" };
 static const char* isolinux_bin[] = { "isolinux.bin", "boot.bin" };
@@ -200,9 +200,8 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
 				if (safe_stricmp(psz_basename, grub_cfg[i]) == 0)
 					props->is_grub_cfg = TRUE;
 			}
-			for (i = 0; i < ARRAYSIZE(menu_cfg); i++) {
-				if (safe_stricmp(psz_basename, menu_cfg[i]) == 0)
-					props->is_menu_cfg = TRUE;
+			if (safe_stricmp(psz_basename, menu_cfg) == 0) {
+				props->is_menu_cfg = TRUE;
 			}
 		}
 
diff --git a/src/rufus.rc b/src/rufus.rc
index 5c9e99cf..48c8dfcf 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.22.2004"
+CAPTION "Rufus 3.22.2005"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,22,2004,0
- PRODUCTVERSION 3,22,2004,0
+ FILEVERSION 3,22,2005,0
+ PRODUCTVERSION 3,22,2005,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.22.2004"
+            VALUE "FileVersion", "3.22.2005"
             VALUE "InternalName", "Rufus"
             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.2004"
+            VALUE "ProductVersion", "3.22.2005"
         END
     END
     BLOCK "VarFileInfo"