[CoreWlan] Make P/Invokes have blittable signatures. (#20465)

Contributes towards #15684.
xamarin · Apr 22, 2024 · f2308d1 · f2308d1
1 parent 216ddf7
commit f2308d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/CoreWlan/CWKeychain.cs b/src/CoreWlan/CWKeychain.cs
@@ -27,7 +27,7 @@ public static partial class CWKeychain {
 		[UnsupportedOSPlatform ("maccatalyst")]
 #endif
 		[DllImport (Constants.CoreWlanLibrary)]
-		static extern OSStatus CWKeychainCopyWiFiEAPIdentity (/* CWKeychainDomain */ nint domain, NSDataRef ssid, out SecIdentityRef identity);
+		unsafe static extern OSStatus CWKeychainCopyWiFiEAPIdentity (/* CWKeychainDomain */ nint domain, NSDataRef ssid, SecIdentityRef* identity);
 
 #if NET
 		[SupportedOSPlatform ("macos")]
@@ -37,7 +37,9 @@ public static bool TryFindWiFiEAPIdentity (CWKeychainDomain domain, NSData ssid,
 		{
 			identity = null;
 			IntPtr outPtr = IntPtr.Zero;
-			status = CWKeychainCopyWiFiEAPIdentity ((nint) (long) domain, ssid.GetHandle (), out outPtr);
+			unsafe {
+				status = CWKeychainCopyWiFiEAPIdentity ((nint) (long) domain, ssid.GetHandle (), &outPtr);
+			}
 			if (status == 0) {
 				identity = new SecIdentity (outPtr, true);
 			}
@@ -105,7 +107,7 @@ public static bool TryDeleteWiFiPassword (CWKeychainDomain domain, NSData ssid)
 		[UnsupportedOSPlatform ("maccatalyst")]
 #endif
 		[DllImport (Constants.CoreWlanLibrary)]
-		static extern OSStatus CWKeychainFindWiFiEAPUsernameAndPassword (/* CWKeychainDomain */ nint domain, NSDataRef ssid, out NSStringRef username, out NSStringRef password);
+		unsafe static extern OSStatus CWKeychainFindWiFiEAPUsernameAndPassword (/* CWKeychainDomain */ nint domain, NSDataRef ssid, NSStringRef* username, NSStringRef* password);
 
 #if NET
 		[SupportedOSPlatform ("macos")]
@@ -117,7 +119,9 @@ public static bool TryFindWiFiEAPUsernameAndPassword (CWKeychainDomain domain, N
 			password = null;
 			NSStringRef usernamePtr = IntPtr.Zero;
 			NSStringRef passwordPtr = IntPtr.Zero;
-			status = CWKeychainFindWiFiEAPUsernameAndPassword ((nint) (long) domain, ssid.GetHandle (), out usernamePtr, out passwordPtr);
+			unsafe {
+				status = CWKeychainFindWiFiEAPUsernameAndPassword ((nint) (long) domain, ssid.GetHandle (), &usernamePtr, &passwordPtr);
+			}
 			if (usernamePtr != IntPtr.Zero) {
 				username = Runtime.GetNSObject<NSString> (usernamePtr, false);
 			}
@@ -158,7 +162,7 @@ public static bool TryFindWiFiEAPUsernameAndPassword (CWKeychainDomain domain, N
 		[UnsupportedOSPlatform ("maccatalyst")]
 #endif
 		[DllImport (Constants.CoreWlanLibrary)]
-		static extern OSStatus CWKeychainFindWiFiPassword (/* CWKeychainDomain */ nint domain, NSDataRef ssid, out NSStringRef password);
+		unsafe static extern OSStatus CWKeychainFindWiFiPassword (/* CWKeychainDomain */ nint domain, NSDataRef ssid, NSStringRef* password);
 
 #if NET
 		[SupportedOSPlatform ("macos")]
@@ -168,7 +172,9 @@ public static bool TryFindWiFiPassword (CWKeychainDomain domain, NSData ssid, ou
 		{
 			password = null;
 			NSStringRef passwordPtr = IntPtr.Zero;
-			status = CWKeychainFindWiFiPassword ((nint) (long) domain, ssid.GetHandle (), out passwordPtr);
+			unsafe {
+				status = CWKeychainFindWiFiPassword ((nint) (long) domain, ssid.GetHandle (), &passwordPtr);
+			}
 			if (passwordPtr != IntPtr.Zero) {
 				password = Runtime.GetNSObject<NSString> (passwordPtr, false);
 			}

diff --git a/tests/cecil-tests/BlittablePInvokes.KnownFailures.cs b/tests/cecil-tests/BlittablePInvokes.KnownFailures.cs
@@ -250,9 +250,6 @@ public partial class BlittablePInvokes {
 			"System.Int32 AudioUnit.AUGraph::NewAUGraph(System.IntPtr&)",
 			"System.Int32 CoreVideo.CVDisplayLink::CVDisplayLinkTranslateTime(System.IntPtr,CoreVideo.CVTimeStamp,CoreVideo.CVTimeStamp&)",
 			"System.Int32 CoreVideo.CVMetalTextureCache::CVMetalTextureCacheCreate(System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr,System.IntPtr&)",
-			"System.Int32 CoreWlan.CWKeychain::CWKeychainCopyWiFiEAPIdentity(System.IntPtr,System.IntPtr,System.IntPtr&)",
-			"System.Int32 CoreWlan.CWKeychain::CWKeychainFindWiFiEAPUsernameAndPassword(System.IntPtr,System.IntPtr,System.IntPtr&,System.IntPtr&)",
-			"System.Int32 CoreWlan.CWKeychain::CWKeychainFindWiFiPassword(System.IntPtr,System.IntPtr,System.IntPtr&)",
 			"System.Int32 Darwin.KernelQueue::kevent(System.Int32,Darwin.KernelEvent*,System.Int32,Darwin.KernelEvent*,System.Int32,Darwin.TimeSpec&)",
 			"System.Int32 ObjCRuntime.Runtime::_NSGetExecutablePath(System.Byte[],System.Int32&)",
 			"System.Int32 Security.Authorization::AuthorizationCreate(Security.AuthorizationItemSet*,Security.AuthorizationItemSet*,Security.AuthorizationFlags,System.IntPtr&)",