[CoreFoundation] Add a few missing APIs to CFRunLoop and enable nullability.

src/CoreFoundation/CFRunLoop.cs

@@ -47,6 +47,8 @@
 using NativeHandle = System.IntPtr;
 #endif
 
+#nullable enable
+
 namespace CoreFoundation {
 
 	// anonymous and typeless native enum - System/Library/Frameworks/CoreFoundation.framework/Headers/CFRunLoop.h
@@ -183,7 +185,9 @@ protected CFRunLoopSourceCustom ()
 			InitializeHandle (handle);
 		}
 
+#if !NET
 		delegate void ScheduleCallback (IntPtr info, IntPtr runLoop, IntPtr mode);
+#endif
 
 #if NET
 		[UnmanagedCallersOnly]
@@ -204,7 +208,9 @@ static void Schedule (IntPtr info, IntPtr runLoop, IntPtr mode)
 
 		protected abstract void OnSchedule (CFRunLoop loop, NSString mode);
 
+#if !NET
 		delegate void CancelCallback (IntPtr info, IntPtr runLoop, IntPtr mode);
+#endif
 
 #if NET
 		[UnmanagedCallersOnly]
@@ -225,7 +231,9 @@ static void Cancel (IntPtr info, IntPtr runLoop, IntPtr mode)
 
 		protected abstract void OnCancel (CFRunLoop loop, NSString mode);
 
+#if !NET
 		delegate void PerformCallback (IntPtr info);
+#endif
 
 #if NET
 		[UnmanagedCallersOnly]
@@ -321,6 +329,11 @@ public CFRunLoopExitReason RunInMode (NSString mode, double seconds, bool return
 			return CFRunLoopRunInMode (mode.Handle, seconds, returnAfterSourceHandled);
 		}
 
+		public CFRunLoopExitReason RunInMode (string mode, double seconds, bool returnAfterSourceHandled)
+		{
+			return RunInMode ((NSString) mode, seconds, returnAfterSourceHandled);
+		}
+
 		[DllImport (Constants.CoreFoundationLibrary)]
 		extern static void CFRunLoopAddSource (/* CFRunLoopRef */ IntPtr rl, /* CFRunLoopSourceRef */ IntPtr source, /* CFStringRef */ IntPtr mode);
 
@@ -367,8 +380,26 @@ internal CFRunLoop (NativeHandle handle, bool owns)
 		{
 		}
 
+		[DllImport (Constants.CoreFoundationLibrary)]
+		extern static NativeHandle /* CFArrayRef */ CFRunLoopCopyAllModes (NativeHandle /* CFRunLoopRef */ rl);
+
+		public string? []? AllModes {
+			get {
+				return CFArray.StringArrayFromHandle (CFRunLoopCopyAllModes (GetCheckedHandle ()), releaseHandle: true);
+			}
+		}
+
+		[DllImport (Constants.CoreFoundationLibrary)]
+		extern static IntPtr /* CFRunLoopMode */ CFRunLoopCopyCurrentMode (NativeHandle /* CFRunLoopRef */ rl);
+
+		public string? CurrentMode {
+			get {
+				return CFString.FromHandle (CFRunLoopCopyCurrentMode (GetCheckedHandle ()), releaseHandle: true);
+			}
+		}
+
 #if !NET
-		public static bool operator == (CFRunLoop a, CFRunLoop b)
+		public static bool operator == (CFRunLoop? a, CFRunLoop? b)
 		{
 			if (a is null)
 				return b is null;
@@ -378,7 +409,7 @@ internal CFRunLoop (NativeHandle handle, bool owns)
 			return a.Handle == b.Handle;
 		}
 
-		public static bool operator != (CFRunLoop a, CFRunLoop b)
+		public static bool operator != (CFRunLoop? a, CFRunLoop? b)
 		{
 			if (a is null)
 				return b is not null;

tests/monotouch-test/CoreFoundation/RunLoopTest.cs

@@ -0,0 +1,44 @@
+//
+// Unit tests for CFRunLoop
+//
+// Authors:
+//	Rolf Bjarne Kvinge <rolf@xamarin.com>
+//
+// Copyright 2023 Microsoft Corp. All rights reserved.
+//
+
+using System;
+using Foundation;
+using CoreFoundation;
+
+using NUnit.Framework;
+
+namespace MonoTouchFixtures.CoreFoundation {
+
+	[TestFixture]
+	[Preserve (AllMembers = true)]
+	public class RunLoopTest {
+
+		[Test]
+		public void AllModes ()
+		{
+			Assert.That (CFRunLoop.Main.AllModes, Is.Not.Empty, "AllModes");
+		}
+
+		[Test]
+		public void CurrentMode ()
+		{
+			Assert.DoesNotThrow (() => { GC.KeepAlive (CFRunLoop.Main.CurrentMode); }, "CurrentMode");
+		}
+
+		[Test]
+		public void RunInMode ()
+		{
+			var loop = CFRunLoop.Main;
+			Assert.DoesNotThrow (() => { loop.RunInMode ((string) loop.AllModes [0], 0.01, false); }, "RunInMode (string, false)");
+			Assert.DoesNotThrow (() => { loop.RunInMode ((string) loop.AllModes [0], 0.01, true); }, "RunInMode (string, true)");
+			Assert.DoesNotThrow (() => { loop.RunInMode ((NSString) loop.AllModes [0], 0.01, false); }, "RunInMode (NSString, false)");
+			Assert.DoesNotThrow (() => { loop.RunInMode ((NSString) loop.AllModes [0], 0.01, true); }, "RunInMode (NSString, true)");
+		}
+	}
+}

tests/xtro-sharpie/api-annotations-dotnet/common-CoreFoundation.ignore

@@ -616,8 +616,6 @@
 !missing-pinvoke! CFRunLoopAddTimer is not bound
 !missing-pinvoke! CFRunLoopContainsObserver is not bound
 !missing-pinvoke! CFRunLoopContainsTimer is not bound
-!missing-pinvoke! CFRunLoopCopyAllModes is not bound
-!missing-pinvoke! CFRunLoopCopyCurrentMode is not bound
 !missing-pinvoke! CFRunLoopGetNextTimerFireDate is not bound
 !missing-pinvoke! CFRunLoopGetTypeID is not bound
 !missing-pinvoke! CFRunLoopObserverCreate is not bound

tests/xtro-sharpie/common-CoreFoundation.ignore

@@ -616,8 +616,6 @@
 !missing-pinvoke! CFRunLoopAddTimer is not bound
 !missing-pinvoke! CFRunLoopContainsObserver is not bound
 !missing-pinvoke! CFRunLoopContainsTimer is not bound
-!missing-pinvoke! CFRunLoopCopyAllModes is not bound
-!missing-pinvoke! CFRunLoopCopyCurrentMode is not bound
 !missing-pinvoke! CFRunLoopGetNextTimerFireDate is not bound
 !missing-pinvoke! CFRunLoopGetTypeID is not bound
 !missing-pinvoke! CFRunLoopObserverCreate is not bound