Added: Uninstall Hint to Loader Log

Reloaded-Project · Mar 17, 2024 · 1721e1a · 1721e1a
1 parent e9d256b
commit 1721e1a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/source/Reloaded.Mod.Loader.Bootstrapper/EntryPointParameter.h b/source/Reloaded.Mod.Loader.Bootstrapper/EntryPointParameter.h
@@ -1,7 +1,7 @@
 #pragma once
 
 /* For C# source, see EntryPoint.cs */
-#define CURRENT_VERSION 7
+#define CURRENT_VERSION 8
 
 enum EntryPointFlags : int
 {
@@ -19,6 +19,7 @@ struct EntryPointParameters
 public:
 	int version { CURRENT_VERSION };
 	EntryPointFlags flags { None };
+	LPWSTR dll_path { nullptr };
 
 	EntryPointParameters() = default;
 };

diff --git a/source/Reloaded.Mod.Loader.Bootstrapper/dllmain.cpp b/source/Reloaded.Mod.Loader.Bootstrapper/dllmain.cpp
@@ -180,6 +180,10 @@ bool load_reloaded(ReloadedPaths& reloadedPaths)
 		throw std::exception("Failed to load .NET assembly.");
 	}
 
+	// Set path to current dll
+	// Using GetModuleFileNameW
+	entryPointParameters.dll_path = new wchar_t[MAX_PATH];
+	GetModuleFileNameW(thisProcessModule, entryPointParameters.dll_path, MAX_PATH);
 	initialize(&entryPointParameters, sizeof(EntryPointParameters));
 	return true;
 }

diff --git a/source/Reloaded.Mod.Loader/EntryPoint.cs b/source/Reloaded.Mod.Loader/EntryPoint.cs
@@ -92,10 +92,18 @@ private static unsafe void SetupLoader2(EntryPointParameters* parameters)
 
         var setupHooksTask = Task.Run(() => ExecuteTimed("Setting Up Hooks (Async)", () => SetupHooks(hooks)));
         InitialiseParameters(parameters);
+        if (_parameters.SupportsDllPath && _parameters.DllPath != null)
+        {
+            var reloadedPath = Marshal.PtrToStringUni((nint)_parameters.DllPath);
+            Logger!.LogWriteLineAsync($"Loaded via: {reloadedPath}", Logger.ColorInformation);
+            if (reloadedPath!.EndsWith(".asi"))
+                Logger!.LogWriteLineAsync($"Remove the above `.asi` file to uninstall. (Should be in your app/game folder)", Logger.ColorInformation);
+        }
+
         ExecuteTimed("Loading Mods (Total)", () => LoadMods(hooks));
 
         setupHooksTask.Wait();
-        Logger?.LogWriteLineAsync($"Total Loader Initialization Time: {_stopWatch.ElapsedMilliseconds}ms");
+        Logger!.LogWriteLineAsync($"Total Loader Initialization Time: {_stopWatch.ElapsedMilliseconds}ms");
         _stopWatch.Reset();
     }
 

diff --git a/source/Reloaded.Mod.Shared/EntryPointParameters.cs b/source/Reloaded.Mod.Shared/EntryPointParameters.cs
@@ -14,7 +14,7 @@ public struct EntryPointParameters
     /// <summary>
     /// Current version of parameters.
     /// </summary>
-    public const int CurrentVersion = 7;
+    public const int CurrentVersion = 8;
 
     // Version 1
     /// <summary>
@@ -30,6 +30,11 @@ public struct EntryPointParameters
     // Version 2
     // ...
 
+    /// <summary>
+    /// Contains the path to the native DLL which loaded the loader.
+    /// </summary>
+    public unsafe char* DllPath;
+
     /// <summary>
     /// Checks if struct is using latest version.
     /// </summary>
@@ -55,9 +60,19 @@ public static unsafe EntryPointParameters Copy(EntryPointParameters* pointer)
             result.Version = pointer->Version;
             result.Flags = pointer->Flags;
         }
+
+        if (pointer->Version >= 8)
+        {
+            result.DllPath = pointer->DllPath;
+        }
 
         return result;
     }
+
+    /// <summary>
+    /// True if reading the DLL path is supported.
+    /// </summary>
+    public bool SupportsDllPath => Version >= 8;
 }
 
 /// <summary>