From 155b86bc01123cbc55f3199cf2989a3368959c3e Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Thu, 16 Apr 2020 17:33:08 +0100
Subject: [PATCH] [dev] improve UFD vs HDD/SSD detection

* If the device reports HDD or SSD in its name, take it into account
* Also fix ChangeLog
---
 ChangeLog.txt    |  6 ++++--
 src/dev.c        |  6 +++---
 src/hdd_vs_ufd.h |  4 +++-
 src/rufus.rc     | 10 +++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4d648c2d..77de3cd0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -2,8 +2,10 @@ o Version 3.10 (2020.04.??)
     Improve Ubuntu 20.04 support
     Improve detection of FIXED drives with no mounted partitions
     Update UEFI:NTFS file system drivers to v1.5
-    Fix progress not being updated for German UI
-    Fix an assert during FreeDOS drive creation when the system locale is UTF-8
+    Fix progress not being updated for German locale
+    Fix primary GPT being overwritten when adding the protective message MBR
+    Fix a regression with lousy security solutions that prevent the creation of an 'autorun.inf'
+    Fix an assert during FreeDOS drive creation when the Windows system locale is UTF-8
     Fix invalid label errors when using a non-Western locale
 
 o Version 3.9 (2020.02.29)
diff --git a/src/dev.c b/src/dev.c
index 599d76f1..f9fd793c 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -418,9 +418,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
 /* For debugging user reports of HDDs vs UFDs */
 //#define FORCED_DEVICE
 #ifdef FORCED_DEVICE
-#define FORCED_VID 0x6557
-#define FORCED_PID 0x0021
-#define FORCED_NAME "USB DISK 2.0 USB Device"
+#define FORCED_VID 0x05DC
+#define FORCED_PID 0xBA12
+#define FORCED_NAME "Lexar SFF-SSD SCSI Disk Device"
 #endif
 
 /*
diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h
index d086efd6..871a79cf 100644
--- a/src/hdd_vs_ufd.h
+++ b/src/hdd_vs_ufd.h
@@ -89,7 +89,9 @@ static str_score_t str_score[] = {
 
 static str_score_t str_adjust[] = {
 	{ "Gadget", -10 },
-	{ "Flash", -10 }
+	{ "Flash", -10 },
+	{ "HDD", +20 },
+	{ "SSD", +20 }
 };
 
 /* The lists belows set a score according to VID & VID:PID
diff --git a/src/rufus.rc b/src/rufus.rc
index 7ac708c3..faad953d 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.10.1642"
+CAPTION "Rufus 3.10.1643"
 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,10,1642,0
- PRODUCTVERSION 3,10,1642,0
+ FILEVERSION 3,10,1643,0
+ PRODUCTVERSION 3,10,1643,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.10.1642"
+            VALUE "FileVersion", "3.10.1643"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.10.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.10.1642"
+            VALUE "ProductVersion", "3.10.1643"
         END
     END
     BLOCK "VarFileInfo"