Changeset 76 for binary-improvements/assembly-patcher

Timestamp:

Jul 17, 2014, 1:46:42 AM (10 years ago)

Author:

alloc

Message:

fixer

Location:

binary-improvements/assembly-patcher

Files:

• Main.cs (modified) (4 diffs)
• bin/Release/7dtd-fixer.exe (modified) ( previous)

binary-improvements/assembly-patcher/Main.cs

@@ -12 +12 @@
                         ModuleDefinition module = ModuleDefinition.ReadModule ("Assembly-CSharp.dll");
                         telnetPatch (module);
-                        connectLogPatch(module);
+                        connectLogPatch (module);
                         module.Write ("Assembly-CSharp.dll");
                         Console.WriteLine ("Done");
@@ -26 +26 @@
 
                         markTypePatched (module, type);
-                        addHook (type, "RequestToSpawnPlayer", true, 5, typeof(AllocsRequestToSpawnPlayer).GetMethod ("RequestToSpawnPlayer"));
+                        addHook (type, "RequestToSpawnPlayer", true, 5, true, typeof(AllocsRequestToSpawnPlayer).GetMethod ("RequestToSpawnPlayer"));
                 }
 
@@ -49 +49 @@
                 }
 
-                private static void addHook (TypeDefinition type, string methodName, bool addThisRef, int opCount, MethodBase targetMethod)
+                private static void addHook (TypeDefinition type, string methodName, bool addThisRef, int opCount, bool atEnd, MethodBase targetMethod)
                 {
                         foreach (MethodDefinition method in type.Methods) {
@@ -56 +56 @@
                                         var il = method.Body.GetILProcessor ();
                                         var call = il.Create (OpCodes.Call, method.Module.Import (targetMethod));
-                                        var i = 0;
-                                        if (addThisRef)
-                                                il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, 0));
-                                        for (int op = 0; op < opCount; op++) {
-                                                il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, op + 1));
+                                        if (atEnd) {
+                                                int insBefore = method.Body.Instructions.Count;
+                                                if (addThisRef)
+                                                        il.Append (il.Create (OpCodes.Ldarg, 0));
+                                                for (int op = 0; op < opCount; op++) {
+                                                        il.Append (il.Create (OpCodes.Ldarg, op + 1));
+                                                }
+                                                il.Append (call);
+                                                il.Remove (method.Body.Instructions [insBefore - 1]);
+                                                il.Append (il.Create (OpCodes.Ret));
+                                        } else {
+                                                var i = 0;
+                                                if (addThisRef)
+                                                        il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, 0));
+                                                for (int op = 0; op < opCount; op++) {
+                                                        il.InsertBefore (method.Body.Instructions [i++], il.Create (OpCodes.Ldarg, op + 1));
+                                                }
+                                                il.InsertBefore (method.Body.Instructions [i++], call);
                                         }
-                                        il.InsertBefore (method.Body.Instructions [i++], call);
                                 }
                         }