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] fix various minor issues

Browse source 
* 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
This commit is contained in:
Pete Batard 2013-05-01 23:43:44 +01:00
parent 8e9777579b
commit 199b9f4869
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/drive.c
View file

@ -569,7 +569,7 @@ BOOL CreatePartition(HANDLE hDrive, int partition_style, int file_system, BOOL m
switch (partition_style) { switch (partition_style) {
case PARTITION_STYLE_MBR: 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; DriveLayoutEx.PartitionEntry[0].Mbr.HiddenSectors = SelectedDrive.Geometry.SectorsPerTrack;
switch (file_system) { switch (file_system) {
case FS_FAT16: case FS_FAT16:

2
src/icon.c
View file

@ -160,7 +160,7 @@ BOOL SetAutorun(const char* path)
char filename[64]; char filename[64];
wchar_t wlabel[128], wRufusVersion[32]; 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 fd = fopen(filename, "r"); // If there's an existing autorun, don't overwrite
if (fd != NULL) { if (fd != NULL) {
uprintf("%s already exists - keeping it\n", filename); uprintf("%s already exists - keeping it\n", filename);

2
src/rufus.h
View file

@ -192,7 +192,7 @@ typedef struct {
/* Special handling for old .c32 files we need to replace */ /* Special handling for old .c32 files we need to replace */
#define NB_OLD_C32 2 #define NB_OLD_C32 2
#define OLD_C32_NAMES {"menu.c32", "vesamenu.c32"} #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"} #define NEW_C32_URL {RUFUS_URL "/downloads/menu.c32", RUFUS_URL "/downloads/vesamenu.c32"}
/* ISO details that the application may want */ /* ISO details that the application may want */

10
src/rufus.rc
View file

@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 316 IDD_DIALOG DIALOGEX 12, 12, 206, 316
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.3.3.241" CAPTION "Rufus v1.3.3.242"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 DEFPUSHBUTTON "Start",IDC_START,94,278,50,14
@ -274,8 +274,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,3,3,241 FILEVERSION 1,3,3,242
PRODUCTVERSION 1,3,3,241 PRODUCTVERSION 1,3,3,242
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -292,13 +292,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", "1.3.3.241" VALUE "FileVersion", "1.3.3.242"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "(c) 2011-2013 Pete Batard (GPL v3)" VALUE "LegalCopyright", "(c) 2011-2013 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", "1.3.3.241" VALUE "ProductVersion", "1.3.3.242"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"