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

[efi] enable the use of exFAT with UEFI:NTFS

Browse source 
* Only applies for blank UEFI:NTFS drives for now. UEFI:NTFS Windows drives are
  still set to use NTFS only (since Windows 7 doesn't support UEFI exFAT boot).
This commit is contained in:
Pete Batard 2020-01-30 13:51:19 +00:00
parent e522ef6c55
commit d1d5c2a7b6
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
5 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
res/uefi/readme.txt
View file

@ -1,14 +1,16 @@
This directory contains a flat image of the FAT UEFI:NTFS partition added by This directory contains a flat image of the FAT UEFI:NTFS partition added by
Rufus for NTFS UEFI boot support. See https://github.com/pbatard/uefi-ntfs. Rufus for NTFS and exFAT UEFI boot support.
See https://github.com/pbatard/uefi-ntfs for more details.
This image, which you can mount as FAT filesystem or open in 7-zip, contains This image, which you can mount as FAT filesystem or open in 7-zip, contains
the following data: the following data:
o The NTFS UEFI drivers from EfiFs (https://github.com/pbatard/efifs). o The NTFS and exFAT UEFI drivers from EfiFs (https://github.com/pbatard/efifs).
These are the \EFI\Rufus\ntfs_[ia32|x64|arm|aa64].efi files, which were These are the \EFI\Rufus\[exfat|ntfs]_[ia32|x64|arm|aa64].efi files, which were
compiled unmodified from the EfiFs source (@d19363a5), using Visual Studio compiled unmodified from the EfiFs source (@d19363a5), using Visual Studio
2017 Community Edition (v15.8.7) using the gnu-efi submodule rather than EDK2. 2017 Community Edition (v15.8.7) using the gnu-efi submodule rather than EDK2.
o The UEFI:NTFS binaries (https://github.com/pbatard/uefi-ntfs), which were also o The UEFI:NTFS binaries (https://github.com/pbatard/uefi-ntfs), which were
compiled using Visual Studio 2017 Community Edition. compiled using Visual Studio 2019 Community Edition.
These are the \EFI\Boot\boot[ia32|x64|arm|aa64].efi files. These are the \EFI\Boot\boot[ia32|x64|arm|aa64].efi files.
The FAT partition was created on Debian GNU/Linux using the following commands The FAT partition was created on Debian GNU/Linux using the following commands

BIN
res/uefi/uefi-ntfs.img
View file

Binary file not shown.

7
src/format.c
View file

@ -2,7 +2,7 @@
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Formatting function calls * Formatting function calls
* Copyright © 2007-2009 Tom Thornhill/Ridgecrop * Copyright © 2007-2009 Tom Thornhill/Ridgecrop
* Copyright © 2011-2019 Pete Batard <pete@akeo.ie> * Copyright © 2011-2020 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -2502,8 +2502,9 @@ DWORD WINAPI FormatThread(void* param)
// According to Microsoft, every GPT disk (we RUN Windows from) must have an MSR due to not having hidden sectors // According to Microsoft, every GPT disk (we RUN Windows from) must have an MSR due to not having hidden sectors
// http://msdn.microsoft.com/en-us/library/windows/hardware/dn640535.aspx#gpt_faq_what_disk_require_msr // http://msdn.microsoft.com/en-us/library/windows/hardware/dn640535.aspx#gpt_faq_what_disk_require_msr
extra_partitions = XP_ESP | XP_MSR; extra_partitions = XP_ESP | XP_MSR;
else if ( (fs_type == FS_NTFS) && ((boot_type == BT_UEFI_NTFS) || else if ( ((fs_type == FS_NTFS) || (fs_type == FS_EXFAT)) &&
((boot_type == BT_IMAGE) && IS_EFI_BOOTABLE(img_report) && ((target_type == TT_UEFI) || (windows_to_go) || (allow_dual_uefi_bios)))) ) ((boot_type == BT_UEFI_NTFS) || ((boot_type == BT_IMAGE) && IS_EFI_BOOTABLE(img_report) &&
((target_type == TT_UEFI) || (windows_to_go) || (allow_dual_uefi_bios)))) )
extra_partitions = XP_UEFI_NTFS; extra_partitions = XP_UEFI_NTFS;
else if ((boot_type == BT_IMAGE) && !write_as_image && HAS_PERSISTENCE(img_report) && persistence_size) else if ((boot_type == BT_IMAGE) && !write_as_image && HAS_PERSISTENCE(img_report) && persistence_size)
extra_partitions = XP_CASPER; extra_partitions = XP_CASPER;

5
src/rufus.c
View file

@ -1,6 +1,6 @@
/* /*
* Rufus: The Reliable USB Formatting Utility * Rufus: The Reliable USB Formatting Utility
* Copyright © 2011-2019 Pete Batard <pete@akeo.ie> * Copyright © 2011-2020 Pete Batard <pete@akeo.ie>
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -183,6 +183,7 @@ static void SetAllowedFileSystems(void)
break; break;
case BT_UEFI_NTFS: case BT_UEFI_NTFS:
allowed_filesystem[FS_NTFS] = TRUE; allowed_filesystem[FS_NTFS] = TRUE;
allowed_filesystem[FS_EXFAT] = TRUE;
break; break;
} }
@ -1508,7 +1509,7 @@ static DWORD WINAPI BootCheckThread(LPVOID param)
uefi_target: uefi_target:
if (boot_type == BT_UEFI_NTFS) { if (boot_type == BT_UEFI_NTFS) {
fs_type = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem)); fs_type = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
if (fs_type != FS_NTFS) { if (fs_type != FS_NTFS && fs_type != FS_EXFAT) {
MessageBoxExU(hMainDialog, lmprintf(MSG_097, "UEFI:NTFS"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid); MessageBoxExU(hMainDialog, lmprintf(MSG_097, "UEFI:NTFS"), lmprintf(MSG_092), MB_OK|MB_ICONERROR|MB_IS_RTL, selected_langid);
goto out; goto out;
} }

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.9.1594" CAPTION "Rufus 3.9.1595"
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
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,9,1594,0 FILEVERSION 3,9,1595,0
PRODUCTVERSION 3,9,1594,0 PRODUCTVERSION 3,9,1595,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,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.9.1594" VALUE "FileVersion", "3.9.1595"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2019 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.9.exe" VALUE "OriginalFilename", "rufus-3.9.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.9.1594" VALUE "ProductVersion", "3.9.1595"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"