diff --git a/ChangeLog.txt b/ChangeLog.txt index a743a86a..41f9abff 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -8,7 +8,7 @@ o Version 3.2 (2018.09.11) Add support for XP/Server 2003 x64 ISOs (courtesy of Mattiwatti) Improve ISO extraction performance by preallocating files (courtesy of Mattiwatti) Improve bad blocks check algorithm (from suggestions by AL.Skywalker) - Fix progress not being displayed for Sylinux or GRUB downloads + Fix progress not being displayed for Syslinux or GRUB downloads Fix unwanted application close when cancelling an image scan Fix an issue where FAT32 could still be selected for ISOs containing a >4GB file diff --git a/README.md b/README.md index 9cac625e..18f4cf56 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ Rufus: The Reliable USB Formatting Utility ========================================== -[![Build status](https://ci.appveyor.com/api/projects/status/0nciqepn6hko4to9?svg=true)](https://ci.appveyor.com/project/pbatard/rufus) -[![Coverity Scan Build Status](https://scan.coverity.com/projects/2172/badge.svg)](https://scan.coverity.com/projects/pbatard-rufus) -[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) +[![Build status](https://img.shields.io/appveyor/ci/pbatard/rufus.svg?style=for-the-badge)](https://ci.appveyor.com/project/pbatard/rufus) +[![Coverity Scan Build Status](https://img.shields.io/coverity/scan/2172.svg?style=for-the-badge)](https://scan.coverity.com/projects/pbatard-rufus) +[![Build contributors](https://img.shields.io/github/contributors/pbatard/rufus.svg?style=for-the-badge)](https://github.com/pbatard/rufus/graphs/contributors) +[![Licence](https://img.shields.io/badge/license-GPLv3-blue.svg?style=for-the-badge)](https://www.gnu.org/licenses/gpl-3.0.en.html) ![Rufus logo](https://raw.githubusercontent.com/pbatard/rufus/master/res/icons/rufus-128.png) diff --git a/_sign.cmd b/_sign.cmd index 804d4bd1..a80dd71f 100644 --- a/_sign.cmd +++ b/_sign.cmd @@ -1,3 +1,3 @@ @echo off -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1 +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17134.0\x64\signtool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp %1 exit diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml index 936215a3..f13c17c5 100644 --- a/res/appstore/AppxManifest.xml +++ b/res/appstore/AppxManifest.xml @@ -11,12 +11,12 @@ Version="3.4.1411.0" ProcessorArchitecture="x86" Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET=24 Grey Rock, L=Milford, S=Co. Donegal, PostalCode=F92 D667, C=IE' /> - - Rufus - Akeo Consulting - Rufus - Assets\Square44x44Logo.png - + + Rufus + Akeo Consulting + Rufus + Assets\Square44x44Logo.png + @@ -24,7 +24,7 @@ + MaxVersionTested="10.0.17763.0" /> diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index dedde8d9..30a3480d 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -13,11 +13,11 @@ copy "..\icons\rufus-48.png" "Assets\Square44x44Logo.targetsize-48.png" copy "..\icons\rufus-48.png" "Assets\Square44x44Logo.targetsize-48_altform-unplated.png" copy "..\icons\rufus-150.png" "Assets\Square150x150Logo.png" copy "..\..\rufus-%VERSION%.exe" "rufus.exe" -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\MakePri" createconfig /o /dq en-US /cf priconfig.xml -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\MakePri" new /o /pr . /cf priconfig.xml -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\MakeAppx" pack /o /d . /p Rufus-%VERSION%.appx +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17134.0\x64\MakePri" createconfig /o /dq en-US /cf priconfig.xml +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17134.0\x64\MakePri" new /o /pr . /cf priconfig.xml +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17134.0\x64\MakeAppx" pack /o /d . /p Rufus-%VERSION%.appx if ERRORLEVEL 1 goto out -"C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\SignTool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp Rufus-%VERSION%.appx +"C:\Program Files (x86)\Windows Kits\10\bin\10.0.17134.0\x64\SignTool" sign /v /sha1 9ce9a71ccab3b38a74781b975f1c228222cf7d3b /fd SHA256 /tr http://sha256timestamp.ws.symantec.com/sha256/timestamp Rufus-%VERSION%.appx :out del /q rufus.exe del /q priconfig.xml diff --git a/res/uefi/readme.txt b/res/uefi/readme.txt index fac12e3b..e2e05479 100644 --- a/res/uefi/readme.txt +++ b/res/uefi/readme.txt @@ -3,9 +3,10 @@ Rufus for NTFS UEFI boot support. See https://github.com/pbatard/uefi-ntfs. This image, which you can mount as FAT filesystem or open in 7-zip, contains the following data: -o The NTFS UEFI drivers from efifs (https://github.com/pbatard/efifs). - These are the \EFI\Rufus\ntfs_[ia32|x64|arm|aa64].efi files, which are binary - identical to the ones found at https://efi.akeo.ie (v1.3) +o The NTFS UEFI drivers from EfiFs (https://github.com/pbatard/efifs). + These are the \EFI\Rufus\ntfs_[ia32|x64|arm|aa64].efi files, which were + compiled unmodified from the EfiFs source (@d19363a5), using Visual Studio + 2017 Community Edition (v15.8.7) using the gnu-efi submodule rather than EDK2. o The UEFI:NTFS binaries (https://github.com/pbatard/uefi-ntfs), which were also compiled using Visual Studio 2017 Community Edition. These are the \EFI\Boot\boot[ia32|x64|arm|aa64].efi files. diff --git a/res/uefi/uefi-ntfs.img b/res/uefi/uefi-ntfs.img index 2ab318bc..047f8738 100644 Binary files a/res/uefi/uefi-ntfs.img and b/res/uefi/uefi-ntfs.img differ diff --git a/src/rufus.rc b/src/rufus.rc index 0681dc35..7c66c41a 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.4.1414" +CAPTION "Rufus 3.4.1415" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -392,8 +392,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,4,1414,0 - PRODUCTVERSION 3,4,1414,0 + FILEVERSION 3,4,1415,0 + PRODUCTVERSION 3,4,1415,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.4.1414" + VALUE "FileVersion", "3.4.1415" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.4.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.4.1414" + VALUE "ProductVersion", "3.4.1415" END END BLOCK "VarFileInfo"