feat: Support for Millennium > 2.35.0

Author: shdwmtr

src/include/semver.h

@@ -44,7 +44,9 @@
 #include <http.h>
 #include <task_scheduler.h>
 #include <unzip.h>
+#include <semver.h>
 #include <atomic>
+#include <format>
 #include <windows.h>
 #include <tlhelp32.h>
 
@@ -189,6 +191,25 @@ TaskScheduler::TaskResult DownloadReleaseAssets(std::unique_ptr<double>& progres
     return { true, "success" };
 }
 
+static bool UsesNewInstallLayout(const std::string& tagName)
+{
+    std::string version = tagName;
+    if (!version.empty() && version[0] == 'v') {
+        version = version.substr(1);
+    }
+    try {
+        return semver::cmp(version, "2.35.0") > 0;
+    } catch (...) {
+        return false;
+    }
+}
+
+static std::string GetLocalAppDataPath()
+{
+    const char* localAppData = std::getenv("LOCALAPPDATA");
+    return localAppData ? std::string(localAppData) : std::string();
+}
+
 TaskScheduler::TaskResult InstallReleaseAssets(std::unique_ptr<double>& progress, const nlohmann::json& releaseInfo, const nlohmann::json& osReleaseInfo,
                                                const std::string& steamPath)
 {
@@ -198,7 +219,37 @@ TaskScheduler::TaskResult InstallReleaseAssets(std::unique_ptr<double>& progress
     const auto fileName = std::filesystem::temp_directory_path() / osReleaseInfo["name"].get<std::string>();
     double currentFileProgress = 0.0;
 
-    ExtractZippedArchive(fileName.string().c_str(), steamPath.c_str(), progress.get(), &currentFileProgress);
+    std::string tagName = releaseInfo.contains("tag_name") ? releaseInfo["tag_name"].get<std::string>() : "";
+
+    if (UsesNewInstallLayout(tagName)) {
+        std::string localAppData = GetLocalAppDataPath();
+        if (localAppData.empty()) {
+            return { false, "Failed to resolve %LOCALAPPDATA% path." };
+        }
+
+        auto millenniumPath = std::filesystem::path(localAppData) / "Millennium";
+        std::filesystem::create_directories(millenniumPath);
+
+        ExtractZippedArchive(fileName.string().c_str(), millenniumPath.string().c_str(), progress.get(), &currentFileProgress);
+
+        auto source = millenniumPath / "lib" / "millennium.bootstrap64.dll";
+        auto dest = std::filesystem::path(steamPath) / "wsock32.dll";
+
+        if (!std::filesystem::exists(source)) {
+            return { false, "millennium.bootstrap64.dll not found after extraction." };
+        }
+
+        std::error_code ec;
+        std::filesystem::remove(dest, ec);
+
+        std::filesystem::create_hard_link(source, dest, ec);
+        if (ec) {
+            return { false, std::format("Failed to create hardlink: {}", ec.message()) };
+        }
+    } else {
+        ExtractZippedArchive(fileName.string().c_str(), steamPath.c_str(), progress.get(), &currentFileProgress);
+    }
+
     return { true, "success" };
 }
 

src/routes/installer.cc

@@ -108,30 +108,56 @@ ComponentProps MakeComponentProps(std::vector<std::filesystem::path> pathList)
 
 std::vector<std::pair<std::string, std::tuple<ComponentState, ComponentProps>>> uninstallComponents;
 
+static std::filesystem::path GetMillenniumLocalPath()
+{
+    const char* localAppData = std::getenv("LOCALAPPDATA");
+    if (localAppData) {
+        return std::filesystem::path(localAppData) / "Millennium";
+    }
+    return {};
+}
+
 // clang-format off
 void InitializeUninstaller()
 {
     steamPath = GetSteamPath();
+    auto millenniumLocalPath = GetMillenniumLocalPath();
 
     isUninstalling = false;
     uninstallFinished = false;
 
+    bool isNewLayout = !millenniumLocalPath.empty() && std::filesystem::exists(millenniumLocalPath);
+
+    std::vector<std::filesystem::path> millenniumPaths;
+
+    if (isNewLayout) {
+        // New install (>2.35.0): files in %LOCALAPPDATA%/Millennium + hardlink in Steam
+        millenniumPaths = {
+            millenniumLocalPath / "lib",
+            millenniumLocalPath / "bin",
+            steamPath / "wsock32.dll",
+        };
+    } else {
+        // Legacy install (<=2.35.0): files in Steam directory
+        millenniumPaths = {
+            steamPath / "user32.dll",
+            steamPath / "version.dll",
+            steamPath / "wsock32.dll",
+            steamPath / "ext" / "compat32" / "millennium_x86.dll",
+            steamPath / "ext" / "compat32" / "python311.dll",
+            steamPath / "ext" / "compat64" / "millennium_x64.dll",
+            steamPath / "ext" / "compat64" / "python311.dll",
+            steamPath / "millennium.hhx64.dll",
+            steamPath / "millennium.dll",
+            steamPath / "python311.dll",
+        };
+    }
+
     uninstallComponents = {
-        { "Millennium", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ 
-            steamPath / "user32.dll", 
-            steamPath / "version.dll", 
-            steamPath / "wsock32.dll", 
-            steamPath / "ext" / "compat32" / "millennium_x86.dll", 
-            steamPath / "ext" / "compat32" / "python311.dll", 
-            steamPath / "ext" / "compat64" / "millennium_x64.dll", 
-            steamPath / "ext" / "compat64" / "python311.dll", 
-            steamPath / "millennium.hhx64.dll", 
-            steamPath / "millennium.dll", 
-            steamPath / "python311.dll" 
-        })) },
-        { "Custom Steam Components", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ 
-            steamPath / "ext" / "data" / "assets", 
-            steamPath / "ext" / "data" / "shims" 
+        { "Millennium", std::make_tuple(ComponentState({ false, true }), MakeComponentProps(millenniumPaths)) },
+        { "Custom Steam Components", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({
+            steamPath / "ext" / "data" / "assets",
+            steamPath / "ext" / "data" / "shims"
         })) },
         { "Dependencies", std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ steamPath / "ext" / "data" / "cache", steamPath / "ext" / "data" / "pyx64" })) },
         { "Themes",       std::make_tuple(ComponentState({ false, true }), MakeComponentProps({ steamPath / "steamui" / "skins" }))                                            },