[src] Remove a few MarshalAs attributes in various APIs. (#20704)

In these cases the APIs in question aren't used in P/Invokes at the moment, but that may change, so just make as much as we can blittable by removing any MarshalAs attributes.
xamarin · Jun 10, 2024 · 9c2bd68 · 9c2bd68
1 parent acf63db
commit 9c2bd68
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 16 deletions.
diff --git a/src/AVFoundation/AVSampleBufferExtensions.cs b/src/AVFoundation/AVSampleBufferExtensions.cs
@@ -23,11 +23,10 @@ public static class AVSampleBufferExtensions {
 
         [iOS (14, 5), Mac (11, 3), TV (14, 5), Watch (7,4)]
         [DllImport (Constants.AVFoundationLibrary)]
-        [return: MarshalAs (UnmanagedType.I1)]
-        static extern /* BOOL */ bool AVSampleBufferAttachContentKey (
+        unsafe static extern /* BOOL */ byte AVSampleBufferAttachContentKey (
             /* CMSampleBufferRef */ CMSampleBufferRef sbuf,
             /* AVContentKey */ AVContentKey contentKey,
-            /* NSError * _Nullable * _Nullable */ out NSErrorPtr outError);
+            /* NSError * _Nullable * _Nullable */ IntPtr* outError);
 
         [iOS (14, 5), Mac (11, 3), TV (14, 5), Watch (7,4)]
         public static bool AttachContentKey (this CMSampleBuffer sampleBuffer, AVContentKey contentKey, out NSError error)
@@ -39,9 +38,12 @@ public static bool AttachContentKey (this CMSampleBuffer sampleBuffer, AVContent
                 ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (contentKey));
 
             IntPtr outerr;
-            var retVal = AVSampleBufferAttachContentKey (sampleBuffer.Handle, contentKey.Handle, out outerr);
+            byte retVal;
+            unsafe {
+				retVal = AVSampleBufferAttachContentKey (sampleBuffer.Handle, contentKey.Handle, &outerr);
+            }
             error = Runtime.GetNSObject<NSError> (outerr);
-            return retVal;
+            return retVal != 0;
         }
     }
 }

diff --git a/src/ImageIO/CGImageMetadata.cs b/src/ImageIO/CGImageMetadata.cs
@@ -43,7 +43,6 @@ internal NSMutableDictionary ToDictionary ()
 		}
 	}
 
-	[return: MarshalAs (UnmanagedType.I1)]
 	public delegate bool CGImageMetadataTagBlock (NSString path, CGImageMetadataTag tag);
 
 	// CGImageMetadata.h

diff --git a/src/Metal/Defs.cs b/src/Metal/Defs.cs
@@ -418,15 +418,62 @@ public MTLDrawPatchIndirectArguments (uint pathCount, uint instanceCount, uint p
 #endif
 	[StructLayout (LayoutKind.Sequential)]
 	public struct MTLQuadTessellationFactorsHalf {
+#if XAMCORE_5_0
+		ushort edgeTessellationFactor0;
+		ushort edgeTessellationFactor1;
+		ushort edgeTessellationFactor2;
+		ushort edgeTessellationFactor3;
+		ushort insideTessellationFactor0;
+		ushort insideTessellationFactor1;
+
+		public ushort [] EdgeTessellationFactor {
+			get => new ushort [] { edgeTessellationFactor0, edgeTessellationFactor1, edgeTessellationFactor2, edgeTessellationFactor3 };
+			set {
+				if (value.Length > 4)
+					throw new ArgumentOutOfRangeException ($"The '{nameof (value)}' array length can't be greater than 4.");
+
+				edgeTessellationFactor0 = value.Length >= 1 ? value [0] : 0;
+				edgeTessellationFactor1 = value.Length >= 2 ? value [1] : 0;
+				edgeTessellationFactor2 = value.Length >= 3 ? value [2] : 0;
+				edgeTessellationFactor3 = value.Length >= 4 ? value [3] : 0;
+			}
+		}
+
+		public ushort [] InsideTessellationFactor {
+			get => new ushort [] { insideTessellationFactor0, insideTessellationFactor1 };
+			set {
+				if (value.Length > 2)
+					throw new ArgumentOutOfRangeException ($"The '{nameof (value)}' array length can't be greater than 2.");
+
+				insideTessellationFactor0 = value.Length >= 1 ? value [0] : 0;
+				insideTessellationFactor1 = value.Length >= 2 ? value [1] : 0;
+			}
+		}
+#else
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst = 4)]
 		public ushort [] EdgeTessellationFactor;
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst = 2)]
 		public ushort [] InsideTessellationFactor;
