mirror of
https://github.com/pbatard/rufus.git
synced 2024-08-14 23:57:05 +00:00
[ui] don't report an error on chkdsk failure
This commit is contained in:
parent
30137de7cb
commit
7b86943266
2 changed files with 22 additions and 27 deletions
35
src/format.c
35
src/format.c
|
@ -208,8 +208,8 @@ static BOOLEAN __stdcall ChkdskCallback(FILE_SYSTEM_CALLBACK_COMMAND Command, DW
|
||||||
break;
|
break;
|
||||||
case FCC_DONE:
|
case FCC_DONE:
|
||||||
if (*(BOOLEAN*)pData == FALSE) {
|
if (*(BOOLEAN*)pData == FALSE) {
|
||||||
uprintf("Error while checking disk.\n");
|
uprintf("Error while checking disk");
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_GEN_FAILURE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FCC_UNKNOWN1A:
|
case FCC_UNKNOWN1A:
|
||||||
|
@ -217,37 +217,32 @@ static BOOLEAN __stdcall ChkdskCallback(FILE_SYSTEM_CALLBACK_COMMAND Command, DW
|
||||||
// Silence these specific calls
|
// Silence these specific calls
|
||||||
break;
|
break;
|
||||||
case FCC_INCOMPATIBLE_FILE_SYSTEM:
|
case FCC_INCOMPATIBLE_FILE_SYSTEM:
|
||||||
uprintf("Incompatible File System\n");
|
uprintf("Incompatible File System");
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_INCOMPATIBLE_FS);
|
return FALSE;
|
||||||
break;
|
|
||||||
case FCC_ACCESS_DENIED:
|
case FCC_ACCESS_DENIED:
|
||||||
uprintf("Access denied\n");
|
uprintf("Access denied");
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_ACCESS_DENIED;
|
return FALSE;
|
||||||
break;
|
|
||||||
case FCC_MEDIA_WRITE_PROTECTED:
|
case FCC_MEDIA_WRITE_PROTECTED:
|
||||||
uprintf("Media is write protected\n");
|
uprintf("Media is write protected");
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_WRITE_PROTECT;
|
return FALSE;
|
||||||
break;
|
|
||||||
case FCC_VOLUME_IN_USE:
|
case FCC_VOLUME_IN_USE:
|
||||||
uprintf("Volume is in use\n");
|
uprintf("Volume is in use");
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_DEVICE_IN_USE;
|
return FALSE;
|
||||||
break;
|
|
||||||
case FCC_OUTPUT:
|
case FCC_OUTPUT:
|
||||||
OutputUTF8Message(((PTEXTOUTPUT)pData)->Output);
|
OutputUTF8Message(((PTEXTOUTPUT)pData)->Output);
|
||||||
break;
|
break;
|
||||||
case FCC_NO_MEDIA_IN_DRIVE:
|
case FCC_NO_MEDIA_IN_DRIVE:
|
||||||
uprintf("No media in drive\n");
|
uprintf("No media in drive");
|
||||||
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|ERROR_NO_MEDIA_IN_DRIVE;
|
return FALSE;
|
||||||
break;
|
|
||||||
case FCC_READ_ONLY_MODE:
|
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;
|
break;
|
||||||
default:
|
default:
|
||||||
uprintf("ChkdskExCallback: received unhandled command %X\n", Command);
|
uprintf("ChkdskExCallback: received unhandled command %X", Command);
|
||||||
// Assume the command isn't an error
|
// Assume the command isn't an error
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return (!IS_ERROR(FormatStatus));
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
10
src/rufus.rc
10
src/rufus.rc
|
@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||||
IDD_DIALOG DIALOGEX 12, 12, 242, 376
|
IDD_DIALOG DIALOGEX 12, 12, 242, 376
|
||||||
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 2.15.1099"
|
CAPTION "Rufus 2.15.1100"
|
||||||
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
|
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
|
||||||
BEGIN
|
BEGIN
|
||||||
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
|
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
|
||||||
|
@ -334,8 +334,8 @@ END
|
||||||
//
|
//
|
||||||
|
|
||||||
VS_VERSION_INFO VERSIONINFO
|
VS_VERSION_INFO VERSIONINFO
|
||||||
FILEVERSION 2,15,1099,0
|
FILEVERSION 2,15,1100,0
|
||||||
PRODUCTVERSION 2,15,1099,0
|
PRODUCTVERSION 2,15,1100,0
|
||||||
FILEFLAGSMASK 0x3fL
|
FILEFLAGSMASK 0x3fL
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
FILEFLAGS 0x1L
|
FILEFLAGS 0x1L
|
||||||
|
@ -352,13 +352,13 @@ BEGIN
|
||||||
BEGIN
|
BEGIN
|
||||||
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
|
||||||
VALUE "FileDescription", "Rufus"
|
VALUE "FileDescription", "Rufus"
|
||||||
VALUE "FileVersion", "2.15.1099"
|
VALUE "FileVersion", "2.15.1100"
|
||||||
VALUE "InternalName", "Rufus"
|
VALUE "InternalName", "Rufus"
|
||||||
VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
|
VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
|
||||||
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
|
||||||
VALUE "OriginalFilename", "rufus.exe"
|
VALUE "OriginalFilename", "rufus.exe"
|
||||||
VALUE "ProductName", "Rufus"
|
VALUE "ProductName", "Rufus"
|
||||||
VALUE "ProductVersion", "2.15.1099"
|
VALUE "ProductVersion", "2.15.1100"
|
||||||
END
|
END
|
||||||
END
|
END
|
||||||
BLOCK "VarFileInfo"
|
BLOCK "VarFileInfo"
|
||||||
|
|
Loading…
Reference in a new issue