From 0e1625975cfa29ed389fbc6da9e4753ca7e61fef Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Tue, 10 Feb 2015 01:16:48 +0000
Subject: [PATCH] [misc] fix default listing of Samsung DriveDroid devices

* Closes #401
---
 src/hdd_vs_ufd.h |  3 +++
 src/rufus.rc     | 16 ++++++++--------
 src/smart.c      |  7 +++++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h
index 440f9a75..aea5960d 100644
--- a/src/hdd_vs_ufd.h
+++ b/src/hdd_vs_ufd.h
@@ -81,6 +81,9 @@ static str_score_t str_score[] = {
 	{ "MUSHKIN", -15 },
 };
 
+static str_score_t str_adjust[] = {
+	{ "Gadget", -10 },
+};
 
 /* The lists belows set a score according to VID & VID:PID
  * These were constructed as follows:
diff --git a/src/rufus.rc b/src/rufus.rc
index 3c64f078..ccbdf284 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -32,7 +32,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
-CAPTION "Rufus 2.0.611"
+CAPTION "Rufus 2.0.612"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -157,7 +157,7 @@ END
 
 IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Rufus 2.0.611"
+CAPTION "Rufus 2.0.612"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -283,7 +283,7 @@ END
 IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.0.611"
+CAPTION "Rufus 2.0.612"
 FONT 8, "Segoe UI", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -415,7 +415,7 @@ END
 IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL
-CAPTION "Rufus 2.0.611"
+CAPTION "Rufus 2.0.612"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,127,339,50,14
@@ -671,8 +671,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,0,611,0
- PRODUCTVERSION 2,0,611,0
+ FILEVERSION 2,0,612,0
+ PRODUCTVERSION 2,0,612,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -689,13 +689,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.0.611"
+            VALUE "FileVersion", "2.0.612"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.0.611"
+            VALUE "ProductVersion", "2.0.612"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/smart.c b/src/smart.c
index 2fe02de5..a6526893 100644
--- a/src/smart.c
+++ b/src/smart.c
@@ -472,6 +472,13 @@ int IsHDD(DWORD DriveIndex, uint16_t vid, uint16_t pid, const char* strid)
 		}
 	}
 
+	// Adjust for oddball devices
+	if (strid != NULL) {
+		for (i=0; i<ARRAYSIZE(str_adjust); i++)
+			if (strstr(strid, str_adjust[i].name) != NULL)
+				score += str_adjust[i].score;
+	}
+
 	// Check against known VIDs
 	for (i=0; i<ARRAYSIZE(vid_score); i++) {
 		if (vid == vid_score[i].vid) {