+#endif
 
 		public MTLQuadTessellationFactorsHalf (ushort [] edgeTessellationFactor, ushort [] insideTessellationFactor)
 		{
+			if (edgeTessellationFactor.Length > 4)
+				throw new ArgumentOutOfRangeException ($"The '{nameof (edgeTessellationFactor)}' array length can't be greater than 4.");
+
+			if (insideTessellationFactor.Length > 2)
+				throw new ArgumentOutOfRangeException ($"The '{nameof (insideTessellationFactor)}' array length can't be greater than 2.");
+#if XAMCORE_5_0
+			edgeTessellationFactor0 = edgeTessellationFactor.Length >= 1 ? edgeTessellationFactor [0] : 0;
+			edgeTessellationFactor1 = edgeTessellationFactor.Length >= 2 ? edgeTessellationFactor [1] : 0;
+			edgeTessellationFactor2 = edgeTessellationFactor.Length >= 3 ? edgeTessellationFactor [2] : 0;
+			edgeTessellationFactor3 = edgeTessellationFactor.Length >= 4 ? edgeTessellationFactor [3] : 0;
+			insideTessellationFactor0 = insideTessellationFactor.Length >= 1 ? insideTessellationFactor [0] : 0;
+			insideTessellationFactor1 = insideTessellationFactor.Length >= 2 ? insideTessellationFactor [1] : 0;
+#else
 			EdgeTessellationFactor = edgeTessellationFactor;
 			InsideTessellationFactor = insideTessellationFactor;
+#endif
 		}
 
 	}
@@ -441,13 +488,38 @@ public MTLQuadTessellationFactorsHalf (ushort [] edgeTessellationFactor, ushort
 #endif
 	[StructLayout (LayoutKind.Sequential)]
 	public struct MTLTriangleTessellationFactorsHalf {
+#if XAMCORE_5_0
+		ushort edgeTessellationFactor0;
+		ushort edgeTessellationFactor1;
+		ushort edgeTessellationFactor2;
+
+		public ushort [] EdgeTessellationFactor {
+			get => new ushort [] { edgeTessellationFactor0, edgeTessellationFactor1, edgeTessellationFactor2 };
+			set {
+				if (value.Length > 3)
+					throw new ArgumentOutOfRangeException ($"The '{nameof (value)}' array length can't be greater than 3.");
+				edgeTessellationFactor0 = value.Length >= 1 ? value [0] : 0;
+				edgeTessellationFactor1 = value.Length >= 2 ? value [1] : 0;
+				edgeTessellationFactor2 = value.Length >= 3 ? value [2] : 0;
+			}
+		}
+#else
 		[MarshalAs (UnmanagedType.ByValArray, SizeConst = 3)]
 		public ushort [] EdgeTessellationFactor;
+#endif
 		public ushort InsideTessellationFactor;
 
 		public MTLTriangleTessellationFactorsHalf (ushort [] edgeTessellationFactor, ushort insideTessellationFactor)
 		{
+			if (edgeTessellationFactor.Length > 3)
+				throw new ArgumentOutOfRangeException ($"The '{nameof (edgeTessellationFactor)}' array length can't be greater than 3.");
+#if XAMCORE_5_0
+			edgeTessellationFactor0 = edgeTessellationFactor.Length >= 1 ? edgeTessellationFactor [0] : 0;
+			edgeTessellationFactor1 = edgeTessellationFactor.Length >= 2 ? edgeTessellationFactor [1] : 0;
+			edgeTessellationFactor2 = edgeTessellationFactor.Length >= 3 ? edgeTessellationFactor [2] : 0;
+#else
 			EdgeTessellationFactor = edgeTessellationFactor;
+#endif
 			InsideTessellationFactor = insideTessellationFactor;
 		}
 	}

diff --git a/src/Network/NWFramer.cs b/src/Network/NWFramer.cs
@@ -30,7 +30,7 @@
 
 namespace Network {
 
-	public delegate nuint NWFramerParseCompletionDelegate (Memory<byte> buffer, [MarshalAs (UnmanagedType.I1)] bool isCompleted);
+	public delegate nuint NWFramerParseCompletionDelegate (Memory<byte> buffer, bool isCompleted);
 	public delegate nuint NWFramerInputDelegate (NWFramer framer);
 
 #if NET

diff --git a/src/ObjCRuntime/Class.cs b/src/ObjCRuntime/Class.cs
@@ -872,10 +872,9 @@ internal static void FreeStringPtrs (IntPtr [] ptrs)
 			}
 		}
 
