64 bit support for CoreGraphics

src/AddressBook/ABAddressBook.cs

@@ -4,7 +4,7 @@
 // Authors: Mono Team
 //     
 // Copyright (C) 2009 Novell, Inc
-// Copyright 2011, 2012 Xamarin Inc.
+// Copyright 2011-2013 Xamarin Inc.
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -69,13 +69,17 @@ public ExternalChangeEventArgs (ABAddressBook addressBook, NSDictionary info)
 	//
 	// Meaning we can't rely on static constructors, as they could be invoked
 	// before those functions have been invoked. :-/
+	//
+	// Note that the above comment was removed from iOS 6.0+ documentation (and were not part of OSX docs AFAIK).
+	// It make sense since it's not possible to call those functions, from 6.0+ they will return NULL on devices,
+	// unless the application has been authorized to access the address book.
 	class InitConstants {
 		public static void Init () {}
 
 		static InitConstants ()
 		{
-			// ensure we can init.
-			CFObject.CFRelease (ABAddressBook.ABAddressBookCreate ());
+			// ensure we can init. This is needed before iOS6 (as per doc).
+			IntPtr p = ABAddressBook.ABAddressBookCreate ();
 
 			ABGroupProperty.Init ();
 			ABLabel.Init ();
@@ -89,6 +93,11 @@ static InitConstants ()
 			ABPersonRelatedNamesLabel.Init ();
 			ABPersonUrlLabel.Init ();
 			ABSourcePropertyId.Init ();
+
+			// From iOS 6.0+ this might return NULL, e.g. if the application is not authorized to access the
+			// address book, and we would crash if we tried to release a null pointer
+			if (p != IntPtr.Zero)
+				CFObject.CFRelease (p);
 		}
 	}
 

src/AudioToolbox/AudioBuffers.cs

@@ -53,18 +53,23 @@ public AudioBuffers (IntPtr address, bool owns)
 			this.owns = owns;
 		}
 
-		public AudioBuffers (int count)
+		public unsafe AudioBuffers (int count)
 		{
 			if (count < 0)
 				throw new ArgumentOutOfRangeException ("count");
 
-			var size = sizeof (int) + count * Marshal.SizeOf (typeof (AudioBuffer));
+			var size = sizeof (int) + count * sizeof (AudioBuffer);
 			address = Marshal.AllocHGlobal (size);
 			owns = true;
 
 			Marshal.WriteInt32 (address, 0, count);
-			for (int i = sizeof (int); i < size; i++)
-				Marshal.WriteByte (address, i, 0);
+			AudioBuffer *ptr = (AudioBuffer *) (((byte *) address) + sizeof (int));
+			for (int i = 0; i < count; i++){
+				ptr->NumberChannels = 0;
+				ptr->DataByteSize = 0;
+				ptr->Data = IntPtr.Zero;
+				ptr++;
+			}
 		}
 
 		~AudioBuffers ()
@@ -73,9 +78,9 @@ public AudioBuffers (int count)
 			GC.SuppressFinalize (this);
 		}
 
-		public int Count {
+		public unsafe int Count {
 			get {
-				return Marshal.ReadInt32 (address);
+				return *(int *) address;
 			}
 		}
 
@@ -96,8 +101,8 @@ public AudioBuffer this [int index] {
 				unsafe {
 					byte *baddress = (byte *) address;
 
-					var ptr = baddress + sizeof (int) + index * Marshal.SizeOf (typeof (AudioBuffer));
-					return (AudioBuffer) Marshal.PtrToStructure ((IntPtr) ptr, typeof (AudioBuffer));
+					var ptr = baddress + sizeof (int) + index * sizeof (AudioBuffer);
+					return *(AudioBuffer *) ptr;
 				}
 			}
 			set {
@@ -106,10 +111,8 @@ public AudioBuffer this [int index] {
 
 				unsafe {
 					byte *baddress = (byte *) address;
-					var ptr = (IntPtr) (baddress + sizeof (int) + index * Marshal.SizeOf (typeof (AudioBuffer)));
-					Marshal.WriteInt32 (ptr, value.NumberChannels);
-					Marshal.WriteInt32 (ptr, sizeof (int), value.DataByteSize);
-					Marshal.WriteIntPtr (ptr, sizeof (int) + sizeof (int), value.Data);
+					var ptr = (AudioBuffer *) (baddress + sizeof (int) + index * sizeof (AudioBuffer));
+					*ptr = value;
 				}
 			}
 		}
@@ -126,8 +129,8 @@ public void SetData (int index, IntPtr data)
 
 			unsafe {
 				byte * baddress = (byte *) address;
-				var ptr = (IntPtr)(baddress + sizeof (int) + index * Marshal.SizeOf (typeof (AudioBuffer)) + sizeof (int) + sizeof (int));
-				Marshal.WriteIntPtr (ptr, data);
+				var ptr = (IntPtr *)(baddress + sizeof (int) + index * sizeof (AudioBuffer) + sizeof (int) + sizeof (int));
+				*ptr = data;
 			}
 		}
 
