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

[iso] fix 'internal error' notice due to bootriscv###.efi support

Browse source 
* These bootloaders will require LFN support. Since we don't expect that
  many people to create bootable media for RISC-V derived from bootloaders
  contained in a 'efi.img`, we simply ignore these for now.
This commit is contained in:
Pete Batard 2020-09-10 17:55:07 +01:00
parent f04ed61805
commit ca70b4c213
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/iso.c
View file

@ -1389,18 +1389,17 @@ BOOL HasEfiImgBootLoaders(void)
dc = direntry.entry[26] + (direntry.entry[27] << 8); dc = direntry.entry[26] + (direntry.entry[27] << 8);
for (i = 0; i < ARRAYSIZE(efi_bootname); i++) { for (i = 0; i < ARRAYSIZE(efi_bootname); i++) {
// Sanity check in case the EFI forum comes up with a 'bootmips64.efi' or something... // TODO: bootriscv###.efi will need LFN support but cross that bridge when/if we get there...
if (strlen(efi_bootname[i]) > 12) { if (strlen(efi_bootname[i]) > 12)
uprintf("Internal error: FAT 8.3");
continue; continue;
}
for (j = 0, k = 0; efi_bootname[i][j] != 0; j++) { for (j = 0, k = 0; efi_bootname[i][j] != 0; j++) {
if (efi_bootname[i][j] == '.') { if (efi_bootname[i][j] == '.') {
while (k < 8) while (k < 8)
name[k++] = ' '; name[k++] = ' ';
} else } else {
name[k++] = toupper(efi_bootname[i][j]); name[k++] = toupper(efi_bootname[i][j]);
} }
}
c = libfat_searchdir(lf_fs, dc, name, &direntry); c = libfat_searchdir(lf_fs, dc, name, &direntry);
if (c > 0) { if (c > 0) {
if (!ret) if (!ret)

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.12.1699" CAPTION "Rufus 3.12.1700"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,12,1699,0 FILEVERSION 3,12,1700,0
PRODUCTVERSION 3,12,1699,0 PRODUCTVERSION 3,12,1700,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.12.1699" VALUE "FileVersion", "3.12.1700"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.12.exe" VALUE "OriginalFilename", "rufus-3.12.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.12.1699" VALUE "ProductVersion", "3.12.1700"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"