Fix potential bug with non-ansi path to the game folder

Author: MahBoiDeveloper

src/GUI/SetUpWindowsWrapper.cpp

@@ -125,7 +125,7 @@ void SetUpWindowsWrapper::LoadFromTheGameWindow_AcceptConfiguration()
     // TODO: Make it load vanila Generals
     //       Also as work with non-ascii paths
     //       Also as search in big-archives (see more at GZH source code)
-    QString gamePath = QString::fromStdString(Registry::GetPathToGame(Registry::Games::GeneralsZeroHour));
+    QString gamePath = QString::fromStdWString(Registry::GetPathToGame(Registry::Games::GeneralsZeroHour));
     QString pathDataEngGenCsf = gamePath + "Data\\English\\generals.csf";
     QString pathEngBig = gamePath + "\\EnglishZH.big";
 

src/Logger.cpp

@@ -98,7 +98,7 @@ using namespace std;
                 Log() << "C&C: " << Registry::ToString(game)  << " not installed" << endl;
             else
                 Log() << "C&C: " << Registry::ToString(game)  << " installed at ["
-                                 << Registry::GetPathToGame(game) << ']' << endl;
+                                 << ToQString(Registry::GetPathToGame(game)).toStdString() << ']' << endl;
         }
 
         LogFile << endl;

src/Registry.cpp

@@ -3,6 +3,7 @@
 #include <windows.h>
 #include <tchar.h>
 
+#include "StringExt.hpp"
 #include "Registry.hpp"
 
 using namespace std;
@@ -22,7 +23,7 @@ Registry::WindowsBit Registry::GetWindowsBit()
     return windowsBit;
 }
 
