Spore ModAPI Launcher: more cleanup

Author: Rosalie241

Spore ModAPI Launcher/Injector.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading;
 using ModAPI.Common;
@@ -9,16 +8,16 @@ namespace SporeModAPI_Launcher
     public class Injector
     {
         private const int WAIT_TIMEOUT = 0x102;
-        private const uint MAXWAIT = 15000; //10000;
-        private const uint AccessRequired = 0x0002 | 0x0020 | 0x0008 | 0x0400 | 0x0010; //0x0002 | 0x0020 | 0x0008; //0xF0000 | 0x00100000 | 0xFFFF;
+        private const uint MAXWAIT = 15000;
+        private const uint AccessRequired = 0x0002 | 0x0020 | 0x0008 | 0x0400 | 0x0010;
 
         public static IntPtr InjectDLL(NativeTypes.PROCESS_INFORMATION pi, string dllPath)
         {
             IntPtr retLib = NativeMethods.GetProcAddress(NativeMethods.GetModuleHandle("Kernel32.dll"), "LoadLibraryA");
 
             if (retLib == IntPtr.Zero)
             {
-                throw new InjectException("LoadLibrary unreachable.");
+                throw new Exception("LoadLibrary unreachable.");
             }
 
             IntPtr hProc = NativeMethods.OpenProcess(AccessRequired, false, pi.dwProcessId); //Open the process with all access
@@ -27,7 +26,7 @@ public static IntPtr InjectDLL(NativeTypes.PROCESS_INFORMATION pi, string dllPat
             IntPtr objPtr = NativeMethods.VirtualAllocEx(hProc, IntPtr.Zero, (uint)dllPath.Length + 1, NativeTypes.AllocationType.Commit, NativeTypes.MemoryProtection.ReadWrite);
             if (objPtr == IntPtr.Zero)
             {
-                string additionalErrorText = "\n" + "hProc: " + hProc.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero);
+                string additionalErrorText = "\n" + "hProc: " + hProc.ToString();
                 Program.ThrowWin32Exception("Virtual alloc failure.", additionalErrorText);
             }
 
@@ -38,15 +37,14 @@ public static IntPtr InjectDLL(NativeTypes.PROCESS_INFORMATION pi, string dllPat
             }
             bytes[dllPath.Length] = 0;
 
-            UIntPtr numBytesWritten;
-            bool writeProcessMemoryOutput = NativeMethods.WriteProcessMemory(hProc, objPtr, bytes, (uint)bytes.Length, out numBytesWritten);
+            bool writeProcessMemoryOutput = NativeMethods.WriteProcessMemory(hProc, objPtr, bytes, (uint)bytes.Length, out UIntPtr numBytesWritten);
             if (!writeProcessMemoryOutput || numBytesWritten.ToUInt32() != bytes.Length)
             {
                 Program.ThrowWin32Exception("Write process memory failed.");
             }
 
             // Create a remote thread that begins at the LoadLibrary function and is passed as memory pointer
-            IntPtr hRemoteThread = NativeMethods.CreateRemoteThread(hProc, IntPtr.Zero, 0, retLib, objPtr, 0, out var lpThreadId);
+            IntPtr hRemoteThread = NativeMethods.CreateRemoteThread(hProc, IntPtr.Zero, 0, retLib, objPtr, 0, out _);
 
             // Wait for the thread to finish
             uint thread_result;
@@ -84,7 +82,7 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
 
             if (SetInjectDataPtr == IntPtr.Zero)
             {
-                string additionalErrorText = "\n" + "hDLLInjectorHandle: " + hDLLInjectorHandle.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero);
+                string additionalErrorText = "\n" + "hDLLInjectorHandle: " + hDLLInjectorHandle.ToString();
                 Program.ThrowWin32Exception("Get proc address failure.", additionalErrorText);
             }
 
@@ -106,7 +104,7 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
             IntPtr objPtr = NativeMethods.VirtualAllocEx(hProc, IntPtr.Zero, (uint)total_alloc_size, NativeTypes.AllocationType.Commit, NativeTypes.MemoryProtection.ReadWrite);
             if (objPtr == IntPtr.Zero)
             {
-                string additionalErrorText = "\n" + "hProc: " + hProc.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero);
+                string additionalErrorText = "\n" + "hProc: " + hProc.ToString();
                 Program.ThrowWin32Exception("Virtual alloc failure.", additionalErrorText);
             }
 
