From 528add160f17c9ca0245713da063f13109ad861b Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 11 Mar 2015 21:45:06 +0000 Subject: [PATCH] [core] fix creation of Windows 10 Preview x32 UFDs * Rufus was detecting the ISO as needing the Windows 7 EFI workaround despite the presence of bootia32.efi * Closes #462 --- src/format.c | 4 ++-- src/rufus.h | 2 +- src/rufus.rc | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/format.c b/src/format.c index a41b9b9c..6d4ac734 100644 --- a/src/format.c +++ b/src/format.c @@ -1889,8 +1889,8 @@ DWORD WINAPI FormatThread(void* param) uprintf("Warning: loader installation failed - KolibriOS will not boot!\n"); } } - // EFI mode selected, with no 'bootx64.efi' (bit #2) but Windows 7 x64's 'bootmgr.efi' (bit #0) - if ((bt == BT_UEFI) && (!(iso_report.has_efi & 4)) && (iso_report.has_efi & 1) && (HAS_INSTALL_WIM(iso_report))) { + // EFI mode selected, with no 'boot###.efi' but Windows 7 x64's 'bootmgr.efi' (bit #0) + if ((bt == BT_UEFI) && IS_WIN7_EFI(iso_report)) { PrintInfoDebug(0, MSG_232); iso_report.install_wim_path[0] = drive_name[0]; efi_dst[0] = drive_name[0]; diff --git a/src/rufus.h b/src/rufus.h index d5dacd46..568ba8ef 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -238,7 +238,7 @@ typedef struct { #define HAS_INSTALL_WIM(r) (r.install_wim_path[0] != 0) #define HAS_TOGO(r) (r.has_bootmgr && r.has_efi && HAS_INSTALL_WIM(r)) #define IS_WINPE(r) (((r & WINPE_MININT) == WINPE_MININT)||(( r & WINPE_I386) == WINPE_I386)) -#define IS_WIN7_EFI(r) (r.has_efi & 1) +#define IS_WIN7_EFI(r) ((r.has_efi == 1) && HAS_INSTALL_WIM(r)) #define IS_REACTOS(r) (r.reactos_path[0] != 0) #define IS_GRUB(r) ((r.has_grub2) || (r.has_grub4dos)) #define IS_FAT(fs) ((fs == FS_FAT16) || (fs == FS_FAT32)) diff --git a/src/rufus.rc b/src/rufus.rc index e230d35b..98e6142c 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.0.642" +CAPTION "Rufus 2.0.643" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -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.0.642" +CAPTION "Rufus 2.0.643" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -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.0.642" +CAPTION "Rufus 2.0.643" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -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.0.642" +CAPTION "Rufus 2.0.643" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,339,50,14 @@ -671,8 +671,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 2,0,642,0 - PRODUCTVERSION 2,0,642,0 + FILEVERSION 2,0,643,0 + PRODUCTVERSION 2,0,643,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.0.642" + VALUE "FileVersion", "2.0.643" 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.0.642" + VALUE "ProductVersion", "2.0.643" END END BLOCK "VarFileInfo"