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 detection of some Samsung UFDs

Browse source
This commit is contained in:
Pete Batard 2015-09-09 01:14:49 +01:00
parent b73e2d80de
commit 1aae24903a
3 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/hdd_vs_ufd.h
View file

@ -73,7 +73,7 @@ static str_score_t str_score[] = {
{ "MAXTOR", 10 }, { "MAXTOR", 10 },
{ "HITACHI", 10 }, { "HITACHI", 10 },
{ "SEAGATE", 10 }, { "SEAGATE", 10 },
{ "SAMSUNG", 10 }, { "SAMSUNG", 5 },
{ "FUJITSU", 10 }, { "FUJITSU", 10 },
{ "TOSHIBA", 5 }, { "TOSHIBA", 5 },
{ "QUANTUM", 10 }, { "QUANTUM", 10 },
@ -91,6 +91,7 @@ static str_score_t str_score[] = {
static str_score_t str_adjust[] = { static str_score_t str_adjust[] = {
{ "Gadget", -10 }, { "Gadget", -10 },
{ "Flash", -10 }
}; };
/* The lists belows set a score according to VID & VID:PID /* The lists belows set a score according to VID & VID:PID
@ -127,7 +128,7 @@ static vid_score_t vid_score[] = {
{ 0x0718, -2 }, // Imation { 0x0718, -2 }, // Imation
{ 0x0781, -5 }, // SanDisk { 0x0781, -5 }, // SanDisk
{ 0x07ab, 8 }, // Freecom { 0x07ab, 8 }, // Freecom
{ 0x090c, -5 }, // Silicon Motion { 0x090c, -5 }, // Silicon Motion (also used by Samsung)
{ 0x0928, 10 }, // PLX Technology { 0x0928, 10 }, // PLX Technology
{ 0x0930, -8 }, // Toshiba { 0x0930, -8 }, // Toshiba
{ 0x093a, -5 }, // Pixart { 0x093a, -5 }, // Pixart
@ -258,6 +259,8 @@ static vidpid_score_t vidpid_score[] = {
{ 0x067b, 0x3500, -10 }, // Hi-Speed Flash Disk with TruePrint AES3500 { 0x067b, 0x3500, -10 }, // Hi-Speed Flash Disk with TruePrint AES3500
// Freecom exceptions // Freecom exceptions
{ 0x07ab, 0xfcab, -20 }, // 4 GB UFD { 0x07ab, 0xfcab, -20 }, // 4 GB UFD
// Samsung exceptions
{ 0x090c, 0x1000, -20 }, // Samsung Flash drive
// Toshiba exceptions // Toshiba exceptions
{ 0x0930, 0x1400, -20 }, { 0x0930, 0x1400, -20 },
{ 0x0930, 0x6533, -20 }, { 0x0930, 0x6533, -20 },

10
src/rufus.rc
View file

@ -32,7 +32,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
CAPTION "Rufus 2.4.729" CAPTION "Rufus 2.4.730"
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
@ -317,8 +317,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,729,0 FILEVERSION 2,4,730,0
PRODUCTVERSION 2,4,729,0 PRODUCTVERSION 2,4,730,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -335,13 +335,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.4.729" VALUE "FileVersion", "2.4.730"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2015 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.4.729" VALUE "ProductVersion", "2.4.730"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

6
src/usb.c
View file

@ -137,9 +137,9 @@ static __inline BOOL IsVHD(const char* buffer)
/* 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 0x174C #define FORCED_VID 0x090c
#define FORCED_PID 0x3074 #define FORCED_PID 0x1000
#define FORCED_NAME "SanDisk Extreme USB Device" #define FORCED_NAME "Samsung Flash Drive USB Device"
#endif #endif
/* /*