Mini refactor

Author: G_Moris

Client/core/CCore.cpp

@@ -60,13 +60,13 @@ static HMODULE WINAPI SkipDirectPlay_LoadLibraryA(LPCSTR fileName)
         const fs::path inLaunchDir = fs::path{FromUTF8(GetLaunchPath())} / "enbseries" / "enbhelper.dll";
 
         if (fs::is_regular_file(inLaunchDir, ec))
-            return Win32LoadLibraryA(ToUTF8(inLaunchDir.wstring()).c_str());
+            return Win32LoadLibraryA(PathToUtf8(inLaunchDir).c_str());
 
         // Try to load enbhelper.dll from the GTA install directory second.
         const fs::path inGTADir = g_gtaDirectory / "enbseries" / "enbhelper.dll";
 
         if (fs::is_regular_file(inGTADir, ec))
-            return Win32LoadLibraryA(ToUTF8(inGTADir.wstring()).c_str());
+            return Win32LoadLibraryA(PathToUtf8(inGTADir).c_str());
 
         return nullptr;
     }

Client/core/CFilePathTranslator.cpp

@@ -80,7 +80,7 @@ void CFilePathTranslator::GetCurrentWorkingDirectory(std::string& WorkingDirecto
 
 void CFilePathTranslator::GetGTARootDirectory(std::string& ModuleRootDirOut)
 {
-    ModuleRootDirOut = ToUTF8(g_gtaDirectory.wstring());
+    ModuleRootDirOut = PathToUtf8(g_gtaDirectory);
 }
 
 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" + ToUTF8(targetPath.wstring());
+                    strMessage += "\n\n" + PathToUtf8(targetPath);
                     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" + ToUTF8(sourcePath.wstring());
+                    strMessage += "\n\n" + PathToUtf8(sourcePath);
                     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" + ToUTF8(patchBasePath.wstring());
+        strMessage += "\n\n" + PathToUtf8(patchBasePath);
         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" + ToUTF8(patchDiffPath.wstring());
+        strMessage += "\n\n" + PathToUtf8(patchDiffPath);
         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" + ToUTF8(dependecyPath.wstring());
+            strMessage += "\n\n" + PathToUtf8(dependecyPath);
             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" + ToUTF8(gtaExePath.wstring());
+                strMessage += "\n\n" + PathToUtf8(gtaExePath);
                 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" + ToUTF8(gtaExePath.wstring());
+                strMessage += "\n\n" + PathToUtf8(gtaExePath);
                 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" + ToUTF8(gtaExePath.wstring());
+            strMessage += "\n\n" + PathToUtf8(gtaExePath);
             BrowseToSolution(SString("patchgta_error&code=%d", ec.value()), ASK_GO_ONLINE, strMessage);
             return "quit";
         }

Client/loader/MainFunctions.cpp

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

Shared/sdk/SharedUtil.File.h

@@ -7,13 +7,26 @@
  *  Multi Theft Auto is available from https://multitheftauto.com/
  *
  *****************************************************************************/
+
 #pragma once
 
 #include <vector>
 #include "SharedUtil.IntTypes.h"
 #include "SString.h"
 #include "WString.h"
 
+// C++20?
+#if __cplusplus >= 202002L
+// Forward declaration of std::filesystem::path to avoid including the <filesystem>
+namespace std
+{
+    namespace filesystem
+    {
+        class path;
+    }
+}
+#endif
+
 namespace SharedUtil
 {
     //
@@ -101,6 +114,11 @@ namespace SharedUtil
     std::wstring FromUTF8(const std::string& strPath);
     std::string  ToUTF8(const std::wstring& wstrPath);
 
+    // C++20?
+    #if __cplusplus >= 202002L
+    std::string PathToUtf8(const std::filesystem::path& path);
+    #endif
+
     std::vector<std::string> ListDir(const char* szPath) noexcept;
 
     namespace File

Shared/sdk/SharedUtil.File.hpp

@@ -642,6 +642,14 @@ std::string SharedUtil::ToUTF8(const std::wstring& wstrPath)
 #endif
 }
 
+// C++20?
+#if __cplusplus >= 202002L
+std::string SharedUtil::PathToUtf8(const std::filesystem::path& path)
+{
+    return ToUTF8(path.wstring());
+}
+#endif
+
 #ifdef _WIN32
 ///////////////////////////////////////////////////////////////
 //

Shared/sdk/SharedUtil.Win32Utf8FileHooks.hpp

@@ -107,7 +107,7 @@ namespace SharedUtil
     {
     #ifdef UTF8_FILE_HOOKS_PERSONALITY_Core
         static SString gtaDirCP = ToACP(g_gtaDirectory);
-        static SString gtaDirUTF8 = ToUTF8(g_gtaDirectory.wstring());
+        static SString gtaDirUTF8 = PathToUtf8(g_gtaDirectory);
         if (strOriginal.BeginsWithI(gtaDirCP))
         {
             SString tail = strOriginal.SubStr(gtaDirCP.length());