mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	[ui] add a message for ISOHybrids that don't allow for ISO mode
* Also limit VDS refresh to DD image writing * Also increase the number of loc messages
This commit is contained in:
		
							parent
							
								
									a3df3b0fb3
								
							
						
					
					
						commit
						480214bbb6
					
				
					 8 changed files with 80 additions and 11 deletions
				
			
		|  | @ -11,7 +11,7 @@ | ||||||
|   <Identity |   <Identity | ||||||
|     Name="19453.net.Rufus" |     Name="19453.net.Rufus" | ||||||
|     Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740" |     Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740" | ||||||
|     Version="3.14.1744.0" /> |     Version="3.14.1745.0" /> | ||||||
| 
 | 
 | ||||||
|   <Properties> |   <Properties> | ||||||
|     <DisplayName>Rufus</DisplayName> |     <DisplayName>Rufus</DisplayName> | ||||||
|  |  | ||||||
|  | @ -24,6 +24,8 @@ o v3.* | ||||||
|   // The following can be tested with <Alt>-<+> and <Alt>-<-> |   // The following can be tested with <Alt>-<+> and <Alt>-<-> | ||||||
|   - *NEW*      MSG_318 "Default thread priority: %d" |   - *NEW*      MSG_318 "Default thread priority: %d" | ||||||
|   - *NEW*      MSG_319 "Ignore Boot Marker" |   - *NEW*      MSG_319 "Ignore Boot Marker" | ||||||
|  |   - *NEW*      MSG_320 "Refreshing partition layout" | ||||||
|  |   - *NEW*      MSG_321 "The image you have selected is an ISOHybrid, but its creators have not made it compatible with ISO mode (...) | ||||||
| 
 | 
 | ||||||
| o v3.5 (2019.03.12) | o v3.5 (2019.03.12) | ||||||
|   The following 3 messages can be tested by creating a UEFI:NTFS drive in Rufus ('Show advanced drive properties' must be enabled |   The following 3 messages can be tested by creating a UEFI:NTFS drive in Rufus ('Show advanced drive properties' must be enabled | ||||||
|  |  | ||||||
|  | @ -579,6 +579,9 @@ t MSG_316 "Number of passes" | ||||||
| t MSG_317 "Disk ID" | t MSG_317 "Disk ID" | ||||||
| t MSG_318 "Default thread priority: %d" | t MSG_318 "Default thread priority: %d" | ||||||
| t MSG_319 "Ignore Boot Marker" | t MSG_319 "Ignore Boot Marker" | ||||||
|  | t MSG_320 "Refreshing partition layout (%s)..." | ||||||
|  | t MSG_321 "The image you have selected is an ISOHybrid, but its creators have not made it compatible with ISO/File " | ||||||
|  | 	"copy mode.\nAs a result, DD image writing mode will be enforced."  | ||||||
| 
 | 
 | ||||||
| ######################################################################### | ######################################################################### | ||||||
| l "ar-SA" "Arabic (العربية)" 0x0401, 0x0801, 0x0c01, 0x1001, 0x1401, 0x1801, 0x1c01, 0x2001, 0x2401, 0x2801, 0x2c01, 0x3001, 0x3401, 0x3801, 0x3c01, 0x4001 | l "ar-SA" "Arabic (العربية)" 0x0401, 0x0801, 0x0c01, 0x1001, 0x1401, 0x1801, 0x1c01, 0x2001, 0x2401, 0x2801, 0x2c01, 0x3001, 0x3401, 0x3801, 0x3c01, 0x4001 | ||||||
|  |  | ||||||
|  | @ -2181,8 +2181,10 @@ DWORD WINAPI FormatThread(void* param) | ||||||
| 	} | 	} | ||||||
| 
 | 
 | ||||||
