Merge pull request #550 from dmitriyse/core2-marshal-fix

dmitriyse · web-flow · commit 46d56af7485d · 2017-12-13T03:57:10.000+04:00
Marshalling fix for 3-IntPtr args cdecl calls.
diff --git a/src/runtime/nativecall.cs b/src/runtime/nativecall.cs
@@ -27,9 +27,6 @@ internal class NativeCall
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate void Void_1_Delegate(IntPtr a1);
 
-        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-        private delegate IntPtr IntPtr_3_Delegate(IntPtr a1, IntPtr a2, IntPtr a3);
-
         [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate int Int_3_Delegate(IntPtr a1, IntPtr a2, IntPtr a3);
 
@@ -40,7 +37,8 @@ public static void Void_Call_1(IntPtr fp, IntPtr a1)
 
         public static IntPtr Call_3(IntPtr fp, IntPtr a1, IntPtr a2, IntPtr a3)
         {
-            return ((IntPtr_3_Delegate)Marshal.GetDelegateForFunctionPointer(fp, typeof(IntPtr_3_Delegate)))(a1, a2, a3);
+            var d = (Interop.TernaryFunc)Marshal.GetDelegateForFunctionPointer(fp, typeof(Interop.TernaryFunc));
+            return d(a1, a2, a3);
         }
 
 

Original file line number	Diff line number	Diff line change
`@@ -27,9 +27,6 @@ internal class NativeCall`
`27`	`27`	`[UnmanagedFunctionPointer(CallingConvention.Cdecl)]`
`28`	`28`	`private delegate void Void_1_Delegate(IntPtr a1);`
`29`	`29`
`30`		`- [UnmanagedFunctionPointer(CallingConvention.Cdecl)]`
`31`		`- private delegate IntPtr IntPtr_3_Delegate(IntPtr a1, IntPtr a2, IntPtr a3);`
`32`		`-`
`33`	`30`	`[UnmanagedFunctionPointer(CallingConvention.Cdecl)]`
`34`	`31`	`private delegate int Int_3_Delegate(IntPtr a1, IntPtr a2, IntPtr a3);`
`35`	`32`
`@@ -40,7 +37,8 @@ public static void Void_Call_1(IntPtr fp, IntPtr a1)`
`40`	`37`
`41`	`38`	`public static IntPtr Call_3(IntPtr fp, IntPtr a1, IntPtr a2, IntPtr a3)`
`42`	`39`	`{`
`43`		`- return ((IntPtr_3_Delegate)Marshal.GetDelegateForFunctionPointer(fp, typeof(IntPtr_3_Delegate)))(a1, a2, a3);`
	`40`	`+ var d = (Interop.TernaryFunc)Marshal.GetDelegateForFunctionPointer(fp, typeof(Interop.TernaryFunc));`
	`41`	`+ return d(a1, a2, a3);`
`44`	`42`	`}`
`45`	`43`
`46`	`44`