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

[misc] UFD vs HDD detection improvements

Browse source
This commit is contained in:
Pete Batard 2021-04-23 12:03:43 +01:00
parent 252759eb91
commit 16c0e8e2a2
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
res/appstore/Package.appxmanifest
View file

@ -11,7 +11,7 @@
<Identity <Identity
Name="19453.net.Rufus" Name="19453.net.Rufus"
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740" Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
Version="3.14.1778.0" /> Version="3.14.1779.0" />
<Properties> <Properties>
<DisplayName>Rufus</DisplayName> <DisplayName>Rufus</DisplayName>

6
src/dev.c
View file

@ -419,9 +419,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 0x0BDA #define FORCED_VID 0x048D
#define FORCED_PID 0x0306 #define FORCED_PID 0x1234
#define FORCED_NAME "SDXC Card" #define FORCED_NAME "VendorCo Disk USB Device"
#endif #endif
/* /*

2
src/hdd_vs_ufd.h
View file

@ -113,7 +113,7 @@ static vid_score_t vid_score[] = {
{ 0x0420, -5 }, // Chipsbank { 0x0420, -5 }, // Chipsbank
{ 0x046d, -5 }, // Logitech { 0x046d, -5 }, // Logitech
{ 0x0480, 5 }, // Toshiba { 0x0480, 5 }, // Toshiba
{ 0x048d, -5 }, // ITE { 0x048d, -10 }, // ITE
{ 0x04b4, 10 }, // Cypress { 0x04b4, 10 }, // Cypress
{ 0x04c5, 7 }, // Fujitsu { 0x04c5, 7 }, // Fujitsu
{ 0x04e8, 5 }, // Samsung { 0x04e8, 5 }, // Samsung

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.14.1778" CAPTION "Rufus 3.14.1779"
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,14,1778,0 FILEVERSION 3,14,1779,0
PRODUCTVERSION 3,14,1778,0 PRODUCTVERSION 3,14,1779,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.14.1778" VALUE "FileVersion", "3.14.1779"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2021 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.14.exe" VALUE "OriginalFilename", "rufus-3.14.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.14.1778" VALUE "ProductVersion", "3.14.1779"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
src/smart.c
View file

@ -451,7 +451,7 @@ int IsHDD(DWORD DriveIndex, uint16_t vid, uint16_t pid, const char* strid)
// Adjust the score depending on the size // Adjust the score depending on the size
drive_size = GetDriveSize(DriveIndex); drive_size = GetDriveSize(DriveIndex);
if (drive_size > 400 * GB) if (drive_size > 800 * GB)
score += 10; score += 10;
else if (drive_size < 32 * GB) else if (drive_size < 32 * GB)
score -= 10; score -= 10;