From 199b9f486953d011bede8fdb270a6f6463fc66d6 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 1 May 2013 23:43:44 +0100 Subject: [PATCH] [misc] fix various minor issues * Raise the size of vesamenu.c32 threshold, a per #140 * Fix a missing backslash when checking for autorun.inf * Only set boot flag is requested by the user --- src/drive.c | 2 +- src/icon.c | 2 +- src/rufus.h | 2 +- src/rufus.rc | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/drive.c b/src/drive.c index 68ec88c2..5e76c1da 100644 --- a/src/drive.c +++ b/src/drive.c @@ -569,7 +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.BootIndicator = IsChecked(IDC_BOOT); DriveLayoutEx.PartitionEntry[0].Mbr.HiddenSectors = SelectedDrive.Geometry.SectorsPerTrack; switch (file_system) { case FS_FAT16: diff --git a/src/icon.c b/src/icon.c index 793101b1..81293c93 100644 --- a/src/icon.c +++ b/src/icon.c @@ -160,7 +160,7 @@ BOOL SetAutorun(const char* path) char filename[64]; wchar_t wlabel[128], wRufusVersion[32]; - safe_sprintf(filename, sizeof(filename), "%sautorun.inf", path); + safe_sprintf(filename, sizeof(filename), "%s\\autorun.inf", path); fd = fopen(filename, "r"); // If there's an existing autorun, don't overwrite if (fd != NULL) { uprintf("%s already exists - keeping it\n", filename); diff --git a/src/rufus.h b/src/rufus.h index 3baea103..0c5a3ffd 100644 --- a/src/rufus.h +++ b/src/rufus.h @@ -192,7 +192,7 @@ typedef struct { /* Special handling for old .c32 files we need to replace */ #define NB_OLD_C32 2 #define OLD_C32_NAMES {"menu.c32", "vesamenu.c32"} -#define OLD_C32_THRESHOLD {53500, 145000} +#define OLD_C32_THRESHOLD {53500, 148000} #define NEW_C32_URL {RUFUS_URL "/downloads/menu.c32", RUFUS_URL "/downloads/vesamenu.c32"} /* ISO details that the application may want */ diff --git a/src/rufus.rc b/src/rufus.rc index a143cab5..ba1f63d6 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.241" +CAPTION "Rufus v1.3.3.242" 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,241 - PRODUCTVERSION 1,3,3,241 + FILEVERSION 1,3,3,242 + PRODUCTVERSION 1,3,3,242 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.241" + VALUE "FileVersion", "1.3.3.242" 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.241" + VALUE "ProductVersion", "1.3.3.242" END END BLOCK "VarFileInfo"