Backport r91391, fix for #349103

svn path=/branches/mono-1-2-6/mcs/; revision=91399
mono · Dec 17, 2007 · cba1442 · cba1442
1 parent 040ba14
commit cba1442
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-16  Miguel de Icaza  <miguel@novell.com>
+
+	[Backport r91391, fix for #349103]
+
+ 	* Image.cs: Use the existing GdipPropertyItem.MarshalTo method to
+ 	conver the PropertyItem into a property item with Sequential
+ 	attached to it, and pass that to unmanaged code.   Fixes #349103.
+
 2007-11-19  Sebastien Pouliot  <sebastien@ximian.com>
 
 	[Backport r89932]

diff --git a/mcs/class/System.Drawing/System.Drawing/Image.cs b/mcs/class/System.Drawing/System.Drawing/Image.cs
@@ -525,16 +525,16 @@ public int SelectActiveFrame(FrameDimension dimension, int frameIndex)
 
 		return frameIndex;		
 	}
-	
+
 	public void SetPropertyItem(PropertyItem propitem)
 	{
-		IntPtr property;
-		int size = Marshal.SizeOf (typeof(GdipPropertyItem));
-		property = Marshal.AllocHGlobal (size);
-
-		Marshal.StructureToPtr (propitem, property, true);
-		Status status = GDIPlus.GdipSetPropertyItem (nativeObject, property);
-		GDIPlus.CheckStatus (status);
+		GdipPropertyItem pi = new GdipPropertyItem ();
+		GdipPropertyItem.MarshalTo (pi, propitem);
+		unsafe {
+			Status status = GDIPlus.GdipSetPropertyItem (nativeObject, &pi);
+			
+			GDIPlus.CheckStatus (status);
+		}
 		// FIXME: GdipSetPropertyItem isn't implemented in libgdiplus (but returns Ok)
 		// so who's freeing "property" ? GDI+ ?
 	}

diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
@@ -1069,7 +1069,7 @@ internal static extern Status GdipGetStringFormatMeasurableCharacterRangeCount (
 		internal static extern Status GdipRemovePropertyItem (IntPtr image, int propertyId);
 
 		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetPropertyItem (IntPtr image, IntPtr propertyItem);
+		internal unsafe static extern Status GdipSetPropertyItem (IntPtr image, GdipPropertyItem *propertyItem);
 
 		[DllImport("gdiplus.dll")]
 		internal static extern Status GdipGetImageThumbnail ( IntPtr image, uint width, uint height, out IntPtr thumbImage, IntPtr callback, IntPtr callBackData );