Fix remaining UTF-8 issues

Addendum for commit af30d18

Author: botder

Client/core/CFilePathTranslator.cpp

@@ -80,7 +80,7 @@ void CFilePathTranslator::GetCurrentWorkingDirectory(std::string& WorkingDirecto
 
 void CFilePathTranslator::GetGTARootDirectory(std::string& ModuleRootDirOut)
 {
-    ModuleRootDirOut = g_gtaDirectory.string();
+    ModuleRootDirOut = g_gtaDirectory.u8string();
 }
 
 void CFilePathTranslator::GetMTASARootDirectory(std::string& InstallRootDirOut)

Client/loader/CInstallManager.cpp

@@ -655,13 +655,13 @@ SString CInstallManager::_PrepareLaunchLocation()
                 if (fs::is_regular_file(sourcePath, ec))
                 {
                     SString strMessage(_("MTA:SA cannot launch because copying a file failed:"));
-                    strMessage += "\n\n" + targetPath.string();
+                    strMessage += "\n\n" + targetPath.u8string();
                     BrowseToSolution("copy-files", ASK_GO_ONLINE, strMessage);
                 }
                 else
                 {
                     SString strMessage(_("MTA:SA cannot launch because an MTA:SA file is incorrect or missing:"));
-                    strMessage += "\n\n" + sourcePath.string();
+                    strMessage += "\n\n" + sourcePath.u8string();
                     BrowseToSolution("mta-datafiles-missing", ASK_GO_ONLINE, strMessage);
                 }
 
@@ -693,15 +693,15 @@ SString CInstallManager::_ProcessGtaPatchCheck()
     if (!FileGenerator::IsPatchBase(patchBasePath))
     {
         SString strMessage(_("MTA:SA cannot launch because a GTA:SA file is incorrect or missing:"));
-        strMessage += "\n\n" + patchBasePath.string();
+        strMessage += "\n\n" + patchBasePath.u8string();
         BrowseToSolution("gengta_pakfiles", ASK_GO_ONLINE, strMessage);
         return "quit";
     }
 
     if (!FileGenerator::IsPatchDiff(patchDiffPath))
     {
         SString strMessage(_("MTA:SA cannot launch because an MTA:SA file is incorrect or missing:"));
-        strMessage += "\n\n" + patchDiffPath.string();
+        strMessage += "\n\n" + patchDiffPath.u8string();
         BrowseToSolution("mta-datafiles-missing", ASK_GO_ONLINE, strMessage);
         return "quit";
     }
@@ -771,7 +771,7 @@ SString CInstallManager::_ProcessGtaDllCheck()
         if (isAdmin)
         {
             SString strMessage(_("MTA:SA cannot launch because a GTA:SA file is incorrect or missing:"));
-            strMessage += "\n\n" + dependecyPath.string();
+            strMessage += "\n\n" + dependecyPath.u8string();
             BrowseToSolution(SString("gendep_error&name=%s", dependency.fileName), ASK_GO_ONLINE, strMessage);
             return "quit";
         }
@@ -826,7 +826,7 @@ SString CInstallManager::_ProcessGtaVersionCheck()
             if (isAdmin)
             {
                 SString strMessage(_("MTA:SA cannot launch because the GTA:SA executable is incorrect or missing:"));
-                strMessage += "\n\n" + gtaExePath.string();
+                strMessage += "\n\n" + gtaExePath.u8string();
                 strMessage +=
                     "\n\n" +
                     _("Please check your anti-virus for a false-positive detection, try to add an exception for the GTA:SA executable and restart MTA:SA.");
@@ -851,7 +851,7 @@ SString CInstallManager::_ProcessGtaVersionCheck()
             if (isAdmin)
             {
                 SString strMessage(_("MTA:SA cannot launch because the GTA:SA executable is not loadable:"));
-                strMessage += "\n\n" + gtaExePath.string();
+                strMessage += "\n\n" + gtaExePath.u8string();
                 BrowseToSolution(SString("gengta_error&code=%d", ec.value()), ASK_GO_ONLINE, strMessage);
                 return "quit";
             }
@@ -874,7 +874,7 @@ SString CInstallManager::_ProcessGtaVersionCheck()
         if (isAdmin)
         {
             SString strMessage(_("MTA:SA cannot launch because patching GTA:SA has failed:"));
-            strMessage += "\n\n" + gtaExePath.string();
+            strMessage += "\n\n" + gtaExePath.u8string();
             BrowseToSolution(SString("patchgta_error&code=%d", ec.value()), ASK_GO_ONLINE, strMessage);
             return "quit";
         }

Client/loader/MainFunctions.cpp

@@ -1119,7 +1119,7 @@ int LaunchGame(SString strCmdLine)
     const SString strGTAPath = GetGTAPath();
     const SString strMTASAPath = GetMTASAPath();
     SString       strMtaDir = PathJoin(strMTASAPath, "mta");
-    SString       strGTAEXEPath = GetGameExecutablePath().string();
+    SString       strGTAEXEPath = GetGameExecutablePath().u8string();
 
     SetDllDirectory(strMtaDir);
     if (!CheckService(CHECK_SERVICE_PRE_CREATE) && !IsUserAdmin())

Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp

@@ -50,6 +50,22 @@ BUT
     #include <filesystem>
 
     extern std::filesystem::path g_gtaDirectory;
+
+    /**
+     * @brief Converts a filesystem path to a string encoded with the active code page.
+     * @param path Path to convert to a string
+    */
+    auto ToACP(const std::filesystem::path& path) -> std::string
+    {
+        if (path.empty())
+            return {};
+
+        const std::wstring widePath = path.wstring();
+        const int          narrowLength = WideCharToMultiByte(CP_ACP, 0, widePath.data(), static_cast<int>(widePath.size()), nullptr, 0, nullptr, nullptr);
+        std::string        narrowPath(narrowLength, 0);
+        WideCharToMultiByte(CP_ACP, 0, widePath.data(), static_cast<int>(widePath.size()), narrowPath.data(), narrowLength, nullptr, nullptr);
+        return narrowPath;
+    }
 #endif
 
 namespace SharedUtil
@@ -90,8 +106,8 @@ namespace SharedUtil
     SString MakeSurePathIsUTF8(const SString& strOriginal)
     {
     #ifdef UTF8_FILE_HOOKS_PERSONALITY_Core
-        static SString gtaDirCP = g_gtaDirectory.string();
-        static SString gtaDirUTF8 = ToUTF8(g_gtaDirectory.wstring());
+        static SString gtaDirCP = ToACP(g_gtaDirectory);
+        static SString gtaDirUTF8 = g_gtaDirectory.u8string();
         if (strOriginal.BeginsWithI(gtaDirCP))
         {
             SString tail = strOriginal.SubStr(gtaDirCP.length());