v3.3

* Also be more lenient about erasing the backup GPT
pbatard · Sep 17, 2018 · 1b63e59 · ItielMaN · Sep 17, 2018 · pbatard
1 parent 97315a2
commit 1b63e59
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -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 Windows To Go drive creation for ARM64 Windows ISOs
 

diff --git a/src/format.c b/src/format.c
@@ -861,8 +861,13 @@ static BOOL ClearMBRGPT(HANDLE hPhysicalDrive, LONGLONG DiskSize, DWORD SectorSi
 				if (j < WRITE_RETRIES) {
 					uprintf("Retrying in %d seconds...", WRITE_TIMEOUT / 1000);
 					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;
+				}
 			}
 		}
 	}

diff --git 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 3.3.1399"
+CAPTION "Rufus 3.3.1400"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,3,1399,0
- PRODUCTVERSION 3,3,1399,0
+ FILEVERSION 3,3,1400,0
+ PRODUCTVERSION 3,3,1400,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.3.1399"
+            VALUE "FileVersion", "3.3.1400"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.3.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.3.1399"
+            VALUE "ProductVersion", "3.3.1400"
         END
     END
     BLOCK "VarFileInfo"