mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-09 12:31:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

[iso] check for freeldr.sys as well for ReactOS

Browse source 
* Closes #2589.

Signed-off-by: Justin Miller <justin.miller@reactos.org>
This commit is contained in:
Justin Miller 2024-10-17 14:47:52 -07:00 • committed by Pete Batard
parent eb282642ff
commit accc7c000b
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/iso.c
View file

@ -112,7 +112,7 @@ static const char* syslinux_cfg[] = { "isolinux.cfg", "syslinux.cfg", "extlinux.
static const char* isolinux_bin[] = { "isolinux.bin", "boot.bin" };
static const char* pe_dirname[] = { "/i386", "/amd64", "/minint" };
static const char* pe_file[] = { "ntdetect.com", "setupldr.bin", "txtsetup.sif" };
static const char* reactos_name = "setupldr.sys"; // TODO: freeldr.sys doesn't seem to work
static const char* reactos_name[] = { "setupldr.sys", "freeldr.sys" };
static const char* kolibri_name = "kolibri.img";
static const char* autorun_name = "autorun.inf";
static const char* manjaro_marker = ".miso";
@ -274,9 +274,12 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
}
}
// Check for ReactOS' setupldr.sys anywhere
if ((img_report.reactos_path[0] == 0) && (safe_stricmp(psz_basename, reactos_name) == 0))
static_strcpy(img_report.reactos_path, psz_fullpath);
// Check for ReactOS presence anywhere
if (img_report.reactos_path[0] == 0) {
for (i = 0; i < ARRAYSIZE(reactos_name); i++)
if (safe_stricmp(psz_basename, reactos_name[i]) == 0)
static_strcpy(img_report.reactos_path, psz_fullpath);
}
// Check for the first 'efi*.img' we can find (that hopefully contains EFI boot files)
if (!HAS_EFI_IMG(img_report) && (safe_strlen(psz_basename) >= 7) &&

10
src/rufus.rc
View file

@ -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 4.6.2206"
CAPTION "Rufus 4.6.2207"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -399,8 +399,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 4,6,2206,0
PRODUCTVERSION 4,6,2206,0
FILEVERSION 4,6,2207,0
PRODUCTVERSION 4,6,2207,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -418,13 +418,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "4.6.2206"
VALUE "FileVersion", "4.6.2207"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2024 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-4.6.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "4.6.2206"
VALUE "ProductVersion", "4.6.2207"
END
END
BLOCK "VarFileInfo"