nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[core] add listing exception for Apple SD card readers

Browse source 
* Also fix a Coverity warning
This commit is contained in:
Pete Batard 2019-04-05 22:02:36 +01:00
parent f02fbe3acc
commit 5dbf537dfb
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
4 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/dev.c
View file

@ -310,9 +310,9 @@ BOOL GetOpticalMedia(IMG_SAVE* img_save)
/* For debugging user reports of HDDs vs UFDs */ /* For debugging user reports of HDDs vs UFDs */
//#define FORCED_DEVICE //#define FORCED_DEVICE
#ifdef FORCED_DEVICE #ifdef FORCED_DEVICE
#define FORCED_VID 0x067B #define FORCED_VID 0x05AC
#define FORCED_PID 0x2733 #define FORCED_PID 0x8406
#define FORCED_NAME "EAGET Mass Storage USB Device" #define FORCED_NAME "APPLE SD Card Reader USB Device"
#endif #endif
/* /*

9
src/hdd_vs_ufd.h
View file

@ -252,6 +252,15 @@ static vidpid_score_t vidpid_score[] = {
{ 0x059f, 0x1027, -20 }, // 16 GB UFD { 0x059f, 0x1027, -20 }, // 16 GB UFD
{ 0x059f, 0x103B, -20 }, // 16 GB UFD { 0x059f, 0x103B, -20 }, // 16 GB UFD
{ 0x059f, 0x1064, -20 }, // 16 GB UFD { 0x059f, 0x1064, -20 }, // 16 GB UFD
// Apple exceptions
{ 0x05ac, 0x8400, -20},
{ 0x05ac, 0x8401, -20},
{ 0x05ac, 0x8402, -20},
{ 0x05ac, 0x8403, -20},
{ 0x05ac, 0x8404, -20},
{ 0x05ac, 0x8405, -20},
{ 0x05ac, 0x8406, -20},
{ 0x05ac, 0x8407, -20},
// Prolific exceptions // Prolific exceptions
{ 0x067b, 0x2506, -20 }, // 8 GB Micro Hard Drive { 0x067b, 0x2506, -20 }, // 8 GB Micro Hard Drive
{ 0x067b, 0x2517, -20 }, // 1 GB UFD { 0x067b, 0x2517, -20 }, // 1 GB UFD

3
src/iso.c
View file

@ -1332,7 +1332,6 @@ BOOL DumpFatDir(const char* path, int32_t cluster)
target = malloc(strlen(path) + safe_strlen(name) + 2); target = malloc(strlen(path) + safe_strlen(name) + 2);
if ((name == NULL) || (target == NULL)) { if ((name == NULL) || (target == NULL)) {
uprintf("Could not allocate buffer"); uprintf("Could not allocate buffer");
safe_free(name);
goto out; goto out;
} }
strcpy(target, path); strcpy(target, path);
@ -1400,6 +1399,8 @@ out:
if (p_iso != NULL) if (p_iso != NULL)
iso9660_close(p_iso); iso9660_close(p_iso);
} }
safe_free(name);
safe_free(target);
return ret; return ret;
} }

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.6.1507" CAPTION "Rufus 3.6.1508"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,6,1507,0 FILEVERSION 3,6,1508,0
PRODUCTVERSION 3,6,1507,0 PRODUCTVERSION 3,6,1508,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.6.1507" VALUE "FileVersion", "3.6.1508"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.6.exe" VALUE "OriginalFilename", "rufus-3.6.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.6.1507" VALUE "ProductVersion", "3.6.1508"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"