diff --git a/res/grub2/grub2_version.h b/res/grub2/grub2_version.h index ad8645f9..eca712d2 100644 --- a/res/grub2/grub2_version.h +++ b/res/grub2/grub2_version.h @@ -2,4 +2,4 @@ * This file contains the version string of the GRUB 2.x binary embedded in Rufus. * Should be the same as GRUB's PACKAGE_VERSION in config.h. */ -#define GRUB2_PACKAGE_VERSION "2.02~rc2" +#define GRUB2_PACKAGE_VERSION "2.02" diff --git a/res/grub2/readme.txt b/res/grub2/readme.txt index 4e64850f..4ff08828 100644 --- a/res/grub2/readme.txt +++ b/res/grub2/readme.txt @@ -1,7 +1,7 @@ This directory contains the Grub 2.0 boot records that are used by Rufus * boot.img and core.img were compiled from - http://alpha.gnu.org/gnu/grub/grub-2.02~rc2.tar.xz, on a Debian stretch x64 system. + http://ftp.gnu.org/gnu/grub/grub-2.02.tar.xz, on a Debian stretch x64 system. This was done following the guide from: http://pete.akeo.ie/2014/05/compiling-and-installing-grub2-for.html. --enable-boot-time was also added during ./configure for Manjaro Linux compatibility. diff --git a/src/db.h b/src/db.h index c061a0e4..c9963979 100644 --- a/src/db.h +++ b/src/db.h @@ -96,7 +96,7 @@ static uint8_t sha256db[] = { 0xd3, 0x47, 0x2c, 0x02, 0x26, 0x3a, 0xcf, 0x9c, 0xd1, 0xda, 0x5d, 0xb5, 0x1e, 0x26, 0x3c, 0x54, 0x84, 0xba, 0xd1, 0x3e, 0xa6, 0x86, 0x18, 0xc4, 0x03, 0xd9, 0xcb, 0x01, 0xca, 0x07, 0x0a, 0xee, // syslinux-6.04/ldlinux.c32 0xd5, 0x50, 0x39, 0xef, 0xb6, 0x8d, 0x6e, 0xec, 0xde, 0x68, 0x61, 0xc9, 0x0b, 0xa9, 0xb7, 0x99, 0x44, 0xd1, 0xaa, 0x8b, 0xc3, 0xd6, 0x01, 0xfb, 0x80, 0xfd, 0x08, 0x7b, 0xc6, 0x13, 0x63, 0xf8, // syslinux-6.02/ldlinux.sys 0xd9, 0x1c, 0xbd, 0xf9, 0x01, 0x79, 0x5e, 0x98, 0x19, 0x84, 0x9c, 0x75, 0x3e, 0xa5, 0x3a, 0xd8, 0x59, 0xc6, 0xf2, 0x5d, 0x59, 0x17, 0xa6, 0x75, 0x92, 0x58, 0x3f, 0xd6, 0x5e, 0x6d, 0x00, 0xf0, // syslinux-6.03/pre18/ldlinux.bss - 0xda, 0xa3, 0x06, 0xa9, 0x97, 0x0e, 0x37, 0x7d, 0xb4, 0x4c, 0xe7, 0xfa, 0xd8, 0xdd, 0x01, 0xe9, 0xe8, 0x53, 0xc6, 0x8b, 0x1e, 0x3d, 0x84, 0xf3, 0x2a, 0xaf, 0x42, 0x24, 0x6f, 0x77, 0xae, 0x3d, // grub-2.02~rc1/core.img + 0xda, 0xa3, 0x06, 0xa9, 0x97, 0x0e, 0x37, 0x7d, 0xb4, 0x4c, 0xe7, 0xfa, 0xd8, 0xdd, 0x01, 0xe9, 0xe8, 0x53, 0xc6, 0x8b, 0x1e, 0x3d, 0x84, 0xf3, 0x2a, 0xaf, 0x42, 0x24, 0x6f, 0x77, 0xae, 0x3d, // grub-2.02/core.img 0xe7, 0x87, 0x08, 0xc7, 0x2c, 0x49, 0x8e, 0xcc, 0x14, 0x9e, 0x30, 0xf0, 0xa9, 0x85, 0xd3, 0x73, 0xa3, 0x00, 0xad, 0x5c, 0xf7, 0xd2, 0x88, 0xc7, 0x7d, 0xe8, 0x05, 0x5e, 0x25, 0x66, 0x28, 0x1f, // syslinux-6.03/pre18/ldlinux.sys 0xe9, 0x00, 0x3a, 0x56, 0x28, 0x43, 0xa3, 0x7b, 0xec, 0x4b, 0xef, 0xd4, 0xbb, 0x71, 0xfe, 0x3c, 0x5e, 0x6a, 0x50, 0x4d, 0x0b, 0x99, 0x36, 0xaf, 0xb6, 0x9e, 0xdc, 0x37, 0x2f, 0x7c, 0x41, 0xef, // syslinux-6.03/pre14/ldlinux.bss 0xec, 0x31, 0xc2, 0xb7, 0xba, 0x09, 0xee, 0x69, 0xee, 0xf8, 0x55, 0x31, 0xe2, 0xc2, 0x4f, 0x22, 0x4a, 0xf7, 0xd9, 0x4a, 0x72, 0x25, 0xb2, 0x6f, 0x4f, 0x57, 0xf7, 0x70, 0x5e, 0x7d, 0xda, 0x1a, // syslinux-5.10/ldlinux.sys diff --git a/src/process.c b/src/process.c index 65c92074..25bb58f4 100644 --- a/src/process.c +++ b/src/process.c @@ -416,7 +416,7 @@ BOOL SearchProcess(char* HandleName, BOOL bPartialMatch, BOOL bIgnoreSelf) HANDLE processHandle = NULL; BOOLEAN bFound = FALSE; ULONG access_rights = 0; - char exe_path[MAX_PATH]; + char exe_path[MAX_PATH] = { 0 }; int cur_pid; PF_INIT_OR_SET_STATUS(NtQueryObject, Ntdll); @@ -437,7 +437,6 @@ BOOL SearchProcess(char* HandleName, BOOL bPartialMatch, BOOL bIgnoreSelf) goto out; } - exe_path[0] = 0; pid[0] = (ULONG_PTR)0; cur_pid = 1; @@ -482,7 +481,7 @@ BOOL SearchProcess(char* HandleName, BOOL bPartialMatch, BOOL bIgnoreSelf) // If we're switching process and found a match, print it if (bFound) { - uprintf("‣ '%s' (pid: %ld, access: %s)", exe_path, pid[cur_pid], access_rights_str[access_rights & 0x3]); + uprintf("o '%s' (pid: %ld, access: %s)", exe_path, pid[cur_pid], access_rights_str[access_rights & 0x3]); bFound = FALSE; access_rights = 0; } diff --git a/src/rufus.rc b/src/rufus.rc index fbc0cde6..bd9f6b2e 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.1107" +CAPTION "Rufus 2.15.1108" 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,1107,0 - PRODUCTVERSION 2,15,1107,0 + FILEVERSION 2,15,1108,0 + PRODUCTVERSION 2,15,1108,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.1107" + VALUE "FileVersion", "2.15.1108" 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.1107" + VALUE "ProductVersion", "2.15.1108" END END BLOCK "VarFileInfo"