From 82bb497c1bbce644c739bc84a9f92a49b13c23a6 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 19 Mar 2019 12:04:29 +0000 Subject: [PATCH] [fido] add a log notice to explain why ISO downloads are disabled * Also fix an issue where Rufus doesn't report an error if 'fmifs.dll' can't be found (#1284) * Also improve GitHub issue template to mention that Ctrl-L can also be used to access the log --- .github/ISSUE_TEMPLATE.md | 2 +- ChangeLog.txt | 5 +++-- src/format.c | 6 ++++-- src/rufus.h | 2 +- src/rufus.rc | 10 +++++----- src/stdlg.c | 6 ++++-- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index dc2bb37c..46d03239 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -4,7 +4,7 @@ Checklist --------- - [ ] I looked at https://github.com/pbatard/rufus/wiki/FAQ to see if my question has already been answered. - [ ] I performed a search in the issue tracker for similar issues using keywords relevant to my problem, such as the error message I got from the log. -- [ ] I clicked the "Log" button in Rufus (last small blue button before _START_) and copy/pasted the log into the line that says `` below. +- [ ] I clicked the 'Log' button or pressed Ctrl-L in Rufus, and copy/pasted the log into the line that says `` below. - [ ] The log I am copying is the FULL log, starting with the line `Rufus version: x.y.z` - I have NOT removed any part of it. Additionally (if applicable): diff --git a/ChangeLog.txt b/ChangeLog.txt index 351d037d..81f6155d 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,12 +1,13 @@ o Version 3.5 (2019.03.??) Add a feature to download official retail Windows 8.1 or Windows 10 ISOs + (Note: 'Check for updates' must also be enabled for the above to be active) Add Windows To Go support for MCT generated Windows ISOs Add a notice about the 'WppRecorder.sys' Microsoft bug for Windows 10 1809 ISOs Add a notice about trying to format a drive larger than 2 TB in MBR mode Add a notice about Legacy boot when trying to boot UEFI-only media in Legacy mode - Report the full PID and command line of detected blocking processes in the log + Report the full PID and command line of potentially blocking processes in the log Fix a potential silent abort when the drive is in use - Fix 'Quick Format' option always being active + Fix 'Quick Format' option always being activated Fix some unwanted file system changes occurring after an ISO had been selected o Version 3.4 (2018.12.05) diff --git a/src/format.c b/src/format.c index 1206213a..5b63b4f7 100644 --- a/src/format.c +++ b/src/format.c @@ -720,8 +720,8 @@ static BOOL FormatDrive(DWORD DriveIndex) // problems with tolower(). Make sure we restore the locale. For more details, // see http://comments.gmane.org/gmane.comp.gnu.mingw.user/39300 locale = setlocale(LC_ALL, NULL); - PF_INIT_OR_OUT(FormatEx, Fmifs); - PF_INIT(EnableVolumeCompression, Fmifs); + PF_INIT_OR_OUT(FormatEx, fmifs); + PF_INIT(EnableVolumeCompression, fmifs); setlocale(LC_ALL, locale); GetWindowTextW(hFileSystem, wFSType, ARRAYSIZE(wFSType)); @@ -768,6 +768,8 @@ static BOOL FormatDrive(DWORD DriveIndex) } out: + if (!r && !IS_ERROR(FormatStatus)) + FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|SCODE_CODE(GetLastError()); safe_free(VolumeName); safe_free(wVolumeName); return r; diff --git a/src/rufus.h b/src/rufus.h index fc3edf45..b1a3ca88 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -94,7 +94,7 @@ #define MAX_FAT32_SIZE 2.0f // Threshold above which we disable FAT32 formatting (in TB) #define FAT32_CLUSTER_THRESHOLD 1.011f // For FAT32, cluster size changes don't occur at power of 2 boundaries but sligthly above #define DD_BUFFER_SIZE 65536 // Minimum size of the buffer we use for DD operations -#define UBUFFER_SIZE 2048 +#define UBUFFER_SIZE 4096 #define RSA_SIGNATURE_SIZE 256 #define CBN_SELCHANGE_INTERNAL (CBN_SELCHANGE + 256) #if defined(RUFUS_TEST) diff --git a/src/rufus.rc b/src/rufus.rc index 629e2189..c6c8e76f 100644 --- 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.5.1476" +CAPTION "Rufus 3.5.1477" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -394,8 +394,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,5,1476,0 - PRODUCTVERSION 3,5,1476,0 + FILEVERSION 3,5,1477,0 + PRODUCTVERSION 3,5,1477,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -413,13 +413,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.5.1476" + VALUE "FileVersion", "3.5.1477" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.5.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.5.1476" + VALUE "ProductVersion", "3.5.1477" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index 28c82cc2..44dff99f 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -1563,8 +1563,10 @@ BOOL SetUpdateCheck(void) } safe_free(loc); } - if (!enable_fido) - uprintf("Note: ISO download feature will be disabled"); + if (!enable_fido) { + ubprintf("Notice: The ISO download feature has been deactivated because %s", (ReadSetting32(SETTING_UPDATE_INTERVAL) <= 0) ? + "'Check for updates' is disabled in your settings." : "the remote download script can not be accessed."); + } return TRUE; }