From b8c0e7b09555f65b4602353dedd0228a731fbb2e Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 4 Oct 2018 12:24:08 +0200 Subject: [PATCH] [dev] add exception for Prolific SD/TF Card Reader * Closes #1221 --- src/dev.c | 6 +++--- src/hdd_vs_ufd.h | 8 +++++--- src/rufus.rc | 10 +++++----- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/dev.c b/src/dev.c index 0f338886..be7f525b 100644 --- a/src/dev.c +++ b/src/dev.c @@ -311,9 +311,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save) /* For debugging user reports of HDDs vs UFDs */ //#define FORCED_DEVICE #ifdef FORCED_DEVICE -#define FORCED_VID 0x056E -#define FORCED_PID 0x8008 -#define FORCED_NAME "Generic- USB3.0 CRW -SD USB Device" +#define FORCED_VID 0x067B +#define FORCED_PID 0x2731 +#define FORCED_NAME "SD Card Reader USB Device" #endif /* diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h index 2053cdab..4b8b6198 100644 --- a/src/hdd_vs_ufd.h +++ b/src/hdd_vs_ufd.h @@ -246,21 +246,23 @@ static vidpid_score_t vidpid_score[] = { { 0x04e8, 0x6845, -20 }, // 16 GB UFD { 0x04e8, 0x685E, -20 }, // 16 GB UFD // Sunplus exceptions - { 0x04fc, 0x05d8, -20 }, // Verbatim flash drive - { 0x04fc, 0x5720, -20 }, // Card reader + { 0x04fc, 0x05d8, -20 }, // Verbatim Flash Drive + { 0x04fc, 0x5720, -20 }, // Card Reader // LaCie exceptions { 0x059f, 0x1027, -20 }, // 16 GB UFD { 0x059f, 0x103B, -20 }, // 16 GB UFD { 0x059f, 0x1064, -20 }, // 16 GB UFD // Prolific exceptions + { 0x067b, 0x2506, -20 }, // 8 GB Micro Hard Drive { 0x067b, 0x2517, -20 }, // 1 GB UFD { 0x067b, 0x2528, -20 }, // 8 GB UFD + { 0x067b, 0x2731, -20 }, // SD/TF Card Reader { 0x067b, 0x3400, -10 }, // Hi-Speed Flash Disk with TruePrint AES3400 { 0x067b, 0x3500, -10 }, // Hi-Speed Flash Disk with TruePrint AES3500 // Freecom exceptions { 0x07ab, 0xfcab, -20 }, // 4 GB UFD // Samsung exceptions - { 0x090c, 0x1000, -20 }, // Samsung Flash drive + { 0x090c, 0x1000, -20 }, // Samsung Flash Drive // Toshiba exceptions { 0x0930, 0x1400, -20 }, { 0x0930, 0x6533, -20 }, diff --git a/src/rufus.rc b/src/rufus.rc index ca0f39c7..fb96b40e 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -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.4.1403" +CAPTION "Rufus 3.4.1404" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -392,8 +392,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,4,1403,0 - PRODUCTVERSION 3,4,1403,0 + FILEVERSION 3,4,1404,0 + PRODUCTVERSION 3,4,1404,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.4.1403" + VALUE "FileVersion", "3.4.1404" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.4.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.4.1403" + VALUE "ProductVersion", "3.4.1404" END END BLOCK "VarFileInfo"