[format] added volume unmount and improve logic

* acquire a vomume handle and unmount the volume before anything else
* remove the volume access check after partitioning - use a small delay instead

src/drive.c

@@ -155,3 +155,14 @@ BOOL GetDriveLabel(DWORD DriveIndex, char* letter, char** label)
 
 	return TRUE;
 }
+
+BOOL UnmountDrive(HANDLE hDrive)
+{
+	DWORD size;
+
+	if (!DeviceIoControl(hDrive, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0, &size, NULL)) {
+		uprintf("Could not ummount drive: %s\n", WindowsErrorString());
+		return FALSE;
+	}
+	return TRUE;
+}

src/format.c

@@ -164,7 +164,7 @@ static BOOL FormatDrive(char DriveLetter)
 	uprintf("Using cluster size: %d bytes\n", ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize)));
 	format_percent = 0.0f;
 	task_number = 0;
-	fs_index = ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
+	fs_index = (int)ComboBox_GetItemData(hFileSystem, ComboBox_GetCurSel(hFileSystem));
 	pfFormatEx(wDriveRoot, SelectedDrive.Geometry.MediaType, wFSType, wLabel,
 		IsChecked(IDC_QUICKFORMAT), (ULONG)ComboBox_GetItemData(hClusterSize, ComboBox_GetCurSel(hClusterSize)),
 		FormatExCallback);
@@ -338,7 +338,7 @@ void __cdecl FormatThread(void* param)
 	HANDLE hLogicalVolume = INVALID_HANDLE_VALUE;
 	char drive_name[] = "?:";
 	char bb_msg[256];
-	int i;
+	int r;
 
 	hPhysicalDrive = GetDriveHandle(num, NULL, TRUE, TRUE);
 	if (hPhysicalDrive == INVALID_HANDLE_VALUE) {
@@ -347,16 +347,19 @@ void __cdecl FormatThread(void* param)
 	}
 	// At this stage with have both a handle and a lock to the physical drive...
 
