From a3c0911529ccc1e5cbd71707c6c8e74899802d1d Mon Sep 17 00:00:00 2001
From: fufesou <fufesou@users.noreply.github.com>
Date: Fri, 19 Apr 2024 00:47:13 +0800
Subject: [PATCH] fix: msi, explicit wide char api (#7764)

Signed-off-by: fufesou <shuanglongchen@yeah.net>
---
 res/msi/CustomActions/CustomActions.cpp | 6 +++---
 res/msi/CustomActions/ServiceUtils.cpp  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/msi/CustomActions/CustomActions.cpp b/res/msi/CustomActions/CustomActions.cpp
index 37a728a4b..1543e8f65 100644
--- a/res/msi/CustomActions/CustomActions.cpp
+++ b/res/msi/CustomActions/CustomActions.cpp
@@ -59,7 +59,7 @@ UINT __stdcall RemoveInstallFolder(
     fileOp.pFrom = installFolder;
     fileOp.fFlags = FOF_NOCONFIRMATION | FOF_SILENT;
 
-    nResult = SHFileOperation(&fileOp);
+    nResult = SHFileOperationW(&fileOp);
     if (nResult == 0)
     {
         WcaLog(LOGMSG_STANDARD, "The directory \"%ls\" has been deleted.", installFolder);
@@ -179,7 +179,7 @@ bool TerminateProcessesByNameW(LPCWSTR processName, LPCWSTR excludeParam)
                         CloseHandle(process);
                     }
                 }
-            } while (Process32Next(snapshot, &processEntry));
+            } while (Process32NextW(snapshot, &processEntry));
         }
         CloseHandle(snapshot);
     }
@@ -497,7 +497,7 @@ UINT __stdcall TryDeleteStartupShortcut(__in MSIHANDLE hInstall)
     hr = StringCchPrintfW(pwszTemp, 1024, L"%ls%ls.lnk", szStartupDir, szShortcut);
     ExitOnFailure(hr, "Failed to compose a resource identifier string");
 
-    if (DeleteFile(pwszTemp)) {
+    if (DeleteFileW(pwszTemp)) {
         WcaLog(LOGMSG_STANDARD, "Failed to delete startup shortcut of : \"%ls\"", pwszTemp);
     }
     else {
diff --git a/res/msi/CustomActions/ServiceUtils.cpp b/res/msi/CustomActions/ServiceUtils.cpp
index 5bf8c9fe5..234f70371 100644
--- a/res/msi/CustomActions/ServiceUtils.cpp
+++ b/res/msi/CustomActions/ServiceUtils.cpp
@@ -12,7 +12,7 @@ bool MyCreateServiceW(LPCWSTR serviceName, LPCWSTR displayName, LPCWSTR binaryPa
     SC_HANDLE schService;
 
     // Get a handle to the SCM database. 
-    schSCManager = OpenSCManager(
+    schSCManager = OpenSCManagerW(
         NULL,                    // local computer
         NULL,                    // ServicesActive database 
         SC_MANAGER_ALL_ACCESS);  // full access rights 
@@ -24,7 +24,7 @@ bool MyCreateServiceW(LPCWSTR serviceName, LPCWSTR displayName, LPCWSTR binaryPa
     }
 
     // Create the service
-    schService = CreateService(
+    schService = CreateServiceW(
         schSCManager,              // SCM database 
         serviceName,               // name of service 
         displayName,               // service name to display 
@@ -100,7 +100,7 @@ bool MyStartServiceW(LPCWSTR serviceName)
         return false;
     }
 
-    bool success = StartService(hService, 0, NULL);
+    bool success = StartServiceW(hService, 0, NULL);
     if (!success) {
         WcaLog(LOGMSG_STANDARD, "Failed to start service: %ls", serviceName);
     }