Fixed unicode paths

CMakeLists.txt

@@ -34,6 +34,7 @@ set(SMOKE_API_STATIC_SOURCES
 set(SMOKE_API_SOURCES
     ${SMOKE_API_STATIC_SOURCES}
     src/steam_api/exports/steam_api.cpp
+    src/steam_api/exports/steam_api.hpp
     src/steam_api/exports/steam_api_flat.cpp
     src/steam_api/exports/steam_api_internal.cpp
     src/steam_api/exports/steam_api_unversioned.cpp
@@ -56,11 +57,6 @@ set(SMOKE_API_SOURCES
 
 add_library(SmokeAPI_interface INTERFACE)
 
-# There is a weird MSVC bug where c++23 features are not enabled in x64 builds,
-# while they are available in x86. I've no idea what causes this discrepancy,
-# but manually setting the MSVC compiler option fixes this issue.
-#target_compile_options(SmokeAPI_interface PUBLIC /std:c++latest)
-
 target_include_directories(SmokeAPI_interface INTERFACE
     "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/static>"
 )
@@ -71,17 +67,19 @@ target_link_libraries(SmokeAPI_interface INTERFACE KoalaBox $<TARGET_OBJECTS:Koa
 
 add_library(SmokeAPI_static STATIC ${SMOKE_API_STATIC_SOURCES})
 target_link_libraries(SmokeAPI_static PUBLIC SmokeAPI_interface)
-#target_include_directories(SmokeAPI_static PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/static")
 
 ### Shared SmokeAPI
 
 add_library(SmokeAPI SHARED ${SMOKE_API_SOURCES})
 target_link_libraries(SmokeAPI PUBLIC SmokeAPI_interface)
 set_target_properties(SmokeAPI PROPERTIES RUNTIME_OUTPUT_NAME ${STEAMAPI_DLL})
-configure_version_resource(SmokeAPI "Free DLC for everyone ʕ ᵔᴥᵔʔ")
+configure_version_resource(
+    TARGET SmokeAPI
+    FILE_DESC "Steamworks DLC unlocker"
+    ORIG_NAME ${STEAMAPI_DLL}
+)
 target_include_directories(SmokeAPI PRIVATE
     "${CMAKE_CURRENT_SOURCE_DIR}/src"
-#    "${CMAKE_CURRENT_SOURCE_DIR}/static"
     "${CMAKE_CURRENT_BINARY_DIR}")
 
 CPMAddPackage(
@@ -98,7 +96,6 @@ configure_linker_exports(
     DLL_FILES_GLOB "${CMAKE_CURRENT_SOURCE_DIR}/res/steamworks/*/binaries/${STEAM_API_DLL}"
 )
 
-# TODO: Why not add other compatible DLLs?
 configure_linker_exports(
     TARGET SmokeAPI
     HEADER_NAME "linker_exports_for_version"

src/smoke_api.cpp

@@ -4,15 +4,18 @@
 #include <koalabox/hook.hpp>
 #include <koalabox/loader.hpp>
 #include <koalabox/logger.hpp>
+#include <koalabox/path.hpp>
 #include <koalabox/paths.hpp>
+#include <koalabox/str.hpp>
 #include <koalabox/util.hpp>
-#include <koalabox/win_util.hpp>
+#include <koalabox/win.hpp>
 
 #include "build_config.h"
 
 #include "smoke_api.hpp"
 #include "smoke_api/config.hpp"
 #include "smoke_api/steamclient/steamclient.hpp"
+#include "steam_api/exports/steam_api.hpp"
 
 // Hooking steam_api has shown itself to be less desirable than steamclient
 // for the reasons outlined below:
@@ -51,7 +54,7 @@ namespace {
     void init_proxy_mode() {
         LOG_INFO("Detected proxy mode");
 
-        const auto self_path = kb::paths::get_self_path();
+        const auto self_path = kb::paths::get_self_dir();
         smoke_api::steamapi_module = kb::loader::load_original_library(self_path, STEAMAPI_DLL);
     }
 
@@ -60,16 +63,26 @@ namespace {
 
         kb::hook::init(true);
 
+        const std::vector<std::string> target_libraries{STEAMCLIENT_DLL, STEAMAPI_DLL};
         kb::dll_monitor::init_listener(
-            STEAMCLIENT_DLL,
+            target_libraries,
-            [](const HMODULE& steamclient_module) {
+            [&](const HMODULE& module_handle, const std::string& library_name) {
-                kb::hook::detour_or_warn(
+                static auto hook_count = 0U;
-                    steamclient_module,
-                    "CreateInterface",
-                    reinterpret_cast<uintptr_t>(CreateInterface)
-                );
 
-                kb::dll_monitor::shutdown_listener();
+                if(kb::str::eq(library_name, STEAMCLIENT_DLL)) {
+                    KB_HOOK_DETOUR_MODULE(CreateInterface, module_handle);
+
+                    hook_count++;
+                } else if(kb::str::eq(library_name, STEAMAPI_DLL)) {
+                    KB_HOOK_DETOUR_MODULE(SteamAPI_RestartAppIfNecessary, module_handle);
+                    KB_HOOK_DETOUR_MODULE(SteamAPI_Shutdown, module_handle);
+
+                    hook_count++;
+                }
+
+                if(hook_count == target_libraries.size()) {
+                    kb::dll_monitor::shutdown_listener();
+                }
             }
         );
     }
@@ -77,9 +90,9 @@ namespace {
 
 namespace smoke_api {
     HMODULE steamapi_module = nullptr;
+    bool hook_mode = false;
 
     void init(const HMODULE module_handle) {
-        // FIXME: IMPORTANT! Non ascii paths in directories will result in init errors
         try {
             kb::globals::init_globals(module_handle, PROJECT_NAME);
 
@@ -93,14 +106,15 @@ namespace smoke_api {
             // compilation time stamp only when this file gets recompiled.
             LOG_INFO("{} v{} | Compiled at '{}'", PROJECT_NAME, PROJECT_VERSION, __TIMESTAMP__);
 
-            const fs::path exe_path = kb::win_util::get_module_file_name_or_throw(nullptr);
+            const auto exe_path = kb::win::get_module_path(nullptr);
-            const auto exe_name = exe_path.filename().string();
+            const auto exe_name = kb::path::to_str(exe_path.filename());
 
             LOG_DEBUG("Process name: '{}' [{}-bit]", exe_name, kb::util::BITNESS);
 
             override_app_id();
 
             if(kb::hook::is_hook_mode(module_handle, STEAMAPI_DLL)) {
+                hook_mode = true;
                 init_hook_mode();
             } else {
                 init_proxy_mode();
@@ -115,7 +129,7 @@ namespace smoke_api {
     void shutdown() {
         try {
             if(steamapi_module != nullptr) {
-                kb::win_util::free_library(steamapi_module);
+                kb::win::free_library(steamapi_module);
                 steamapi_module = nullptr;
             }
 

src/smoke_api.hpp

@@ -20,9 +20,17 @@ constexpr auto STEAM_INVENTORY = "STEAMINVENTORY_INTERFACE_V";
 #define MODULE_CALL_CLOSURE(FUNC, ...) \
     [&] { MODULE_CALL(FUNC, __VA_ARGS__); }
 
+#define AUTO_CALL(FUNC, ...) \
+   static const auto _##FUNC = smoke_api::hook_mode \
+    ? KB_HOOK_GET_HOOKED_FN(FUNC) \
+    : KB_HOOK_GET_MODULE_FN(smoke_api::steamapi_module, FUNC); \
+    return _##FUNC(__VA_ARGS__)
+
 namespace smoke_api {
     extern HMODULE steamapi_module;
 
+    extern bool hook_mode;
+
     void init(HMODULE module_handle);
 
     void shutdown();

src/steam_api/exports/steam_api.cpp

@@ -1,23 +1,20 @@
 #include <koalabox/logger.hpp>
 
+#include "steam_api/exports/steam_api.hpp"
 #include "smoke_api.hpp"
 #include "smoke_api/config.hpp"
 
-// TODO: Support in hook mode
+DLL_EXPORT(bool) SteamAPI_RestartAppIfNecessary(const AppId_t unOwnAppID) {
-DLL_EXPORT(bool) SteamAPI_RestartAppIfNecessary(const uint32_t unOwnAppID) {
     if(smoke_api::config::instance.override_app_id != 0) {
         LOG_DEBUG("{} -> {}. Preventing app restart", unOwnAppID, __func__);
         return false;
     }
 
-    // Note: Assumes proxy mode only
+    AUTO_CALL(SteamAPI_RestartAppIfNecessary, unOwnAppID);
-    MODULE_CALL(SteamAPI_RestartAppIfNecessary, unOwnAppID);
 }
 
-// TODO: Support in hook mode
 DLL_EXPORT(void) SteamAPI_Shutdown() {
     LOG_INFO("{} -> Game requested shutdown", __func__);
 
-    // Note: Assumes proxy mode only
+    AUTO_CALL(SteamAPI_Shutdown);
-    MODULE_CALL(SteamAPI_Shutdown);
 }

src/steam_api/exports/steam_api.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include "smoke_api.hpp"
+#include "smoke_api/types.hpp"
+
+DLL_EXPORT(bool) SteamAPI_RestartAppIfNecessary(AppId_t unOwnAppID);
+
+DLL_EXPORT(void) SteamAPI_Shutdown();

src/steam_api/exports/steam_api_unversioned.cpp

@@ -3,7 +3,7 @@
 
 #include <koalabox/logger.hpp>
 #include <koalabox/util.hpp>
-#include <koalabox/win_util.hpp>
+#include <koalabox/win.hpp>
 
 #include "smoke_api.hpp"
 #include "steam_api/steam_client.hpp"
@@ -23,7 +23,7 @@ namespace {
 
         if(not version_map.contains(version_prefix)) {
             try {
-                const std::string rdata = kb::win_util::get_pe_section_data_or_throw(
+                const std::string rdata = kb::win::get_pe_section_data_or_throw(
                     smoke_api::steamapi_module,
                     ".rdata"
                 );

src/steam_api/steam_interface.cpp

@@ -6,7 +6,7 @@
 #include <koalabox/hook.hpp>
 #include <koalabox/logger.hpp>
 #include <koalabox/util.hpp>
-#include <koalabox/win_util.hpp>
+#include <koalabox/win.hpp>
 
 #include "smoke_api.hpp"
 #include "virtuals/steam_api_virtuals.hpp"
@@ -113,7 +113,7 @@ namespace steam_interface {
     namespace kb = koalabox;
 
     AppId_t get_app_id_or_throw() {
-        const auto app_id_str = kb::win_util::get_env_var("SteamAppId");
+        const auto app_id_str = kb::win::get_env_var("SteamAppId");
         return std::stoi(app_id_str);
     }
 

tools/CMakeLists.txt

@@ -17,11 +17,7 @@ target_include_directories(BS_thread_pool INTERFACE ${BS_thread_pool_SOURCE_DIR}
 ### Steamworks Downloader executable
 
 add_executable(steamworks_downloader steamworks_downloader.cpp)
-target_link_libraries(steamworks_downloader PRIVATE
+target_link_libraries(steamworks_downloader PRIVATE KoalaBox)
-    KoalaBox
-    cpr # HTTP client
-    miniz # ZIP library TODO: Use koalabox instead
-)
 
 ### Steamworks Parser executable
 

tools/steamworks_downloader.cpp

@@ -6,6 +6,7 @@
 
 #include <koalabox/http_client.hpp>
 #include <koalabox/logger.hpp>
+#include <koalabox/path.hpp>
 #include <koalabox/str.hpp>
 #include <koalabox/zip.hpp>
 
@@ -91,10 +92,12 @@ int wmain(const int argc, const wchar_t** argv) { // NOLINT(*-use-internal-linka
 
     const auto steamworks_dir = std::filesystem::current_path() / "steamworks";
 
+    // Special case. If there is a directory with a bunch of SDKs downloaded,
+    // then we can just provide it as a single argument
     if(argc == 2) {
         if(const auto cdn_dir = kb::str::to_str(argv[1]); fs::is_directory(cdn_dir)) {
             for(const auto& entry : fs::directory_iterator(cdn_dir)) {
-                const auto filename = entry.path().filename().string();
+                const auto filename = kb::path::to_str(entry.path().filename());
                 const std::regex re(R"(steamworks_sdk_(.+)\.zip)");
 
                 if(std::smatch match; std::regex_match(filename, match, re)) {

tools/steamworks_parser.cpp

@@ -12,8 +12,8 @@
 #include <koalabox/io.hpp>
 #include <koalabox/logger.hpp>
 #include <koalabox/parser.hpp>
+#include <koalabox/path.hpp>
 #include <koalabox/str.hpp>
-#include <koalabox/util.hpp>
 
 namespace {
     namespace fs = std::filesystem;
@@ -123,8 +123,7 @@ namespace {
         static std::mutex section;
         if(not
             interface_version.empty()
-        )
+        ) {
-        {
             const std::lock_guard lock(section);
             lookup[interface_version] = current_lookup;
         }
@@ -150,13 +149,14 @@ namespace {
         BS::thread_pool<>& pool
     ) {
         const auto headers_dir = sdk_path / "headers\\steam";
+        const auto headers_dir_str = kb::path::to_str(headers_dir);
 
         if(not fs::exists(headers_dir)) {
-            LOG_WARN("Warning: SDK missing 'headers' directory: {}", headers_dir.string());
+            LOG_WARN("Warning: SDK missing 'headers/steam' directory: {}", headers_dir_str);
             return;
         }
 
-        LOG_INFO("Parsing SDK: {}", headers_dir.string());
+        LOG_INFO("Parsing SDK: {}", headers_dir_str);
 
         // Go over each file in headers directory
         for(const auto& entry : fs::directory_iterator(headers_dir)) {
@@ -164,7 +164,7 @@ namespace {
                 const auto task = pool.submit_task(
                     [&, header_path] {
                         try {
-                            LOG_DEBUG("Parsing header: {}", header_path.string());
+                            LOG_DEBUG("Parsing header: {}", kb::path::to_str(header_path));
 
                             const auto processed_header = manually_preprocess_header(header_path);
                             parse_header(processed_header, lookup);
@@ -193,21 +193,14 @@ namespace {
 
         // Go over each steamworks sdk version
         for(const auto& entry : fs::directory_iterator(steamworks_dir)) {
-            if(not
+            if(not entry.is_directory()) {
-                entry.is_directory()
-            )
-            {
                 continue;
             }
 
-            if(not
+            if(
-                sdk_filter.empty()
+                not sdk_filter.empty() and
-            and
+                not sdk_filter.contains(kb::path::to_str(entry.path().filename()))
-               not sdk_filter
+            ) {
-            .
-            contains(entry.path().filename().string())
-            )
-            {
                 continue;
             }
 
@@ -222,7 +215,10 @@ namespace {
         std::ofstream lookup_output(interface_lookup_path);
         lookup_output << std::setw(4) << lookup;
 
-        LOG_INFO("Interface lookup generated at: {}", fs::absolute(interface_lookup_path).string());
+        LOG_INFO(
+            "Interface lookup generated at: {}",
+            kb::path::to_str(fs::absolute(interface_lookup_path))
+        );
     }
 }
 
@@ -259,4 +255,4 @@ int wmain(const int argc, const wchar_t* argv[]) { // NOLINT(*-use-internal-link
         LOG_CRITICAL("Error: {}", e.what());
         return 1;
     }
-}
+}