Spore ModAPI Launcher: misc improvements

Author: Rosalie241

Spore ModAPI Launcher/Injector.cs

@@ -27,7 +27,8 @@ 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)
             {
-                Program.ThrowWin32Exception("Virtual alloc failure.");
+                string additionalErrorText = "\n" + "hProc: " + hProc.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero);
+                Program.ThrowWin32Exception("Virtual alloc failure.", additionalErrorText);
             }
 
             //Write the path to the DLL file in the location just created
@@ -53,7 +54,7 @@ public static IntPtr InjectDLL(NativeTypes.PROCESS_INFORMATION pi, string dllPat
             {
                 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 thread_result))
                 {
@@ -76,7 +77,7 @@ public static IntPtr InjectDLL(NativeTypes.PROCESS_INFORMATION pi, string dllPat
             return new IntPtr((Int64)thread_result);
         }
 
-        public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr hDLLInjectorHandle, bool is_disc_spore, List<string> dlls)
+        public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr hDLLInjectorHandle, bool is_disc_spore, string[] dlls)
         {
             IntPtr hLocalDLLInjectorHandle = NativeMethods.LoadLibraryEx("ModAPI.DLLInjector.dll", IntPtr.Zero, NativeTypes.LoadLibraryFlags.DONT_RESOLVE_DLL_REFERENCES);
             IntPtr SetInjectDataPtr = NativeMethods.GetProcAddress(hLocalDLLInjectorHandle, "SetInjectionData");
@@ -113,7 +114,7 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
             var bytes = new byte[total_alloc_size];
             int byte_offset = 0;
             bytes[byte_offset++] = (byte)(is_disc_spore ? 1 : 0);
-            foreach (byte b in BitConverter.GetBytes((uint)dlls.Count))
+            foreach (byte b in BitConverter.GetBytes((uint)dlls.Length))
                 bytes[byte_offset++] = b;
 
             foreach (string dll in dlls)

Spore ModAPI Launcher/Program.cs

@@ -191,53 +191,57 @@ public void ShowError(Exception ex)
             }
         }
 
