diff --git a/res/uefi/readme.txt b/res/uefi/readme.txt index c3ae32d7..76fb335d 100644 --- a/res/uefi/readme.txt +++ b/res/uefi/readme.txt @@ -13,11 +13,11 @@ o Secure Boot signed NTFS UEFI drivers, derived from ntfs-3g [1]. ARM driver (ntfs_arm.efi) is not Secure Boot signed. o Non Secure Boot signed exFAT UEFI drivers from EfiFs [2]. - These drivers are the exact same as the binaries from EfiFs release 1.9 but, + These drivers are the exact same as the binaries from EfiFs release 1.11 but, because they are licensed under GPLv3, cannot be Secure Boot signed. o Secure Boot signed UEFI:NTFS bootloader binaries [3]. - These drivers are the exact same as the binaries from release 2.3, except for + These drivers are the exact same as the binaries from release 2.6, except for the addition of Microsoft's Secure Boot signature. Note that, per Microsoft's current Secure Boot signing policies, the 32-bit ARM bootloader (bootarm.efi) is not Secure Boot signed. diff --git a/res/uefi/uefi-ntfs.img b/res/uefi/uefi-ntfs.img index 8ed9d212..33529741 100644 Binary files a/res/uefi/uefi-ntfs.img and b/res/uefi/uefi-ntfs.img differ diff --git a/src/cregex_compile.c b/src/cregex_compile.c index f2b30480..df93278b 100644 --- a/src/cregex_compile.c +++ b/src/cregex_compile.c @@ -247,6 +247,10 @@ static cregex_program_instr_t *compile_context(regex_compile_context *context, /* Compile a parsed pattern (using a previously allocated program with at least * estimate_instructions(root) instructions). */ +#if defined __GNUC__ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdangling-pointer" +#endif static cregex_program_t *compile_node_with_program(const cregex_node_t *root, cregex_program_t *program) { @@ -286,6 +290,9 @@ static cregex_program_t *compile_node_with_program(const cregex_node_t *root, return program; } +#if defined __GNUC__ +#pragma GCC diagnostic pop +#endif /* Upper bound of number of instructions required to compile parsed pattern. */ static int estimate_instructions(const cregex_node_t *root) diff --git a/src/format.c b/src/format.c index f5ef4bb0..b75dca9d 100644 --- a/src/format.c +++ b/src/format.c @@ -1438,7 +1438,7 @@ out: DWORD WINAPI FormatThread(void* param) { int r; - BOOL ret, use_large_fat32, windows_to_go, actual_lock_drive = lock_drive, write_as_ext = FALSE; + BOOL ret, windows_to_go, actual_lock_drive = lock_drive, write_as_ext = FALSE; // Windows 11 and VDS (which I suspect is what fmifs.dll's FormatEx() is now calling behind the scenes) // require us to unlock the physical drive to format the drive, else access denied is returned. BOOL need_logical = FALSE, must_unlock_physical = (use_vds || WindowsVersion.Version >= WINDOWS_11); @@ -1456,7 +1456,6 @@ DWORD WINAPI FormatThread(void* param) char kolibri_dst[] = "?:\\MTLD_F32"; char grub4dos_dst[] = "?:\\grldr"; - use_large_fat32 = (fs_type == FS_FAT32) && ((SelectedDrive.DiskSize > LARGE_FAT32_SIZE) || (force_large_fat32)); windows_to_go = (image_options & IMOP_WINTOGO) && (boot_type == BT_IMAGE) && HAS_WINTOGO(img_report) && (ComboBox_GetCurItemData(hImageOption) == IMOP_WIN_TO_GO); large_drive = (SelectedDrive.DiskSize > (1*TB)); diff --git a/src/rufus.rc b/src/rufus.rc index ee0a4c89..cd83c15b 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 4.12.2296" +CAPTION "Rufus 4.12.2297" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -408,8 +408,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,12,2296,0 - PRODUCTVERSION 4,12,2296,0 + FILEVERSION 4,12,2297,0 + PRODUCTVERSION 4,12,2297,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -427,13 +427,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "4.12.2296" + VALUE "FileVersion", "4.12.2297" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2025 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-4.12.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "4.12.2296" + VALUE "ProductVersion", "4.12.2297" END END BLOCK "VarFileInfo"