From 83b1e7306242884416beac23e0d977725897e217 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 8 Jul 2024 13:22:37 +0100
Subject: [PATCH] [dev] add exception for Samsung uSD Card devices

* Closes #2506.
---
 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 8e367636..b223b4bb 100644
--- a/src/dev.c
+++ b/src/dev.c
@@ -416,9 +416,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
 /* For debugging user reports of HDDs vs UFDs */
 //#define FORCED_DEVICE
 #ifdef FORCED_DEVICE
-#define FORCED_VID 0x23A9
-#define FORCED_PID 0xEF18
-#define FORCED_NAME "SCSI DISK USB Device"
+#define FORCED_VID 0x04E8
+#define FORCED_PID 0x61ED
+#define FORCED_NAME "Samsung uSD Card Reader USB Device"
 #endif
 
 void ClearDrives(void)
diff --git a/src/hdd_vs_ufd.h b/src/hdd_vs_ufd.h
index 484e8dbf..e239cb9d 100644
--- a/src/hdd_vs_ufd.h
+++ b/src/hdd_vs_ufd.h
@@ -91,6 +91,7 @@ static str_score_t str_adjust[] = {
 	{ "Gadget", -10 },
 	{ "Flash", -10 },
 	{ "SD-CARD", -10 },
+	{ "uSD Card", -10 },
 	{ "HDD", +20 },
 	{ "SATA", +20 },
 	{ "SCSI", +20 },
diff --git a/src/rufus.rc b/src/rufus.rc
index 4b5cd975..186c7a76 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 4.6.2185"
+CAPTION "Rufus 4.6.2186"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -397,8 +397,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,6,2185,0
- PRODUCTVERSION 4,6,2185,0
+ FILEVERSION 4,6,2186,0
+ PRODUCTVERSION 4,6,2186,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -416,13 +416,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "4.6.2185"
+            VALUE "FileVersion", "4.6.2186"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2024 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-4.6.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "4.6.2185"
+            VALUE "ProductVersion", "4.6.2186"
         END
     END
     BLOCK "VarFileInfo"