-        List<string> GetDLLsToInject(string dllEnding)
+        string[] GetDLLsToInject(string dllEnding)
         {
             List<string> dlls = new List<string>();
 
             //coreLibs and mLibs
-            var baseFolder = new FileInfo(Assembly.GetEntryAssembly().Location).Directory;
-            var coreFolder = Path.Combine(baseFolder.FullName, "coreLibs");
-            var mFolder    = Path.Combine(baseFolder.FullName, "mLibs");
-            if (!Directory.Exists(mFolder))
-                Directory.CreateDirectory(mFolder);
-
-            string libName = "SporeModAPI.lib";
-            string MODAPI_DLL = "SporeModAPI-" + dllEnding + ".dll";
-            string coreDllName = GameVersion.GetNewDLLName(ExecutableType);
-            string coreDllOutPath = Path.Combine(mFolder, "SporeModAPI.dll");
-
-            if (coreDllName == null)
+            string basePath     = Path.GetDirectoryName(Assembly.GetEntryAssembly().Location);
+            string coreLibsPath = Path.Combine(basePath, "coreLibs");
+            string mLibsPath    = Path.Combine(basePath, "mLibs");
+
+            if (!Directory.Exists(mLibsPath))
+                Directory.CreateDirectory(mLibsPath);
+
+            string coreLibFile =  "SporeModAPI.lib";
+            string coreLibPath = Path.Combine(coreLibsPath, coreLibFile);
+            string coreLegacyDllName = "SporeModAPI-" + dllEnding + ".dll";
+            string coreLegacyDllPath = Path.Combine(basePath, coreLegacyDllName);
+            string coreDllPath = Path.Combine(coreLibsPath, GameVersion.GetNewDLLName(this.ExecutableType));
+            string coreDllOutPath = Path.Combine(mLibsPath, "SporeModAPI.dll");
+
+            // ensure ModAPI DLLs exist
+            foreach (string dll in new string[] { coreLegacyDllPath, coreDllPath })
             {
-                throw new Exception("Failed to retrieve DLL name!");
+                if (!File.Exists(dll))
+                {
+                    throw new FileNotFoundException("Required ModAPI DLL was not found: " + dll);
+                }
             }
 
-            File.Copy(Path.Combine(coreFolder, libName), Path.Combine(mFolder, libName), true);
-            File.Copy(Path.Combine(coreFolder, coreDllName), coreDllOutPath, true);
+            File.Copy(coreLibPath, Path.Combine(mLibsPath, coreLibFile), true);
+            File.Copy(coreDllPath, coreDllOutPath, true);
 
             dlls.Add(coreDllOutPath);
-            dlls.Add(Path.GetFullPath(MODAPI_DLL));
-
-            foreach (string s in Directory.EnumerateFiles(mFolder)
-                .Where(x => !Path.GetFileName(x).Equals(coreDllName, StringComparison.OrdinalIgnoreCase) && 
-                    x.ToLowerInvariant().EndsWith(".dll") &&
-                    !dlls.Contains(x)))
+            dlls.Add(coreLegacyDllPath);
+
+            foreach (string file in Directory.EnumerateFiles(mLibsPath)
+                                          .Where(x => 
+                                          {
+                                              x = x.ToLowerInvariant();
+                                              return x.EndsWith(".dll") && x != coreDllOutPath.ToLowerInvariant();
+                                          }))
             {
-                dlls.Add(s);
+                dlls.Add(file);
             }
 
-            foreach (var file in baseFolder.EnumerateFiles("*" + dllEnding + ".dll")
-                .Where(x => x.Name != MODAPI_DLL))
+            foreach (string file in Directory.EnumerateFiles(basePath, "*" + dllEnding + ".dll")
+                                            .Where(x => x.ToLowerInvariant() != coreLegacyDllPath.ToLowerInvariant()))
             {
-                // the ModAPI dll should already be loaded
-                if (file.Name != MODAPI_DLL)
-                {
-                    dlls.Add(file.FullName);
-                }
+                dlls.Add(file);
             }
 
-
-            return dlls;
+            return dlls.ToArray();
         }
 
         void InjectSporeProcess(string dllEnding)
@@ -249,7 +253,7 @@ void InjectSporeProcess(string dllEnding)
                 const string MOD_API_DLL_INJECTOR = "ModAPI.DLLInjector.dll";
                 IntPtr hDLLInjectorHandle = Injector.InjectDLL(this.ProcessInfo, Path.GetFullPath(MOD_API_DLL_INJECTOR));
 
-                List<string> dlls = GetDLLsToInject(dllEnding);
+                string[] dlls = GetDLLsToInject(dllEnding);
 
                 Injector.SetInjectionData(this.ProcessInfo, hDLLInjectorHandle, dllEnding == "disk", dlls);
 
@@ -280,20 +284,16 @@ void InjectSporeProcess(string dllEnding)
         void CreateSporeProcess()
         {
             var sb = new StringBuilder();
-            int i = 0;
-            foreach (string arg in Environment.GetCommandLineArgs())
+            // skip first argument because it's the launcher executable
+            foreach (string arg in Environment.GetCommandLineArgs().Skip(1))
             {
-                // the first argument is the path
-                if (i != 0)
-                {
-                    sb.Append(arg);
-                    sb.Append(" ");
-                }
-                i++;
+                sb.Append(arg);
+                sb.Append(" ");
             }
 
             if (!NativeMethods.CreateProcess(null, "\"" + this.ExecutablePath + "\" " + sb,
-                    IntPtr.Zero, IntPtr.Zero, false, NativeTypes.ProcessCreationFlags.CREATE_SUSPENDED, IntPtr.Zero, this.SporebinPath, ref this.StartupInfo, out this.ProcessInfo))
+                    IntPtr.Zero, IntPtr.Zero, false, NativeTypes.ProcessCreationFlags.CREATE_SUSPENDED, IntPtr.Zero, 
+                    this.SporebinPath, ref this.StartupInfo, out this.ProcessInfo))
             {
                 ThrowWin32Exception(Strings.ProcessNotStarted);
             }