From 7b8694326645bc31c40818e2d6cc2c2235a6fed6 Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 1 May 2017 16:40:14 +0100
Subject: [PATCH] [ui] don't report an error on chkdsk failure

---
 src/format.c | 39 +++++++++++++++++----------------------
 src/rufus.rc | 10 +++++-----
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/format.c b/src/format.c
index 81faed99..59ca11df 100644
--- a/src/format.c
+++ b/src/format.c
@@ -200,16 +200,16 @@ static BOOLEAN __stdcall ChkdskCallback(FILE_SYSTEM_CALLBACK_COMMAND Command, DW
 	if (IS_ERROR(FormatStatus))
 		return FALSE;
 
-	switch(Command) {
+	switch (Command) {
 	case FCC_PROGRESS:
 	case FCC_CHECKDISK_PROGRESS:
 		percent = (DWORD*)pData;
 		PrintInfo(0, MSG_219, *percent);
 		break;
 	case FCC_DONE:
-		if(*(BOOLEAN*)pData == FALSE) {
-			uprintf("Error while checking disk.\n");
-			FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_GEN_FAILURE;
+		if (*(BOOLEAN*)pData == FALSE) {
+			uprintf("Error while checking disk");
+			return FALSE;
 		}
 		break;
 	case FCC_UNKNOWN1A:
@@ -217,37 +217,32 @@ static BOOLEAN __stdcall ChkdskCallback(FILE_SYSTEM_CALLBACK_COMMAND Command, DW
 		// Silence these specific calls
 		break;
 	case FCC_INCOMPATIBLE_FILE_SYSTEM:
-		uprintf("Incompatible File System\n");
-		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_INCOMPATIBLE_FS);
-		break;
+		uprintf("Incompatible File System");
+		return FALSE;
 	case FCC_ACCESS_DENIED:
-		uprintf("Access denied\n");
-		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_ACCESS_DENIED;
-		break;
+		uprintf("Access denied");
+		return FALSE;
 	case FCC_MEDIA_WRITE_PROTECTED:
-		uprintf("Media is write protected\n");
-		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_WRITE_PROTECT;
-		break;
+		uprintf("Media is write protected");
+		return FALSE;
 	case FCC_VOLUME_IN_USE:
-		uprintf("Volume is in use\n");
-		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_DEVICE_IN_USE;
-		break;
+		uprintf("Volume is in use");
+		return FALSE;
 	case FCC_OUTPUT:
 		OutputUTF8Message(((PTEXTOUTPUT)pData)->Output);
 		break;
 	case FCC_NO_MEDIA_IN_DRIVE:
-		uprintf("No media in drive\n");
-		FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_NO_MEDIA_IN_DRIVE;
-		break;
+		uprintf("No media in drive");
+		return FALSE;
 	case FCC_READ_ONLY_MODE:
-		uprintf("Media has been switched to read-only - Leaving checkdisk\n");
+		uprintf("Media has been switched to read-only - Leaving checkdisk");
 		break;
 	default:
-		uprintf("ChkdskExCallback: received unhandled command %X\n", Command);
+		uprintf("ChkdskExCallback: received unhandled command %X", Command);
 		// Assume the command isn't an error
 		break;
 	}
-	return (!IS_ERROR(FormatStatus));
+	return TRUE;
 }
 
 /*
diff --git a/src/rufus.rc b/src/rufus.rc
index 884bdbe4..752a0d79 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 242, 376
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 2.15.1099"
+CAPTION "Rufus 2.15.1100"
 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Device",IDS_DEVICE_TXT,9,6,200,8
@@ -334,8 +334,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,15,1099,0
- PRODUCTVERSION 2,15,1099,0
+ FILEVERSION 2,15,1100,0
+ PRODUCTVERSION 2,15,1100,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -352,13 +352,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "2.15.1099"
+            VALUE "FileVersion", "2.15.1100"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "2.15.1099"
+            VALUE "ProductVersion", "2.15.1100"
         END
     END
     BLOCK "VarFileInfo"