-string Registry::GetTextFromKey(const Registry::RootFolder Folder, const char* pPathToFolder, const char* pKeyName)
+string Registry::GetTextFromKeyA(const Registry::RootFolder Folder, const char* pPathToFolder, const char* pKeyName)
 {
     HKEY  rKey;
     DWORD Size = 256;
@@ -48,11 +49,37 @@ string Registry::GetTextFromKey(const Registry::RootFolder Folder, const char* p
     return returnValue;
 }
 
-string Registry::GetPathToGame(const Games game)
+wstring Registry::GetTextFromKeyW(const Registry::RootFolder Folder, const wchar_t* pPathToFolder, const wchar_t* pKeyName)
 {
-    string Key  = "InstallPath";
-    string Path = Registry::PATHS_TO_GAMES.find(game)->second.find(GetWindowsBit())->second;
-    return GetTextFromKey(Registry::RootFolder::HKLM, Path.c_str(), Key.c_str());
+    HKEY  rKey;
+    DWORD Size = 256;
+    WCHAR Reget[Size] = { 0 };
+
+    switch (Folder)
+    {
+        case Registry::RootFolder::HKCU :
+            RegOpenKeyExW(HKEY_CURRENT_USER, pPathToFolder, 0, KEY_READ, &rKey);
+            break;
+        
+        case Registry::RootFolder::HKLM :
+            RegOpenKeyExW(HKEY_LOCAL_MACHINE, pPathToFolder, 0, KEY_READ, &rKey);
+            break;
+    }
+
+    RegQueryValueExW(rKey, pKeyName, NULL, NULL, (LPBYTE)&Reget, &Size);
+    RegCloseKey(rKey);
+    
+    wstring returnValue(Reget);
+    returnValue.shrink_to_fit();
+         
+    return returnValue;
+}
+
+wstring Registry::GetPathToGame(const Games game)
+{
+    wstring Key  = L"InstallPath";
+    wstring Path = Registry::PATHS_TO_GAMES.find(game)->second.find(GetWindowsBit())->second;
+    return GetTextFromKeyW(Registry::RootFolder::HKLM, Path.c_str(), Key.c_str());
 }
 
 string Registry::ToString(Games game)
@@ -82,21 +109,21 @@ bool Registry::IsWindow32bit() { return GetWindowsBit() == WindowsBit::Win32; }
     {
         const char Path[] = {"Control Panel\\International"};
         const char Key[]  = {"LocaleName"};
-        return GetTextFromKey(Registry::RootFolder::HKCU, &Path[0], &Key[0]).substr(0, 2);
+        return GetTextFromKeyA(Registry::RootFolder::HKCU, &Path[0], &Key[0]).substr(0, 2);
     }
 
     string Registry::GetWindowsVersion()
     {
         const char Path[] = {"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion"};
         const char Key[]  = {"ProductName"};
-        return GetTextFromKey(Registry::RootFolder::HKLM, &Path[0], &Key[0]);
+        return GetTextFromKeyA(Registry::RootFolder::HKLM, &Path[0], &Key[0]);
     }
 
     string Registry::GetProcessorInfo()
     {
         const char Path[]  = {"HARDWARE\\DESCRIPTION\\System\\CentralProcessor\\0"};
         const char Value[] = {"ProcessorNameString"};
-        return GetTextFromKey(Registry::RootFolder::HKLM, &Path[0], &Value[0]);
+        return GetTextFromKeyA(Registry::RootFolder::HKLM, &Path[0], &Value[0]);
     }
 
     string Registry::GetMemoryInfo()

src/Registry.hpp

@@ -2,7 +2,6 @@
 #include <string>
 #include <map>
 #include <QString>
-#include "StringExt.hpp"
 
 class Registry final
 {
@@ -25,12 +24,12 @@ class Registry final
         HKCU
     };
 
-    inline static const std::map<Games, std::map<WindowsBit, std::string>> PATHS_TO_GAMES =
+    inline static const std::map<Games, std::map<WindowsBit, std::wstring>> PATHS_TO_GAMES =
     {
-        {Games::Generals,         {{WindowsBit::Win32, "SOFTWARE\\Electronic Arts\\EA Games\\Generals"},
-                                   {WindowsBit::Win64, "SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Generals"}}},
-        {Games::GeneralsZeroHour, {{WindowsBit::Win32, "SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"},
-                                   {WindowsBit::Win64, "SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"}}},
+        {Games::Generals,         {{WindowsBit::Win32, L"SOFTWARE\\Electronic Arts\\EA Games\\Generals"},
+                                   {WindowsBit::Win64, L"SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Generals"}}},
+        {Games::GeneralsZeroHour, {{WindowsBit::Win32, L"SOFTWARE\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"},
+                                   {WindowsBit::Win64, L"SOFTWARE\\WOW6432Node\\Electronic Arts\\EA Games\\Command and Conquer Generals Zero Hour"}}},
     };
 
 public: // Methods
@@ -41,18 +40,20 @@ class Registry final
     /// @brief Returns equal string for enum class value. 
     static QString ToQString(Games game);
     /// @brief Returns actual Windows bit like a enum value.
-    static WindowsBit  GetWindowsBit();
+    static WindowsBit GetWindowsBit();
 
     /// @brief Returns REG_SZ string value from MS Windows registry.
-    static std::string GetTextFromKey(RootFolder Folder, const char* pPathToFolder, const char* pKeyName);
+    static std::string GetTextFromKeyA(RootFolder Folder, const char* pPathToFolder, const char* pKeyName);
+    /// @brief Returns REG_SZ string value from MS Windows registry.
+    static std::wstring GetTextFromKeyW(RootFolder Folder, const wchar_t* pPathToFolder, const wchar_t* pKeyName);
 
     /// @brief Checks if Windows is 64-bit.
     static bool IsWindow64bit();
     /// @brief Checks if Windows is 32-bit.
     static bool IsWindow32bit();
 
     /// @brief Sets paths to all games (C&C: Generals and C&C: Generals - Zero Hour).
-    static std::string GetPathToGame(Games game);
+    static std::wstring GetPathToGame(Games game);
     /// @brief Returns current user language from HKCU\\Control Panel\\International\\Geo\\Name (example: EN).
     static std::string GetCurrentUserLanguage();
     /// @brief Returns Windows version from HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProductName.

src/StringExt.hpp

@@ -6,6 +6,11 @@
 #define L10N(x)   StringExt::l10n(x)
 #define nameof(x) QString(#x)
 
+inline QString ToQString(std::string str)   { return QString::fromStdString(str); }
+inline QString ToQString(std::wstring str)  { return QString::fromStdWString(str); }
+inline QString ToQString(const char* ch)    { return QString(ch); }
+inline QString ToQString(const wchar_t* ch) { return ToQString(std::wstring(ch)); }
+
 template<class T>
 concept IsSymbol = std::same_as<T, char> || std::same_as<T, wchar_t> || std::same_as<T, QChar>;