| out: | out: | ||||||
| 	// TODO: Use a thread or only issue this on DD write
 | 	if ((boot_type == BT_IMAGE) && write_as_image) { | ||||||
|  | 		PrintInfo(0, MSG_320, lmprintf(MSG_307)); | ||||||
| 		VdsRescan(VDS_RESCAN_REFRESH, 0, TRUE); | 		VdsRescan(VDS_RESCAN_REFRESH, 0, TRUE); | ||||||
|  | 	} | ||||||
| 	safe_free(volume_name); | 	safe_free(volume_name); | ||||||
| 	safe_free(buffer); | 	safe_free(buffer); | ||||||
| 	safe_closehandle(hSourceImage); | 	safe_closehandle(hSourceImage); | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| /*
 | /*
 | ||||||
|  * Rufus: The Reliable USB Formatting Utility |  * Rufus: The Reliable USB Formatting Utility | ||||||
|  * Localization tables - autogenerated from resource.h |  * Localization tables - autogenerated from resource.h | ||||||
|  * Copyright © 2013-2018 Pete Batard <pete@akeo.ie> |  * Copyright © 2013-2021 Pete Batard <pete@akeo.ie> | ||||||
|  * |  * | ||||||
|  * This program is free software: you can redistribute it and/or modify |  * This program is free software: you can redistribute it and/or modify | ||||||
|  * it under the terms of the GNU General Public License as published by |  * it under the terms of the GNU General Public License as published by | ||||||
|  | @ -101,6 +101,7 @@ const loc_control_id control_id[] = { | ||||||
| 	LOC_CTRL(IDC_MD5), | 	LOC_CTRL(IDC_MD5), | ||||||
| 	LOC_CTRL(IDC_SHA1), | 	LOC_CTRL(IDC_SHA1), | ||||||
| 	LOC_CTRL(IDC_SHA256), | 	LOC_CTRL(IDC_SHA256), | ||||||
|  | 	LOC_CTRL(IDC_SHA512), | ||||||
| 	LOC_CTRL(IDC_SELECTION_ICON), | 	LOC_CTRL(IDC_SELECTION_ICON), | ||||||
| 	LOC_CTRL(IDC_SELECTION_TEXT), | 	LOC_CTRL(IDC_SELECTION_TEXT), | ||||||
| 	LOC_CTRL(IDC_SELECTION_LINE), | 	LOC_CTRL(IDC_SELECTION_LINE), | ||||||
|  | @ -479,6 +480,36 @@ const loc_control_id control_id[] = { | ||||||
| 	LOC_CTRL(MSG_318), | 	LOC_CTRL(MSG_318), | ||||||
| 	LOC_CTRL(MSG_319), | 	LOC_CTRL(MSG_319), | ||||||
| 	LOC_CTRL(MSG_320), | 	LOC_CTRL(MSG_320), | ||||||
|  | 	LOC_CTRL(MSG_321), | ||||||
|  | 	LOC_CTRL(MSG_322), | ||||||
|  | 	LOC_CTRL(MSG_323), | ||||||
|  | 	LOC_CTRL(MSG_324), | ||||||
|  | 	LOC_CTRL(MSG_325), | ||||||
|  | 	LOC_CTRL(MSG_326), | ||||||
|  | 	LOC_CTRL(MSG_327), | ||||||
|  | 	LOC_CTRL(MSG_328), | ||||||
|  | 	LOC_CTRL(MSG_329), | ||||||
|  | 	LOC_CTRL(MSG_330), | ||||||
|  | 	LOC_CTRL(MSG_331), | ||||||
|  | 	LOC_CTRL(MSG_332), | ||||||
|  | 	LOC_CTRL(MSG_333), | ||||||
|  | 	LOC_CTRL(MSG_334), | ||||||
|  | 	LOC_CTRL(MSG_335), | ||||||
|  | 	LOC_CTRL(MSG_336), | ||||||
|  | 	LOC_CTRL(MSG_337), | ||||||
|  | 	LOC_CTRL(MSG_338), | ||||||
|  | 	LOC_CTRL(MSG_339), | ||||||
|  | 	LOC_CTRL(MSG_340), | ||||||
|  | 	LOC_CTRL(MSG_341), | ||||||
|  | 	LOC_CTRL(MSG_342), | ||||||
|  | 	LOC_CTRL(MSG_343), | ||||||
|  | 	LOC_CTRL(MSG_344), | ||||||
|  | 	LOC_CTRL(MSG_345), | ||||||
|  | 	LOC_CTRL(MSG_346), | ||||||
|  | 	LOC_CTRL(MSG_347), | ||||||
|  | 	LOC_CTRL(MSG_348), | ||||||
|  | 	LOC_CTRL(MSG_349), | ||||||
|  | 	LOC_CTRL(MSG_350), | ||||||
| 	LOC_CTRL(MSG_MAX), | 	LOC_CTRL(MSG_MAX), | ||||||
| 	LOC_CTRL(IDOK), | 	LOC_CTRL(IDOK), | ||||||
| 	LOC_CTRL(IDCANCEL), | 	LOC_CTRL(IDCANCEL), | ||||||
|  |  | ||||||
|  | @ -535,7 +535,37 @@ | ||||||
| #define MSG_318                         3318 | #define MSG_318                         3318 | ||||||
| #define MSG_319                         3319 | #define MSG_319                         3319 | ||||||
| #define MSG_320                         3320 | #define MSG_320                         3320 | ||||||
| #define MSG_MAX                         3321 | #define MSG_321                         3321 | ||||||
|  | #define MSG_322                         3322 | ||||||
|  | #define MSG_323                         3323 | ||||||
|  | #define MSG_324                         3324 | ||||||
|  | #define MSG_325                         3325 | ||||||
|  | #define MSG_326                         3326 | ||||||
|  | #define MSG_327                         3327 | ||||||
|  | #define MSG_328                         3328 | ||||||
|  | #define MSG_329                         3329 | ||||||
|  | #define MSG_330                         3330 | ||||||
|  | #define MSG_331                         3331 | ||||||
|  | #define MSG_332                         3332 | ||||||
|  | #define MSG_333                         3333 | ||||||
|  | #define MSG_334                         3334 | ||||||
|  | #define MSG_335                         3335 | ||||||
|  | #define MSG_336                         3336 | ||||||
|  | #define MSG_337                         3337 | ||||||
|  | #define MSG_338                         3338 | ||||||
|  | #define MSG_339                         3339 | ||||||
|  | #define MSG_340                         3340 | ||||||
|  | #define MSG_341                         3341 | ||||||
|  | #define MSG_342                         3342 | ||||||
|  | #define MSG_343                         3343 | ||||||
|  | #define MSG_344                         3344 | ||||||
|  | #define MSG_345                         3345 | ||||||
|  | #define MSG_346                         3346 | ||||||
|  | #define MSG_347                         3347 | ||||||
|  | #define MSG_348                         3348 | ||||||
|  | #define MSG_349                         3349 | ||||||
|  | #define MSG_350                         3350 | ||||||
|  | #define MSG_MAX                         3351 | ||||||
| 
 | 
 | ||||||
| // Next default values for new objects
 | // Next default values for new objects
 | ||||||
| // 
 | // 
 | ||||||
|  |  | ||||||
|  | @ -1261,7 +1261,8 @@ DWORD WINAPI ImageScanThread(LPVOID param) | ||||||
| 		// If we have an ISOHybrid, but without an ISO method we support, disable ISO support altogether
 | 		// If we have an ISOHybrid, but without an ISO method we support, disable ISO support altogether
 | ||||||
| 		if (IS_DD_BOOTABLE(img_report) && (img_report.disable_iso || | 		if (IS_DD_BOOTABLE(img_report) && (img_report.disable_iso || | ||||||
| 				(!IS_BIOS_BOOTABLE(img_report) && !IS_EFI_BOOTABLE(img_report)))) { | 				(!IS_BIOS_BOOTABLE(img_report) && !IS_EFI_BOOTABLE(img_report)))) { | ||||||
| 			uprintf("Note: ISO mode will be disabled because this ISOHybrid is not compatible with ISO boot."); | 			MessageBoxExU(hMainDialog, lmprintf(MSG_321), lmprintf(MSG_274), MB_OK | MB_ICONINFORMATION | MB_IS_RTL, selected_langid); | ||||||
|  | 			uprintf("Note: DD image mode enforced since this ISOHybrid is not ISO mode compatible."); | ||||||
| 			img_report.is_iso = FALSE; | 			img_report.is_iso = FALSE; | ||||||
| 		} | 		} | ||||||
| 		selection_default = BT_IMAGE; | 		selection_default = BT_IMAGE; | ||||||
|  |  | ||||||
							
								
								
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							
							
						
						
									
										10
									
								
								src/rufus.rc
									
										
									
									
									
								
							|  | @ -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.14.1744" | CAPTION "Rufus 3.14.1745" | ||||||
| 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 | ||||||
|  | @ -395,8 +395,8 @@ END | ||||||
| // | // | ||||||
| 
 | 
 | ||||||
| VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||||
|  FILEVERSION 3,14,1744,0 |  FILEVERSION 3,14,1745,0 | ||||||
|  PRODUCTVERSION 3,14,1744,0 |  PRODUCTVERSION 3,14,1745,0 | ||||||
|  FILEFLAGSMASK 0x3fL |  FILEFLAGSMASK 0x3fL | ||||||
| #ifdef _DEBUG | #ifdef _DEBUG | ||||||
|  FILEFLAGS 0x1L |  FILEFLAGS 0x1L | ||||||
|  | @ -414,13 +414,13 @@ BEGIN | ||||||
|             VALUE "Comments", "https://rufus.ie" |             VALUE "Comments", "https://rufus.ie" | ||||||
|             VALUE "CompanyName", "Akeo Consulting" |             VALUE "CompanyName", "Akeo Consulting" | ||||||
|             VALUE "FileDescription", "Rufus" |             VALUE "FileDescription", "Rufus" | ||||||
|             VALUE "FileVersion", "3.14.1744" |             VALUE "FileVersion", "3.14.1745" | ||||||
|             VALUE "InternalName", "Rufus" |             VALUE "InternalName", "Rufus" | ||||||
|             VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" |             VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" | ||||||
|             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" |             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" | ||||||
|             VALUE "OriginalFilename", "rufus-3.14.exe" |             VALUE "OriginalFilename", "rufus-3.14.exe" | ||||||
|             VALUE "ProductName", "Rufus" |             VALUE "ProductName", "Rufus" | ||||||
|             VALUE "ProductVersion", "3.14.1744" |             VALUE "ProductVersion", "3.14.1745" | ||||||
|         END |         END | ||||||
|     END |     END | ||||||
|     BLOCK "VarFileInfo" |     BLOCK "VarFileInfo" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue