From 94e7e41082f708bca2e1cf34d1c4d24a897745ce Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sun, 24 May 2015 23:06:36 +0100 Subject: [PATCH] [misc] use BOOLEAN in structs rather than BOOL * int vs byte * Also gear up for 2.2 release --- ChangeLog.txt | 8 ++++++++ res/grub/readme.txt | 2 +- src/iso.c | 6 +++--- src/rufus.h | 32 ++++++++++++++++---------------- src/rufus.rc | 16 ++++++++-------- 5 files changed, 36 insertions(+), 28 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 1cf20d6b..6ac7e694 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,11 @@ +o Version 2.2 (2015.05.??) + Modernize the language selection button, courtesy of David Warner + Add keyboard accessibility, courtesy of David Warner + Add a clear indication of UEFI-CSM usage + Fix Rufus preventing Windows shutdown when idle + Improve UI on high DPI monitors + Other UI improvements and fixes + o Version 2.1 (2015.03.23) Add 32 bit support to UEFI:NTFS boot Add standalone UEFI:NTFS boot installation, in advanced mode diff --git a/res/grub/readme.txt b/res/grub/readme.txt index 381a6951..899d96d8 100644 --- a/res/grub/readme.txt +++ b/res/grub/readme.txt @@ -1,6 +1,6 @@ This directory contains the Grub4DOS boot records that are used by Rufus -* grldr.mbr was taken from the official 2014.02.15 release from +* grldr.mbr was taken from the official 2015.02.15 release from http://grub4dos.chenall.net/downloads/grub4dos-0.4.6a-2015-02-15/ * Note that, for convenience reasons, the first 512 bytes from this grldr.mbr are diff --git a/src/iso.c b/src/iso.c index ccedab57..423e80ae 100644 --- a/src/iso.c +++ b/src/iso.c @@ -53,9 +53,9 @@ CdIo_t* cdio_open (const char* psz_source, driver_id_t driver_id) {return NULL;} void cdio_destroy (CdIo_t* p_cdio) {} typedef struct { - BOOL is_syslinux_cfg; - BOOL is_grub_cfg; - BOOL is_old_c32[NB_OLD_C32]; + BOOLEAN is_syslinux_cfg; + BOOLEAN is_grub_cfg; + BOOLEAN is_old_c32[NB_OLD_C32]; } EXTRACT_PROPS; RUFUS_ISO_REPORT iso_report; diff --git a/src/rufus.h b/src/rufus.h index 45125af5..aa641f12 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -254,22 +254,22 @@ typedef struct { uint64_t src_size; uint8_t winpe; uint8_t has_efi; - BOOL has_4GB_file; - BOOL has_long_filename; - BOOL has_symlinks; - BOOL has_bootmgr; - BOOL has_autorun; - BOOL has_old_c32[NB_OLD_C32]; - BOOL has_old_vesamenu; - BOOL has_efi_syslinux; - BOOL needs_syslinux_overwrite; - BOOL has_grub4dos; - BOOL has_grub2; - BOOL has_kolibrios; - BOOL uses_minint; - BOOL is_bootable_img; - BOOL compression_type; - BOOL is_vhd; + BOOLEAN has_4GB_file; + BOOLEAN has_long_filename; + BOOLEAN has_symlinks; + BOOLEAN has_bootmgr; + BOOLEAN has_autorun; + BOOLEAN has_old_c32[NB_OLD_C32]; + BOOLEAN has_old_vesamenu; + BOOLEAN has_efi_syslinux; + BOOLEAN needs_syslinux_overwrite; + BOOLEAN has_grub4dos; + BOOLEAN has_grub2; + BOOLEAN has_kolibrios; + BOOLEAN uses_minint; + BOOLEAN is_bootable_img; + BOOLEAN compression_type; + BOOLEAN is_vhd; uint16_t sl_version; // Syslinux/Isolinux version char sl_version_str[12]; char sl_version_ext[32]; diff --git a/src/rufus.rc b/src/rufus.rc index 0784fd5e..d86dae59 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,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 -CAPTION "Rufus 2.2.663" +CAPTION "Rufus 2.2.664" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -157,7 +157,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 2.2.663" +CAPTION "Rufus 2.2.664" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -283,7 +283,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.2.663" +CAPTION "Rufus 2.2.664" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -415,7 +415,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 2.2.663" +CAPTION "Rufus 2.2.664" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 @@ -671,8 +671,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,2,663,0 - PRODUCTVERSION 2,2,663,0 + FILEVERSION 2,2,664,0 + PRODUCTVERSION 2,2,664,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -689,13 +689,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "2.2.663" + VALUE "FileVersion", "2.2.664" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "2.2.663" + VALUE "ProductVersion", "2.2.664" END END BLOCK "VarFileInfo"