diff --git a/README.txt b/README.txt index d45e1b68..8f33e545 100644 --- a/README.txt +++ b/README.txt @@ -8,7 +8,7 @@ Features: - Bad blocks check - Modern UI, with UAC elevation for Windows Vista and later - Very small footprint, no installation required -- Fully Open Source (GPL v3) +- 100% Free Source Software (GPL v3) Compilation: Use either Visual Studio 2010, WDK (Windows Driver Kit) or MinGW and then diff --git a/configure b/configure index e2681f5f..fb69576f 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rufus 1.1.2. +# Generated by GNU Autoconf 2.68 for rufus 1.1.3. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='rufus 1.1.2' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='rufus 1.1.3' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='http://rufus.akeo.ie' @@ -1204,7 +1204,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 1.1.2 to adapt to many kinds of systems. +\`configure' configures rufus 1.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 1.1.2:";; + short | recursive ) echo "Configuration of rufus 1.1.3:";; esac cat <<\_ACEOF @@ -1363,7 +1363,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 1.1.2 +rufus configure 1.1.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1418,7 +1418,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 1.1.2, which was +It was created by rufus $as_me 1.1.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2233,7 +2233,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='1.1.2' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -4091,7 +4091,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 1.1.2, which was +This file was extended by rufus $as_me 1.1.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4145,7 +4145,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rufus config.status 1.1.2 +rufus config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index ebd0ab4d..86da9a4d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [1.1.2], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) +AC_INIT([rufus], [1.1.3], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/drive.c b/src/drive.c index 5d989235..fa0943ba 100644 --- a/src/drive.c +++ b/src/drive.c @@ -101,7 +101,9 @@ HANDLE GetDriveHandle(DWORD DriveIndex, char* DriveLetter, BOOL bWriteAccess, BO value there => Use GetDriveType() to filter out unwanted devices. See https://github.com/pbatard/rufus/issues/32 for details. */ drive_type = GetDriveTypeA(drive); - if ((drive_type != DRIVE_REMOVABLE) && (drive_type != DRIVE_FIXED)) + // NB: the HP utility allows drive_type == DRIVE_FIXED, which we don't really really want for now + // TODO: allow fixed drives after partitioning/preserving of existing partitions has been sorted out + if (drive_type != DRIVE_REMOVABLE) continue; safe_sprintf(logical_drive, sizeof(logical_drive), "\\\\.\\%c:", drive[0]); diff --git a/src/format.c b/src/format.c index 0e43e0c9..3aa638cd 100644 --- a/src/format.c +++ b/src/format.c @@ -66,6 +66,7 @@ static BOOLEAN __stdcall FormatExCallback(FILE_SYSTEM_CALLBACK_COMMAND Command, case FCC_PROGRESS: percent = (DWORD*)pData; PrintStatus(0, FALSE, "Formatting: %d%% completed.", *percent); +// uprintf("%d percent completed.\n", *percent); UpdateProgress(OP_FORMAT, 1.0f * (*percent)); break; case FCC_STRUCTURE_PROGRESS: // No progress on quick format @@ -667,7 +668,6 @@ DWORD WINAPI FormatThread(LPVOID param) } if (IsChecked(IDC_SET_ICON)) SetAutorun(drive_name); - UpdateProgress(OP_DOS, -1.0f); // Issue another complete remount before we exit, to ensure we're clean RemountVolume(drive_name[0]); } diff --git a/src/rufus.rc b/src/rufus.rc index fbfc231b..c73413dd 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 289 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.1.2.143" +CAPTION "Rufus v1.1.3.144" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,248,50,14 @@ -73,7 +73,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.1.2 (Build 143)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.1.3 (Build 144)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -223,8 +223,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,1,2,143 - PRODUCTVERSION 1,1,2,143 + FILEVERSION 1,1,3,144 + PRODUCTVERSION 1,1,3,144 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -241,13 +241,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.1.2.143" + VALUE "FileVersion", "1.1.3.144" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.1.2.143" + VALUE "ProductVersion", "1.1.3.144" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index 7e9dc473..d7f04fe6 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -331,7 +331,7 @@ char* FileDialog(BOOL save, char* path, char* filename, char* ext, char* ext_des #if (_WIN32_WINNT >= 0x0600) // Vista and later HRESULT hr = FALSE; - IFileDialog *pfd; + IFileDialog *pfd = NULL; IShellItem *psiResult; COMDLG_FILTERSPEC filter_spec[2]; char* ext_filter;