From da526ca66738cfca94982706fdf187eec4523da7 Mon Sep 17 00:00:00 2001
From: Tom Dewey <tom.dewey@raspberrypi.com>
Date: Wed, 31 Jul 2024 14:22:10 +0100
Subject: [PATCH] mountutils: use TCHAR where appropriate

---
 src/dependencies/mountutils/src/windows/functions.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/dependencies/mountutils/src/windows/functions.cpp b/src/dependencies/mountutils/src/windows/functions.cpp
index 7734f0d..88e6f5e 100644
--- a/src/dependencies/mountutils/src/windows/functions.cpp
+++ b/src/dependencies/mountutils/src/windows/functions.cpp
@@ -40,7 +40,7 @@ HANDLE CreateVolumeHandleFromDevicePath(LPCTSTR devicePath, DWORD flags) {
 
 HANDLE CreateVolumeHandleFromDriveLetter(TCHAR driveLetter, DWORD flags) {
   TCHAR devicePath[8];
-  sprintf_s(devicePath, "\\\\.\\%c:", driveLetter);
+  sprintf_s(devicePath, TEXT("\\\\.\\%c:"), driveLetter);
   return CreateVolumeHandleFromDevicePath(devicePath, flags);
 }
 
@@ -65,7 +65,7 @@ ULONG GetDeviceNumberFromVolumeHandle(HANDLE volume) {
 
 BOOL IsDriveFixed(TCHAR driveLetter) {
   TCHAR rootName[5];
-  sprintf_s(rootName, "%c:\\", driveLetter);
+  sprintf_s(rootName, TEXT("%c:\\"), driveLetter);
   return GetDriveType(rootName) == DRIVE_FIXED;
 }
 
@@ -262,7 +262,7 @@ MOUNTUTILS_RESULT EjectFixedDriveByDeviceNumber(ULONG deviceNumber) {
 
   CONFIGRET status;
   PNP_VETO_TYPE vetoType = PNP_VetoTypeUnknown;
-  char vetoName[MAX_PATH];
+  TCHAR vetoName[MAX_PATH];
 
   // It's often seen that the removal fails on the first
   // attempt but works on the second attempt.