-	if (IsChecked(IDC_BADBLOCKS)) {
 	// ... but we can't write sectors that are part of a volume, even if we have 
 	// access to physical, unless we have a lock (which doesn't have to be write)
+	// Also, having a volume handle allows us to unmount the volume
 	hLogicalVolume = GetDriveHandle(num, drive_name, FALSE, TRUE);
 	if (hLogicalVolume == INVALID_HANDLE_VALUE) {
-			uprintf("Could not lock volume for badblock checks\n");
+		uprintf("Could not lock volume\n");
 		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_OPEN_FAILED;
 		goto out;
 	}
-bb_retry:
+	UnmountDrive(hLogicalVolume);
+
+	if (IsChecked(IDC_BADBLOCKS)) {
+		do {
 			if (!BadBlocks(hPhysicalDrive, SelectedDrive.DiskSize,
 				SelectedDrive.Geometry.BytesPerSector, BADBLOCKS_RW, &report)) {
 				uprintf("Bad blocks check failed.\n");
@@ -369,23 +372,24 @@ bb_retry:
 			uprintf("Check completed, %u bad block%s found. (%d/%d/%d errors)\n",
 				report.bb_count, (report.bb_count==1)?"":"s",
 				report.num_read_errors, report.num_write_errors, report.num_corruption_errors);
+			r = IDOK;
 			if (report.bb_count) {
 				safe_sprintf(bb_msg, sizeof(bb_msg), "Check completed - %u bad block%s found:\n"
 					"  %d read errors\n  %d write errors\n  %d corruption errors",
 					report.bb_count, (report.bb_count==1)?"":"s",
 					report.num_read_errors, report.num_write_errors, 
 					report.num_corruption_errors);
-			switch(MessageBoxA(hMainDialog, bb_msg, "Bad blocks check", 
+				r = MessageBoxA(hMainDialog, bb_msg, "Bad blocks check", MB_ABORTRETRYIGNORE|MB_ICONWARNING);
-				MB_ABORTRETRYIGNORE|MB_ICONWARNING)) {
+			}
-			case IDRETRY: 
+		} while (r == IDRETRY);
-				goto bb_retry;
+		if (r == IDABORT) {
-			case IDABORT:
 			FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_CANCELLED;
 			goto out;
 		}
 	}
-		safe_unlockclose(hLogicalVolume);
+	// Close the (unmounted) volume before formatting, but keep the lock
-	}
+	safe_closehandle(hLogicalVolume);
+	// TODO: do we have to sleep here for unmount to be effective?
 
 	// Especially after destructive badblocks test, you must zero the MBR completely
 	// before repartitioning. Else, all kind of bad things happen
@@ -402,21 +406,8 @@ bb_retry:
 	}
 	UpdateProgress(OP_PARTITION, -1.0f);
 
-	// Make sure we can access the volume again before trying to format it
+	// Add a small delay after partitioning to be safe
-	for (i=0; i<10; i++) {
 	Sleep(500);
-		hLogicalVolume = GetDriveHandle(num, drive_name, FALSE, FALSE);
-		if (hLogicalVolume != INVALID_HANDLE_VALUE) {
-			break;
-		}
-	}
-	if (i >= 10) {
-		uprintf("Could not access volume after partitioning\n");
-		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_OPEN_FAILED;
-		goto out;
-	}
-	// Handle needs to be closed for FormatEx to be happy - we keep a lock though
-	safe_closehandle(hLogicalVolume);
 
 	if (!FormatDrive(drive_name[0])) {
 		// Error will be set by FormatDrive() in FormatStatus
@@ -424,11 +415,6 @@ bb_retry:
 		goto out;
 	}
 
-	// TODO: Enable compression on NTFS
-	// TODO: optionally disable indexing on NTFS
-	// TODO: use progress bar during MBR/FSBR/MSDOS copy
-	// TODO: unlock/remount trick to make the volume reappear
-
 	PrintStatus(0, "Writing master boot record...\n");
 	if (!WriteMBR(hPhysicalDrive)) {
 		// Errorcode has already been set
@@ -437,8 +423,9 @@ bb_retry:
 	UpdateProgress(OP_FIX_MBR, -1.0f);
 
 	if (IsChecked(IDC_DOS)) {
-		// We must have a lock to modify the volume boot record...
+		// We still have a lock, which we need to modify the volume boot record 
-		hLogicalVolume = GetDriveHandle(num, drive_name, TRUE, TRUE);
+		// => no need to reacquire the lock...
+		hLogicalVolume = GetDriveHandle(num, drive_name, TRUE, FALSE);
 		if (hLogicalVolume == INVALID_HANDLE_VALUE) {
 			uprintf("Could not re-mount volume for partition boot record access\n");
 			FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_OPEN_FAILED;
@@ -449,7 +436,7 @@ bb_retry:
 			// Errorcode has already been set
 			goto out;
 		}
-		// ... and we must have relinquished that lock to write the MS-DOS files 
+		// ...but we must have relinquished that lock to write the MS-DOS files 
 		safe_unlockclose(hLogicalVolume);
 		UpdateProgress(OP_DOS, -1.0f);
 		PrintStatus(0, "Copying MS-DOS files...\n");

src/rufus.h

@@ -159,6 +159,7 @@ extern void __cdecl FormatThread(void* param);
 extern BOOL CreatePartition(HANDLE hDrive);
 extern HANDLE GetDriveHandle(DWORD DriveIndex, char* DriveLetter, BOOL bWriteAccess, BOOL bLockDrive);
 extern BOOL GetDriveLabel(DWORD DriveIndex, char* letter, char** label);
+extern BOOL UnmountDrive(HANDLE hDrive);
 
 __inline static BOOL UnlockDrive(HANDLE hDrive)
 {

src/rufus.rc

@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 206, 278
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Rufus v1.0.2.87 (Beta)"
+CAPTION "Rufus v1.0.2.88 (Beta)"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,236,50,14
@@ -64,7 +64,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,231,175,50,14,WS_GROUP
     CONTROL         "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
                     "SysLink",WS_TABSTOP,46,47,114,9
-    LTEXT           "Version 1.0.2 (Build 87)",IDC_STATIC,46,19,78,8
+    LTEXT           "Version 1.0.2 (Build 88)",IDC_STATIC,46,19,78,8
     PUSHBUTTON      "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -163,8 +163,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,2,87
+ FILEVERSION 1,0,2,88
- PRODUCTVERSION 1,0,2,87
+ PRODUCTVERSION 1,0,2,88
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -181,13 +181,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.0.2.87"
+            VALUE "FileVersion", "1.0.2.88"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.0.2.87"
+            VALUE "ProductVersion", "1.0.2.88"
         END
     END
     BLOCK "VarFileInfo"