mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[core] fix HP card reader detection
This commit is contained in:
		
							parent
							
								
									ebced16383
								
							
						
					
					
						commit
						3593cced87
					
				
					 5 changed files with 9 additions and 11 deletions
				
			
		|  | @ -12,7 +12,7 @@ o Version 1.4.2 (2014.01.??) | |||
|     Improve initial locale detection | ||||
|     Save user selected locale between sessions | ||||
|     Always use English locale in the log, where possible | ||||
|     Fix detection for some SanDisk, Kingston and Toshiba drives | ||||
|     Fix detection for some SanDisk, Kingston, HP and Toshiba drives | ||||
|     Fix a potential issue with drive letter assignation | ||||
|     Many other minor fixes and improvements | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /*
 | ||||
|  * Rufus: The Reliable USB Formatting Utility | ||||
|  * SMART HDD vs Flash detection - isHDD() tables | ||||
|  * Copyright © 2013 Pete Batard <pete@akeo.ie> | ||||
|  * Copyright © 2013-2014 Pete Batard <pete@akeo.ie> | ||||
|  * | ||||
|  * Based in part on drivedb.h from Smartmontools:  | ||||
|  * http://svn.code.sf.net/p/smartmontools/code/trunk/smartmontools/drivedb.h
 | ||||
|  | @ -55,7 +55,6 @@ typedef struct { | |||
|  * '#' means any number in [0-9] | ||||
|  */ | ||||
| static str_score_t str_score[] = { | ||||
| 	{ "HP ", 10 }, | ||||
| 	{ "IC#", 10 }, | ||||
| 	{ "ST#", 10 }, | ||||
| 	{ "MX#", 10 }, | ||||
|  |  | |||
							
								
								
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							|  | @ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL | |||
| IDD_DIALOG DIALOGEX 12, 12, 206, 329 | ||||
| STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | ||||
| EXSTYLE WS_EX_APPWINDOW | ||||
| CAPTION "Rufus v1.4.2.381" | ||||
| CAPTION "Rufus v1.4.2.382" | ||||
| FONT 8, "MS Shell Dlg", 400, 0, 0x1 | ||||
| BEGIN | ||||
|     DEFPUSHBUTTON   "Start",IDC_START,94,291,50,14 | ||||
|  | @ -288,8 +288,8 @@ END | |||
| // | ||||
| 
 | ||||
| VS_VERSION_INFO VERSIONINFO | ||||
|  FILEVERSION 1,4,2,381 | ||||
|  PRODUCTVERSION 1,4,2,381 | ||||
|  FILEVERSION 1,4,2,382 | ||||
|  PRODUCTVERSION 1,4,2,382 | ||||
|  FILEFLAGSMASK 0x3fL | ||||
| #ifdef _DEBUG | ||||
|  FILEFLAGS 0x1L | ||||
|  | @ -306,13 +306,13 @@ BEGIN | |||
|         BEGIN | ||||
|             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" | ||||
|             VALUE "FileDescription", "Rufus" | ||||
|             VALUE "FileVersion", "1.4.2.381" | ||||
|             VALUE "FileVersion", "1.4.2.382" | ||||
|             VALUE "InternalName", "Rufus" | ||||
|             VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" | ||||
|             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" | ||||
|             VALUE "OriginalFilename", "rufus.exe" | ||||
|             VALUE "ProductName", "Rufus" | ||||
|             VALUE "ProductVersion", "1.4.2.381" | ||||
|             VALUE "ProductVersion", "1.4.2.382" | ||||
|         END | ||||
|     END | ||||
|     BLOCK "VarFileInfo" | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /*
 | ||||
|  * Rufus: The Reliable USB Formatting Utility | ||||
|  * SMART HDD vs Flash detection (using ATA over USB, S.M.A.R.T., etc.) | ||||
|  * Copyright © 2014 Pete Batard <pete@akeo.ie> | ||||
|  * Copyright © 2013-2014 Pete Batard <pete@akeo.ie> | ||||
|  * | ||||
|  * Based in part on scsiata.cpp from Smartmontools: http://smartmontools.sourceforge.net
 | ||||
|  * Copyright © 2006-12 Douglas Gilbert <dgilbert@interlog.com> | ||||
|  | @ -493,6 +493,5 @@ int IsHDD(DWORD DriveIndex, uint16_t vid, uint16_t pid, const char* strid) | |||
| 	} | ||||
| 
 | ||||
| 	// TODO: try to perform inquiry if below a specific threshold (Verbatim, etc)?
 | ||||
| 	// TODO: lower the score for well known UFD manufacturers (ADATA, SanDisk, etc.)?
 | ||||
| 	return score; | ||||
| } | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| /*
 | ||||
|  * Rufus: The Reliable USB Formatting Utility | ||||
|  * SMART HDD vs Flash detection (using ATA over USB, S.M.A.R.T., etc.) | ||||
|  * Copyright © 2013 Pete Batard <pete@akeo.ie> | ||||
|  * Copyright © 2013-2014 Pete Batard <pete@akeo.ie> | ||||
|  * | ||||
|  * Based in part on Smartmontools: http://smartmontools.sourceforge.net
 | ||||
|  * Copyright © 2006-12 Douglas Gilbert <dgilbert@interlog.com> | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue