From 7757cab3c59d3cdbf825af7a3726385251f7f7cc Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 22 Oct 2018 22:28:20 +0100
Subject: [PATCH] [ui] fix possible truncation of short image path

* Closes #1233
* Also fix MinGW builds due to missing PROCESSOR_ARCHITECTURE_ARM64 define
---
 src/rufus.c  |  4 +++-
 src/rufus.rc | 10 +++++-----
 src/stdfn.c  |  3 ++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/rufus.c b/src/rufus.c
index 079084e2..355942b3 100644
--- a/src/rufus.c
+++ b/src/rufus.c
@@ -1071,7 +1071,9 @@ DWORD WINAPI ISOScanThread(LPVOID param)
 	} else {
 		if (!dont_display_image_name) {
 			for (i = (int)safe_strlen(image_path); (i > 0) && (image_path[i] != '\\'); i--);
-			short_image_path = &image_path[i + 1];
+			if (i != 0)
+				i++;
+			short_image_path = &image_path[i];
 			PrintStatus(0, MSG_205, short_image_path);
 			UpdateImage();
 			uprintf("Using image: %s (%s)", short_image_path, SizeToHumanReadable(img_report.image_size, FALSE, FALSE));
diff --git a/src/rufus.rc b/src/rufus.rc
index ada7aa95..33412a10 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.4.1412"
+CAPTION "Rufus 3.4.1413"
 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,4,1412,0
- PRODUCTVERSION 3,4,1412,0
+ FILEVERSION 3,4,1413,0
+ PRODUCTVERSION 3,4,1413,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.4.1412"
+            VALUE "FileVersion", "3.4.1413"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus-3.4.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.4.1412"
+            VALUE "ProductVersion", "3.4.1413"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/stdfn.c b/src/stdfn.c
index c94de25d..61c72ea7 100644
--- a/src/stdfn.c
+++ b/src/stdfn.c
@@ -239,7 +239,8 @@ int GetCpuArch(void)
 		return CPU_ARCH_X86_64;
 	case PROCESSOR_ARCHITECTURE_INTEL:
 		return CPU_ARCH_X86_64;
-	case PROCESSOR_ARCHITECTURE_ARM64:
+	// TODO: Set this back to PROCESSOR_ARCHITECTURE_ARM64 when the MinGW headers have it
+	case 12:
 		return CPU_ARCH_ARM_64;
 	case PROCESSOR_ARCHITECTURE_ARM:
 		return CPU_ARCH_ARM_32;