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

[dev] improve UFD vs HDD/SSD detection

Browse source 
* If the device reports HDD or SSD in its name, take it into account
* Also fix ChangeLog
This commit is contained in:
Pete Batard 2020-04-16 17:33:08 +01:00
parent 11633a318a
commit 155b86bc01
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog.txt
View file

@ -2,8 +2,10 @@ o Version 3.10 (2020.04.??)
Improve Ubuntu 20.04 support Improve Ubuntu 20.04 support
Improve detection of FIXED drives with no mounted partitions Improve detection of FIXED drives with no mounted partitions
Update UEFI:NTFS file system drivers to v1.5 Update UEFI:NTFS file system drivers to v1.5
Fix progress not being updated for German UI Fix progress not being updated for German locale
Fix an assert during FreeDOS drive creation when the system locale is UTF-8 Fix primary GPT being overwritten when adding the protective message MBR
Fix a regression with lousy security solutions that prevent the creation of an 'autorun.inf'
Fix an assert during FreeDOS drive creation when the Windows system locale is UTF-8
Fix invalid label errors when using a non-Western locale Fix invalid label errors when using a non-Western locale
o Version 3.9 (2020.02.29) o Version 3.9 (2020.02.29)

6
src/dev.c
View file

@ -418,9 +418,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
/* For debugging user reports of HDDs vs UFDs */ /* For debugging user reports of HDDs vs UFDs */
//#define FORCED_DEVICE //#define FORCED_DEVICE
#ifdef FORCED_DEVICE #ifdef FORCED_DEVICE
#define FORCED_VID 0x6557 #define FORCED_VID 0x05DC
#define FORCED_PID 0x0021 #define FORCED_PID 0xBA12
#define FORCED_NAME "USB DISK 2.0 USB Device" #define FORCED_NAME "Lexar SFF-SSD SCSI Disk Device"
#endif #endif
/* /*

4
src/hdd_vs_ufd.h
View file

@ -89,7 +89,9 @@ static str_score_t str_score[] = {
static str_score_t str_adjust[] = { static str_score_t str_adjust[] = {
{ "Gadget", -10 }, { "Gadget", -10 },
{ "Flash", -10 } { "Flash", -10 },
{ "HDD", +20 },
{ "SSD", +20 }
}; };
/* The lists belows set a score according to VID & VID:PID /* The lists belows set a score according to VID & VID:PID

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.10.1642" CAPTION "Rufus 3.10.1643"
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,10,1642,0 FILEVERSION 3,10,1643,0
PRODUCTVERSION 3,10,1642,0 PRODUCTVERSION 3,10,1643,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.10.1642" VALUE "FileVersion", "3.10.1643"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2020 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.10.exe" VALUE "OriginalFilename", "rufus-3.10.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.10.1642" VALUE "ProductVersion", "3.10.1643"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"