nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge 1da02f235a into 5b544c6a4a

Browse source
This commit is contained in:
pluto00987 2017-01-01 20:24:06 +00:00 • committed by GitHub
commit 45aa14ca12
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/format.c
View file

@ -1106,7 +1106,11 @@ 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 {
} else if ((bt == BT_ISO) && (img_report.has_bootmgr)) {
if (!write_fat_32_pe_br(fp, 0)) break;
} else if ((bt == BT_ISO) && (img_report.has_ntldr)) {
if (!write_fat_32_nt_br(fp, 0)) break;
} else { /* This is a DOS boot record */
if (!write_fat_32_br(fp, 0)) break;
}
// Disk Drive ID needs to be corrected on XP

4
src/iso.c
View file

@ -69,6 +69,7 @@ BOOL enable_iso = TRUE, enable_joliet = TRUE, enable_rockridge = TRUE, has_ldlin
#define ISO_BLOCKING(x) do {x; iso_blocking_status++; } while(0)
static const char* psz_extract_dir;
static const char* bootmgr_efi_name = "bootmgr.efi";
static const char* ntldr_name = "ntldr";
static const char* grldr_name = "grldr";
static const char* ldlinux_name = "ldlinux.sys";
static const char* ldlinux_c32 = "ldlinux.c32";
@ -188,6 +189,9 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t i_file_length, cons
if (safe_strnicmp(psz_basename, bootmgr_efi_name, safe_strlen(bootmgr_efi_name)-5) == 0) {
img_report.has_bootmgr = TRUE;
}
if (safe_stricmp(psz_basename, ntldr_name) == 0) {
img_report.has_ntldr = TRUE;
}
if (safe_stricmp(psz_basename, grldr_name) == 0) {
img_report.has_grub4dos = TRUE;
}

1
src/rufus.h
View file

@ -280,6 +280,7 @@ typedef struct {
BOOLEAN has_long_filename;
BOOLEAN has_symlinks;
BOOLEAN has_bootmgr;
BOOLEAN has_ntldr;
BOOLEAN has_autorun;
BOOLEAN has_old_c32[NB_OLD_C32];
BOOLEAN has_old_vesamenu;