mirror of
				https://github.com/pbatard/rufus.git
				synced 2024-08-14 23:57:05 +00:00 
			
		
		
		
	v3.3
* Also be more lenient about erasing the backup GPT
This commit is contained in:
		
							parent
							
								
									97315a238d
								
							
						
					
					
						commit
						1b63e59ee2
					
				
					 3 changed files with 12 additions and 7 deletions
				
			
		|  | @ -1,4 +1,4 @@ | ||||||
| o Version 3.3 (2018.09.??) [BUGFIX RELEASE] | o Version 3.3 (2018.09.17) [BUGFIX RELEASE] | ||||||
|     Fix a regression when processing uncompressed bootable DD images |     Fix a regression when processing uncompressed bootable DD images | ||||||
|     Fix Windows To Go drive creation for ARM64 Windows ISOs |     Fix Windows To Go drive creation for ARM64 Windows ISOs | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -861,11 +861,16 @@ static BOOL ClearMBRGPT(HANDLE hPhysicalDrive, LONGLONG DiskSize, DWORD SectorSi | ||||||
| 				if (j < WRITE_RETRIES) { | 				if (j < WRITE_RETRIES) { | ||||||
| 					uprintf("Retrying in %d seconds...", WRITE_TIMEOUT / 1000); | 					uprintf("Retrying in %d seconds...", WRITE_TIMEOUT / 1000); | ||||||
| 					Sleep(WRITE_TIMEOUT); | 					Sleep(WRITE_TIMEOUT); | ||||||
| 				} else | 				} else { | ||||||
|  | 					// Windows seems to be an ass about keeping a lock on a backup GPT,
 | ||||||
|  | 					// so we try to be lenient about about not being able to clear it.
 | ||||||
|  | 					uprintf("Warning: Failed to clear backup GPT..."); | ||||||
|  | 					r = TRUE; | ||||||
| 					goto out; | 					goto out; | ||||||
| 				} | 				} | ||||||
| 			} | 			} | ||||||
| 		} | 		} | ||||||
|  | 	} | ||||||
| 	r = TRUE; | 	r = TRUE; | ||||||
| 
 | 
 | ||||||
| out: | out: | ||||||
|  |  | ||||||
							
								
								
									
										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.3.1399" | CAPTION "Rufus 3.3.1400" | ||||||
| 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 | ||||||
|  | @ -392,8 +392,8 @@ END | ||||||
| // | // | ||||||
| 
 | 
 | ||||||
| VS_VERSION_INFO VERSIONINFO | VS_VERSION_INFO VERSIONINFO | ||||||
|  FILEVERSION 3,3,1399,0 |  FILEVERSION 3,3,1400,0 | ||||||
|  PRODUCTVERSION 3,3,1399,0 |  PRODUCTVERSION 3,3,1400,0 | ||||||
|  FILEFLAGSMASK 0x3fL |  FILEFLAGSMASK 0x3fL | ||||||
| #ifdef _DEBUG | #ifdef _DEBUG | ||||||
|  FILEFLAGS 0x1L |  FILEFLAGS 0x1L | ||||||
|  | @ -411,13 +411,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.3.1399" |             VALUE "FileVersion", "3.3.1400" | ||||||
|             VALUE "InternalName", "Rufus" |             VALUE "InternalName", "Rufus" | ||||||
|             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" |             VALUE "LegalCopyright", "© 2011-2018 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.3.exe" |             VALUE "OriginalFilename", "rufus-3.3.exe" | ||||||
|             VALUE "ProductName", "Rufus" |             VALUE "ProductName", "Rufus" | ||||||
|             VALUE "ProductVersion", "3.3.1399" |             VALUE "ProductVersion", "3.3.1400" | ||||||
|         END |         END | ||||||
|     END |     END | ||||||
|     BLOCK "VarFileInfo" |     BLOCK "VarFileInfo" | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue