From c86a62ed69216014d22438eb1b33a33a36b7e15b Mon Sep 17 00:00:00 2001
From: Pete Batard <pete@akeo.ie>
Date: Mon, 30 Mar 2020 11:09:03 +0100
Subject: [PATCH] [misc] update msapi_utf8.h to latest

* Also update appveyor.yml now that MinGW is part of the VS2019 image
---
 appveyor.yml     | 23 +++++++++--------------
 src/msapi_utf8.h |  9 +++++++++
 src/rufus.rc     | 10 +++++-----
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index e5b9a4cb..be1f4593 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,3 +1,5 @@
+os: Visual Studio 2019
+
 skip_commits:
   # Don't run AppVeyor for commits that only modify resource or non-code files
   files:
@@ -20,32 +22,25 @@ environment:
   global:
     BITS: 32
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    CONFIGURATION: Debug
+  - CONFIGURATION: Debug
     COMPILER: MSVC
     PLATFORM: x86
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    CONFIGURATION: Debug
+  - CONFIGURATION: Debug
     COMPILER: MSVC
     PLATFORM: x64
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    CONFIGURATION: Release
+  - CONFIGURATION: Release
     COMPILER: MSVC
     PLATFORM: x86
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    CONFIGURATION: Release
+  - CONFIGURATION: Release
     COMPILER: MSVC
     PLATFORM: x64
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    CONFIGURATION: Release
+  - CONFIGURATION: Release
     COMPILER: MinGW
     PLATFORM: i686
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-    CONFIGURATION: Release
+  - CONFIGURATION: Release
     COMPILER: MinGW
     PLATFORM: x86_64
-  - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-    CONFIGURATION: Release
+  - CONFIGURATION: Release
     COMPILER: Coverity
     PLATFORM: x86
 
diff --git a/src/msapi_utf8.h b/src/msapi_utf8.h
index 3ff15d95..96e5d40e 100644
--- a/src/msapi_utf8.h
+++ b/src/msapi_utf8.h
@@ -1024,6 +1024,15 @@ static __inline int _openU(const char *filename, int oflag , int pmode)
 }
 #endif
 
+static __inline int _unlinkU(const char* path)
+{
+	int ret;
+	wconvert(path);
+	ret = _wunlink(wpath);
+	wfree(path);
+	return ret;
+}
+
 static __inline int _stat64U(const char *path, struct __stat64 *buffer)
 {
 	int ret;
diff --git a/src/rufus.rc b/src/rufus.rc
index 4d287361..2d57963c 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.10.1629"
+CAPTION "Rufus 3.10.1630"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,10,1629,0
- PRODUCTVERSION 3,10,1629,0
+ FILEVERSION 3,10,1630,0
+ PRODUCTVERSION 3,10,1630,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.10.1629"
+            VALUE "FileVersion", "3.10.1630"
             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.10.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.10.1629"
+            VALUE "ProductVersion", "3.10.1630"
         END
     END
     BLOCK "VarFileInfo"