nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[misc] use BOOLEAN in structs rather than BOOL

Browse source 
* int vs byte
* Also gear up for 2.2 release
This commit is contained in:
Pete Batard 2015-05-24 23:06:36 +01:00
parent 5e131a7f56
commit 94e7e41082
5 changed files with 36 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog.txt
View file

@ -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) o Version 2.1 (2015.03.23)
Add 32 bit support to UEFI:NTFS boot Add 32 bit support to UEFI:NTFS boot
Add standalone UEFI:NTFS boot installation, in advanced mode Add standalone UEFI:NTFS boot installation, in advanced mode

2
res/grub/readme.txt
View file

@ -1,6 +1,6 @@
This directory contains the Grub4DOS boot records that are used by Rufus 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/ 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 * Note that, for convenience reasons, the first 512 bytes from this grldr.mbr are

6
src/iso.c
View file

@ -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) {} void cdio_destroy (CdIo_t* p_cdio) {}
typedef struct { typedef struct {
BOOL is_syslinux_cfg; BOOLEAN is_syslinux_cfg;
BOOL is_grub_cfg; BOOLEAN is_grub_cfg;
BOOL is_old_c32[NB_OLD_C32]; BOOLEAN is_old_c32[NB_OLD_C32];
} EXTRACT_PROPS; } EXTRACT_PROPS;
RUFUS_ISO_REPORT iso_report; RUFUS_ISO_REPORT iso_report;

32
src/rufus.h
View file

@ -254,22 +254,22 @@ typedef struct {
uint64_t src_size; uint64_t src_size;
uint8_t winpe; uint8_t winpe;
uint8_t has_efi; uint8_t has_efi;
BOOL has_4GB_file; BOOLEAN has_4GB_file;
BOOL has_long_filename; BOOLEAN has_long_filename;
BOOL has_symlinks; BOOLEAN has_symlinks;
BOOL has_bootmgr; BOOLEAN has_bootmgr;
BOOL has_autorun; BOOLEAN has_autorun;
BOOL has_old_c32[NB_OLD_C32]; BOOLEAN has_old_c32[NB_OLD_C32];
BOOL has_old_vesamenu; BOOLEAN has_old_vesamenu;
BOOL has_efi_syslinux; BOOLEAN has_efi_syslinux;
BOOL needs_syslinux_overwrite; BOOLEAN needs_syslinux_overwrite;
BOOL has_grub4dos; BOOLEAN has_grub4dos;
BOOL has_grub2; BOOLEAN has_grub2;
BOOL has_kolibrios; BOOLEAN has_kolibrios;
BOOL uses_minint; BOOLEAN uses_minint;
BOOL is_bootable_img; BOOLEAN is_bootable_img;
BOOL compression_type; BOOLEAN compression_type;
BOOL is_vhd; BOOLEAN is_vhd;
uint16_t sl_version; // Syslinux/Isolinux version uint16_t sl_version; // Syslinux/Isolinux version
char sl_version_str[12]; char sl_version_str[12];
char sl_version_ext[32]; char sl_version_ext[32];

16
src/rufus.rc
View file

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU 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 FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -157,7 +157,7 @@ END
IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376 IDD_DIALOG_XP DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU 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 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -283,7 +283,7 @@ END
IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376 IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU 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 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 FONT 8, "Segoe UI", 400, 0, 0x1
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -415,7 +415,7 @@ END
IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376 IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU 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 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 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -671,8 +671,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,2,663,0 FILEVERSION 2,2,664,0
PRODUCTVERSION 2,2,663,0 PRODUCTVERSION 2,2,664,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -689,13 +689,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.2.663" VALUE "FileVersion", "2.2.664"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.2.663" VALUE "ProductVersion", "2.2.664"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"