nerd
/
rufus
mirror of https://github.com/pbatard/rufus.git
1
1
Fork 0
Code Issues 1 Projects Releases Wiki Activity

[iso] add ISOHybrid "CD" partition and ISO9660 file system detection 

* Notably for openSUSE-Leap-15.3-XFCE-Live-x86_64-Build9.427-Media.iso
This commit is contained in:
Pete Batard 2022-04-05 18:31:03 +01:00
parent 50d81af6cf
commit f669f05403
No known key found for this signature in database
GPG Key ID: 38E0CF5E69EDD671
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/drive.c
View File

@ -1748,12 +1748,15 @@ const char* GetFsName(HANDLE hPhysical, LARGE_INTEGER StartingOffset)
if (buf == NULL) if (buf == NULL)
goto out; goto out;
// 1. Try to detect FAT/exFAT/NTFS/ReFS through the 512 bytes superblock at offset 0 // 1. Try to detect ISO9660/FAT/exFAT/NTFS/ReFS through the 512 bytes superblock at offset 0
if (!SetFilePointerEx(hPhysical, StartingOffset, NULL, FILE_BEGIN)) if (!SetFilePointerEx(hPhysical, StartingOffset, NULL, FILE_BEGIN))
goto out; goto out;
if (!ReadFile(hPhysical, buf, sector_size, &size, NULL) || size != sector_size) if (!ReadFile(hPhysical, buf, sector_size, &size, NULL) || size != sector_size)
goto out; goto out;
if (strncmp("CD001", &buf[0x01], 5) == 0) {
ret = "ISO9660";
goto out;
}
// The beginning of a superblock for FAT/exFAT/NTFS/ReFS is pretty much always the same: // The beginning of a superblock for FAT/exFAT/NTFS/ReFS is pretty much always the same:
// There are 3 bytes potentially used for a jump instruction, and then are 8 bytes of // There are 3 bytes potentially used for a jump instruction, and then are 8 bytes of

1
src/mbr_types.h
View File

@ -150,6 +150,7 @@ mbr_type_t mbr_type[] = {
{ 0xc4, "DR DOS Extended" }, { 0xc4, "DR DOS Extended" },
{ 0xc6, "DR DOS FAT16" }, { 0xc6, "DR DOS FAT16" },
{ 0xc7, "Syrinx" }, { 0xc7, "Syrinx" },
{ 0xcd, "ISOHybrid" },
{ 0xda, "Non-FS Data" }, { 0xda, "Non-FS Data" },
{ 0xdb, "CP/M" }, { 0xdb, "CP/M" },
{ 0xde, "Dell Utility" }, { 0xde, "Dell Utility" },

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.19.1879" CAPTION "Rufus 3.19.1880"
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,19,1879,0 FILEVERSION 3,19,1880,0
PRODUCTVERSION 3,19,1879,0 PRODUCTVERSION 3,19,1880,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.19.1879" VALUE "FileVersion", "3.19.1880"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2022 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.19.exe" VALUE "OriginalFilename", "rufus-3.19.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.19.1879" VALUE "ProductVersion", "3.19.1880"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"