From 54004f7f6cde24cf9d9ea25238295e2492a33eed Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 31 Jan 2017 11:37:25 +0000 Subject: [PATCH] [enum] fix default listing for Toshiba TransMemory UFDs --- src/dev.c | 6 +++--- src/hdd_vs_ufd.h | 1 + src/rufus.rc | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/dev.c b/src/dev.c index 1398d9b2..00a8d65f 100644 --- a/src/dev.c +++ b/src/dev.c @@ -253,9 +253,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save) /* For debugging user reports of HDDs vs UFDs */ //#define FORCED_DEVICE #ifdef FORCED_DEVICE -#define FORCED_VID 0x058F -#define FORCED_PID 0x6387 -#define FORCED_NAME "Intenso Rainbow Line USB Device" +#define FORCED_VID 0x0409 +#define FORCED_PID 0x005A +#define FORCED_NAME "TOSHIBA TransMemory USB Device" #endif /* diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h index 0dc35654..87918431 100644 --- a/src/hdd_vs_ufd.h +++ b/src/hdd_vs_ufd.h @@ -106,6 +106,7 @@ static str_score_t str_adjust[] = { static vid_score_t vid_score[] = { { 0x0011, -5 }, // Kingston { 0x03f0, -5 }, // HP + { 0x0409, -10 }, // NEC/Toshiba { 0x0411, 5 }, // Buffalo { 0x0420, -5 }, // Chipsbank { 0x046d, -5 }, // Logitech diff --git a/src/rufus.rc b/src/rufus.rc index aa88cf02..7b265aca 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.12.1057" +CAPTION "Rufus 2.12.1058" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -334,8 +334,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,12,1057,0 - PRODUCTVERSION 2,12,1057,0 + FILEVERSION 2,12,1058,0 + PRODUCTVERSION 2,12,1058,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -352,13 +352,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.12.1057" + VALUE "FileVersion", "2.12.1058" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.12.1057" + VALUE "ProductVersion", "2.12.1058" END END BLOCK "VarFileInfo"