Aug 27, 2019 · Aug 26, 2019 · Aug 27, 2019
diff --git a/src/ObjCRuntime/DynamicRegistrar.cs b/src/ObjCRuntime/DynamicRegistrar.cs
 return rv;
 }

 if (type.IsGenericType) {
 var rv = true;
 var args = type.GetGenericArguments ();
 var constrs = new Type [args.Length];
 for (int i = 0; i < args.Length; i++) {
 Type constr;
 rv &= VerifyIsConstrainedToNSObject (args [i], out constr);
 constrs [i] = constr;
 }
 constrained_type = type.GetGenericTypeDefinition ().MakeGenericType (constrs);
 return rv;
 }

 return false;
 return true;
 }

 protected override Exception CreateException (int code, Exception innerException, MethodBase method, string message, params object[] args)
diff --git a/tests/monotouch-test/ObjCRuntime/Messaging.cs b/tests/monotouch-test/ObjCRuntime/Messaging.cs

 [DllImport (LIBOBJC_DYLIB, EntryPoint = "objc_msgSend")]
 public extern static void void_objc_msgSend_int_int_int (IntPtr receiver, IntPtr selector, int p1, ref int p2, out int p3);

 [DllImport (LIBOBJC_DYLIB, EntryPoint = "objc_msgSend")]
 public extern static void void_objc_msgSend_IntPtr_IntPtr_BlockLiteral (IntPtr receiver, IntPtr selector, IntPtr p1, IntPtr p2, ref BlockLiteral p3);
 }
 }

diff --git a/tests/monotouch-test/ObjCRuntime/RegistrarTest.cs b/tests/monotouch-test/ObjCRuntime/RegistrarTest.cs
 #if !__TVOS__
 using Contacts;
 #endif
 using WebKit;
 #else
 using MonoTouch;
 using MonoTouch.AddressBook;
 }

 }

 #if !__WATCHOS__ && !__TVOS__ // No WebKit on watchOS/tvOS
 [Test]
 public void GenericClassWithUnrelatedGenericDelegate ()
 {
 using (var obj = new GenericWebNavigationThingie<NSObject> ()) {
 var handler_called = false;
 Action<WKNavigationActionPolicy> handler = new Action<WKNavigationActionPolicy> ((v) => {
 handler_called = true;
 });
 var block = new BlockLiteral ();
 var tramp = new DActionArity1V3 (SDActionArity1V3.Invoke);
 if (Runtime.DynamicRegistrationSupported) {
 block.SetupBlock (tramp, handler);
 Messaging.void_objc_msgSend_IntPtr_IntPtr_BlockLiteral (obj.Handle, Selector.GetHandle ("webView:decidePolicyForNavigationAction:decisionHandler:"), IntPtr.Zero, IntPtr.Zero, ref block);
 block.CleanupBlock ();
 Assert.IsTrue (handler_called, "Handler called");
 } else {
 Assert.Throws<RuntimeException> (() => block.SetupBlock (tramp, handler));
 }
 }
 }

 [UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl)]
 internal delegate void DActionArity1V3 (IntPtr block, nint value);
 static internal class SDActionArity1V3 {
 static internal readonly DActionArity1V3 Handler = Invoke;

 [MonoPInvokeCallback (typeof (DActionArity1V3))]
 public static unsafe void Invoke (IntPtr block, nint value)
 {
 var del = BlockLiteral.GetTarget<Action<WKNavigationActionPolicy>> (block);
 if (del != null)
 del ((WKNavigationActionPolicy) (long) value);
 }
 }
 #endif // !__WATCHOS__ && !__TVOS__

 }

 #if !__WATCHOS__
 public class SomeConsumer : NSObject, ISomeDelegate
 {
 }

 #if !__WATCHOS__ && !__TVOS__ // No WebKit on watchOS/tvOS
 [Preserve]
 public class GenericWebNavigationThingie<WebViewModel> : NSObject, IWKNavigationDelegate {
 [Export ("webView:decidePolicyForNavigationAction:decisionHandler:")]
 public void DecidePolicy (WKWebView webView, WKNavigationAction navigationAction, Action<WKNavigationActionPolicy> decisionHandler)
 {
 decisionHandler (WKNavigationActionPolicy.Allow);
 }
 }
 #endif

 #if !__WATCHOS__ // no MetalKit on watchOS
 // These classes implement Metal* protocols, so that the generated registrar code includes the corresponding Metal* headers.
 // https://github.com/xamarin/xamarin-macios/issues/4422
