From faebe1040fd67472ee43218b5fbe3364e5dd0376 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 19 Jun 2018 11:35:45 +0100 Subject: [PATCH] v3.1 (build 1320) * Also update GitHub issue template for 3.0 UI * Also increase size of the ESP to 300MB, for Windows To Go drives using GPT (See #979) --- .github/ISSUE_TEMPLATE.md | 16 ++++++++-------- ChangeLog.txt | 3 ++- appveyor.yml | 5 ++++- res/appstore/AppxManifest.xml | 2 +- src/drive.c | 11 ++++++----- src/rufus.rc | 10 +++++----- 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index d87d1030..dc2bb37c 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,19 +1,19 @@ - + 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. -- [ ] I clicked the `Log` button in Rufus and copy/pasted the log into the line that says `` below. +- [ ] 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. - [ ] 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): -- [ ] I ran a bad blocks check, by clicking the "bad blocks" check box in Rufus, and confirmed that my USB is not defective +- [ ] I ran a bad blocks check, by clicking _Show advanced format options_ then _Check device for bad blocks_, and confirmed that my USB is not defective. - [ ] I also tried one or more of the following: - - [ ] Using a different USB drive - - [ ] Plugging the USB into a different port - - [ ] Running Rufus on a different computer -- [ ] If using an ISO image, I clicked on the `#` button (at the bottom of the Rufus interface), to compute the MD5, SHA1 and SHA256 checksums, which are therefore present in the log I copied. I confirmed, by performing an internet search, that these values match the ones from the official image. + - [ ] Using a different USB drive. + - [ ] Plugging the USB into a different port. + - [ ] Running Rufus on a different computer. +- [ ] If using an image, I clicked on the `(✓)` button to compute the MD5, SHA1 and SHA256 checksums, which are therefore present in the log I copied. I confirmed, by performing an internet search, that these values match the ones from the official image. Issue description ----------------- diff --git a/ChangeLog.txt b/ChangeLog.txt index a4e329cc..bccd1a02 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,8 +1,9 @@ -o Version 3.1 (2018.06.??) +o Version 3.1 (2018.06.19) Fix extraction of ISO content for GRUB based ISOs (Manjaro, Kaspersky, etc.) Fix text being truncated on some dialogs (mostly Russian and Thai) Add detection & warning about the 'Controlled Folder Access' Windows 10 feature Improve retry attempts for transient errors + Increase size of the ESP to 300MB, for Windows To Go drives using GPT Update GRUB 2.0 and Grub4DOS to latest Update libcdio to latest diff --git a/appveyor.yml b/appveyor.yml index 99aeb969..2bbb7a57 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,11 +12,14 @@ init: } skip_commits: - # Don't bother running AppVeyor on commits that only modify resource or .md/.sh files + # Don't run AppVeyor for commits that only modify resource or non-code files files: - res/* + - '**/*.cmd' - '**/*.md' - '**/*.sh' + - '**/*.txt' + - '**/*.xml' environment: COVERITY_SCAN_PROJECT_NAME: "pbatard/rufus" diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml index b2a1b445..995d3f74 100644 --- a/res/appstore/AppxManifest.xml +++ b/res/appstore/AppxManifest.xml @@ -8,7 +8,7 @@ for an interesting struggle, when you also happen to have a comma in one of the fields... --> diff --git a/src/drive.c b/src/drive.c index dbb89dcc..22ed314f 100644 --- a/src/drive.c +++ b/src/drive.c @@ -1167,11 +1167,12 @@ BOOL CreatePartition(HANDLE hDrive, int partition_style, int file_system, BOOL m if (extra_partitions) { uprintf("Adding extra partition"); if (extra_partitions & XP_EFI) { - // The size of the EFI partition depends on the minimum size we're able to format in FAT32, - // which in turn depends on the cluster size used, which in turn depends on the disk sector size. - if (SelectedDrive.SectorSize <= 1024) - ms_efi_size = 100*MB; - else if (SelectedDrive.SectorSize <= 4096) + // The size of the EFI partition depends on the minimum size we're able to format in FAT32, which + // in turn depends on the cluster size used, which in turn depends on the disk sector size. + // Plus some people are complaining that the *OFFICIAL MINIMUM SIZE* as documented by Microsoft at + // https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/configure-uefigpt-based-hard-drive-partitions + // is too small. See: https://github.com/pbatard/rufus/issues/979 + if (SelectedDrive.SectorSize <= 4096) ms_efi_size = 300*MB; else ms_efi_size = 1200*MB; // That'll teach you to have a nonstandard disk! diff --git a/src/rufus.rc b/src/rufus.rc index 95114ddb..47328500 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.1.1319" +CAPTION "Rufus 3.1.1320" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -389,8 +389,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,1,1319,0 - PRODUCTVERSION 3,1,1319,0 + FILEVERSION 3,1,1320,0 + PRODUCTVERSION 3,1,1320,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -407,13 +407,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.1.1319" + VALUE "FileVersion", "3.1.1320" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.1.1319" + VALUE "ProductVersion", "3.1.1320" END END BLOCK "VarFileInfo"