[misc] UFD vs HDD detection improvements

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

View File

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

View File

@ -419,9 +419,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
/* For debugging user reports of HDDs vs UFDs */
//#define FORCED_DEVICE
#ifdef FORCED_DEVICE
#define FORCED_VID 0x0BDA
#define FORCED_PID 0x0306
#define FORCED_NAME "SDXC Card"
#define FORCED_VID 0x048D
#define FORCED_PID 0x1234
#define FORCED_NAME "VendorCo Disk USB Device"
#endif
/*

View File

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

View File

@ -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 3.14.1778"
CAPTION "Rufus 3.14.1779"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,14,1778,0
PRODUCTVERSION 3,14,1778,0
FILEVERSION 3,14,1779,0
PRODUCTVERSION 3,14,1779,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.14.1778"
VALUE "FileVersion", "3.14.1779"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.14.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.14.1778"
VALUE "ProductVersion", "3.14.1779"
END
END
BLOCK "VarFileInfo"

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
drive_size = GetDriveSize(DriveIndex);
if (drive_size > 400 * GB)
if (drive_size > 800 * GB)
score += 10;
else if (drive_size < 32 * GB)
score -= 10;