1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00

v1.3.0 (build 214)

* Closes #114 (UpdateProgress(6): error negative percentage sent for negative slot value)
This commit is contained in:
Pete Batard 2012-12-16 23:08:56 +00:00
parent d01749004c
commit 3f79a61802
3 changed files with 20 additions and 7 deletions

View file

@ -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"

View file

@ -21,6 +21,7 @@
#endif
#include <windows.h>
#include <windowsx.h>
#include <stdio.h>
#include <malloc.h>
#include <ctype.h>
@ -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;