From 70419d31e94713b2be5c76135cb6398769214dff Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Wed, 12 Feb 2020 17:49:29 +0000
Subject: [PATCH] [ui] report timeout errors for logical drive access

* Also update ChangeLog
---
 ChangeLog.txt | 13 +++++++++++++
 src/format.c  |  3 ++-
 src/rufus.rc  | 10 +++++-----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a6f20d0e..a3ee1d0c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+o Version 3.9 (2020.02.??)
+    Fix ext2/ext3 corruption for partitions larger than 4 GB
+    Improve ex2/ext3 formatting speed
+    Add exFAT support for bare UEFI:NTFS partitions [EXPERIMENTAL]
+    Keep early boot files uncompressed on compressed NTFS partitions
+    Improve reporting of GPT partition types
+    Improve reporting of Windows version
+    Improve error reporting on Syslinux/GRUB download issues
+    Report the usage of UDF symbolic links
+    Fix writing of compressed streams that don't end on sector boundary
+    Fix percent not being displayed on slow format
+    Update embedded Syslinux to 6.04-pre1
+
 o Version 3.8 (2019.09.16) [BUGFIX RELEASE]
     Fix regression where some ISOs (Debian) would produce a Syslinux error when booted in BIOS mode
     Fix potential 0xC0030057 errors when trying to create a persistent partitions on a non-FIXED drive
diff --git a/src/format.c b/src/format.c
index 07e042b5..fa7101fe 100644
--- a/src/format.c
+++ b/src/format.c
@@ -1954,7 +1954,8 @@ DWORD WINAPI FormatThread(void* param)
 	Sleep(200);
 	if (!WaitForLogical(DriveIndex, partition_offset[PI_MAIN])) {
 		uprintf("Logical drive was not found - aborting");
-		FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | ERROR_NO_VOLUME_ID;
+		if (!IS_ERROR(FormatStatus))
+			FormatStatus = ERROR_SEVERITY_ERROR | FAC(FACILITY_STORAGE) | ERROR_TIMEOUT;
 		goto out;
 	}
 	CHECK_FOR_USER_CANCEL;
diff --git a/src/rufus.rc b/src/rufus.rc
index 5a41e3ff..a1bf7b79 100644
--- a/src/rufus.rc
+++ b/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.9.1607"
+CAPTION "Rufus 3.9.1608"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,9,1607,0
- PRODUCTVERSION 3,9,1607,0
+ FILEVERSION 3,9,1608,0
+ PRODUCTVERSION 3,9,1608,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.9.1607"
+            VALUE "FileVersion", "3.9.1608"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.9.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.9.1607"
+            VALUE "ProductVersion", "3.9.1608"
         END
     END
     BLOCK "VarFileInfo"