Author: spouliot
Date: 2007-03-30 10:12:17 -0500 (Fri, 30 Mar 2007)
New Revision: 75202
Modified:
trunk/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
trunk/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs
Log:
2007-03-30 Sebastien Pouliot <[EMAIL PROTECTED]>
* GDIPlusTest.cs: Add pen test case to check for #81266 (note: will
crash libgdiplus if it's not updated to the latest svn revision).
Modified: trunk/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
===================================================================
--- trunk/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
2007-03-30 15:08:04 UTC (rev 75201)
+++ trunk/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
2007-03-30 15:12:17 UTC (rev 75202)
@@ -1,5 +1,7 @@
-2007-03-30 Sebastien Pouliot <[EMAIL PROTECTED]>
+2007-03-30 Sebastien Pouliot <[EMAIL PROTECTED]>
+ * GDIPlusTest.cs: Add pen test case to check for #81266 (note: will
+ crash libgdiplus if it's not updated to the latest svn revision).
* SystemFontsTest.cs: Allow a small delta when comparing floats. This
allows the ARM to work properly (e.g. 8.249999 versus 8.25).
Modified: trunk/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs
===================================================================
--- trunk/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs
2007-03-30 15:08:04 UTC (rev 75201)
+++ trunk/mcs/class/System.Drawing/Test/System.Drawing/GDIPlusTest.cs
2007-03-30 15:12:17 UTC (rev 75202)
@@ -914,6 +914,47 @@
Assert.AreEqual (Status.InvalidParameter,
GDIPlus.GdipDeletePen (IntPtr.Zero), "GdipDeletePen-null");
}
+ [Test]
+ public void PenColor_81266 ()
+ {
+ IntPtr pen;
+ Assert.AreEqual (Status.Ok, GDIPlus.GdipCreatePen1
(0x7f0000ff, 1f, Unit.UnitPixel, out pen), "GdipCreatePen1");
+ try {
+ int color = 0;
+ IntPtr brush;
+ Assert.AreEqual (Status.InvalidParameter,
GDIPlus.GdipGetPenBrushFill (IntPtr.Zero, out brush),
"GdipGetPenBrushFill-null");
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipGetPenBrushFill (pen, out brush), "GdipGetPenBrushFill");
+ try {
+ Assert.AreEqual
(Status.InvalidParameter, GDIPlus.GdipGetSolidFillColor (IntPtr.Zero, out
color), "GdipGetSolidFillColor-null");
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipGetSolidFillColor (brush, out color), "GdipGetSolidFillColor-0");
+ Assert.AreEqual (0x7f0000ff, color,
"color-0");
+
+ Assert.AreEqual
(Status.InvalidParameter, GDIPlus.GdipSetPenColor (IntPtr.Zero, 0x7fff0000),
"GdipSetPenColor-null");
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipSetPenColor (pen, 0x7fff0000), "GdipSetPenColor");
+
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipGetSolidFillColor (brush, out color), "GdipGetSolidFillColor-1");
+ // previous brush color didn't change
+ Assert.AreEqual (0x7f0000ff, color,
"color-1");
+ }
+ finally {
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipDeleteBrush (brush), "GdipDeleteBrush");
+ }
+
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipGetPenBrushFill (pen, out brush), "GdipGetPenBrushFill-2");
+ try {
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipGetSolidFillColor (brush, out color), "GdipGetSolidFillColor-2");
+ // new brush color is updated
+ Assert.AreEqual (0x7fff0000, color,
"color-2");
+ }
+ finally {
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipDeleteBrush (brush), "GdipDeleteBrush-2");
+ }
+ }
+ finally {
+ Assert.AreEqual (Status.Ok,
GDIPlus.GdipDeletePen (pen), "GdipDeletePen");
+ }
+ }
+
// Region
[Test]
public void CreateRegionRgnData ()
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches