From 0905e932c1d16ce8e1da785cd6447fdf6c33b31c Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 11 Mar 2015 21:43:08 +0000 Subject: [PATCH] [core] set UEFI:TOGO GPT partition type to Basic Data * It was set to EFI System, however the Windows installer fails if it detects 2 EFI system partitions on the same system (and it creates one during standard installation). * This caused UEFI/GPT/NTFS installation to fail with Rufus 2.0 * Closes #461 * Also add the missing copyright notices for Grub4DOS and GRUB2 --- src/drive.c | 3 ++- src/license.h | 14 +++++++++++--- src/rufus.rc | 16 ++++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/drive.c b/src/drive.c index 57e2512d..6bde0513 100644 --- a/src/drive.c +++ b/src/drive.c @@ -1137,7 +1137,8 @@ BOOL CreatePartition(HANDLE hDrive, int partition_style, int file_system, BOOL m DriveLayoutEx.PartitionEntry[pn].PartitionLength.QuadPart = (extra_partitions & XP_UEFI_TOGO)?uefi_togo_size: extra_part_size_in_tracks * SelectedDrive.Geometry.SectorsPerTrack * SelectedDrive.Geometry.BytesPerSector; if (partition_style == PARTITION_STYLE_GPT) { - DriveLayoutEx.PartitionEntry[pn].Gpt.PartitionType = PARTITION_SYSTEM_GUID; + DriveLayoutEx.PartitionEntry[pn].Gpt.PartitionType = (extra_partitions & XP_UEFI_TOGO)? + PARTITION_BASIC_DATA_GUID:PARTITION_SYSTEM_GUID; IGNORE_RETVAL(CoCreateGuid(&DriveLayoutEx.PartitionEntry[pn].Gpt.PartitionId)); wcscpy(DriveLayoutEx.PartitionEntry[pn].Gpt.Name, (extra_partitions & XP_UEFI_TOGO)?L"UEFI:TOGO":L"EFI system partition"); } else { diff --git a/src/license.h b/src/license.h index 5e47f71f..f038b312 100644 --- a/src/license.h +++ b/src/license.h @@ -46,20 +46,28 @@ const char* additional_copyrights = "http://www.freedos.org\\line\n" "GNU General Public License (GPL) v2 or later, with binary redistribution allowed\\line\n" "\\line\n" -"ISO extraction support from libcdio by Rocky Bernstein et al:\\line\n" +"ISO extraction support from libcdio by Rocky Bernstein et al.:\\line\n" "http://www.gnu.org/software/libcdio\\line\n" "GNU General Public License (GPL) v3 or later\\line\n" "\\line\n" -"Syslinux support from Syslinux by H. Peter Anvin et al:\\line\n" +"Syslinux support from Syslinux by H. Peter Anvin et al.:\\line\n" "http://www.syslinux.org\\line\n" "GNU General Public License (GPL) v2 or later\\line\n" "\\line\n" +"Grub4DOS support from Grub4DOS by chenall, itself based on GRUB Legacy by the Free Software Foundation:\\line\n" +"https://github.com/chenall/grub4dos\\line\n" +"GNU General Public License (GPL) v2 or later\\line\n" +"\\line\n" +"GRUB 2 support from GNU GRUB by the Free Software Foundation:\\line\n" +"http://www.gnu.org/software/grub\\line\n" +"GNU General Public License (GPL) v3 or later\\line\n" +"\\line\n" "ReactOS support & additional FAT and time-conversion handling by ReactOS:\\line\n" "http://www.reactos.org\\line\n" "http://svn.reactos.org/svn/reactos/trunk/reactos\\line\n" "GNU General Public License (GPL) v2 or later\\line\n" "\\line\n" -"Bad blocks testing from e2fsprogs by Theodore T'so et al:\\line\n" +"Bad blocks testing from e2fsprogs by Theodore T'so et al.:\\line\n" "http://e2fsprogs.sourceforge.net\\line\n" "GNU General Public License (GPL) v3 compatible\\line\n" "\\line\n" diff --git a/src/rufus.rc b/src/rufus.rc index 9eea7e80..e230d35b 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.641" +CAPTION "Rufus 2.0.642" 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.641" +CAPTION "Rufus 2.0.642" 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.641" +CAPTION "Rufus 2.0.642" 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.641" +CAPTION "Rufus 2.0.642" 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,641,0 - PRODUCTVERSION 2,0,641,0 + FILEVERSION 2,0,642,0 + PRODUCTVERSION 2,0,642,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.641" + VALUE "FileVersion", "2.0.642" 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.641" + VALUE "ProductVersion", "2.0.642" END END BLOCK "VarFileInfo"