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

[core] fix sanitizing of exFAT labels

Browse source 
* Closes #818
This commit is contained in:
Pete Batard 2016-08-31 13:01:39 +01:00
parent 08566fa127
commit 8ca644de5a
4 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog.txt
View file

@ -1,3 +1,12 @@
o Version 2.11 (2016.09.??)
Do not download BIOS related files unless BIOS boot is selected
Improve support for Arch Linux derivatives
Add a cheat mode to disable drive indexing (Alt-Q) on format
Fix handling of 'Super Floppy Disk' formatted drives
Fix an issue that enabled FAT32 file system selection on some Windows images
Fix broken UI font for XP users
Fix sanitizing of exFAT labels
o Version 2.10 (2016.07.20) o Version 2.10 (2016.07.20)
Add SHA-256 validation for downloaded files. You will now see an ✓ or ✗ in the log for relevant content Add SHA-256 validation for downloaded files. You will now see an ✓ or ✗ in the log for relevant content
Add support for O2Micro PCI-E card readers Add support for O2Micro PCI-E card readers

2
src/drive.c
View file

@ -728,7 +728,7 @@ BOOL GetDrivePartitionData(DWORD DriveIndex, char* FileSystemName, DWORD FileSys
// Detect drives that are using the whole disk as a single partition // Detect drives that are using the whole disk as a single partition
if ((DriveLayout->PartitionEntry[0].Mbr.PartitionType != PARTITION_ENTRY_UNUSED) && if ((DriveLayout->PartitionEntry[0].Mbr.PartitionType != PARTITION_ENTRY_UNUSED) &&
(DriveLayout->PartitionEntry[0].StartingOffset.QuadPart == 0LL)) { (DriveLayout->PartitionEntry[0].StartingOffset.QuadPart == 0LL)) {
suprintf("Partition type: BFD (Big Floppy Disk)"); suprintf("Partition type: SFD (Super Floppy Disk) or Unpartitioned");
big_floppy = TRUE; big_floppy = TRUE;
} else { } else {
suprintf("Partition type: MBR, NB Partitions: %d\n", SelectedDrive.nPartitions); suprintf("Partition type: MBR, NB Partitions: %d\n", SelectedDrive.nPartitions);

2
src/format.c
View file

@ -733,7 +733,7 @@ static BOOL FormatDrive(DWORD DriveIndex)
} }
GetWindowTextW(hLabel, wLabel, ARRAYSIZE(wLabel)); GetWindowTextW(hLabel, wLabel, ARRAYSIZE(wLabel));
// Make sure the label is valid // Make sure the label is valid
ToValidLabel(wLabel, (wFSType[0] == 'F') && (wFSType[1] == 'A') && (wFSType[2] == 'T')); ToValidLabel(wLabel, (fs == FS_FAT16) || (fs == FS_FAT32) || (fs == FS_EXFAT));
ulClusterSize = (ULONG)ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize)); ulClusterSize = (ULONG)ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize));
if (ulClusterSize < 0x200) { if (ulClusterSize < 0x200) {
// 0 is FormatEx's value for default, which we need to use for UDF // 0 is FormatEx's value for default, which we need to use for UDF

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
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 2.11.992" CAPTION "Rufus 2.11.993"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,11,992,0 FILEVERSION 2,11,993,0
PRODUCTVERSION 2,11,992,0 PRODUCTVERSION 2,11,993,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.11.992" VALUE "FileVersion", "2.11.993"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.11.992" VALUE "ProductVersion", "2.11.993"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"