Simplified delegate handle tracking

Author: govert

Source/ExcelDna.Loader/XlRegistration.cs

@@ -37,7 +37,6 @@ public static void RegisterMethods(List<MethodInfo> methods)
         public static void RegisterMethodsWithAttributes(List<MethodInfo> methods, List<object> methodAttributes, List<List<object>> argumentAttributes)
         {
             List<XlMethodInfo> xlMethods = XlMethodInfo.ConvertToXlMethodInfos(methods, null, null, methodAttributes, argumentAttributes);
-            xlMethods.ForEach(i => delegateHandles.Add(i.DelegateHandle));
             RegisterXlMethods(xlMethods);
         }
 
@@ -57,14 +56,12 @@ public static void RegisterDelegatesWithAttributes(List<Delegate> delegates, Lis
                 targets.Add(del);
             }
             List<XlMethodInfo> xlMethods = XlMethodInfo.ConvertToXlMethodInfos(methods, targets, null, methodAttributes, argumentAttributes);
-            xlMethods.ForEach(i => delegateHandles.Add(i.DelegateHandle));
             RegisterXlMethods(xlMethods);
         }
 
         public static void RegisterLambdaExpressionsWithAttributes(List<LambdaExpression> lambdaExpressions, List<object> methodAttributes, List<List<object>> argumentAttributes)
         {
             List<XlMethodInfo> xlMethods = XlMethodInfo.ConvertToXlMethodInfos(null, null, lambdaExpressions, methodAttributes, argumentAttributes);
-            xlMethods.ForEach(i => delegateHandles.Add(i.DelegateHandle));
             RegisterXlMethods(xlMethods);
         }
 
@@ -89,7 +86,6 @@ public static void RegisterRtdWrapper(string progId, object rtdWrapperOptions, o
                      null,
                      new List<object> { functionAttribute },
                      new List<List<object>> { argumentAttributes });
-            xlMethods.ForEach(i => delegateHandles.Add(i.DelegateHandle));
             RegisterXlMethods(xlMethods);
         }
 
@@ -143,6 +139,8 @@ static void RegisterXlMethods(List<XlMethodInfo> xlMethods)
 
         static void RegisterXlMethod(XlMethodInfo mi)
         {
+            delegateHandles.Add(mi.DelegateHandle);
+
             int index = registeredMethods.Count;
             XlAddIn.SetJump(index, mi.FunctionPointer);
             string exportedProcName = string.Format("f{0}", index);