Bug fixes; v1.0.6

pardeike · Feb 4, 2017 · 2adaaeb · 2adaaeb
1 parent 39b990f
commit 2adaaeb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 50 deletions.
diff --git a/Harmony/PatchFunctions.cs b/Harmony/PatchFunctions.cs
@@ -67,13 +67,14 @@ public static void UpdateWrapper(MethodBase original, PatchInfo patchInfo)
 			var sortedPostfixes = GetSortedPatchMethods(patchInfo.postfixes);
 			var sortedProcessors = GetSortedProcessors(patchInfo.processors);
 
-			var replacement = MethodPatcher.CreatePatchedMethod(original, sortedPostfixes, sortedPostfixes, sortedProcessors);
+			var replacement = MethodPatcher.CreatePatchedMethod(original, sortedPrefixes, sortedPostfixes, sortedProcessors);
 			if (replacement == null) throw new MissingMethodException("Cannot create dynamic replacement for " + original);
-			PatchTools.KeepAliveForever(replacement);
 
 			var originalCodeStart = Memory.GetMethodStart(original);
 			var patchCodeStart = Memory.GetMethodStart(replacement);
 			Memory.WriteJump(originalCodeStart, patchCodeStart);
+
+			PatchTools.RememberObject(original, replacement); // no gc for new value + release old value to gc
 		}
 	}
 }
diff --git a/Harmony/PatchProcessor.cs b/Harmony/PatchProcessor.cs
@@ -1,7 +1,5 @@
-using Harmony.ILCopying;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 
 namespace Harmony

diff --git a/Harmony/Properties/AssemblyInfo.cs b/Harmony/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.5.0")]
-[assembly: AssemblyFileVersion("1.0.5.0")]
+[assembly: AssemblyVersion("1.0.6.0")]
+[assembly: AssemblyFileVersion("1.0.6.0")]
diff --git a/Harmony/Tools/PatchTools.cs b/Harmony/Tools/PatchTools.cs
@@ -9,21 +9,18 @@ namespace Harmony
 	public static class PatchTools
 	{
 		// this holds all the objects we want to keep alive so they don't get garbage-collected
-		static object[] objectReferences;
-		[MethodImpl(MethodImplOptions.Synchronized)]
-		public static void KeepAliveForever(object obj)
+		static Dictionary<object, object> objectReferences = new Dictionary<object, object>();
+		public static void RememberObject(object key, object value)
 		{
-			if (objectReferences == null)
-				objectReferences = new object[0];
-			objectReferences.Add(obj);
+			objectReferences[key] = value;
 		}
 
-		public static MethodInfo GetPatchMethod<T>(Type patchType, string name, Type[] parameter)
+		public static MethodInfo GetPatchMethod<T>(Type patchType, string name, Type[] parameters = null)
 		{
 			var method = patchType.GetMethods(AccessTools.all)
 				.FirstOrDefault(m => m.GetCustomAttributes(typeof(T), true).Count() > 0);
 			if (method == null)
-				method = patchType.GetMethod(name, AccessTools.all, null, parameter, null);
+				method = AccessTools.Method(patchType, name, parameters);
 			return method;
 		}
 
@@ -32,42 +29,10 @@ public static void GetPatches(Type patchType, MethodBase original, out MethodInf
 			var type = original.DeclaringType;
 			var methodName = original.Name;
 
-			var parameters = original.GetParameters();
-			var prefixParams = new List<Type>();
-			var postfixParams = new List<Type>();
-			if (original.IsStatic == false)
-			{
-				prefixParams.Add(type);
-				postfixParams.Add(type);
-			}
-			var returnedType = AccessTools.GetReturnedType(original);
-			if (returnedType != typeof(void))
-			{
-				var retRef = returnedType.MakeByRefType();
-				prefixParams.Add(retRef);
-				postfixParams.Add(retRef);
-			}
-			parameters.Do(pi =>
-			{
-				var paramRef = pi.ParameterType.MakeByRefType();
-				if (pi.IsOut == false) // prefix patches should not get out-parameters
-					prefixParams.Add(paramRef);
-				postfixParams.Add(paramRef);
-			});
-
-			prefix = GetPatchMethod<HarmonyPrefix>(patchType, "Prefix", prefixParams.ToArray());
-			postfix = GetPatchMethod<HarmonyPostfix>(patchType, "Postfix", postfixParams.ToArray());
+			prefix = GetPatchMethod<HarmonyPrefix>(patchType, "Prefix");
+			postfix = GetPatchMethod<HarmonyPostfix>(patchType, "Postfix");
 			if (prefix == null && postfix == null)
-			{
-				var prefixMethod = "Prefix(" + string.Join(", ", prefixParams.Select(p => p.FullName).ToArray()) + ")";
-				var postfixMethod = "Postfix(" + string.Join(", ", postfixParams.Select(p => p.FullName).ToArray()) + ")";
-				throw new MissingMethodException("No prefix/postfix patch for " + type.FullName + "." + methodName + "() found that matches " + prefixMethod + " or " + postfixMethod);
-			}
-
-			if (prefix != null && prefix.ReturnType != typeof(bool))
-				throw new MissingMethodException("Prefix() must return bool (return true to execute original method)");
-			if (postfix != null && postfix.ReturnType != typeof(void))
-				throw new MissingMethodException("Postfix() must not return anything");
+				throw new MissingMethodException("No prefix/postfix patch for " + type.FullName + "." + methodName + "() found");
 		}
 	}
 }