Spore ModAPI Launcher: cleanup ThrowWin32Exception() and use it more

Author: Rosalie241

Spore ModAPI Launcher/Injector.cs

@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-
-using System.Runtime.InteropServices;
 using System.Threading;
 using ModAPI.Common;
 
@@ -29,9 +27,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)
             {
-                int lastError = Marshal.GetLastWin32Error();
-                System.Windows.Forms.MessageBox.Show("Error: " + lastError.ToString() + "\n" + "hProc: " + hProc.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero), "Virtual alloc failure.");
-                throw new System.ComponentModel.Win32Exception(lastError);
+                Program.ThrowWin32Exception("Virtual alloc failure.");
             }
 
             //Write the path to the DLL file in the location just created
@@ -45,7 +41,6 @@ public static IntPtr InjectDLL(NativeTypes.PROCESS_INFORMATION pi, string dllPat
             bool writeProcessMemoryOutput = NativeMethods.WriteProcessMemory(hProc, objPtr, bytes, (uint)bytes.Length, out numBytesWritten);
             if (!writeProcessMemoryOutput || numBytesWritten.ToUInt32() != bytes.Length)
             {
-                /*throw new InjectException("Write process memory failed.");*/
                 Program.ThrowWin32Exception("Write process memory failed.");
             }
 
@@ -70,9 +65,8 @@ public static IntPtr InjectDLL(NativeTypes.PROCESS_INFORMATION pi, string dllPat
             }
             else
             {
-                int lastError = System.Runtime.InteropServices.Marshal.GetLastWin32Error();
-                System.Windows.Forms.MessageBox.Show("Error: " + lastError.ToString(), "Create remote thread failed.");
-                throw new System.ComponentModel.Win32Exception(lastError);
+                Program.ThrowWin32Exception("Create remote thread failed.");
+                return IntPtr.Zero; // silence a warning
             }
 
             NativeMethods.VirtualFreeEx(hProc, objPtr, (uint)0, NativeTypes.AllocationType.Release);
@@ -89,9 +83,8 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
 
             if (SetInjectDataPtr == IntPtr.Zero)
             {
-                int lastError = Marshal.GetLastWin32Error();
-                System.Windows.Forms.MessageBox.Show("Error: " + lastError.ToString() + "\n" + "hDLLInjectorHandle: " + hDLLInjectorHandle.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero), "Get proc address failure.");
-                throw new System.ComponentModel.Win32Exception(lastError);
+                string additionalErrorText = "\n" + "hDLLInjectorHandle: " + hDLLInjectorHandle.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero);
+                Program.ThrowWin32Exception("Get proc address failure.", additionalErrorText);
             }
 
             SetInjectDataPtr = new IntPtr(hDLLInjectorHandle.ToInt64() + (SetInjectDataPtr.ToInt64() - hLocalDLLInjectorHandle.ToInt64()));
@@ -112,9 +105,8 @@ 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)
             {
-                int lastError = Marshal.GetLastWin32Error();
-                System.Windows.Forms.MessageBox.Show("Error: " + lastError.ToString() + "\n" + "hProc: " + hProc.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero), "Virtual alloc failure.");
-                throw new System.ComponentModel.Win32Exception(lastError);
+                string additionalErrorText = "\n" + "hProc: " + hProc.ToString() + "\nProgram.processHandle: " + (Program.processHandle == IntPtr.Zero);
+                Program.ThrowWin32Exception("Virtual alloc failure.", additionalErrorText);
             }
 
             //write injection data
