From 638f7876c45b648de0e990dca1a5907014803e79 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 13 Dec 2012 23:50:23 +0000 Subject: [PATCH] [format] set read-only checkdisk error as benign * Closes #106 --- src/format.c | 3 +++ src/format.h | 2 +- src/rufus.rc | 10 +++++----- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/format.c b/src/format.c index 01591617..eed80e4b 100644 --- a/src/format.c +++ b/src/format.c @@ -186,6 +186,9 @@ static BOOLEAN __stdcall ChkdskCallback(FILE_SYSTEM_CALLBACK_COMMAND Command, DW uprintf("No media in drive\n"); FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_NO_MEDIA_IN_DRIVE; break; + case FCC_READ_ONLY_MODE: + uprintf("Media has been switched to read-only - Leaving checkdisk\n"); + break; default: uprintf("ChkdskExCallback: received unhandled command %X\n", Command); // Assume the command isn't an error diff --git a/src/format.h b/src/format.h index 18c904f3..ccc910b7 100644 --- a/src/format.h +++ b/src/format.h @@ -57,7 +57,7 @@ typedef enum { FCC_UNKNOWN1D, FCC_UNKNOWN1E, FCC_UNKNOWN1F, - FCC_UNKNOWN20, + FCC_READ_ONLY_MODE, } FILE_SYSTEM_CALLBACK_COMMAND; typedef struct { diff --git a/src/rufus.rc b/src/rufus.rc index b4a54081..ba9a2113 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.3.0.209" +CAPTION "Rufus v1.3.0.210" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -274,8 +274,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,209 - PRODUCTVERSION 1,3,0,209 + FILEVERSION 1,3,0,210 + PRODUCTVERSION 1,3,0,210 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -292,13 +292,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.3.0.209" + VALUE "FileVersion", "1.3.0.210" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "(c) 2011-2012 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.3.0.209" + VALUE "ProductVersion", "1.3.0.210" END END BLOCK "VarFileInfo"