diff --git a/src/format.c b/src/format.c index 38cc2204..6287f9d1 100644 --- a/src/format.c +++ b/src/format.c @@ -922,6 +922,9 @@ static BOOL WriteSBR(HANDLE hPhysicalDrive) sub_type = BT_GRUB2; } else if (partition_type == PARTITION_STYLE_GPT) { sub_type = BT_NON_BOOTABLE; + } else { + // Needed to prevent protective message to be written for MBR mode + sub_type = BT_MAX; } switch (sub_type) { diff --git a/src/format_ext.c b/src/format_ext.c index 7fbd7849..b80cec3a 100644 --- a/src/format_ext.c +++ b/src/format_ext.c @@ -323,15 +323,13 @@ BOOL FormatExtFs(DWORD DriveIndex, uint64_t PartitionOffset, DWORD BlockSize, LP uprintf("%lld blocks (%0.1f%%) reserved for the super user", ext2fs_r_blocks_count(&features), reserve_ratio * 100.0f); // Set features - ext2fs_set_feature_xattr(&features); -// ext2fs_set_feature_resize_inode(&features); ext2fs_set_feature_dir_index(&features); ext2fs_set_feature_filetype(&features); -// ext2fs_set_feature_sparse_super(&features); ext2fs_set_feature_large_file(&features); + ext2fs_set_feature_sparse_super(&features); + ext2fs_set_feature_xattr(&features); if (FSName[3] != '2') ext2fs_set_feature_journal(&features); - features.s_backup_bgs[0] = ~0; features.s_default_mount_opts = EXT2_DEFM_XATTR_USER | EXT2_DEFM_ACL; // Now that we have set our base features, initialize a virtual superblock diff --git a/src/rufus.rc b/src/rufus.rc index d1730101..d7995aeb 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.10.1645" +CAPTION "Rufus 3.10.1646" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -395,8 +395,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,10,1645,0 - PRODUCTVERSION 3,10,1645,0 + FILEVERSION 3,10,1646,0 + PRODUCTVERSION 3,10,1646,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -414,13 +414,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.10.1645" + VALUE "FileVersion", "3.10.1646" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.10.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.10.1645" + VALUE "ProductVersion", "3.10.1646" END END BLOCK "VarFileInfo"