Dont worry about pinnin anything

Author: ammeep

LibGit2Sharp/Core/GitFilter.cs

@@ -13,30 +13,30 @@ internal class GitFilter
 
         public IntPtr attributes;
 
-        public IntPtr init;
+        //public IntPtr init;
 
-        public IntPtr shutdown;
+        //public IntPtr shutdown;
 
-        public IntPtr check;
+        //public IntPtr check;
 
-        public IntPtr apply;
+        //public IntPtr apply;
 
-        public IntPtr cleanup;
+        //public IntPtr cleanup;
 
-        //[MarshalAs(UnmanagedType.FunctionPtr)]
-        //public git_filter_init_fn init;
+        [MarshalAs(UnmanagedType.FunctionPtr)]
+        public git_filter_init_fn init;
 
-        //[MarshalAs(UnmanagedType.FunctionPtr)]
-        //public git_filter_shutdown_fn shutdown;
+        [MarshalAs(UnmanagedType.FunctionPtr)]
+        public git_filter_shutdown_fn shutdown;
 
-        //[MarshalAs(UnmanagedType.FunctionPtr)]
-        //public git_filter_check_fn check;
+        [MarshalAs(UnmanagedType.FunctionPtr)]
+        public git_filter_check_fn check;
 
-        //[MarshalAs(UnmanagedType.FunctionPtr)]
-        //public git_filter_apply_fn apply;
+        [MarshalAs(UnmanagedType.FunctionPtr)]
+        public git_filter_apply_fn apply;
 
-        //[MarshalAs(UnmanagedType.FunctionPtr)]
-        //public git_filter_cleanup_fn cleanup;
+        [MarshalAs(UnmanagedType.FunctionPtr)]
+        public git_filter_cleanup_fn cleanup;
 
         /* The libgit2 structure definition ends here. Subsequent fields are for libgit2sharp bookkeeping. */
 

LibGit2Sharp/Filter.cs

@@ -20,7 +20,6 @@ public sealed class Filter : IEquatable<Filter>
         private readonly FilterCallbacks filterCallbacks;
 
         private GitFilter managedFilter;
-        private GCHandle filterHandle;
         private readonly GitFilterSafeHandle nativeFilter;
 
         private GitFilter.git_filter_apply_fn applyCallback;
@@ -29,17 +28,6 @@ public sealed class Filter : IEquatable<Filter>
         private GitFilter.git_filter_shutdown_fn shutdownCallback;
         private GitFilter.git_filter_cleanup_fn cleanCallback;
 
-        private IntPtr applyCallbackHandle;
-        private IntPtr checkCallbackHandle;
-        private IntPtr initCallbackHandle;
-        private GCHandle checkCallbackGCHandle;
-        private GCHandle applyCallbackGCHandle;
-        private GCHandle initCallbackGCHandle;
-        private IntPtr shutdownCallbackHandle;
-        private IntPtr cleanCallbackHandle;
-        private GCHandle shutdownCallbackGCHandle;
-        private GCHandle cleanCallbackGCHandle;
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Filter"/> class.
         /// And allocates the filter natively. 
@@ -62,30 +50,18 @@ public Filter(string name, string attributes, int version, FilterCallbacks filte
             shutdownCallback = ShutdownCallback;
             cleanCallback = CleanUpCallback;
 
-            checkCallbackHandle = Marshal.GetFunctionPointerForDelegate(checkCallback);
-            applyCallbackHandle = Marshal.GetFunctionPointerForDelegate(applyCallback);
-            initCallbackHandle = Marshal.GetFunctionPointerForDelegate(initCallback);
-            shutdownCallbackHandle = Marshal.GetFunctionPointerForDelegate(shutdownCallback);
-            cleanCallbackHandle = Marshal.GetFunctionPointerForDelegate(cleanCallback);
-
-            checkCallbackGCHandle = GCHandle.Alloc(checkCallbackHandle, GCHandleType.Pinned);
-            applyCallbackGCHandle = GCHandle.Alloc(applyCallbackHandle, GCHandleType.Pinned);
-            initCallbackGCHandle = GCHandle.Alloc(initCallbackHandle, GCHandleType.Pinned);
-            shutdownCallbackGCHandle = GCHandle.Alloc(shutdownCallbackHandle, GCHandleType.Pinned);
-            cleanCallbackGCHandle = GCHandle.Alloc(cleanCallbackHandle, GCHandleType.Pinned);
 
             managedFilter = new GitFilter
             {
                 attributes = EncodingMarshaler.FromManaged(Encoding.UTF8, attributes),
                 version = (uint)version,
-                init = initCallbackHandle,
-                apply = applyCallbackHandle,
-                check = checkCallbackHandle,
-                shutdown = shutdownCallbackHandle,
-                cleanup = cleanCallbackHandle
+                init = initCallback,
+                apply = applyCallback,
+                check = checkCallback,
+                shutdown = shutdownCallback,
+                cleanup = cleanCallback
             };
 
-            filterHandle = GCHandle.Alloc(managedFilter, GCHandleType.Pinned);
             nativeFilter = new GitFilterSafeHandle(managedFilter);
         }
 
@@ -136,36 +112,6 @@ public void Register()
         public void Deregister()
         {
             Proxy.git_filter_unregister(name);
-
-            if (filterHandle.IsAllocated)
-            {
-                filterHandle.Free();
-            }
-
-            if (applyCallbackGCHandle.IsAllocated)
-            {
-                applyCallbackGCHandle.Free();
-            }
-
-            if (checkCallbackGCHandle.IsAllocated)
-            {
-                checkCallbackGCHandle.Free();
-            }
-
-            if (initCallbackGCHandle.IsAllocated)
-            {
-                initCallbackGCHandle.Free();
-            }
-
-            if (shutdownCallbackGCHandle.IsAllocated)
-            {
-                shutdownCallbackGCHandle.Free();
-            }
-
-            if (cleanCallbackGCHandle.IsAllocated)
-            {
-                cleanCallbackGCHandle.Free();
-            }
         }
 
         /// <summary>