diff --git a/ChangeLog.txt b/ChangeLog.txt index 6b9e9133..bf350a5b 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -3,7 +3,7 @@ o Version 2.15 (2017.05.??) Report external processes that may be preventing disk access (in the log) Improve Windows To Go support for Windows 10 Creators Update Don't report an error on checkdisk failure - Update GRUB 2.0 to latest + Update GRUB 2.0 and Grub4DOS to latest Additional fixes and improvements o Version 2.14 (2017.04.10) [BUGFIX RELEASE] diff --git a/appveyor.yml b/appveyor.yml index 232f3942..17f7c038 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,11 +1,14 @@ os: Visual Studio 2017 init: - - ps: >- - if ($env:appveyor_repo_tag -eq "true") { - Update-AppveyorBuild -Version "$env:appveyor_repo_tag_name" + # Set the AppVeyor build version number to our tag or, if untagged, to the commit hash + # See https://github.com/appveyor/ci/issues/691 + # Also include the build number, to distinguish between rebuilds of the same commit + - ps: | + if ($env:APPVEYOR_REPO_TAG -eq "true") { + Update-AppveyorBuild -Version "$($env:APPVEYOR_REPO_TAG_NAME)_#$env:APPVEYOR_BUILD_NUMBER" } else { - Update-AppveyorBuild -Version "dev-$($env:appveyor_repo_commit.substring(0,8))" + Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.Substring(0,8))_#$env:APPVEYOR_BUILD_NUMBER" } environment: diff --git a/res/grub/readme.txt b/res/grub/readme.txt index 3fd2952e..2d5cd25d 100644 --- a/res/grub/readme.txt +++ b/res/grub/readme.txt @@ -1,7 +1,7 @@ This directory contains the Grub4DOS boot records that are used by Rufus -* grldr.mbr was taken from the official 2016.12.24 release from - http://grub4dos.chenall.net/downloads/grub4dos-0.4.6a-2016-12-24/ +* grldr.mbr was taken from the official 2017.05.15 release from + http://grub4dos.chenall.net/downloads/grub4dos-0.4.6a-2017-05-15/ * Note that, for convenience reasons, the first 512 bytes from this grldr.mbr are *not* the ones that Rufus processes when writing the actual MBR (first 512 bytes). diff --git a/src/db.h b/src/db.h index c9963979..d68c8916 100644 --- a/src/db.h +++ b/src/db.h @@ -28,10 +28,10 @@ static uint8_t sha256db[] = { 0x12, 0xbd, 0x22, 0xd2, 0xb3, 0x69, 0x56, 0x0f, 0x89, 0xb8, 0x50, 0x7e, 0x7e, 0x74, 0xeb, 0xc5, 0xea, 0x44, 0x91, 0x48, 0x75, 0xf0, 0xa4, 0xcb, 0x1e, 0xa6, 0xfb, 0x4e, 0xc9, 0x89, 0x58, 0x17, // syslinux-6.03/pre6/ldlinux.sys 0x15, 0x5f, 0x36, 0x7b, 0xb1, 0x30, 0xfe, 0x05, 0x5c, 0x79, 0x9f, 0x88, 0xb3, 0xc0, 0xc1, 0xa0, 0x0a, 0x18, 0x05, 0x78, 0x22, 0x69, 0xcf, 0x7e, 0x54, 0xaa, 0x61, 0xbd, 0xe3, 0x8e, 0x05, 0x92, // syslinux-6.03/pre3/ldlinux.bss + 0x16, 0xfa, 0x7a, 0xb6, 0x9b, 0x63, 0xc3, 0x79, 0xa1, 0x25, 0x7d, 0x6a, 0x1f, 0x1c, 0xf0, 0xc8, 0x17, 0xfe, 0x59, 0x67, 0xc0, 0x69, 0x66, 0xd8, 0x7e, 0x6c, 0x48, 0x0b, 0x87, 0x71, 0x1d, 0xf7, // grub4dos-0.4.6a/grldr 0x1c, 0xb7, 0x8b, 0x98, 0xbc, 0xd6, 0x76, 0x7b, 0x01, 0x44, 0xf5, 0x00, 0xaf, 0x81, 0xef, 0x4f, 0x3c, 0x54, 0xea, 0xaf, 0xe3, 0xc9, 0x4e, 0x1f, 0xd6, 0x24, 0x68, 0x41, 0x4e, 0x98, 0x92, 0x25, // syslinux-6.03/pre20/ldlinux.bss 0x1c, 0xc6, 0x32, 0x21, 0xfd, 0xf4, 0x46, 0xfc, 0xda, 0xc6, 0xc0, 0x56, 0x35, 0x79, 0x54, 0xc1, 0x5b, 0x61, 0x75, 0xca, 0x1b, 0xc2, 0xa4, 0x9f, 0x85, 0x52, 0xec, 0xca, 0x28, 0xac, 0x3e, 0x51, // syslinux-6.02/ldlinux.bss 0x22, 0x96, 0x82, 0xac, 0x61, 0xb8, 0x8b, 0x11, 0x25, 0xfc, 0xd7, 0xe6, 0x9f, 0x4e, 0x7f, 0x46, 0x7f, 0x68, 0xc5, 0x14, 0x9e, 0xb9, 0x37, 0x1a, 0x98, 0xd8, 0xf2, 0x78, 0x41, 0x40, 0xad, 0x88, // syslinux-5.00/ldlinux.sys - 0x24, 0xca, 0x34, 0xcf, 0x6c, 0xf1, 0x23, 0x97, 0xab, 0x7d, 0x16, 0x32, 0xbb, 0x9b, 0x07, 0x60, 0x4d, 0x26, 0x74, 0xb5, 0x5c, 0xd1, 0x55, 0x04, 0x0e, 0x94, 0x39, 0xc3, 0x29, 0xa1, 0x11, 0xd8, // grub4dos-0.4.6a/grldr 0x25, 0xd1, 0x38, 0xf3, 0x8b, 0x17, 0x35, 0x79, 0x3e, 0xee, 0x89, 0x19, 0xa3, 0xa0, 0xe5, 0xc9, 0x97, 0x9d, 0x2f, 0xac, 0xc0, 0xb5, 0x70, 0x74, 0x24, 0xe8, 0x04, 0x98, 0x1d, 0x25, 0xf9, 0xc9, // syslinux-6.03/pre10/ldlinux.sys 0x2b, 0x31, 0x7b, 0x12, 0xab, 0xff, 0x49, 0x66, 0x48, 0x78, 0xdf, 0xe0, 0xb5, 0x00, 0xb8, 0x50, 0x0f, 0x93, 0xf1, 0xd5, 0xe4, 0xd5, 0x28, 0x45, 0x95, 0xcc, 0x2c, 0x15, 0x6c, 0x74, 0x4f, 0x79, // grub-2.02~beta3/core.img 0x2d, 0x99, 0x55, 0x09, 0xd0, 0xd6, 0xcd, 0xf7, 0x6e, 0xd5, 0x9f, 0x46, 0x53, 0xf1, 0xcb, 0xe1, 0xc9, 0xe6, 0x24, 0xe1, 0xaf, 0xa8, 0xf7, 0x8e, 0xc2, 0x45, 0x5b, 0x24, 0x53, 0x4b, 0x87, 0x76, // syslinux-6.03/pre13/ldlinux.bss diff --git a/src/rufus.rc b/src/rufus.rc index 03cd406c..0e4b0634 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 2.15.1115" +CAPTION "Rufus 2.15.1116" FONT 8, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -334,8 +334,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,15,1115,0 - PRODUCTVERSION 2,15,1115,0 + FILEVERSION 2,15,1116,0 + PRODUCTVERSION 2,15,1116,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -352,13 +352,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.15.1115" + VALUE "FileVersion", "2.15.1116" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.15.1115" + VALUE "ProductVersion", "2.15.1116" END END BLOCK "VarFileInfo"