From 3f79a61802cd99eaf8e64872a92aa5ec7bc5c22f Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Sun, 16 Dec 2012 23:08:56 +0000 Subject: [PATCH] v1.3.0 (build 214) * Closes #114 (UpdateProgress(6): error negative percentage sent for negative slot value) --- ChangeLog.txt | 9 +++++++++ src/rufus.rc | 10 +++++----- src/syslinux.c | 8 ++++++-- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index c13a18cc..a445425f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ +o Version 1.3.0 (2012.12.16) + FAT32 format support for >32GB drives + Based on fat32format from Ridgecrop Consultants Ltd: + http://www.ridgecrop.demon.co.uk/index.htm?fat32format.htm + Automated update check + Relax ISO9660 compliance for Arch Linux images + Add support for VMWare ESXi 5.1 ISO images + Update Syslinux to v4.0.6 and libcdio to v0.90 + Miscellaneous UI improvements and fixes o Version 1.2.0 (2012.06.04) Single version of Rufus, that includes FreeDOS support always Add a toggleable advanced options panel diff --git a/src/rufus.rc b/src/rufus.rc index fd04fb53..816d9edc 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.0.213" +CAPTION "Rufus v1.3.0.214" 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,0,213 - PRODUCTVERSION 1,3,0,213 + FILEVERSION 1,3,0,214 + PRODUCTVERSION 1,3,0,214 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.0.213" + VALUE "FileVersion", "1.3.0.214" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "(c) 2011-2012 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.3.0.213" + VALUE "ProductVersion", "1.3.0.214" END END BLOCK "VarFileInfo" diff --git a/src/syslinux.c b/src/syslinux.c index 763dd606..c47f3f83 100644 --- a/src/syslinux.c +++ b/src/syslinux.c @@ -21,6 +21,7 @@ #endif #include +#include #include #include #include @@ -83,6 +84,7 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name) int ldlinux_sectors; uint32_t ldlinux_cluster; int nsectors; + int dt = (int)ComboBox_GetItemData(hDOSType, ComboBox_GetCurSel(hDOSType)); ldlinux_name[0] = drive_name[0]; @@ -144,7 +146,8 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name) } uprintf("Succesfully wrote 'ldlinux.sys'\n"); - UpdateProgress(OP_DOS, -1.0f); + if (dt == DT_SYSLINUX) + UpdateProgress(OP_DOS, -1.0f); /* Now flush the media */ if (!FlushFileBuffers(f_handle)) { @@ -211,7 +214,8 @@ BOOL InstallSyslinux(DWORD num, const char* drive_name) } uprintf("Succesfully wrote Syslinux boot record\n"); - UpdateProgress(OP_DOS, -1.0f); + if (dt == DT_SYSLINUX) + UpdateProgress(OP_DOS, -1.0f); r = TRUE;