[core] fix a regression when scanning uncompressed bootable DD images

* Closes pbatard#1206

ChangeLog.txt

@@ -1,3 +1,6 @@
+o Version 3.2 (2018.09.??) [BUGFIX RELEASE]
+    Fix a regression when processing uncompressed bootable DD images
+
 o Version 3.2 (2018.09.11)
     Add RSA-2048 signature validation on all the server downloads
     Add "Fast zeroing" cheat mode (courtesy of René van der Zee)
@@ -66,7 +69,7 @@ o Version 2.15 (2017.05.17)
     Update GRUB 2.0 and Grub4DOS to latest
     Other fixes and improvements
 
-o Version 2.14 (2017.04.10)  [BUGFIX RELEASE]
+o Version 2.14 (2017.04.10) [BUGFIX RELEASE]
     Fix inability to create BIOS-bootable drives, in some circumstances, due to write sharing permissions
 
 o Version 2.13 (2017.04.06)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for rufus 3.2.
+# Generated by GNU Autoconf 2.69 for rufus 3.3.
 #
 # Report bugs to <https://github.com/pbatard/rufus/issues>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rufus'
 PACKAGE_TARNAME='rufus'
-PACKAGE_VERSION='3.2'
-PACKAGE_STRING='rufus 3.2'
+PACKAGE_VERSION='3.3'
+PACKAGE_STRING='rufus 3.3'
 PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
 PACKAGE_URL='https://rufus.ie'
 
@@ -1228,7 +1228,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 3.2 to adapt to many kinds of systems.
+\`configure' configures rufus 3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1294,7 +1294,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rufus 3.2:";;
+     short | recursive ) echo "Configuration of rufus 3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1385,7 +1385,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rufus configure 3.2
+rufus configure 3.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1440,7 +1440,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 3.2, which was
+It was created by rufus $as_me 3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2303,7 +2303,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rufus'
- VERSION='3.2'
+ VERSION='3.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4481,7 +4481,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 3.2, which was
+This file was extended by rufus $as_me 3.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4535,7 +4535,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 3.2
+rufus config.status 3.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([rufus], [3.2], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie])
+AC_INIT([rufus], [3.3], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie])
 AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
 AC_CONFIG_SRCDIR([src/rufus.c])
 AC_CONFIG_MACRO_DIR([m4])

res/appstore/AppxManifest.xml

@@ -8,7 +8,7 @@
        for an interesting struggle, when you also happen to have a comma in one of the fields... -->
   <Identity
    Name="Rufus"
-   Version="3.2.1397.0"
+   Version="3.3.1400.0"
    ProcessorArchitecture="x86"
    Publisher='CN=Akeo Consulting, O=Akeo Consulting, STREET=24 Grey Rock, L=Milford, S=Co. Donegal, PostalCode=F92 D667, C=IE' />
     <Properties>

res/appstore/packme.cmd

@@ -1,5 +1,5 @@
 @echo off
-set VERSION=3.2
+set VERSION=3.3
 
 rem Make sure you don't have anything you don't want included in the package, as anything residing in the
 rem current directory will be included, including any previous .appx, which makes for nice recursion...

src/format.c

@@ -55,9 +55,9 @@
 /*
  * Globals
  */
-DWORD FormatStatus;
-badblocks_report report;
-static uint64_t LastRefresh;
+DWORD FormatStatus = 0;
+badblocks_report report = { 0 };
+static uint64_t LastRefresh = 0;
 static float format_percent = 0.0f;
 static int task_number = 0;
 extern const int nb_steps[FS_MAX];

src/rufus.c

@@ -1029,7 +1029,8 @@ DWORD WINAPI ISOScanThread(LPVOID param)
 	img_report.is_iso = (BOOLEAN)ExtractISO(image_path, "", TRUE);
 	img_report.is_bootable_img = (BOOLEAN)IsBootableImage(image_path);
 
-	if (IS_ERROR(FormatStatus) || (img_report.image_size == 0) || (!img_report.is_iso && !img_report.is_bootable_img)) {
+	if ((FormatStatus == (ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | ERROR_CANCELLED)) ||
+		(img_report.image_size == 0) || (!img_report.is_iso && !img_report.is_bootable_img)) {
 		// Failed to scan image
 		SendMessage(hMainDialog, UM_PROGRESS_EXIT, 0, 0);
 		safe_free(image_path);

src/rufus.rc

@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.2.1397"
+CAPTION "Rufus 3.3.1398"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -392,8 +392,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,1397,0
- PRODUCTVERSION 3,2,1397,0
+ FILEVERSION 3,3,1398,0
+ PRODUCTVERSION 3,3,1398,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -411,13 +411,13 @@ BEGIN
             VALUE "Comments", "https://akeo.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.2.1397"
+            VALUE "FileVersion", "3.3.1398"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "� 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
-            VALUE "OriginalFilename", "rufus-3.2.exe"
+            VALUE "OriginalFilename", "rufus-3.3.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.2.1397"
+            VALUE "ProductVersion", "3.3.1398"
         END
     END
     BLOCK "VarFileInfo"