Original file line number	Diff line number	Diff line change
Expand Up		@@ -503,20 +503,7 @@ protected override bool VerifyIsConstrainedToNSObject (Type type, out Type const
		return rv;
		}

		if (type.IsGenericType) {
		var rv = true;
		var args = type.GetGenericArguments ();
		var constrs = new Type [args.Length];
		for (int i = 0; i < args.Length; i++) {
		Type constr;
		rv &= VerifyIsConstrainedToNSObject (args [i], out constr);
		constrs [i] = constr;
		}
		constrained_type = type.GetGenericTypeDefinition ().MakeGenericType (constrs);
		return rv;
		}

		return false;
		return true;
		}

		protected override Exception CreateException (int code, Exception innerException, MethodBase method, string message, params object[] args)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -254,6 +254,9 @@ public struct objc_super {

		[DllImport (LIBOBJC_DYLIB, EntryPoint = "objc_msgSend")]
		public extern static void void_objc_msgSend_int_int_int (IntPtr receiver, IntPtr selector, int p1, ref int p2, out int p3);

		[DllImport (LIBOBJC_DYLIB, EntryPoint = "objc_msgSend")]
		public extern static void void_objc_msgSend_IntPtr_IntPtr_BlockLiteral (IntPtr receiver, IntPtr selector, IntPtr p1, IntPtr p2, ref BlockLiteral p3);
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -35,6 +35,7 @@
		#if !__TVOS__
		using Contacts;
		#endif
		using WebKit;
		#else
		using MonoTouch;
		using MonoTouch.AddressBook;
Expand DownExpand Up		@@ -5246,6 +5247,44 @@ public override void TestClassArray (int action, ref Class [] refValue, out Clas
		}

		}

		#if !__WATCHOS__ && !__TVOS__ // No WebKit on watchOS/tvOS
		[Test]
		public void GenericClassWithUnrelatedGenericDelegate ()
		{
		using (var obj = new GenericWebNavigationThingie<NSObject> ()) {
		var handler_called = false;
		Action<WKNavigationActionPolicy> handler = new Action<WKNavigationActionPolicy> ((v) => {
		handler_called = true;
		});
		var block = new BlockLiteral ();
		var tramp = new DActionArity1V3 (SDActionArity1V3.Invoke);
		if (Runtime.DynamicRegistrationSupported) {
		block.SetupBlock (tramp, handler);
		Messaging.void_objc_msgSend_IntPtr_IntPtr_BlockLiteral (obj.Handle, Selector.GetHandle ("webView:decidePolicyForNavigationAction:decisionHandler:"), IntPtr.Zero, IntPtr.Zero, ref block);
		block.CleanupBlock ();
		Assert.IsTrue (handler_called, "Handler called");
		} else {
		Assert.Throws<RuntimeException> (() => block.SetupBlock (tramp, handler));
		}
		}
		}

		[UnmanagedFunctionPointerAttribute (CallingConvention.Cdecl)]
		internal delegate void DActionArity1V3 (IntPtr block, nint value);
		static internal class SDActionArity1V3 {
		static internal readonly DActionArity1V3 Handler = Invoke;

		[MonoPInvokeCallback (typeof (DActionArity1V3))]
		public static unsafe void Invoke (IntPtr block, nint value)
		{
		var del = BlockLiteral.GetTarget<Action<WKNavigationActionPolicy>> (block);
		if (del != null)
		del ((WKNavigationActionPolicy) (long) value);
		}
		}
		#endif // !__WATCHOS__ && !__TVOS__

		}

		#if !__WATCHOS__
Expand DownExpand Up		@@ -5382,6 +5421,18 @@ public class FutureClass : NSObject
		public class SomeConsumer : NSObject, ISomeDelegate
		{
		}

		#if !__WATCHOS__ && !__TVOS__ // No WebKit on watchOS/tvOS
		[Preserve]
		public class GenericWebNavigationThingie<WebViewModel> : NSObject, IWKNavigationDelegate {
		[Export ("webView:decidePolicyForNavigationAction:decisionHandler:")]
		public void DecidePolicy (WKWebView webView, WKNavigationAction navigationAction, Action<WKNavigationActionPolicy> decisionHandler)
		{
		decisionHandler (WKNavigationActionPolicy.Allow);
		}
		}
		#endif

		#if !__WATCHOS__ // no MetalKit on watchOS
		// These classes implement Metal* protocols, so that the generated registrar code includes the corresponding Metal* headers.
		// https://github.com/xamarin/xamarin-macios/issues/4422
Expand Down