From 2bccc53eeab9eb175e2024f73653f65e5bd257ef Mon Sep 17 00:00:00 2001 From: FutureRave Date: Fri, 3 Mar 2023 10:59:39 +0000 Subject: [PATCH] steam_proxy: use wide strings --- src/module/steam_proxy.cpp | 2 +- src/steam/steam.cpp | 228 ++++++++++++++++++------------------- src/steam/steam.hpp | 2 +- src/utils/nt.cpp | 2 +- 4 files changed, 117 insertions(+), 117 deletions(-) diff --git a/src/module/steam_proxy.cpp b/src/module/steam_proxy.cpp index f7dd3c1..fa7ab1c 100644 --- a/src/module/steam_proxy.cpp +++ b/src/module/steam_proxy.cpp @@ -34,7 +34,7 @@ public: this->start_mod("\xF0\x9F\x90\x8D Open-IW5 Multiplayer", 42690); } } - catch (std::exception& e) + catch (const std::exception& e) { printf("Steam: %s\n", e.what()); } diff --git a/src/steam/steam.cpp b/src/steam/steam.cpp index 642b1f2..6be9464 100644 --- a/src/steam/steam.cpp +++ b/src/steam/steam.cpp @@ -75,22 +75,22 @@ namespace steam results_.clear(); } - std::string get_steam_install_directory() + std::wstring get_steam_install_directory() { HKEY reg_key; - if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, "Software\\Valve\\Steam", 0, KEY_QUERY_VALUE, ®_key) == + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Valve\\Steam", 0, KEY_QUERY_VALUE, ®_key) == ERROR_SUCCESS) { - char path[MAX_PATH] = {0}; + wchar_t path[MAX_PATH]{}; DWORD length = sizeof(path); - RegQueryValueExA(reg_key, "InstallPath", nullptr, nullptr, reinterpret_cast(path), + RegQueryValueExW(reg_key, L"InstallPath", nullptr, nullptr, reinterpret_cast(path), &length); RegCloseKey(reg_key); - std::string steam_path = path; - if (steam_path.back() != '\\' && steam_path.back() != '/') + std::wstring steam_path = path; + if (steam_path.back() != L'\\' && steam_path.back() != L'/') { - steam_path.push_back('\\'); + steam_path.push_back(L'\\'); } return steam_path; @@ -99,134 +99,134 @@ namespace steam return {}; } - extern "C" { - bool SteamAPI_RestartAppIfNecessary() + extern "C" { - return false; - } - - bool SteamAPI_Init() - { - overlay = ::utils::nt::library("gameoverlayrenderer.dll"); - - if (!overlay) + bool SteamAPI_RestartAppIfNecessary() { - const auto steam_path = get_steam_install_directory(); - if (!steam_path.empty()) - { - overlay = ::utils::nt::library::load(steam_path + "gameoverlayrenderer.dll"); - } + return false; } - return true; - } + bool SteamAPI_Init() + { + overlay = ::utils::nt::library("gameoverlayrenderer.dll"); - void SteamAPI_RegisterCallResult(callbacks::base* result, uint64_t call) - { - callbacks::register_call_result(call, result); - } + if (!overlay) + { + const std::filesystem::path steam_path = ::steam::get_steam_install_directory(); + if (!steam_path.empty()) + { + overlay = ::utils::nt::library::load(steam_path / "gameoverlayrenderer.dll"); + } + } - void SteamAPI_RegisterCallback(callbacks::base* handler, int callback) - { - callbacks::register_callback(handler, callback); - } + return true; + } - void SteamAPI_RunCallbacks() - { - callbacks::run_callbacks(); - } + void SteamAPI_RegisterCallResult(callbacks::base* result, uint64_t call) + { + callbacks::register_call_result(call, result); + } - void SteamAPI_Shutdown() - { - } + void SteamAPI_RegisterCallback(callbacks::base* handler, int callback) + { + callbacks::register_callback(handler, callback); + } - void SteamAPI_UnregisterCallResult() - { - } + void SteamAPI_RunCallbacks() + { + callbacks::run_callbacks(); + } - void SteamAPI_UnregisterCallback() - { - } + void SteamAPI_Shutdown() + { + } + + void SteamAPI_UnregisterCallResult() + { + } + + void SteamAPI_UnregisterCallback() + { + } + + bool SteamGameServer_Init() + { + return true; + } + + void SteamGameServer_RunCallbacks() + { + } + + void SteamGameServer_Shutdown() + { + } - bool SteamGameServer_Init() - { - return true; - } + friends* SteamFriends() + { + static friends friends; + return &friends; + } - void SteamGameServer_RunCallbacks() - { - } + matchmaking* SteamMatchmaking() + { + static matchmaking matchmaking; + return &matchmaking; + } - void SteamGameServer_Shutdown() - { - } + matchmaking_servers* SteamMatchmakingServers() + { + static matchmaking_servers matchmaking_servers; + return &matchmaking_servers; + } + game_server* SteamGameServer() + { + static game_server game_server; + return &game_server; + } - friends* SteamFriends() - { - static friends friends; - return &friends; - } + master_server_updater* SteamMasterServerUpdater() + { + static master_server_updater master_server_updater; + return &master_server_updater; + } - matchmaking* SteamMatchmaking() - { - static matchmaking matchmaking; - return &matchmaking; - } + networking* SteamNetworking() + { + static networking networking; + return &networking; + } - matchmaking_servers* SteamMatchmakingServers() - { - static matchmaking_servers matchmaking_servers; - return &matchmaking_servers; - } + remote_storage* SteamRemoteStorage() + { + static remote_storage remote_storage; + return &remote_storage; + } - game_server* SteamGameServer() - { - static game_server game_server; - return &game_server; - } + user* SteamUser() + { + static user user; + return &user; + } - master_server_updater* SteamMasterServerUpdater() - { - static master_server_updater master_server_updater; - return &master_server_updater; - } + utils* SteamUtils() + { + static utils utils; + return &utils; + } - networking* SteamNetworking() - { - static networking networking; - return &networking; - } + apps* SteamApps() + { + static apps apps; + return &apps; + } - remote_storage* SteamRemoteStorage() - { - static remote_storage remote_storage; - return &remote_storage; - } - - user* SteamUser() - { - static user user; - return &user; - } - - utils* SteamUtils() - { - static utils utils; - return &utils; - } - - apps* SteamApps() - { - static apps apps; - return &apps; - } - - user_stats* SteamUserStats() - { - static user_stats user_stats; - return &user_stats; - } + user_stats* SteamUserStats() + { + static user_stats user_stats; + return &user_stats; + } } } diff --git a/src/steam/steam.hpp b/src/steam/steam.hpp index 91f4809..4637a0a 100644 --- a/src/steam/steam.hpp +++ b/src/steam/steam.hpp @@ -118,7 +118,7 @@ namespace steam STEAM_EXPORT apps* SteamApps(); STEAM_EXPORT user_stats* SteamUserStats(); - std::string get_steam_install_directory(); + std::wstring get_steam_install_directory(); extern ::utils::nt::library overlay; } diff --git a/src/utils/nt.cpp b/src/utils/nt.cpp index 4138c0e..acbbaaa 100644 --- a/src/utils/nt.cpp +++ b/src/utils/nt.cpp @@ -10,7 +10,7 @@ namespace utils::nt library library::load(const std::filesystem::path& path) { - return library::load(path.generic_string()); + return library(LoadLibraryW(path.generic_wstring().data())); } library library::get_by_address(void* address)