@@ -141,7 +139,7 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
             {
                 if (NativeMethods.WaitForSingleObject(hRemoteThread, MAXWAIT) == WAIT_TIMEOUT)
                 {
-                    Program.ThrowWin32Exception("Wait for single object failed. This usually occurs if something has become stuck during injection, or if another error was left open for too long.");
+                    Program.ThrowWin32Exception("Wait for single object failed.");
                 }
                 while (NativeMethods.GetExitCodeThread(hRemoteThread, out var thread_result))
                 {
@@ -160,17 +158,4 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
             NativeMethods.CloseHandle(hProc);
         }
     }
-
-    [Serializable()]
-    public class InjectException : Exception
-    {
-        public InjectException() : base() { }
-        public InjectException(string message) : base(message) { }
-        public InjectException(string message, System.Exception inner) : base(message, inner) { }
-
-        // A constructor is needed for serialization when an
-        // exception propagates from a remoting server to the client. 
-        protected InjectException(System.Runtime.Serialization.SerializationInfo info,
-            System.Runtime.Serialization.StreamingContext context) { }
-    }
 }

Spore ModAPI Launcher/Program.cs

@@ -20,8 +20,6 @@ namespace SporeModAPI_Launcher
 
     class Program
     {
-        public static IntPtr processHandle = IntPtr.Zero;
-
         private const string ModAPIFixDownloadURL = "https://davoonline.com/sporemodder/emd4600/SporeApp_ModAPIFix.zip";
         private const string ModApiHelpThreadURL = "https://launcherkit.sporecommunity.com/support";
 
@@ -33,6 +31,8 @@ class Program
         private NativeTypes.STARTUPINFO StartupInfo;
         private NativeTypes.PROCESS_INFORMATION ProcessInfo;
 
+        private string LauncherKitPath;
+
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
@@ -71,6 +71,9 @@ void Execute()
         {
             try
             {
+                // store the launcher kit path for later
+                this.LauncherKitPath = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+
                 // We try a new approach for Steam users.
                 // Before, we used Steam to launch the game and tried to find the new process and inject it.
                 // However, when the injection happens the game already executed a bit, so mods fail.
@@ -154,14 +157,7 @@ void Execute()
                     }
                 }
 
-                string dllEnding = GameVersion.GetVersionName(this.ExecutableType);
-                if (dllEnding == null)
-                {
-                    MessageBox.Show(Strings.VersionNotDetected, CommonStrings.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    return;
-                }
-
-                InjectSporeProcess(dllEnding);
+                InjectSporeProcess(GameVersion.GetVersionName(this.ExecutableType));
             }
             catch (Exception ex)
             {
@@ -177,9 +173,9 @@ public void ShowError(Exception ex)
                 versionInfo += "\n\nSpore version: " + FileVersionInfo.GetVersionInfo(this.ExecutablePath).FileVersion + " - " + this.ExecutableType + "\nSpore path: " + this.ExecutablePath;
             }
             MessageBox.Show(Strings.GalacticAdventuresNotExecuted + "\n" + ModApiHelpThreadURL + "\n\n" + ex.GetType() + "\n\n" + ex.Message + "\n\n" + ex.StackTrace + "\n\n" + versionInfo, CommonStrings.Error, MessageBoxButtons.OK, MessageBoxIcon.Error);
-            if (ex is System.ComponentModel.Win32Exception)
+            if (ex is Win32Exception)
             {
-                var exc = ex as System.ComponentModel.Win32Exception;
+                var exc = ex as Win32Exception;
                 MessageBox.Show("ErrorCode: " + exc.ErrorCode + "\n" +
                                 "NativeErrorCode: " + exc.NativeErrorCode + "\n" +
                                 "HResult: " + exc.HResult + "\n", "Additional Win32Exception Error Info");
@@ -196,17 +192,16 @@ string[] GetDLLsToInject(string dllEnding)
             List<string> dlls = new List<string>();
 
             //coreLibs and mLibs
-            string basePath     = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
-            string coreLibsPath = Path.Combine(basePath, "coreLibs");
-            string mLibsPath    = Path.Combine(basePath, "mLibs");
+            string coreLibsPath = Path.Combine(this.LauncherKitPath, "coreLibs");
+            string mLibsPath    = Path.Combine(this.LauncherKitPath, "mLibs");
 
             if (!Directory.Exists(mLibsPath))
                 Directory.CreateDirectory(mLibsPath);
 
-            string coreLibFile =  "SporeModAPI.lib";
+            const string coreLibFile =  "SporeModAPI.lib";
             string coreLibPath = Path.Combine(coreLibsPath, coreLibFile);
             string coreLegacyDllName = "SporeModAPI-" + dllEnding + ".dll";
-            string coreLegacyDllPath = Path.Combine(basePath, coreLegacyDllName);
+            string coreLegacyDllPath = Path.Combine(this.LauncherKitPath, coreLegacyDllName);
             string coreDllPath = Path.Combine(coreLibsPath, GameVersion.GetNewDLLName(this.ExecutableType));
             string coreDllOutPath = Path.Combine(mLibsPath, "SporeModAPI.dll");
 
@@ -235,7 +230,7 @@ string[] GetDLLsToInject(string dllEnding)
                 dlls.Add(file);
             }
 
-            foreach (string file in Directory.EnumerateFiles(basePath, "*" + dllEnding + ".dll")
+            foreach (string file in Directory.EnumerateFiles(this.LauncherKitPath, "*" + dllEnding + ".dll")
                                             .Where(x => x.ToLowerInvariant() != coreLegacyDllPath.ToLowerInvariant()))
             {
                 dlls.Add(file);
@@ -250,8 +245,8 @@ void InjectSporeProcess(string dllEnding)
 
             try
             {
-                const string MOD_API_DLL_INJECTOR = "ModAPI.DLLInjector.dll";
-                IntPtr hDLLInjectorHandle = Injector.InjectDLL(this.ProcessInfo, Path.GetFullPath(MOD_API_DLL_INJECTOR));
+                const string modApiDllInjector = "ModAPI.DLLInjector.dll";
+                IntPtr hDLLInjectorHandle = Injector.InjectDLL(this.ProcessInfo, Path.Combine(this.LauncherKitPath, modApiDllInjector));
 
                 string[] dlls = GetDLLsToInject(dllEnding);
 

Spore ModAPI Launcher/Strings.resx

@@ -120,9 +120,6 @@
   <data name="DownloadFixTitle" xml:space="preserve">
     <value>Downloading ModAPI Fix</value>
   </data>
-  <data name="Downloading" xml:space="preserve">
-    <value>Downloading</value>
-  </data>
   <data name="DownloadOriginFix" xml:space="preserve">
     <value>EA App and Origin users need to download an additional file in order for mods to work. If you press OK, the launcher will download and apply this additional file.</value>
   </data>
@@ -132,18 +129,12 @@
   <data name="GalacticAdventuresNotExecuted" xml:space="preserve">
     <value>Something went wrong while starting or injecting your mods into Spore. The game may start, but some mods will not work correctly. Please report the issue, along with a screenshot of this error, using the instructions at the following website:</value>
   </data>
-  <data name="MightNotWork" xml:space="preserve">
-    <value>The Launcher Kit requires Galactic Adventures and one of the following three game versions: 3.0.0.2818 (disc only), 3.1.0.22, or 3.1.0.29. If your game crashes or mods do not work, download the latest version of Spore and Galactic Adventures. Disc users must instead manually install patch 1.5.1 after installing Galactic Adventures.</value>
-  </data>
   <data name="ProcessNotResumed" xml:space="preserve">
     <value>Process thread could not be resumed.</value>
   </data>
   <data name="ProcessNotStarted" xml:space="preserve">
     <value>Could not start process.</value>
   </data>
-  <data name="VersionNotDetected" xml:space="preserve">
-    <value>Your version could not be detected, ModAPI won't load.</value>
-  </data>
   <data name="CannotApplySteamFix" xml:space="preserve">
     <value>Could not apply the Steam fix. To apply it, you can do one of these two options:
  - Re-execute the Launcher with Administrator Privileges.