-		[StructLayout (LayoutKind.Sequential, CharSet = CharSet.Ansi)]
 		internal struct objc_attribute_prop {
-			[MarshalAs (UnmanagedType.LPStr)] internal string name;
-			[MarshalAs (UnmanagedType.LPStr)] internal string value;
+			internal string name;
+			internal string value;
 		}
 #endif // !COREBUILD
 	}

diff --git a/tests/cecil-tests/BlittablePInvokes.KnownFailures.cs b/tests/cecil-tests/BlittablePInvokes.KnownFailures.cs
@@ -20,10 +20,6 @@ public partial class BlittablePInvokes {
 		static HashSet<string> knownFailuresMarshalAs = new (); // shouldn't have any failures here in XAMCORE_5_0.
 #else
 		static HashSet<string> knownFailuresMarshalAs = new HashSet<string> {
-			"For the method ImageIO.CGImageMetadataTagBlock::EndInvoke(System.IAsyncResult) the return type has a [MarshalAs] attribute",
-			"For the method ImageIO.CGImageMetadataTagBlock::Invoke(Foundation.NSString,ImageIO.CGImageMetadataTag) the return type has a [MarshalAs] attribute",
-			"For the method Network.NWFramerParseCompletionDelegate::BeginInvoke(System.Memory`1<System.Byte>,System.Boolean,System.AsyncCallback,System.Object) the parameter #1 (isCompleted) has a [MarshalAs] attribute",
-			"For the method Network.NWFramerParseCompletionDelegate::Invoke(System.Memory`1<System.Byte>,System.Boolean) the parameter #1 (isCompleted) has a [MarshalAs] attribute",
 			"The field AVFoundation.AVSampleCursorAudioDependencyInfo.IsIndependentlyDecodable has a [MarshalAs] attribute",
 			"The field AVFoundation.AVSampleCursorChunkInfo.HasUniformFormatDescriptions has a [MarshalAs] attribute",
 			"The field AVFoundation.AVSampleCursorChunkInfo.HasUniformSampleDurations has a [MarshalAs] attribute",
@@ -49,8 +45,6 @@ public partial class BlittablePInvokes {
 			"The field Metal.MTLQuadTessellationFactorsHalf.EdgeTessellationFactor has a [MarshalAs] attribute",
 			"The field Metal.MTLQuadTessellationFactorsHalf.InsideTessellationFactor has a [MarshalAs] attribute",
 			"The field Metal.MTLTriangleTessellationFactorsHalf.EdgeTessellationFactor has a [MarshalAs] attribute",
-			"The field ObjCRuntime.Class/objc_attribute_prop.name has a [MarshalAs] attribute",
-			"The field ObjCRuntime.Class/objc_attribute_prop.value has a [MarshalAs] attribute",
 		};
 #endif
 		static HashSet<string> knownFailuresPInvokes = new HashSet<string> {