@@ -138,9 +141,11 @@ public void SetData (int index, IntPtr data, int dataByteSize)
 
 			unsafe {
 				byte *baddress = (byte *) address;
-				var ptr = (IntPtr)(baddress + sizeof (int) + index * Marshal.SizeOf (typeof (AudioBuffer)) + sizeof (int));
-				Marshal.WriteInt32 (ptr, dataByteSize);
-				Marshal.WriteIntPtr (ptr, sizeof (int), data);
+				var ptr = (int *)(baddress + sizeof (int) + index * sizeof (AudioBuffer) + sizeof (int));
+				*ptr = dataByteSize;
+				ptr++;
+				IntPtr *iptr = (IntPtr *) ptr;
+				*iptr = data;
 			}
 		}
 

src/AudioToolbox/AudioConverter.cs

@@ -76,6 +76,7 @@ public enum AudioConverterPrimeMethod
 		None		= 2
 	}
 
+	[StructLayout (LayoutKind.Sequential)]
 	public struct AudioConverterPrimeInfo
 	{
 		public int LeadingFrames;
@@ -185,10 +186,10 @@ public AudioConverterPrimeMethod PrimeMethod {
 			}
 		}
 
-		public AudioConverterPrimeInfo PrimeInfo {
+		public unsafe AudioConverterPrimeInfo PrimeInfo {
 			get {
 				AudioConverterPrimeInfo value;
-				var size = Marshal.SizeOf (typeof (AudioConverterPrimeInfo));
+				var size = sizeof (AudioConverterPrimeInfo);
 				var res = AudioConverterGetProperty (handle, AudioConverterPropertyID.PrimeInfo, ref size, out value);
 				if (res != AudioConverterError.None)
 					throw new ArgumentException (res.ToString ());
@@ -328,7 +329,7 @@ public AudioChannelLayoutTag[] AvailableEncodeChannelLayoutTags {
 			}
 		}
 
-		public AudioStreamBasicDescription CurrentOutputStreamDescription {
+		public unsafe AudioStreamBasicDescription CurrentOutputStreamDescription {
 			get {
 				int size;
 				bool writable;
@@ -341,13 +342,13 @@ public AudioStreamBasicDescription CurrentOutputStreamDescription {
 				if (res != AudioConverterError.None)
 					throw new ArgumentException (res.ToString ());
 
-				var asbd = (AudioStreamBasicDescription) Marshal.PtrToStructure (ptr, typeof (AudioStreamBasicDescription));
+				var asbd = *(AudioStreamBasicDescription *) ptr;
 				Marshal.FreeHGlobal (ptr);
 				return asbd;
 			}
 		}
 
-		public AudioStreamBasicDescription CurrentInputStreamDescription {
+		public unsafe AudioStreamBasicDescription CurrentInputStreamDescription {
 			get {
 				int size;
 				bool writable;
@@ -360,7 +361,7 @@ public AudioStreamBasicDescription CurrentInputStreamDescription {
 				if (res != AudioConverterError.None)
 					throw new ArgumentException (res.ToString ());
 
-				var asbd = (AudioStreamBasicDescription) Marshal.PtrToStructure (ptr, typeof (AudioStreamBasicDescription));
+				var asbd = *(AudioStreamBasicDescription*) ptr;
 				Marshal.FreeHGlobal (ptr);
 				return asbd;
 			}
@@ -375,9 +376,9 @@ public int BitDepthHint {
 			}
 		}
 
-		public AudioFormat[] FormatList {
+		public unsafe AudioFormat[] FormatList {
 			get {
-				return GetArray<AudioFormat> (AudioConverterPropertyID.PropertyFormatList, Marshal.SizeOf (typeof (AudioFormat)));
+				return GetArray<AudioFormat> (AudioConverterPropertyID.PropertyFormatList, sizeof (AudioFormat));
 			}
 		}
 
@@ -568,26 +569,31 @@ double GetDoubleProperty (AudioConverterPropertyID propertyID)
 			return value;
 		}
 
-		AudioValueRange[] GetAudioValueRange (AudioConverterPropertyID prop)
+		unsafe AudioValueRange[] GetAudioValueRange (AudioConverterPropertyID prop)
 		{
-			return GetArray<AudioValueRange> (prop, Marshal.SizeOf (typeof (AudioValueRange)));
+			return GetArray<AudioValueRange> (prop, sizeof (AudioValueRange));
 		}
 
-		unsafe T[] GetArray<T> (AudioConverterPropertyID prop, int elementSize) where T : struct
+		unsafe T[] GetArray<T> (AudioConverterPropertyID prop, int elementSize)
 		{
 			int size;
 			bool writable;
 			if (AudioConverterGetPropertyInfo (handle, prop, out size, out writable) != AudioConverterError.None)
 				return null;
 
-			var data = new T[size / elementSize];
-			fixed (T* ptr = &data[0]) {
-				var res = AudioConverterGetProperty (handle, prop, ref size, (IntPtr)ptr);
+			var data = new T [size / elementSize];
+			var array_handle = GCHandle.Alloc (data, GCHandleType.Pinned);
+
+			try {
+				var ptr = array_handle.AddrOfPinnedObject ();
+				var res = AudioConverterGetProperty (handle, prop, ref size, ptr);
 				if (res != 0)
 					return null;
 
 				Array.Resize (ref data, size / elementSize);
 				return data;
+			} finally {
+				array_handle.Free ();
 			}
 		}		
 

src/AudioToolbox/AudioFile.cs

@@ -276,8 +276,8 @@ public AudioFileMarker this [int index] {
 				// }
 				//
 				unsafe {
-					var ptr = (byte *) this.ptr + 2 * sizeof (int) + index * Marshal.SizeOf (typeof (AudioFileMarker));
-					return (AudioFileMarker) Marshal.PtrToStructure ((IntPtr) ptr, typeof (AudioFileMarker));
+					var ptr = (AudioFileMarker *) this.ptr + 2 * sizeof (int) + index * sizeof (AudioFileMarker);
+					return *ptr;
 				}
 			}
 		}
@@ -347,15 +347,15 @@ internal IntPtr NameWeak {
 			}
 		}
 
-		public AudioFileRegionFlags Flags {
+		public unsafe AudioFileRegionFlags Flags {
 			get {
-				return (AudioFileRegionFlags) Marshal.ReadInt32 (ptr, sizeof (uint) + Marshal.SizeOf (typeof (IntPtr)));
+				return (AudioFileRegionFlags) Marshal.ReadInt32 (ptr, sizeof (uint) + sizeof (IntPtr));
 			}
 		}
 
-		public int Count {
+		public unsafe int Count {
 			get {
-				return Marshal.ReadInt32 (ptr, 2 * sizeof (uint) + Marshal.SizeOf (typeof (IntPtr)));
+				return Marshal.ReadInt32 (ptr, 2 * sizeof (uint) + sizeof (IntPtr));
 			}
 		}
 
@@ -365,15 +365,15 @@ public AudioFileMarker this [int index] {
 					throw new ArgumentOutOfRangeException ("index");
 
 				unsafe {
-					var ptr = (byte *) this.ptr + 3 * sizeof (int) + Marshal.SizeOf (typeof (IntPtr)) + index * Marshal.SizeOf (typeof (AudioFileMarker));
-					return (AudioFileMarker) Marshal.PtrToStructure ((IntPtr) ptr, typeof (AudioFileMarker));
+					var ptr = (AudioFileMarker *) this.ptr + 3 * sizeof (int) + sizeof (IntPtr) + index * sizeof (AudioFileMarker);
+					return *ptr;
 				}
 			}
 		}
 
-		internal int TotalSize {
+		internal unsafe int TotalSize {
 			get {
-				return Count * Marshal.SizeOf (typeof (AudioFileMarker));
+				return Count * sizeof (AudioFileMarker);
 			}
 		}
 	}
@@ -991,7 +991,7 @@ public IntPtr GetProperty (AudioFileProperty property, out int size)
 			return IntPtr.Zero;
 		}
 
-		T? GetProperty<T> (AudioFileProperty property) where T : struct
+		unsafe T? GetProperty<T> (AudioFileProperty property) where T : struct
 		{
 			int size, writable;
 
@@ -1002,8 +1002,10 @@ public IntPtr GetProperty (AudioFileProperty property, out int size)
 				return null;
 			try {
 				var r = AudioFileGetProperty (handle, property, ref size, buffer);
-				if (r == 0)
-					return (T) Marshal.PtrToStructure (buffer, typeof (T));
+				if (r == 0){
+					T t = (T) Marshal.PtrToStructure (buffer, typeof (T));
+					return t;
+				}
 
 				return null;
 			} finally {
@@ -1258,7 +1260,7 @@ public AudioFileRegionList RegionList {
 			}
 		}
 
-		public AudioFilePacketTableInfo? PacketTableInfo {
+		public unsafe AudioFilePacketTableInfo? PacketTableInfo {
 			get {
 				return GetProperty<AudioFilePacketTableInfo> (AudioFileProperty.PacketTableInfo);
 			}
@@ -1267,7 +1269,7 @@ public AudioFilePacketTableInfo? PacketTableInfo {
 					throw new ArgumentNullException ("value");
 
 				AudioFilePacketTableInfo afpti = value.Value;
-				var res = AudioFileSetProperty (handle, AudioFileProperty.PacketTableInfo, Marshal.SizeOf (typeof (AudioFilePacketTableInfo)), ref afpti);
+				var res = AudioFileSetProperty (handle, AudioFileProperty.PacketTableInfo, sizeof (AudioFilePacketTableInfo), ref afpti);
 				if (res != 0)
 					throw new ArgumentException (res.ToString ());
 			}
@@ -1326,7 +1328,7 @@ public long PacketToFrame (long packet)
 
 			unsafe {
 				AudioFramePacketTranslation *p = &buffer;
-				int size = Marshal.SizeOf (buffer);
+				int size = sizeof (AudioFramePacketTranslation);
 				if (AudioFileGetProperty (handle, AudioFileProperty.PacketToFrame, ref size, (IntPtr) p) == 0)
 					return buffer.Frame;
 				return -1;
@@ -1340,7 +1342,7 @@ public long FrameToPacket (long frame, out int frameOffsetInPacket)
 
 			unsafe {
 				AudioFramePacketTranslation *p = &buffer;
-				int size = Marshal.SizeOf (buffer);
+				int size = sizeof (AudioFramePacketTranslation);
 				if (AudioFileGetProperty (handle, AudioFileProperty.FrameToPacket, ref size, (IntPtr) p) == 0){
 					frameOffsetInPacket = buffer.FrameOffsetInPacket;
 					return buffer.Packet;
@@ -1357,7 +1359,7 @@ public long PacketToByte (long packet, out bool isEstimate)
 
 			unsafe {
 				AudioBytePacketTranslation *p = &buffer;
-				int size = Marshal.SizeOf (buffer);
+				int size = sizeof (AudioBytePacketTranslation);
 				if (AudioFileGetProperty (handle, AudioFileProperty.PacketToByte, ref size, (IntPtr) p) == 0){
 					isEstimate = (buffer.Flags & BytePacketTranslationFlags.IsEstimate) != 0;
 					return buffer.Byte;
@@ -1374,7 +1376,7 @@ public long ByteToPacket (long byteval, out int byteOffsetInPacket, out bool isE
 
 			unsafe {
 				AudioBytePacketTranslation *p = &buffer;
-				int size = Marshal.SizeOf (buffer);
+				int size = sizeof (AudioBytePacketTranslation);
 				if (AudioFileGetProperty (handle, AudioFileProperty.ByteToPacket, ref size, (IntPtr) p) == 0){
 					isEstimate = (buffer.Flags & BytePacketTranslationFlags.IsEstimate) != 0;
 					byteOffsetInPacket = buffer.ByteOffsetInPacket;