Merge pull request #165 from LemmusLemmus/develop

Fix Unicode support for game names and paths.

GlosSIConfig/UIModel.cpp

@@ -39,7 +39,7 @@ UIModel::UIModel() : QObject(nullptr)
         std::filesystem::create_directories(path);
 
     config_path_ = path;
-    config_dir_name_ = (path /= "Targets").string().data();
+    config_dir_name_ = QString::fromStdWString((path /= "Targets").wstring().data());
 
     if (!std::filesystem::exists(path))
         std::filesystem::create_directories(path);
@@ -58,7 +58,7 @@ void UIModel::readConfigs()
 
     std::for_each(entries.begin(), entries.end(), [this](const auto& name) {
         auto path = config_path_;
-        path /= config_dir_name_.toStdString();
+        path /= config_dir_name_.toStdWString();
         path /= name.toStdWString();
         QFile file(path);
         if (!file.open(QIODevice::Text | QIODevice::ReadOnly)) {

GlosSIConfig/VDFParser.h

@@ -326,7 +326,7 @@ class Parser {
     {
         VDFFile vdffile;
 
-        ifile.open(path.string(), std::ios::binary | std::ios::in);
+        ifile.open(path, std::ios::binary | std::ios::in);
         if (!ifile.is_open()) {
             return {};
         }
@@ -489,9 +489,9 @@ class Parser {
 
     static inline bool writeShortcuts(std::filesystem::path path, const VDFFile& vdffile)
     {
-        const auto copied = std::filesystem::copy_file(path, path.string() + ".bak", std::filesystem::copy_options::update_existing);
+        const auto copied = std::filesystem::copy_file(path, path.wstring() + L".bak", std::filesystem::copy_options::update_existing);
 
-        ofile.open(path.string(), std::ios::binary | std::ios::out);
+        ofile.open(path.wstring(), std::ios::binary | std::ios::out);
         if (!ofile.is_open()) {
             return false;
         }

GlosSIConfig/main.cpp

@@ -106,7 +106,6 @@ void myMessageHandler(QtMsgType type, const QMessageLogContext&, const QString&
     std::cout << txt.toStdString() << "\n";
 }
 
-
 int main(int argc, char* argv[])
 {
 
@@ -140,14 +139,14 @@ int main(int argc, char* argv[])
     if (argc >= 4) {
         if (QString::fromStdString(argv[1]) == "remove") {
             const auto write_res = uimodel.removeFromSteam(
-                QString::fromStdString(argv[2]), QString::fromStdString(argv[3]), true);
+                QCoreApplication::arguments().at(2), QCoreApplication::arguments().at(3), true);
             if (write_res) {
                 return 0;
             }
             return 1;
         } else if (QString::fromStdString(argv[1]) == "add") {
             const auto write_res = uimodel.addToSteam(
-                QString::fromStdString(argv[2]), QString::fromStdString(argv[3]), true);
+                QCoreApplication::arguments().at(2), QCoreApplication::arguments().at(3), true);
             if (write_res) {
                 return 0;
             }

GlosSITarget/GlosSITarget.vcxproj

@@ -125,7 +125,7 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_DEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>
@@ -148,7 +148,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NDEBUG;SPDLOG_WCHAR_TO_UTF8_SUPPORT;SPDLOG_WCHAR_FILENAMES;_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING;SUBHOOK_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp20</LanguageStandard>
     </ClCompile>

GlosSITarget/Overlay.cpp

@@ -17,6 +17,8 @@ limitations under the License.
 
 #include <filesystem>
 #include <utility>
+#include <locale>
+#include <codecvt>
 
 #include "Roboto.h"
 
@@ -53,7 +55,8 @@ Overlay::Overlay(
     if (!std::filesystem::exists(config_path))
         std::filesystem::create_directories(config_path);
     config_path /= "imgui.ini";
-    config_file_name_ = config_path.string();
+    // This assumes that char is utf8 and wchar_t is utf16, which is guaranteed on Windows.
+    config_file_name_ = std::wstring_convert<std::codecvt_utf8<wchar_t>>().to_bytes(config_path.wstring());
     io.IniFilename = config_file_name_.data();
 #endif
 

GlosSITarget/Settings.h

@@ -20,6 +20,8 @@ limitations under the License.
 #include <string>
 #include <nlohmann/json.hpp>
 #include <spdlog/spdlog.h>
+#include <locale>
+#include <codecvt>
 
 namespace Settings {
 
@@ -62,10 +64,10 @@ inline bool checkIsUwp(const std::wstring& launch_path)
     return false;
 }
 
-inline void Parse(std::string arg1)
+inline void Parse(std::wstring arg1)
 {
-    if (!arg1.ends_with(".json")) {
+    if (!arg1.ends_with(L".json")) {
-        arg1 += ".json";
+        arg1 += L".json";
     }
     std::filesystem::path path(arg1);
     if (path.has_extension() && !std::filesystem::exists(path)) {
@@ -82,7 +84,7 @@ inline void Parse(std::string arg1)
     std::ifstream json_file;
     json_file.open(path);
     if (!json_file.is_open()) {
-        spdlog::error("Couldn't open settings file {}", path.string());
+        spdlog::error(L"Couldn't open settings file {}", path.wstring());
         return;
     }
     const auto json = nlohmann::json::parse(json_file);
@@ -111,10 +113,8 @@ inline void Parse(std::string arg1)
         std::string meh;
         safeParseValue(object, key, meh);
         if (!meh.empty()) {
-            value.clear();
+            // This assumes that char is utf8 and wchar_t is utf16, which is guaranteed on Windows.
-            std::ranges::transform(meh, std::back_inserter(value), [](const auto& ch) {
+            value = std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>>().from_bytes(meh);
-                return static_cast<wchar_t>(ch);
-            });
         }
     };
 
@@ -146,7 +146,7 @@ inline void Parse(std::string arg1)
 
     json_file.close();
 
-    spdlog::debug("Read config file \"{}\"", path.string());
+    spdlog::debug(L"Read config file \"{}\"", path.wstring());
 
     if (launch.launch) {
         launch.isUWP = checkIsUwp(launch.launchPath);

GlosSITarget/SteamTarget.cpp

@@ -30,7 +30,7 @@ limitations under the License.
 #include <tray.hpp>
 #endif
 
-SteamTarget::SteamTarget(int argc, char* argv[])
+SteamTarget::SteamTarget()
     : window_(
           [this] { run_ = false; },
           [this] { toggleGlossiOverlay(); },

GlosSITarget/SteamTarget.h

@@ -32,7 +32,7 @@ limitations under the License.
 
 class SteamTarget {
   public:
-    explicit SteamTarget(int argc, char* argv[]);
+    explicit SteamTarget();
     int run();
 
   private:

GlosSITarget/main.cpp

@@ -27,6 +27,7 @@ limitations under the License.
 
 #include "OverlayLogSink.h"
 #include "Settings.h"
+#include <iostream>
 
 #ifdef _WIN32
 
@@ -126,9 +127,10 @@ int main(int argc, char* argv[])
     if (!std::filesystem::exists(path))
         std::filesystem::create_directories(path);
     path /= "glossitarget.log";
-    const auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(path.string(), true);
+    // For "path.wstring()" to be usable here, SPDLOG_WCHAR_FILENAMES must be defined.
+    const auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(path.wstring(), true);
 #else
-    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("/tmp/glossitarget.log", true);
+    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(L"/tmp/glossitarget.log", true);
 #endif
     file_sink->set_level(spdlog::level::trace);
 
@@ -148,21 +150,23 @@ int main(int argc, char* argv[])
     auto exit = 1;
     try {
 #ifdef _WIN32
-        std::string argsv = "";
+        int numArgs;
-        if (__argc > 1) {
+        LPWSTR* args = CommandLineToArgvW(GetCommandLine(), &numArgs);
-            for (int i = 1; i < __argc; i++)
+        std::wstring argsv = L"";
-                argsv += i == 1 ? __argv[i] : std::string(" ") + __argv[i];
+        if (numArgs > 1) {
+            for (int i = 1; i < numArgs; i++)
+                argsv += i == 1 ? args[i] : std::wstring(L" ") + args[i];
         }
         Settings::Parse(argsv);
-        SteamTarget target(__argc, __argv);
+        SteamTarget target;
-#else
+#else // Code below is broken now due to parse requiring std::wstring instead of std:string. Sorry.
         std::string argsv = "";
         if (argc > 1) {
             for (int i = 1; i < argc; i++)
                 argsv += i == 1 ? argv[i] : std::string(" ") + argv[i];
         }
         Settings::Parse(argsv);
-        SteamTarget target(argc, argv);
+        SteamTarget target;
 #endif
         exit = target.run();
     }