@@ -148,7 +140,6 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
             {
                 if (NativeMethods.WaitForSingleObject(hRemoteThread, MAXWAIT) == WAIT_TIMEOUT)
                 {
-                    //throw new InjectException("Wait for single object failed.");
                     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.");
                 }
                 while (NativeMethods.GetExitCodeThread(hRemoteThread, out var thread_result))
@@ -160,9 +151,7 @@ public static void SetInjectionData(NativeTypes.PROCESS_INFORMATION pi, IntPtr h
             }
             else
             {
-                int lastError = Marshal.GetLastWin32Error();
-                System.Windows.Forms.MessageBox.Show("Error: " + lastError, "Create remote thread failed.");
-                throw new System.ComponentModel.Win32Exception(lastError);
+                Program.ThrowWin32Exception("Create remote thread failed.");
             }
 
             NativeMethods.VirtualFreeEx(hProc, objPtr, (uint)0, NativeTypes.AllocationType.Release);

Spore ModAPI Launcher/Program.cs

@@ -10,10 +10,10 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading;
 using System.Windows.Forms;
-using System.Xml;
 
 namespace SporeModAPI_Launcher
 {
@@ -162,11 +162,6 @@ void Execute()
                 }
 
                 InjectSporeProcess(dllEnding);
-
-                int lastError = System.Runtime.InteropServices.Marshal.GetLastWin32Error();
-                
-                if (lastError != 0 && lastError != 18)
-                    ThrowWin32Exception("Something went wrong", lastError);
             }
             catch (Exception ex)
             {
@@ -177,7 +172,7 @@ void Execute()
         public void ShowError(Exception ex)
         {
             string versionInfo = "Launcher Kit version: " + UpdateManager.CurrentVersion + "\nModAPI DLLs version: " + UpdateManager.CurrentDllsBuild + "\nLauncher Kit path: " + Assembly.GetEntryAssembly().Location;
-            if(this.ExecutablePath != null && File.Exists(this.ExecutablePath))
+            if (this.ExecutablePath != null && File.Exists(this.ExecutablePath))
             {
                 versionInfo += "\n\nSpore version: " + FileVersionInfo.GetVersionInfo(this.ExecutablePath).FileVersion + " - " + this.ExecutableType + "\nSpore path: " + this.ExecutablePath;
             }
@@ -186,8 +181,8 @@ public void ShowError(Exception ex)
             {
                 var exc = ex as System.ComponentModel.Win32Exception;
                 MessageBox.Show("ErrorCode: " + exc.ErrorCode + "\n" +
-                    "NativeErrorCode: " + exc.NativeErrorCode + "\n" +
-                    "HResult: " + exc.HResult + "\n", "Additional Win32Exception Error Info");
+                                "NativeErrorCode: " + exc.NativeErrorCode + "\n" +
+                                "HResult: " + exc.HResult + "\n", "Additional Win32Exception Error Info");
 
                 if (exc.InnerException != null)
                 {
@@ -300,18 +295,14 @@ void CreateSporeProcess()
             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))
             {
-                //throw new InjectException(Strings.ProcessNotStarted);
-                int lastError = System.Runtime.InteropServices.Marshal.GetLastWin32Error();
-                System.Windows.Forms.MessageBox.Show("Error: " + lastError, Strings.ProcessNotStarted);
-                throw new System.ComponentModel.Win32Exception(lastError);
+                ThrowWin32Exception(Strings.ProcessNotStarted);
             }
         }
 
         void ResumeSporeProcess()
         {
             if (NativeMethods.ResumeThread(this.ProcessInfo.hThread) != 1)
             {
-                /*throw new InjectException(Strings.ProcessNotResumed);*/
                 ThrowWin32Exception(Strings.ProcessNotResumed);
             }
         }
@@ -394,38 +385,11 @@ static bool ExtractFixFiles(MemoryStream zipStream, string outputPath)
             }
         }
 
-        public static void ThrowWin32Exception(string info)
-        {
-            ThrowWin32Exception(info, System.Runtime.InteropServices.Marshal.GetLastWin32Error());
-        }
-
-        public static void ThrowWin32Exception(string info, int error)
-        {
-            if ((error != 0) && (error != 18))
-            {
-                System.Windows.Forms.MessageBox.Show("Error: " + error, info);
-                throw new System.ComponentModel.Win32Exception(error);
-            }
-        }
-
-        private static List<string> GetModFiles(XmlNode componentNode)
+        public static void ThrowWin32Exception(string title, string additionalErrorText = "")
         {
-            var modFiles = new List<string>();
-            foreach (XmlNode child in componentNode.ChildNodes)
-            {
-                switch (child.Name.ToLower())
-                {
-                    case "component":
-                    case "prerequisite":
-                    case "compatfile":
-                        modFiles.AddRange(child.InnerText.Split('?'));
-                        break;
-                    case "componentgroup":
-                        modFiles.AddRange(GetModFiles(child));
-                        break;
-                }
-            }
-            return modFiles;
+            int error = Marshal.GetLastWin32Error();
+            MessageBox.Show("Error: " + error + additionalErrorText, title);
+            throw new Win32Exception(error);
         }
     }
 }