From 8e9777579b6a795ad3387502ded69eb08c80351b Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 8 Apr 2013 00:14:28 +0100 Subject: [PATCH] [core] Fix active MBR partition not being set * Related to issue #128 * Also reported by Owen Yang --- src/drive.c | 2 ++ src/rufus.rc | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/drive.c b/src/drive.c index 53a1fa62..68ec88c2 100644 --- a/src/drive.c +++ b/src/drive.c @@ -569,6 +569,7 @@ BOOL CreatePartition(HANDLE hDrive, int partition_style, int file_system, BOOL m switch (partition_style) { case PARTITION_STYLE_MBR: + DriveLayoutEx.PartitionEntry[0].Mbr.BootIndicator = TRUE; DriveLayoutEx.PartitionEntry[0].Mbr.HiddenSectors = SelectedDrive.Geometry.SectorsPerTrack; switch (file_system) { case FS_FAT16: @@ -594,6 +595,7 @@ BOOL CreatePartition(HANDLE hDrive, int partition_style, int file_system, BOOL m DriveLayoutEx.PartitionEntry[1].PartitionLength.QuadPart = SelectedDrive.Geometry.SectorsPerTrack*SelectedDrive.Geometry.BytesPerSector; DriveLayoutEx.PartitionEntry[1].PartitionNumber = 2; DriveLayoutEx.PartitionEntry[1].RewritePartition = TRUE; + DriveLayoutEx.PartitionEntry[1].Mbr.BootIndicator = FALSE; DriveLayoutEx.PartitionEntry[1].Mbr.HiddenSectors = SelectedDrive.Geometry.SectorsPerTrack*SelectedDrive.Geometry.BytesPerSector; DriveLayoutEx.PartitionEntry[1].Mbr.PartitionType = DriveLayoutEx.PartitionEntry[0].Mbr.PartitionType + 0x10; // Hidden whatever } diff --git a/src/rufus.rc b/src/rufus.rc index f72ea71b..a143cab5 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.3.3.240" +CAPTION "Rufus v1.3.3.241" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -274,8 +274,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,3,240 - PRODUCTVERSION 1,3,3,240 + FILEVERSION 1,3,3,241 + PRODUCTVERSION 1,3,3,241 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -292,13 +292,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.3.3.240" + VALUE "FileVersion", "1.3.3.241" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "(c) 2011-2013 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.3.3.240" + VALUE "ProductVersion", "1.3.3.241" END END BLOCK "VarFileInfo"