update

gwdevhub · Jan 19, 2025 · 910fb6d · 910fb6d
1 parent f20a168
commit 910fb6d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/GW Launcher/Memory/GWCAMemory.cs b/GW Launcher/Memory/GWCAMemory.cs
@@ -351,6 +351,7 @@ public enum LoadModuleResult
         MEMORY_NOT_ALLOCATED,
         PATH_NOT_WRITTEN,
         REMOTE_THREAD_NOT_SPAWNED,
+        REMOTE_THREAD_DID_NOT_START,
         REMOTE_THREAD_DID_NOT_FINISH,
         MEMORY_NOT_DEALLOCATED
     }
@@ -402,7 +403,7 @@ public LoadModuleResult LoadModule(string modulepath)
         var threadResult = WaitForSingleObject(hThread, 5000u);
         if (threadResult is 0x102 or 0xFFFFFFFF /* WAIT_FAILED */)
         {
-            return LoadModuleResult.REMOTE_THREAD_DID_NOT_FINISH;
+            return LoadModuleResult.REMOTE_THREAD_DID_NOT_START;
         }
 
         if (GetExitCodeThread(hThread, out _) == 0)

diff --git a/GW Launcher/MulticlientPatch.cs b/GW Launcher/MulticlientPatch.cs
@@ -147,7 +147,7 @@ private static IntPtr GetProcessModuleBase(IntPtr process)
             var loadModuleResult = memory.LoadModule(dll);
             if (loadModuleResult != GWCAMemory.LoadModuleResult.SUCCESSFUL)
             {
-                err = GetErrorMessage($"memory.LoadModule({dll})", Marshal.GetLastWin32Error());
+                err = GetErrorMessage($"Result {loadModuleResult}: memory.LoadModule({dll})", Marshal.GetLastWin32Error());
 				goto cleanup;
 			}
         }
@@ -177,8 +177,14 @@ private static IntPtr GetProcessModuleBase(IntPtr process)
         cleanup:
         if (err != null)
         {
-            process?.Kill();
-            memory = null;
+            try
+            {
+                process?.Kill();
+            }
+            finally
+            {
+                memory = null;
+            }
         }
 		// Make sure to restore the modfile.txt file (blank string if in the gwlauncher dir, whatever was there before if in the gw dir)
 		if (!modfile.IsNullOrEmpty())