X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Drawing%2FSystem.Drawing%2FgdipFunctions.cs;h=c42b38a20bc841fd273be353c3a5e9f7e37d830b;hb=411a37af27905eaa44dac1a31f6387a11c0b0244;hp=5147116609f3fe81556720b34429d83ad6c459e1;hpb=18751d4475cda0456b25597c3d4f9634c14f8a68;p=mono.git

diff --git a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
index 5147116609f..c42b38a20bc 100644
--- a/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
+++ b/mcs/class/System.Drawing/System.Drawing/gdipFunctions.cs
@@ -7,7 +7,7 @@
 //	Sanjay Gupta (gsanjay@novell.com)
 //	Ravindra (rkumar@novell.com)
 //	Peter Dennis Bartok (pbartok@novell.com)
-//	Sebastien Pouliot  <sebastien@ximian.com>
+//	Sebastien Pouliot <sebastien@ximian.com>
 //
 // Copyright (C) 2004 - 2007 Novell, Inc (http://www.novell.com)
 //
@@ -43,11 +43,18 @@ using System.Runtime.InteropServices.ComTypes;
 
 namespace System.Drawing
 {
+	internal partial class SafeNativeMethods
+	{
+		internal partial class Gdip : GDIPlus
+		{
+
+		}
+	}
+
 	/// <summary>
 	/// GDI+ API Functions
 	/// </summary>
-	[SuppressUnmanagedCodeSecurity]
-	internal static class GDIPlus {
+	internal /*static*/ class GDIPlus {
 		public const int FACESIZE = 32;
 		public const int LANG_NEUTRAL = 0;
 		public static IntPtr Display = IntPtr.Zero;
@@ -55,27 +62,29 @@ namespace System.Drawing
 		public static bool UseCarbonDrawable = false;
 		public static bool UseCocoaDrawable = false;
 
+		private const string GdiPlus = "gdiplus";
+
 		#region gdiplus.dll functions
 
 		// startup / shutdown
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdiplusStartup(ref ulong token, ref GdiplusStartupInput input, ref GdiplusStartupOutput output);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern void GdiplusShutdown(ref ulong token);
-		
+
 		internal static ulong GdiPlusToken = 0;
 
 		static void ProcessExit (object sender, EventArgs e)
-		{		
+		{
 			// Called all pending objects and claim any pending handle before
 			// shutting down
-			GC.Collect ();	
+			GC.Collect ();
 			GC.WaitForPendingFinalizers ();
-#if false			
+#if false
 			GdiPlusToken = 0;
 
 			// This causes crashes in because this call occurs before all
-			// managed GDI+ objects are finalized. When they are finalized 
+			// managed GDI+ objects are finalized. When they are finalized
 			// they call into a shutdown GDI+ and we crash.
 			GdiplusShutdown (ref GdiPlusToken);
 
@@ -91,8 +100,14 @@ namespace System.Drawing
 
 		static GDIPlus ()
 		{
+#if NETSTANDARD1_6
+			bool isUnix = !RuntimeInformation.IsOSPlatform (OSPlatform.Windows);
+#else
 			int platform = (int) Environment.OSVersion.Platform;
-			if ((platform == 4) || (platform == 6) || (platform == 128)) {
+			bool isUnix = (platform == 4) || (platform == 6) || (platform == 128);
+#endif
+
+			if (isUnix) {
 				if (Environment.GetEnvironmentVariable ("not_supported_MONO_MWF_USE_NEW_X11_BACKEND") != null || Environment.GetEnvironmentVariable ("MONO_MWF_MAC_FORCE_X11") != null) {
 					UseX11Drawable = true;
 				} else {
@@ -126,7 +141,9 @@ namespace System.Drawing
 			}
 
 			// under MS 1.x this event is raised only for the default application domain
+#if !NETSTANDARD1_6
 			AppDomain.CurrentDomain.ProcessExit += new EventHandler (ProcessExit);
+#endif
 		}
 
 		static public bool RunningOnWindows ()
@@ -138,62 +155,62 @@ namespace System.Drawing
 		{
 			return UseX11Drawable || UseCarbonDrawable || UseCocoaDrawable;
 		}
-		
+
 		// Copies a Ptr to an array of Points and releases the memory
 		static public void FromUnManagedMemoryToPointI (IntPtr prt, Point [] pts)
-		{						
+		{
 			int nPointSize = Marshal.SizeOf (pts[0]);
 			IntPtr pos = prt;
 			for (int i=0; i<pts.Length; i++, pos = new IntPtr (pos.ToInt64 () + nPointSize))
 				pts[i] = (Point) Marshal.PtrToStructure (pos, typeof (Point));
-			
-			Marshal.FreeHGlobal (prt);			
+
+			Marshal.FreeHGlobal (prt);
 		}
-		
+
 		// Copies a Ptr to an array of Points and releases the memory
 		static public void FromUnManagedMemoryToPoint (IntPtr prt, PointF [] pts)
-		{						
+		{
 			int nPointSize = Marshal.SizeOf (pts[0]);
 			IntPtr pos = prt;
 			for (int i=0; i<pts.Length; i++, pos = new IntPtr (pos.ToInt64 () + nPointSize))
 				pts[i] = (PointF) Marshal.PtrToStructure (pos, typeof (PointF));
-			
-			Marshal.FreeHGlobal (prt);			
+
+			Marshal.FreeHGlobal (prt);
 		}
-		
+
 		// Copies an array of Points to unmanaged memory
 		static public IntPtr FromPointToUnManagedMemoryI (Point [] pts)
 		{
-			int nPointSize =  Marshal.SizeOf (pts[0]);
+			int nPointSize = Marshal.SizeOf (pts[0]);
 			IntPtr dest = Marshal.AllocHGlobal (nPointSize * pts.Length);
 			IntPtr pos = dest;
 			for (int i=0; i<pts.Length; i++, pos = new IntPtr (pos.ToInt64 () + nPointSize))
-				Marshal.StructureToPtr (pts[i], pos, false);	
-			
-			return dest;			
-		}		
-				
+				Marshal.StructureToPtr (pts[i], pos, false);
+
+			return dest;
+		}
+
 		// Copies a Ptr to an array of v and releases the memory
 		static public void FromUnManagedMemoryToRectangles (IntPtr prt, RectangleF [] pts)
-		{						
+		{
 			int nPointSize = Marshal.SizeOf (pts[0]);
 			IntPtr pos = prt;
 			for (int i = 0; i < pts.Length; i++, pos = new IntPtr (pos.ToInt64 () + nPointSize))
 				pts[i] = (RectangleF) Marshal.PtrToStructure (pos, typeof (RectangleF));
-			
-			Marshal.FreeHGlobal (prt);			
+
+			Marshal.FreeHGlobal (prt);
 		}
-		
+
 		// Copies an array of Points to unmanaged memory
 		static public IntPtr FromPointToUnManagedMemory (PointF [] pts)
 		{
-			int nPointSize =  Marshal.SizeOf (pts[0]);
-			IntPtr dest = Marshal.AllocHGlobal (nPointSize * pts.Length);			
+			int nPointSize = Marshal.SizeOf (pts[0]);
+			IntPtr dest = Marshal.AllocHGlobal (nPointSize * pts.Length);
 			IntPtr pos = dest;
 			for (int i=0; i<pts.Length; i++, pos = new IntPtr (pos.ToInt64 () + nPointSize))
-				Marshal.StructureToPtr (pts[i], pos, false);	
-			
-			return dest;			
+				Marshal.StructureToPtr (pts[i], pos, false);
+
+			return dest;
 		}
 
 		// Converts a status into exception
@@ -251,1212 +268,1212 @@ namespace System.Drawing
 				throw new Exception (msg);
 			}
 		}
-		
+
 		// Memory functions
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern IntPtr GdipAlloc (int size);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern void GdipFree (IntPtr ptr);
 
-		
+
 		// Brush functions
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCloneBrush (IntPtr brush, out IntPtr clonedBrush);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipDeleteBrush (IntPtr brush);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetBrushType (IntPtr brush, out BrushType type);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCloneBrush (HandleRef brush, out IntPtr clonedBrush);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipDeleteBrush (HandleRef brush);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetBrushType (HandleRef brush, out BrushType type);
 
 
-                // Region functions
-                [DllImport("gdiplus.dll")]
+		// Region functions
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateRegion (out IntPtr region);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateRegionRgnData (byte[] data, int size, out IntPtr region);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipDeleteRegion (IntPtr region);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCloneRegion (IntPtr region, out IntPtr cloned);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateRegionRect (ref RectangleF rect, out IntPtr region);
 
-                [DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateRegionRectI (ref Rectangle rect,  out IntPtr region);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipCreateRegionRectI (ref Rectangle rect, out IntPtr region);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateRegionPath (IntPtr path, out IntPtr region);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipTranslateRegion (IntPtr region, float dx, float dy);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipTranslateRegionI (IntPtr region, int dx, int dy);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipIsVisibleRegionPoint (IntPtr region, float x, float y,
-                        IntPtr graphics, out bool result);
+			IntPtr graphics, out bool result);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipIsVisibleRegionPointI (IntPtr region, int x, int y,
-                        IntPtr graphics, out bool result);
+			IntPtr graphics, out bool result);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipIsVisibleRegionRect (IntPtr region, float x, float y, float width,
-                        float height, IntPtr graphics, out bool result);
+			float height, IntPtr graphics, out bool result);
 
-                [DllImport("gdiplus.dll")]
-		static internal extern Status  GdipIsVisibleRegionRectI (IntPtr region, int x, int y, int width,
-                        int height, IntPtr graphics, out bool result);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipIsVisibleRegionRectI (IntPtr region, int x, int y, int width,
+			int height, IntPtr graphics, out bool result);
 
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCombineRegionRect (IntPtr region, ref RectangleF rect,
-                        CombineMode combineMode);
+			CombineMode combineMode);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCombineRegionRectI (IntPtr region, ref Rectangle rect,
-                        CombineMode combineMode);
+			CombineMode combineMode);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCombineRegionPath (IntPtr region, IntPtr path, CombineMode combineMode);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetRegionBounds (IntPtr region, IntPtr graphics, ref RectangleF rect);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetInfinite (IntPtr region);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetEmpty (IntPtr region);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipIsEmptyRegion (IntPtr region, IntPtr graphics, out bool result);
-                
-                [DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipIsInfiniteRegion (IntPtr region, IntPtr graphics, out bool result);
 
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCombineRegionRegion (IntPtr region, IntPtr region2,
-                        CombineMode combineMode);
-                        
-		[DllImport("gdiplus.dll")]
+			CombineMode combineMode);
+
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipIsEqualRegion (IntPtr region, IntPtr region2,
-                           IntPtr graphics, out bool result);                                   
-                           
-                [DllImport("gdiplus.dll")]
+			IntPtr graphics, out bool result);
+
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetRegionDataSize (IntPtr region, out int bufferSize);
 
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetRegionData (IntPtr region, byte[] buffer, int bufferSize, 
-                  out int sizeFilled);
-                  
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipGetRegionData (IntPtr region, byte[] buffer, int bufferSize,
+		 out int sizeFilled);
+
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetRegionScansCount (IntPtr region, out int count, IntPtr matrix);
 
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetRegionScans (IntPtr region,  IntPtr rects, out int count, 
-                   IntPtr matrix);
-                
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipGetRegionScans (IntPtr region, IntPtr rects, out int count,
+			IntPtr matrix);
+
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipTransformRegion(IntPtr region, IntPtr matrix);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipFillRegion(IntPtr graphics, IntPtr brush, IntPtr region);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetRegionHRgn (IntPtr region, IntPtr graphics, ref IntPtr hRgn);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateRegionHrgn (IntPtr hRgn, out IntPtr region);
 
 		// Solid brush functions
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateSolidFill (int color, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetSolidFillColor (IntPtr brush, out int color);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipSetSolidFillColor (IntPtr brush, int color);
-		
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCreateSolidFill (int color, out IntPtr brush);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetSolidFillColor (HandleRef brush, out int color);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipSetSolidFillColor (HandleRef brush, int color);
+
 		// Hatch Brush functions
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateHatchBrush (HatchStyle hatchstyle, int foreColor, int backColor, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetHatchStyle (IntPtr brush, out HatchStyle hatchstyle);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetHatchForegroundColor (IntPtr brush, out int foreColor);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetHatchBackgroundColor (IntPtr brush, out int backColor);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCreateHatchBrush (/*HatchStyle*/ int hatchstyle, int foreColor, int backColor, out IntPtr brush);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetHatchStyle (HandleRef brush, out /*HatchStyle*/ int hatchstyle);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetHatchForegroundColor (HandleRef brush, out int foreColor);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetHatchBackgroundColor (HandleRef brush, out int backColor);
 
 		// Texture brush functions
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetTextureImage (IntPtr texture, out IntPtr image);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateTexture (IntPtr image, WrapMode wrapMode,  out IntPtr texture);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateTextureIAI (IntPtr image, IntPtr imageAttributes, int x, int y, int width, int height, out IntPtr texture);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateTextureIA (IntPtr image, IntPtr imageAttributes, float x, float y, float width, float height, out IntPtr texture);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateTexture2I (IntPtr image, WrapMode wrapMode, int x, int y, int width, int height, out IntPtr texture);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateTexture2 (IntPtr image, WrapMode wrapMode, float x, float y, float width, float height, out IntPtr texture);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetTextureTransform (IntPtr texture, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipSetTextureTransform (IntPtr texture, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetTextureWrapMode (IntPtr texture, out WrapMode wrapMode);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipSetTextureWrapMode (IntPtr texture, WrapMode wrapMode);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipMultiplyTextureTransform (IntPtr texture, IntPtr matrix, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipResetTextureTransform (IntPtr texture);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipRotateTextureTransform (IntPtr texture, float angle, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipScaleTextureTransform (IntPtr texture, float sx, float sy, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipTranslateTextureTransform (IntPtr texture, float dx, float dy, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetTextureImage (HandleRef texture, out IntPtr image);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCreateTexture (HandleRef image, /*WrapMode*/ int wrapMode, out IntPtr texture);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCreateTextureIAI (HandleRef image, HandleRef imageAttributes, int x, int y, int width, int height, out IntPtr texture);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCreateTextureIA (HandleRef image, HandleRef imageAttributes, float x, float y, float width, float height, out IntPtr texture);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCreateTexture2I (HandleRef image, /*WrapMode*/ int wrapMode, int x, int y, int width, int height, out IntPtr texture);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipCreateTexture2 (HandleRef image, /*WrapMode*/ int wrapMode, float x, float y, float width, float height, out IntPtr texture);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetTextureTransform (HandleRef texture, HandleRef matrix);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipSetTextureTransform (HandleRef texture, HandleRef matrix);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetTextureWrapMode (HandleRef texture, out /*WrapMode*/ int wrapMode);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipSetTextureWrapMode (HandleRef texture, /*WrapMode*/ int wrapMode);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipMultiplyTextureTransform (HandleRef texture, HandleRef matrix, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipResetTextureTransform (HandleRef texture);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipRotateTextureTransform (HandleRef texture, float angle, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipScaleTextureTransform (HandleRef texture, float sx, float sy, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipTranslateTextureTransform (HandleRef texture, float dx, float dy, MatrixOrder order);
 
 		// PathGradientBrush functions
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreatePathGradientFromPath (IntPtr path, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreatePathGradientI (Point [] points, int count, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreatePathGradient (PointF [] points, int count, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientBlendCount (IntPtr brush, out int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientBlend (IntPtr brush, float [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientBlend (IntPtr brush, float [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientCenterColor (IntPtr brush, out int color);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientCenterColor (IntPtr brush, int color);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientCenterPoint (IntPtr brush, out PointF point);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientCenterPoint (IntPtr brush, ref PointF point);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientFocusScales (IntPtr brush, out float xScale, out float yScale);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientFocusScales (IntPtr brush, float xScale, float yScale);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientPresetBlendCount (IntPtr brush, out int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientPresetBlend (IntPtr brush, int [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientPresetBlend (IntPtr brush, int [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientRect (IntPtr brush, out RectangleF rect);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientSurroundColorCount (IntPtr brush, out int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientSurroundColorsWithCount (IntPtr brush, int [] color, ref int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientSurroundColorsWithCount (IntPtr brush, int [] color, ref int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientTransform (IntPtr brush, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientTransform (IntPtr brush, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetPathGradientWrapMode (IntPtr brush, out WrapMode wrapMode);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientWrapMode (IntPtr brush, WrapMode wrapMode);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientLinearBlend (IntPtr brush, float focus, float scale);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetPathGradientSigmaBlend (IntPtr brush, float focus, float scale);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipMultiplyPathGradientTransform (IntPtr texture, IntPtr matrix, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipResetPathGradientTransform (IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipRotatePathGradientTransform (IntPtr brush, float angle, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipScalePathGradientTransform (IntPtr brush, float sx, float sy, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipTranslatePathGradientTransform (IntPtr brush, float dx, float dy, MatrixOrder order);
 
 		// LinearGradientBrush functions
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateLineBrushI (ref Point point1, ref Point point2, int color1, int color2, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateLineBrush (ref PointF point1, ref PointF point2, int color1, int color2, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateLineBrushFromRectI (ref Rectangle rect, int color1, int color2, LinearGradientMode linearGradientMode, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateLineBrushFromRect (ref RectangleF rect, int color1, int color2, LinearGradientMode linearGradientMode, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateLineBrushFromRectWithAngleI (ref Rectangle rect, int color1, int color2, float angle, bool isAngleScaleable, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateLineBrushFromRectWithAngle (ref RectangleF rect, int color1, int color2, float angle, bool isAngleScaleable, WrapMode wrapMode, out IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineBlendCount (IntPtr brush, out int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLineBlend (IntPtr brush, float [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineBlend (IntPtr brush, float [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLineGammaCorrection (IntPtr brush, bool useGammaCorrection);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineGammaCorrection (IntPtr brush, out bool useGammaCorrection);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLinePresetBlendCount (IntPtr brush, out int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLinePresetBlend (IntPtr brush, int [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLinePresetBlend (IntPtr brush, int [] blend, float [] positions, int count);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLineColors (IntPtr brush, int color1, int color2);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineColors (IntPtr brush, int [] colors);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineRectI (IntPtr brush, out Rectangle rect);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineRect (IntPtr brush, out RectangleF rect);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLineTransform (IntPtr brush, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineTransform (IntPtr brush, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLineWrapMode (IntPtr brush, WrapMode wrapMode);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetLineWrapMode (IntPtr brush, out WrapMode wrapMode);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLineLinearBlend (IntPtr brush, float focus, float scale);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSetLineSigmaBlend (IntPtr brush, float focus, float scale);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipMultiplyLineTransform (IntPtr brush, IntPtr matrix, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipResetLineTransform (IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipRotateLineTransform (IntPtr brush, float angle, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipScaleLineTransform (IntPtr brush, float sx, float sy, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipTranslateLineTransform (IntPtr brush, float dx, float dy, MatrixOrder order);
 
 		// Graphics functions
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipCreateFromHDC(IntPtr hDC, out IntPtr graphics);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipDeleteGraphics(IntPtr graphics);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipRestoreGraphics(IntPtr graphics, uint graphicsState);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipSaveGraphics(IntPtr graphics, out uint state);
-		[DllImport("gdiplus.dll")]                
-                static internal extern Status GdipMultiplyWorldTransform (IntPtr graphics, IntPtr matrix, MatrixOrder order);
-                
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipMultiplyWorldTransform (IntPtr graphics, IntPtr matrix, MatrixOrder order);
+
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipRotateWorldTransform(IntPtr graphics, float angle, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipTranslateWorldTransform(IntPtr graphics, float dx, float dy, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipDrawArc (IntPtr graphics, IntPtr pen, float x, float y, float width, float height, float startAngle, float sweepAngle);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipDrawArcI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipDrawBezier (IntPtr graphics, IntPtr pen, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipDrawBezierI (IntPtr graphics, IntPtr pen, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipDrawEllipseI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipDrawEllipse (IntPtr graphics, IntPtr pen, float x, float y, float width, float height);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipDrawArc (IntPtr graphics, IntPtr pen, float x, float y, float width, float height, float startAngle, float sweepAngle);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipDrawArcI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipDrawBezier (IntPtr graphics, IntPtr pen, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipDrawBezierI (IntPtr graphics, IntPtr pen, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipDrawEllipseI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipDrawEllipse (IntPtr graphics, IntPtr pen, float x, float y, float width, float height);
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipDrawLine (IntPtr graphics, IntPtr pen, float x1, float y1, float x2, float y2);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipDrawLineI (IntPtr graphics, IntPtr pen, int x1, int y1, int x2, int y2);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawLines (IntPtr graphics, IntPtr pen, PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawLinesI (IntPtr graphics, IntPtr pen, Point [] points, int count);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawPath (IntPtr graphics, IntPtr pen, IntPtr path);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawPie (IntPtr graphics, IntPtr pen, float x, float y, float width, float height, float startAngle, float sweepAngle);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawPieI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawPolygon (IntPtr graphics, IntPtr pen, PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawPolygonI (IntPtr graphics, IntPtr pen, Point [] points, int count);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawRectangle (IntPtr graphics, IntPtr pen, float x, float y, float width, float height);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawRectangleI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawRectangles (IntPtr graphics, IntPtr pen, RectangleF [] rects, int count);
-                [DllImport ("gdiplus.dll")]
-                static internal extern Status GdipDrawRectanglesI (IntPtr graphics, IntPtr pen, Rectangle [] rects, int count);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipFillEllipseI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height);
-		[DllImport("gdiplus.dll")]
-                static internal extern Status GdipFillEllipse (IntPtr graphics, IntPtr pen, float x, float y, float width, float height);
-                [DllImport ("gdiplus.dll")]
-                static internal extern  Status GdipFillPolygon (IntPtr graphics, IntPtr brush, PointF [] points, int count, FillMode fillMode);
-                [DllImport ("gdiplus.dll")]
-                static internal extern  Status GdipFillPolygonI (IntPtr graphics, IntPtr brush, Point [] points, int count, FillMode fillMode);
-                [DllImport ("gdiplus.dll")]
-                static internal extern  Status GdipFillPolygon2 (IntPtr graphics, IntPtr brush, PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]
-                static internal extern  Status GdipFillPolygon2I (IntPtr graphics, IntPtr brush, Point [] points, int count);
-                [DllImport("gdiplus.dll")]
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawLines (IntPtr graphics, IntPtr pen, PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawLinesI (IntPtr graphics, IntPtr pen, Point [] points, int count);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawPath (IntPtr graphics, IntPtr pen, IntPtr path);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawPie (IntPtr graphics, IntPtr pen, float x, float y, float width, float height, float startAngle, float sweepAngle);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawPieI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height, float startAngle, float sweepAngle);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawPolygon (IntPtr graphics, IntPtr pen, PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawPolygonI (IntPtr graphics, IntPtr pen, Point [] points, int count);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawRectangle (IntPtr graphics, IntPtr pen, float x, float y, float width, float height);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawRectangleI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawRectangles (IntPtr graphics, IntPtr pen, RectangleF [] rects, int count);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipDrawRectanglesI (IntPtr graphics, IntPtr pen, Rectangle [] rects, int count);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipFillEllipseI (IntPtr graphics, IntPtr pen, int x, int y, int width, int height);
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipFillEllipse (IntPtr graphics, IntPtr pen, float x, float y, float width, float height);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipFillPolygon (IntPtr graphics, IntPtr brush, PointF [] points, int count, FillMode fillMode);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipFillPolygonI (IntPtr graphics, IntPtr brush, Point [] points, int count, FillMode fillMode);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipFillPolygon2 (IntPtr graphics, IntPtr brush, PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		static internal extern Status GdipFillPolygon2I (IntPtr graphics, IntPtr brush, Point [] points, int count);
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipFillRectangle (IntPtr graphics, IntPtr brush, float x1, float y1, float x2, float y2);
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipFillRectangleI (IntPtr graphics, IntPtr brush, int x1, int y1, int x2, int y2);
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipFillRectangles (IntPtr graphics, IntPtr brush, RectangleF [] rects, int count);
-                [DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipFillRectanglesI (IntPtr graphics, IntPtr brush, Rectangle [] rects, int count);
-		[DllImport("gdiplus.dll", CharSet=CharSet.Unicode)]
+		[DllImport(GdiPlus, CharSet=CharSet.Unicode)]
 		static internal extern Status GdipDrawString (IntPtr graphics, string text, int len, IntPtr font, ref RectangleF rc, IntPtr format, IntPtr brush);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipGetDC (IntPtr graphics, out IntPtr hdc);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipReleaseDC (IntPtr graphics, IntPtr hdc);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		static internal extern Status GdipDrawImageRectI (IntPtr graphics, IntPtr image, int x, int y, int width, int height);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		static internal extern Status GdipGetRenderingOrigin (IntPtr graphics, out int x, out int y);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		static internal extern Status GdipSetRenderingOrigin (IntPtr graphics, int x, int y);
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipCloneBitmapArea (float x, float y, float width, float height, PixelFormat format, IntPtr original, out IntPtr bitmap);
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipCloneBitmapAreaI (int x, int y, int width, int height, PixelFormat format, IntPtr original, out IntPtr bitmap);
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipResetWorldTransform (IntPtr graphics);
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipSetWorldTransform (IntPtr graphics, IntPtr matrix);
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipGetWorldTransform (IntPtr graphics, IntPtr matrix);
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipScaleWorldTransform (IntPtr graphics, float sx, float sy, MatrixOrder order); 		
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipGraphicsClear(IntPtr graphics, int argb); 		
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawClosedCurve(IntPtr graphics, IntPtr pen, PointF [] points, int count);
-		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawClosedCurveI(IntPtr graphics, IntPtr pen, Point [] points, int count); 		
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawClosedCurve2(IntPtr graphics, IntPtr pen, PointF [] points, int count, float tension);
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawClosedCurve2I(IntPtr graphics, IntPtr pen, Point [] points, int count, float tension); 		
- 		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawCurve(IntPtr graphics, IntPtr pen, PointF [] points, int count);
-		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawCurveI(IntPtr graphics, IntPtr pen, Point [] points, int count);
-		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawCurve2(IntPtr graphics, IntPtr pen, PointF [] points, int count, float tension);
-		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawCurve2I(IntPtr graphics, IntPtr pen, Point [] points, int count, float tension);
-		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawCurve3(IntPtr graphics, IntPtr pen, PointF [] points, int count, int offset, int numberOfSegments, float tension);
-		[DllImport("gdiplus.dll")]
- 		internal static extern Status GdipDrawCurve3I(IntPtr graphics, IntPtr pen, Point [] points, int count, int offset, int numberOfSegments, float tension); 		
- 		[DllImport("gdiplus.dll")] 		
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipCloneBitmapArea (float x, float y, float width, float height, PixelFormat format, IntPtr original, out IntPtr bitmap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipCloneBitmapAreaI (int x, int y, int width, int height, PixelFormat format, IntPtr original, out IntPtr bitmap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipResetWorldTransform (IntPtr graphics);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetWorldTransform (IntPtr graphics, IntPtr matrix);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetWorldTransform (IntPtr graphics, IntPtr matrix);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipScaleWorldTransform (IntPtr graphics, float sx, float sy, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGraphicsClear(IntPtr graphics, int argb);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawClosedCurve(IntPtr graphics, IntPtr pen, PointF [] points, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawClosedCurveI(IntPtr graphics, IntPtr pen, Point [] points, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawClosedCurve2(IntPtr graphics, IntPtr pen, PointF [] points, int count, float tension);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawClosedCurve2I(IntPtr graphics, IntPtr pen, Point [] points, int count, float tension);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawCurve(IntPtr graphics, IntPtr pen, PointF [] points, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawCurveI(IntPtr graphics, IntPtr pen, Point [] points, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawCurve2(IntPtr graphics, IntPtr pen, PointF [] points, int count, float tension);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawCurve2I(IntPtr graphics, IntPtr pen, Point [] points, int count, float tension);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawCurve3(IntPtr graphics, IntPtr pen, PointF [] points, int count, int offset, int numberOfSegments, float tension);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawCurve3I(IntPtr graphics, IntPtr pen, Point [] points, int count, int offset, int numberOfSegments, float tension);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetClipRect(IntPtr graphics, float x, float y, float width, float height, CombineMode combineMode);
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetClipRectI(IntPtr graphics, int x, int y, int width, int height, CombineMode combineMode);
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetClipPath(IntPtr graphics, IntPtr path, CombineMode combineMode);
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetClipRegion(IntPtr graphics, IntPtr region, CombineMode combineMode);
-		[DllImport("gdiplus.dll")] 	
-		internal static extern Status GdipSetClipGraphics(IntPtr graphics, IntPtr srcgraphics, CombineMode combineMode);		
-		[DllImport("gdiplus.dll")] 	
-		internal static extern Status GdipResetClip(IntPtr graphics);		
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetClipGraphics(IntPtr graphics, IntPtr srcgraphics, CombineMode combineMode);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipResetClip(IntPtr graphics);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipEndContainer(IntPtr graphics, uint state);
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetClip (IntPtr graphics, IntPtr region);
 
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipFillClosedCurve(IntPtr graphics, IntPtr brush, PointF [] points, int count);
-                              
-		[DllImport("gdiplus.dll")] 	
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipFillClosedCurveI(IntPtr graphics, IntPtr brush, Point [] points, int count);
 
-		[DllImport("gdiplus.dll")] 	
-		internal static extern Status GdipFillClosedCurve2(IntPtr graphics, IntPtr brush, 
-				          PointF [] points, int count, float tension, FillMode fillMode);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipFillClosedCurve2(IntPtr graphics, IntPtr brush,
+					PointF [] points, int count, float tension, FillMode fillMode);
 
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipFillClosedCurve2I(IntPtr graphics, IntPtr brush,
-                              Point [] points, int count, float tension, FillMode fillMode);
-                              
-		[DllImport("gdiplus.dll")] 	
+			Point [] points, int count, float tension, FillMode fillMode);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipFillPie(IntPtr graphics, IntPtr brush, float x, float y,
-            	float width, float height, float startAngle, float sweepAngle);
+			float width, float height, float startAngle, float sweepAngle);
 
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipFillPieI(IntPtr graphics, IntPtr brush, int x, int y,
-             int width, int height, float startAngle, float sweepAngle);
-             
-		[DllImport("gdiplus.dll")] 	
+			int width, int height, float startAngle, float sweepAngle);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipFillPath(IntPtr graphics, IntPtr brush, IntPtr path);
-		
-		[DllImport("gdiplus.dll")] 	
-		internal static extern Status GdipGetNearestColor(IntPtr graphics,  out int argb);
-		
-		[DllImport("gdiplus.dll")] 	
+
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetNearestColor(IntPtr graphics, out int argb);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipIsVisiblePoint(IntPtr graphics, float x, float y, out bool result);
 
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipIsVisiblePointI(IntPtr graphics, int x, int y, out bool result);
 
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipIsVisibleRect(IntPtr graphics, float x, float y,
-                           float width, float height, out bool result);
+			float width, float height, out bool result);
 
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipIsVisibleRectI(IntPtr graphics, int x, int y,
-                           int width, int height, out bool result);
-                           
-		[DllImport("gdiplus.dll")] 	
+			int width, int height, out bool result);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipTransformPoints(IntPtr graphics, CoordinateSpace destSpace,
-                             CoordinateSpace srcSpace, IntPtr points,  int count);
+			CoordinateSpace srcSpace, IntPtr points, int count);
 
-		[DllImport("gdiplus.dll")] 	
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipTransformPointsI(IntPtr graphics, CoordinateSpace destSpace,
-                             CoordinateSpace srcSpace, IntPtr points, int count);                           
-        
-        [DllImport("gdiplus.dll")] 	                     
+			CoordinateSpace srcSpace, IntPtr points, int count);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipTranslateClip(IntPtr graphics, float dx, float dy);
-		[DllImport("gdiplus.dll")] 	                     
-		internal static extern Status GdipTranslateClipI(IntPtr graphics, int dx, int dy);		
-		[DllImport("gdiplus.dll")] 	                     
-		internal static extern Status GdipGetClipBounds(IntPtr graphics, out RectangleF rect);		
-		[DllImport("gdiplus.dll")] 	                     
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipTranslateClipI(IntPtr graphics, int dx, int dy);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetClipBounds(IntPtr graphics, out RectangleF rect);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetCompositingMode(IntPtr graphics, CompositingMode compositingMode);
-		[DllImport("gdiplus.dll")] 	                     
-		internal static extern Status GdipGetCompositingMode(IntPtr graphics, out CompositingMode compositingMode);		
-		[DllImport("gdiplus.dll")] 	                     
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetCompositingMode(IntPtr graphics, out CompositingMode compositingMode);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetCompositingQuality(IntPtr graphics, CompositingQuality compositingQuality);
-		[DllImport("gdiplus.dll")] 	                     
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetCompositingQuality(IntPtr graphics, out CompositingQuality compositingQuality);
-		[DllImport("gdiplus.dll")] 	                     
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetInterpolationMode(IntPtr graphics, InterpolationMode interpolationMode);
-		[DllImport("gdiplus.dll")]                   
-		internal static extern Status GdipGetInterpolationMode(IntPtr graphics, out InterpolationMode interpolationMode);		
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetInterpolationMode(IntPtr graphics, out InterpolationMode interpolationMode);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetDpiX(IntPtr graphics, out float dpi);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetDpiY(IntPtr graphics, out float dpi);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipIsClipEmpty(IntPtr graphics, out bool result);
-		[DllImport("gdiplus.dll")]                   
-		internal static extern Status GdipIsVisibleClipEmpty(IntPtr graphics, out bool result);		
-		[DllImport("gdiplus.dll")]                   
-		internal static extern Status GdipGetPageUnit(IntPtr graphics, out GraphicsUnit unit);		
-		[DllImport("gdiplus.dll")]                   
-		internal static extern Status GdipGetPageScale(IntPtr graphics, out float scale);		
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipIsVisibleClipEmpty(IntPtr graphics, out bool result);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPageUnit(IntPtr graphics, out GraphicsUnit unit);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPageScale(IntPtr graphics, out float scale);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetPageUnit(IntPtr graphics, GraphicsUnit unit);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetPageScale(IntPtr graphics, float scale);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetPixelOffsetMode(IntPtr graphics, PixelOffsetMode pixelOffsetMode);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPixelOffsetMode(IntPtr graphics, out PixelOffsetMode pixelOffsetMode);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetSmoothingMode(IntPtr graphics, SmoothingMode smoothingMode);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetSmoothingMode(IntPtr graphics, out SmoothingMode smoothingMode);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetTextContrast(IntPtr graphics, int contrast);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetTextContrast(IntPtr graphics, out int contrast);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetTextRenderingHint(IntPtr graphics, TextRenderingHint mode);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetTextRenderingHint(IntPtr graphics, out TextRenderingHint mode);
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetVisibleClipBounds(IntPtr graphics, out RectangleF rect);
-		
-		[DllImport("gdiplus.dll")]                   
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipFlush(IntPtr graphics, FlushIntention intention);
 
-		[DllImport("gdiplus.dll", CharSet=CharSet.Unicode)]
+		[DllImport(GdiPlus, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipAddPathString (IntPtr path, string s, int lenght, IntPtr family, int style, float emSize, ref RectangleF layoutRect, IntPtr format);
-		[DllImport("gdiplus.dll", CharSet=CharSet.Unicode)]
+		[DllImport(GdiPlus, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipAddPathStringI (IntPtr path, string s, int lenght, IntPtr family, int style, float emSize, ref Rectangle layoutRect, IntPtr format);
 
-				
+
 		// Pen functions
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreatePen1 (int argb, float width, GraphicsUnit unit, out IntPtr pen);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreatePen2 (IntPtr brush, float width, GraphicsUnit unit, out IntPtr pen);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipClonePen (IntPtr pen, out IntPtr clonepen);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipClonePen (IntPtr pen, out IntPtr clonepen);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDeletePen(IntPtr pen);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenBrushFill (IntPtr pen, IntPtr brush);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenBrushFill (IntPtr pen, out IntPtr brush);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenFillType (IntPtr pen, out PenType type);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenColor (IntPtr pen, int color);
-                [DllImport("gdiplus.dll")]                
-                internal static extern Status GdipGetPenColor (IntPtr pen, out int color);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenCompoundArray (IntPtr pen, float[] dash, int count);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenCompoundArray (IntPtr pen, float[] dash, int count);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenCompoundCount (IntPtr pen, out int count);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenDashCap197819 (IntPtr pen, DashCap dashCap);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenDashCap197819 (IntPtr pen, out DashCap dashCap);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenDashStyle (IntPtr pen, DashStyle dashStyle);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenDashStyle (IntPtr pen, out DashStyle dashStyle);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenDashOffset (IntPtr pen, float offset);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenDashOffset (IntPtr pen, out float offset);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenDashCount (IntPtr pen, out int count);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenDashArray (IntPtr pen, float[] dash, int count);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenDashArray (IntPtr pen, float[] dash, int count);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenMiterLimit (IntPtr pen, float miterLimit);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenMiterLimit (IntPtr pen, out float miterLimit);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenLineJoin (IntPtr pen, LineJoin lineJoin);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenLineJoin (IntPtr pen, out LineJoin lineJoin);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenBrushFill (IntPtr pen, IntPtr brush);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenBrushFill (IntPtr pen, out IntPtr brush);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenFillType (IntPtr pen, out PenType type);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenColor (IntPtr pen, int color);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenColor (IntPtr pen, out int color);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenCompoundArray (IntPtr pen, float[] dash, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenCompoundArray (IntPtr pen, float[] dash, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenCompoundCount (IntPtr pen, out int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenDashCap197819 (IntPtr pen, DashCap dashCap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenDashCap197819 (IntPtr pen, out DashCap dashCap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenDashStyle (IntPtr pen, DashStyle dashStyle);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenDashStyle (IntPtr pen, out DashStyle dashStyle);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenDashOffset (IntPtr pen, float offset);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenDashOffset (IntPtr pen, out float offset);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenDashCount (IntPtr pen, out int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenDashArray (IntPtr pen, float[] dash, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenDashArray (IntPtr pen, float[] dash, int count);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenMiterLimit (IntPtr pen, float miterLimit);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenMiterLimit (IntPtr pen, out float miterLimit);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenLineJoin (IntPtr pen, LineJoin lineJoin);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenLineJoin (IntPtr pen, out LineJoin lineJoin);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetPenLineCap197819 (IntPtr pen, LineCap startCap, LineCap endCap, DashCap dashCap);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenMode (IntPtr pen, PenAlignment alignment);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenMode (IntPtr pen, out PenAlignment alignment);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenMode (IntPtr pen, PenAlignment alignment);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenMode (IntPtr pen, out PenAlignment alignment);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetPenStartCap (IntPtr pen, LineCap startCap);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPenStartCap (IntPtr pen, out LineCap startCap);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetPenEndCap (IntPtr pen, LineCap endCap);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPenEndCap (IntPtr pen, out LineCap endCap);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenCustomStartCap (IntPtr pen, IntPtr customCap);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenCustomStartCap (IntPtr pen, out IntPtr customCap);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenCustomEndCap (IntPtr pen, IntPtr customCap);
-                [DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenCustomEndCap (IntPtr pen, out IntPtr customCap);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenTransform (IntPtr pen, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenTransform (IntPtr pen, IntPtr matrix);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipSetPenWidth (IntPtr pen, float width);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipGetPenWidth (IntPtr pen, out float width);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipResetPenTransform (IntPtr pen);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipMultiplyPenTransform (IntPtr pen, IntPtr matrix, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipRotatePenTransform (IntPtr pen, float angle, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipScalePenTransform (IntPtr pen, float sx, float sy, MatrixOrder order);
-		[DllImport("gdiplus.dll")]
-                internal static extern Status GdipTranslatePenTransform (IntPtr pen, float dx, float dy, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenCustomStartCap (IntPtr pen, IntPtr customCap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenCustomStartCap (IntPtr pen, out IntPtr customCap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenCustomEndCap (IntPtr pen, IntPtr customCap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenCustomEndCap (IntPtr pen, out IntPtr customCap);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenTransform (IntPtr pen, IntPtr matrix);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenTransform (IntPtr pen, IntPtr matrix);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetPenWidth (IntPtr pen, float width);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetPenWidth (IntPtr pen, out float width);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipResetPenTransform (IntPtr pen);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipMultiplyPenTransform (IntPtr pen, IntPtr matrix, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipRotatePenTransform (IntPtr pen, float angle, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipScalePenTransform (IntPtr pen, float sx, float sy, MatrixOrder order);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipTranslatePenTransform (IntPtr pen, float dx, float dy, MatrixOrder order);
 
 		// CustomLineCap functions
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipCreateCustomLineCap (IntPtr fillPath, IntPtr strokePath, LineCap baseCap, float baseInset, out IntPtr customCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipDeleteCustomLineCap (IntPtr customCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipCloneCustomLineCap (IntPtr customCap, out IntPtr clonedCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetCustomLineCapStrokeCaps (IntPtr customCap, LineCap startCap, LineCap endCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetCustomLineCapStrokeCaps (IntPtr customCap, out LineCap startCap, out LineCap endCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetCustomLineCapStrokeJoin (IntPtr customCap, LineJoin lineJoin);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetCustomLineCapStrokeJoin (IntPtr customCap, out LineJoin lineJoin);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetCustomLineCapBaseCap (IntPtr customCap, LineCap baseCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetCustomLineCapBaseCap (IntPtr customCap, out LineCap baseCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetCustomLineCapBaseInset (IntPtr customCap, float inset);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetCustomLineCapBaseInset (IntPtr customCap, out float inset);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetCustomLineCapWidthScale (IntPtr customCap, float widthScale);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetCustomLineCapWidthScale (IntPtr customCap, out float widthScale);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipCreateCustomLineCap (HandleRef fillPath, HandleRef strokePath, LineCap baseCap, float baseInset, out IntPtr customCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipDeleteCustomLineCap (HandleRef customCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipCloneCustomLineCap (HandleRef customCap, out IntPtr clonedCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetCustomLineCapStrokeCaps (HandleRef customCap, LineCap startCap, LineCap endCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetCustomLineCapStrokeCaps (HandleRef customCap, out LineCap startCap, out LineCap endCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetCustomLineCapStrokeJoin (HandleRef customCap, LineJoin lineJoin);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetCustomLineCapStrokeJoin (HandleRef customCap, out LineJoin lineJoin);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetCustomLineCapBaseCap (HandleRef customCap, LineCap baseCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetCustomLineCapBaseCap (HandleRef customCap, out LineCap baseCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetCustomLineCapBaseInset (HandleRef customCap, float inset);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetCustomLineCapBaseInset (HandleRef customCap, out float inset);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetCustomLineCapWidthScale (HandleRef customCap, float widthScale);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetCustomLineCapWidthScale (HandleRef customCap, out float widthScale);
 
 		// AdjustableArrowCap functions
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipCreateAdjustableArrowCap (float height, float width, bool isFilled, out IntPtr arrowCap);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetAdjustableArrowCapHeight (IntPtr arrowCap, float height);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetAdjustableArrowCapHeight (IntPtr arrowCap, out float height);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetAdjustableArrowCapWidth (IntPtr arrowCap, float width);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetAdjustableArrowCapWidth (IntPtr arrowCap, out float width);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetAdjustableArrowCapMiddleInset (IntPtr arrowCap, float middleInset);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetAdjustableArrowCapMiddleInset (IntPtr arrowCap, out float middleInset);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetAdjustableArrowCapFillState (IntPtr arrowCap, bool isFilled);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetAdjustableArrowCapFillState (IntPtr arrowCap, out bool isFilled);
-
-
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		internal static extern int GdipCreateAdjustableArrowCap (float height, float width, bool isFilled, out IntPtr arrowCap);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetAdjustableArrowCapHeight (HandleRef arrowCap, float height);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetAdjustableArrowCapHeight (HandleRef arrowCap, out float height);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetAdjustableArrowCapWidth (HandleRef arrowCap, float width);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetAdjustableArrowCapWidth (HandleRef arrowCap, out float width);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetAdjustableArrowCapMiddleInset (HandleRef arrowCap, float middleInset);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetAdjustableArrowCapMiddleInset (HandleRef arrowCap, out float middleInset);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipSetAdjustableArrowCapFillState (HandleRef arrowCap, bool isFilled);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipGetAdjustableArrowCapFillState (HandleRef arrowCap, out bool isFilled);
+
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateFromHWND (IntPtr hwnd, out IntPtr graphics);
 
-		[DllImport("gdiplus.dll", CharSet=CharSet.Unicode)]
+		[DllImport(GdiPlus, CharSet=CharSet.Unicode)]
 		internal unsafe static extern Status GdipMeasureString(IntPtr graphics, string str, int length,
 			IntPtr font, ref RectangleF layoutRect, IntPtr stringFormat, out RectangleF boundingBox,
 			int *codepointsFitted, int *linesFilled);
-    				
-    		[DllImport("gdiplus.dll", CharSet=CharSet.Unicode)]
+
+		[DllImport(GdiPlus, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipMeasureCharacterRanges (IntPtr graphics, string str, int length, IntPtr font,
-			ref RectangleF layoutRect, IntPtr stringFormat, int regcount, out IntPtr regions);          
+			ref RectangleF layoutRect, IntPtr stringFormat, int regcount, out IntPtr regions);
 
-    		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipSetStringFormatMeasurableCharacterRanges (IntPtr native, 
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipSetStringFormatMeasurableCharacterRanges (IntPtr native,
 			int cnt, CharacterRange [] range);
-		
-  		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetStringFormatMeasurableCharacterRangeCount (IntPtr native, 
-			out int cnt);		
-	
+
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetStringFormatMeasurableCharacterRangeCount (IntPtr native,
+			out int cnt);
+
 		// Bitmap functions
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateBitmapFromScan0 (int width, int height, int stride, PixelFormat format, IntPtr scan0, out IntPtr bmp);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateBitmapFromGraphics (int width, int height, IntPtr target, out IntPtr bitmap);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipBitmapLockBits (IntPtr bmp, ref Rectangle rc, ImageLockMode flags, PixelFormat format, [In, Out] BitmapData bmpData);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipBitmapSetResolution(IntPtr bmp, float xdpi, float ydpi);
-				
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipBitmapUnlockBits (IntPtr bmp, [In,Out] BitmapData bmpData);
-		
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipBitmapGetPixel (IntPtr bmp, int x, int y, out int argb); 
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipBitmapGetPixel (IntPtr bmp, int x, int y, out int argb);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipBitmapSetPixel (IntPtr bmp, int x, int y, int argb);
 
 		// Image functions
-		[DllImport("gdiplus.dll", CharSet=CharSet.Auto)]
+		[DllImport(GdiPlus, CharSet=CharSet.Auto)]
 		internal static extern Status GdipLoadImageFromFile ( [MarshalAs(UnmanagedType.LPWStr)] string filename, out IntPtr image );
 
 #if !TEST
 		// Stream functions for Win32 (original Win32 ones)
-		[DllImport("gdiplus.dll", ExactSpelling=true, CharSet=CharSet.Unicode)]
+		[DllImport(GdiPlus, ExactSpelling=true, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipLoadImageFromStream([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, out IntPtr image);
-  		
-		[DllImport("gdiplus.dll", ExactSpelling=true, CharSet=CharSet.Unicode)]
+
+		[DllImport(GdiPlus, ExactSpelling=true, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipSaveImageToStream(HandleRef image, [MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, [In()] ref Guid clsidEncoder, HandleRef encoderParams);
-#endif  		
-				
-		[DllImport("gdiplus.dll")]
+#endif
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCloneImage(IntPtr image, out IntPtr imageclone);
- 
-		[DllImport("gdiplus.dll", CharSet=CharSet.Auto)]
+
+		[DllImport(GdiPlus, CharSet=CharSet.Auto)]
 		internal static extern Status GdipLoadImageFromFileICM ( [MarshalAs(UnmanagedType.LPWStr)] string filename, out IntPtr image );
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateBitmapFromHBITMAP ( IntPtr hBitMap, IntPtr gdiPalette, out IntPtr image );
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDisposeImage ( IntPtr image );
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageFlags(IntPtr image, out int flag);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetImageType (IntPtr image, out ImageType type);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipImageGetFrameDimensionsCount ( IntPtr image, out uint count );
-												   
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipImageGetFrameDimensionsList ( IntPtr image, [Out] Guid [] dimensionIDs, uint count );
- 
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageHeight (IntPtr image, out uint height);
-												   
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageHorizontalResolution ( IntPtr image, out float resolution );
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImagePaletteSize ( IntPtr image, out int size );
-												   
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImagePalette (IntPtr image, IntPtr palette, int size);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetImagePalette (IntPtr image, IntPtr palette);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageDimension ( IntPtr image, out float width, out float height );
-												   
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImagePixelFormat ( IntPtr image, out PixelFormat format );
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPropertyCount (IntPtr image, out uint propNumbers);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPropertyIdList (IntPtr image, uint propNumbers, [Out] int [] list);
- 
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPropertySize (IntPtr image, out int bufferSize, out int propNumbers);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetAllPropertyItems (IntPtr image, int bufferSize, int propNumbers, IntPtr items);
-												   
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageRawFormat ( IntPtr image, out Guid format );
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageVerticalResolution ( IntPtr image, out float resolution );
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageWidth (IntPtr image, out uint width);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageBounds ( IntPtr image, out RectangleF source, ref GraphicsUnit unit );
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetEncoderParameterListSize ( IntPtr image, ref Guid encoder, out uint size );
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetEncoderParameterList ( IntPtr image, ref Guid encoder, uint size, IntPtr buffer );
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipImageGetFrameCount (IntPtr image, ref Guid guidDimension, out uint count );
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipImageSelectActiveFrame (IntPtr image, ref Guid guidDimension, int frameIndex);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPropertyItemSize (IntPtr image, int propertyID, out int propertySize);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetPropertyItem (IntPtr image, int propertyID, int propertySize, IntPtr buffer);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipRemovePropertyItem (IntPtr image, int propertyId);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal unsafe static extern Status GdipSetPropertyItem (IntPtr image, GdipPropertyItem *propertyItem);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipGetImageThumbnail ( IntPtr image, uint width, uint height, out IntPtr thumbImage, IntPtr callback, IntPtr callBackData );
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipImageRotateFlip ( IntPtr image, RotateFlipType rotateFlipType );
-		
-		[DllImport("gdiplus.dll", CharSet=CharSet.Unicode)]
-		internal static extern Status GdipSaveImageToFile (IntPtr image, string filename,  ref Guid encoderClsID, IntPtr encoderParameters); 
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus, CharSet=CharSet.Unicode)]
+		internal static extern Status GdipSaveImageToFile (IntPtr image, string filename, ref Guid encoderClsID, IntPtr encoderParameters);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSaveAdd ( IntPtr image, IntPtr encoderParameters );
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSaveAddImage (IntPtr image, IntPtr imagenew, IntPtr encoderParameters);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImageI (IntPtr graphics, IntPtr image, int x, int y);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipGetImageGraphicsContext (IntPtr image, out IntPtr graphics);		
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipGetImageGraphicsContext (IntPtr image, out IntPtr graphics);
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImage (IntPtr graphics, IntPtr image, float x, float y);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipBeginContainer (IntPtr graphics, ref RectangleF dstrect, ref RectangleF srcrect, GraphicsUnit unit, out uint state);
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipBeginContainerI (IntPtr graphics, ref Rectangle dstrect, ref Rectangle srcrect, GraphicsUnit unit, out uint state);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipBeginContainer2 (IntPtr graphics, out uint state); 
-		
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipBeginContainer2 (IntPtr graphics, out uint state);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImagePoints (IntPtr graphics, IntPtr image, PointF [] destPoints, int count);
 
-		
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipDrawImagePointsI (IntPtr graphics, IntPtr image,  Point [] destPoints, int count);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDrawImagePointsI (IntPtr graphics, IntPtr image, Point [] destPoints, int count);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImageRectRectI (IntPtr graphics, IntPtr image,
-                                int dstx, int dsty, int dstwidth, int dstheight,
-                       		int srcx, int srcy, int srcwidth, int srcheight,
-                       		GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);                      		
+			int dstx, int dsty, int dstwidth, int dstheight,
+			int srcx, int srcy, int srcwidth, int srcheight,
+			GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);
 
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImageRectRect (IntPtr graphics, IntPtr image,
-                                float dstx, float dsty, float dstwidth, float dstheight,
-                       		float srcx, float srcy, float srcwidth, float srcheight,
-                       		GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);                      		                       		
-                
-                [DllImport("gdiplus.dll")]
+			float dstx, float dsty, float dstwidth, float dstheight,
+			float srcx, float srcy, float srcwidth, float srcheight,
+			GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImagePointsRectI (IntPtr graphics, IntPtr image,
-                         Point [] destPoints, int count, int srcx, int srcy, int srcwidth, int srcheight,
-                         GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);
-                         
-                [DllImport("gdiplus.dll")]
+			 Point [] destPoints, int count, int srcx, int srcy, int srcwidth, int srcheight,
+			 GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImagePointsRect (IntPtr graphics, IntPtr image,
-                         PointF [] destPoints, int count, float srcx, float srcy, float srcwidth, float srcheight,
-                         GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);
-                       		
-		[DllImport("gdiplus.dll")]                       		
+			 PointF [] destPoints, int count, float srcx, float srcy, float srcwidth, float srcheight,
+			 GraphicsUnit srcUnit, IntPtr imageattr, Graphics.DrawImageAbort callback, IntPtr callbackData);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImageRect(IntPtr graphics, IntPtr image, float x, float y, float width, float height);
-		[DllImport("gdiplus.dll")]                       		
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImagePointRect(IntPtr graphics, IntPtr image, float x,
-                                float y, float srcx, float srcy, float srcwidth, float srcheight, GraphicsUnit srcUnit);
-                
-                [DllImport("gdiplus.dll")]                       		
+				float y, float srcx, float srcy, float srcwidth, float srcheight, GraphicsUnit srcUnit);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipDrawImagePointRectI(IntPtr graphics, IntPtr image, int x,
-                                int y, int srcx, int srcy, int srcwidth,
-                                int srcheight, GraphicsUnit srcUnit);                           
-                                
-		[DllImport("gdiplus.dll")]                       		
-		internal static extern Status GdipCreateStringFormat(StringFormatFlags formatAttributes,  int language, out IntPtr native);
-		
-		[DllImport("gdiplus.dll")]		
+				int y, int srcx, int srcy, int srcwidth,
+				int srcheight, GraphicsUnit srcUnit);
+
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipCreateStringFormat(StringFormatFlags formatAttributes, int language, out IntPtr native);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateHBITMAPFromBitmap (IntPtr bmp, out IntPtr HandleBmp, int clrbackground);
 
-		[DllImport("gdiplus.dll", CharSet=CharSet.Auto)]
+		[DllImport(GdiPlus, CharSet=CharSet.Auto)]
 		internal static extern Status GdipCreateBitmapFromFile ([MarshalAs (UnmanagedType.LPWStr)] string filename, out IntPtr bitmap);
 
-		[DllImport("gdiplus.dll", CharSet=CharSet.Auto)]
+		[DllImport(GdiPlus, CharSet=CharSet.Auto)]
 		internal static extern Status GdipCreateBitmapFromFileICM ([MarshalAs (UnmanagedType.LPWStr)] string filename, out IntPtr bitmap);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateHICONFromBitmap (IntPtr bmp, out IntPtr HandleIcon);
-		
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipCreateBitmapFromHICON (IntPtr  hicon,  out IntPtr bitmap);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipCreateBitmapFromHICON (IntPtr hicon, out IntPtr bitmap);
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateBitmapFromResource (IntPtr hInstance,
-                                string lpBitmapName, out IntPtr bitmap);
-
-                // Matrix functions
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipCreateMatrix (out IntPtr matrix);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipCreateMatrix2 (float m11, float m12, float m21, float m22, float dx, float dy, out IntPtr matrix);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipCreateMatrix3 (ref RectangleF rect, PointF [] dstplg, out IntPtr matrix);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipCreateMatrix3I (ref Rectangle rect, Point [] dstplg, out IntPtr matrix);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipDeleteMatrix (IntPtr matrix);
-
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipCloneMatrix (IntPtr matrix, out IntPtr cloneMatrix);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipSetMatrixElements (IntPtr matrix, float m11, float m12, float m21, float m22, float dx, float dy);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipGetMatrixElements (IntPtr matrix, IntPtr matrixOut);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipMultiplyMatrix (IntPtr matrix, IntPtr matrix2, MatrixOrder order);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipTranslateMatrix (IntPtr matrix, float offsetX, float offsetY, MatrixOrder order);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipScaleMatrix (IntPtr matrix, float scaleX, float scaleY, MatrixOrder order);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipRotateMatrix (IntPtr matrix, float angle, MatrixOrder order);
-
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipShearMatrix (IntPtr matrix, float shearX, float shearY, MatrixOrder order);
-
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipInvertMatrix (IntPtr matrix);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipTransformMatrixPoints (IntPtr matrix, PointF [] pts, int count);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipTransformMatrixPointsI (IntPtr matrix, Point [] pts, int count);                
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipVectorTransformMatrixPoints (IntPtr matrix, PointF [] pts, int count);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipVectorTransformMatrixPointsI (IntPtr matrix, Point [] pts, int count);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipIsMatrixInvertible (IntPtr matrix, out bool result);
-
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipIsMatrixIdentity (IntPtr matrix, out bool result);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipIsMatrixEqual (IntPtr matrix, IntPtr matrix2, out bool result);
-
-                // GraphicsPath functions
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipCreatePath (FillMode brushMode, out IntPtr path);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipCreatePath2 (PointF [] points, byte [] types, int count, FillMode brushMode, out IntPtr path);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipCreatePath2I (Point [] points, byte [] types, int count, FillMode brushMode, out IntPtr path);                
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipClonePath (IntPtr path, out IntPtr clonePath);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipDeletePath (IntPtr path);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipResetPath (IntPtr path);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipGetPointCount (IntPtr path, out int count);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipGetPathTypes (IntPtr path, [Out] byte [] types, int count);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipGetPathPoints (IntPtr path, [Out] PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipGetPathPointsI (IntPtr path, [Out] Point [] points, int count);
-                [DllImport ("gdiplus.dll")]                                
-                internal static extern Status GdipGetPathFillMode (IntPtr path, out FillMode fillMode);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipSetPathFillMode (IntPtr path, FillMode fillMode);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipStartPathFigure (IntPtr path);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipClosePathFigure (IntPtr path);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipClosePathFigures (IntPtr path);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipSetPathMarker (IntPtr path);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipClearPathMarkers (IntPtr path);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipReversePath (IntPtr path);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipGetPathLastPoint (IntPtr path, out PointF lastPoint);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipAddPathLine (IntPtr path, float x1, float y1, float x2, float y2);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipAddPathLine2 (IntPtr path, PointF[] points, int count);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipAddPathLine2I (IntPtr path, Point[] points, int count);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipAddPathArc (IntPtr path, float x, float y, float width, float height, float startAngle, float sweepAngle);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathBezier (IntPtr path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathBeziers (IntPtr path, PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathCurve (IntPtr path, PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathCurveI (IntPtr path, Point [] points, int count);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathCurve2 (IntPtr path, PointF [] points, int count, float tension);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathCurve2I (IntPtr path, Point [] points, int count, float tension);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathCurve3 (IntPtr path, PointF [] points, int count, int offset, int numberOfSegments, float tension);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathCurve3I (IntPtr path, Point [] points, int count, int offset, int numberOfSegments, float tension);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathClosedCurve (IntPtr path, PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathClosedCurveI (IntPtr path, Point [] points, int count);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathClosedCurve2 (IntPtr path, PointF [] points, int count, float tension);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathClosedCurve2I (IntPtr path, Point [] points, int count, float tension);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathRectangle (IntPtr path, float x, float y, float width, float height);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathRectangles (IntPtr path, RectangleF [] rects, int count);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathEllipse (IntPtr path, float x, float y, float width, float height);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipAddPathEllipseI (IntPtr path, int x, int y, int width, int height);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathPie (IntPtr path, float x, float y, float width, float height, float startAngle, float sweepAngle);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathPieI (IntPtr path, int x, int y, int width, int height, float startAngle, float sweepAngle);                
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathPolygon (IntPtr path, PointF [] points, int count);
-                [DllImport ("gdiplus.dll")]                                                                
-                internal static extern Status GdipAddPathPath (IntPtr path, IntPtr addingPath, bool connect);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipAddPathLineI (IntPtr path, int x1, int y1, int x2, int y2);
-                [DllImport ("gdiplus.dll")]                                                
-                internal static extern Status GdipAddPathArcI (IntPtr path, int x, int y, int width, int height, float startAngle, float sweepAngle);
-                
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipAddPathBezierI (IntPtr path, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipAddPathBeziersI (IntPtr path, Point [] points, int count);
-                                
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipAddPathPolygonI (IntPtr path, Point [] points, int count);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipAddPathRectangleI (IntPtr path, int x, int y, int width, int height);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipAddPathRectanglesI (IntPtr path, Rectangle [] rects, int count);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipFlattenPath (IntPtr path, IntPtr matrix, float floatness);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipTransformPath (IntPtr path, IntPtr matrix);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipWarpPath (IntPtr path, IntPtr matrix,
-                                                            PointF [] points, int count,
-                                                            float srcx, float srcy, float srcwidth, float srcheight,
-                                                            WarpMode mode, float flatness);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipWidenPath (IntPtr path, IntPtr pen, IntPtr matrix, float flatness);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipGetPathWorldBounds (IntPtr path, out RectangleF bounds, IntPtr matrix, IntPtr pen);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipGetPathWorldBoundsI (IntPtr path, out Rectangle bounds, IntPtr matrix, IntPtr pen);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipIsVisiblePathPoint (IntPtr path, float x, float y, IntPtr graphics, out bool result);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipIsVisiblePathPointI (IntPtr path, int x, int y, IntPtr graphics, out bool result); 
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipIsOutlineVisiblePathPoint (IntPtr path, float x, float y, IntPtr pen, IntPtr graphics, out bool result);
-                [DllImport ("gdiplus.dll")]                
-                internal static extern Status GdipIsOutlineVisiblePathPointI (IntPtr path, int x, int y, IntPtr pen, IntPtr graphics, out bool result); 
+				string lpBitmapName, out IntPtr bitmap);
+
+		// Matrix functions
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreateMatrix (out IntPtr matrix);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreateMatrix2 (float m11, float m12, float m21, float m22, float dx, float dy, out IntPtr matrix);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreateMatrix3 (ref RectangleF rect, PointF [] dstplg, out IntPtr matrix);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreateMatrix3I (ref Rectangle rect, Point [] dstplg, out IntPtr matrix);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipDeleteMatrix (IntPtr matrix);
+
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCloneMatrix (IntPtr matrix, out IntPtr cloneMatrix);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipSetMatrixElements (IntPtr matrix, float m11, float m12, float m21, float m22, float dx, float dy);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetMatrixElements (IntPtr matrix, IntPtr matrixOut);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipMultiplyMatrix (IntPtr matrix, IntPtr matrix2, MatrixOrder order);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipTranslateMatrix (IntPtr matrix, float offsetX, float offsetY, MatrixOrder order);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipScaleMatrix (IntPtr matrix, float scaleX, float scaleY, MatrixOrder order);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipRotateMatrix (IntPtr matrix, float angle, MatrixOrder order);
+
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipShearMatrix (IntPtr matrix, float shearX, float shearY, MatrixOrder order);
+
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipInvertMatrix (IntPtr matrix);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipTransformMatrixPoints (IntPtr matrix, [In, Out] PointF [] pts, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipTransformMatrixPointsI (IntPtr matrix, [In, Out] Point [] pts, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipVectorTransformMatrixPoints (IntPtr matrix, [In, Out] PointF [] pts, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipVectorTransformMatrixPointsI (IntPtr matrix, [In, Out] Point [] pts, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipIsMatrixInvertible (IntPtr matrix, out bool result);
+
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipIsMatrixIdentity (IntPtr matrix, out bool result);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipIsMatrixEqual (IntPtr matrix, IntPtr matrix2, out bool result);
+
+		// GraphicsPath functions
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreatePath (FillMode brushMode, out IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreatePath2 (PointF [] points, byte [] types, int count, FillMode brushMode, out IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreatePath2I (Point [] points, byte [] types, int count, FillMode brushMode, out IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipClonePath (IntPtr path, out IntPtr clonePath);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipDeletePath (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipResetPath (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPointCount (IntPtr path, out int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPathTypes (IntPtr path, [Out] byte [] types, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPathPoints (IntPtr path, [Out] PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPathPointsI (IntPtr path, [Out] Point [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPathFillMode (IntPtr path, out FillMode fillMode);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipSetPathFillMode (IntPtr path, FillMode fillMode);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipStartPathFigure (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipClosePathFigure (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipClosePathFigures (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipSetPathMarker (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipClearPathMarkers (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipReversePath (IntPtr path);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPathLastPoint (IntPtr path, out PointF lastPoint);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathLine (IntPtr path, float x1, float y1, float x2, float y2);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathLine2 (IntPtr path, PointF[] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathLine2I (IntPtr path, Point[] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathArc (IntPtr path, float x, float y, float width, float height, float startAngle, float sweepAngle);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathBezier (IntPtr path, float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathBeziers (IntPtr path, PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathCurve (IntPtr path, PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathCurveI (IntPtr path, Point [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathCurve2 (IntPtr path, PointF [] points, int count, float tension);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathCurve2I (IntPtr path, Point [] points, int count, float tension);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathCurve3 (IntPtr path, PointF [] points, int count, int offset, int numberOfSegments, float tension);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathCurve3I (IntPtr path, Point [] points, int count, int offset, int numberOfSegments, float tension);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathClosedCurve (IntPtr path, PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathClosedCurveI (IntPtr path, Point [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathClosedCurve2 (IntPtr path, PointF [] points, int count, float tension);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathClosedCurve2I (IntPtr path, Point [] points, int count, float tension);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathRectangle (IntPtr path, float x, float y, float width, float height);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathRectangles (IntPtr path, RectangleF [] rects, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathEllipse (IntPtr path, float x, float y, float width, float height);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathEllipseI (IntPtr path, int x, int y, int width, int height);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathPie (IntPtr path, float x, float y, float width, float height, float startAngle, float sweepAngle);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathPieI (IntPtr path, int x, int y, int width, int height, float startAngle, float sweepAngle);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathPolygon (IntPtr path, PointF [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathPath (IntPtr path, IntPtr addingPath, bool connect);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathLineI (IntPtr path, int x1, int y1, int x2, int y2);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathArcI (IntPtr path, int x, int y, int width, int height, float startAngle, float sweepAngle);
+
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathBezierI (IntPtr path, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathBeziersI (IntPtr path, Point [] points, int count);
+
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathPolygonI (IntPtr path, Point [] points, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathRectangleI (IntPtr path, int x, int y, int width, int height);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipAddPathRectanglesI (IntPtr path, Rectangle [] rects, int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipFlattenPath (IntPtr path, IntPtr matrix, float floatness);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipTransformPath (IntPtr path, IntPtr matrix);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipWarpPath (IntPtr path, IntPtr matrix,
+			PointF [] points, int count,
+			float srcx, float srcy, float srcwidth, float srcheight,
+			WarpMode mode, float flatness);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipWidenPath (IntPtr path, IntPtr pen, IntPtr matrix, float flatness);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPathWorldBounds (IntPtr path, out RectangleF bounds, IntPtr matrix, IntPtr pen);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetPathWorldBoundsI (IntPtr path, out Rectangle bounds, IntPtr matrix, IntPtr pen);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipIsVisiblePathPoint (IntPtr path, float x, float y, IntPtr graphics, out bool result);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipIsVisiblePathPointI (IntPtr path, int x, int y, IntPtr graphics, out bool result);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipIsOutlineVisiblePathPoint (IntPtr path, float x, float y, IntPtr pen, IntPtr graphics, out bool result);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipIsOutlineVisiblePathPointI (IntPtr path, int x, int y, IntPtr pen, IntPtr graphics, out bool result);
 
 		// GraphicsPathIterator
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipCreatePathIter (out IntPtr iterator, IntPtr path);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterGetCount (IntPtr iterator, out int count);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterGetSubpathCount (IntPtr iterator, out int count);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipDeletePathIter (IntPtr iterator);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterCopyData (IntPtr iterator, out int resultCount, PointF [] points, byte [] types, int startIndex, int endIndex);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterEnumerate (IntPtr iterator, out int resultCount, PointF [] points, byte [] types, int count);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterHasCurve (IntPtr iterator, out bool curve);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterNextMarkerPath (IntPtr iterator, out int resultCount, IntPtr path);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterNextMarker (IntPtr iterator, out int resultCount, out int startIndex, out int endIndex);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterNextPathType (IntPtr iterator, out int resultCount, out byte pathType, out int startIndex, out int endIndex);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterNextSubpathPath (IntPtr iterator, out int resultCount, IntPtr path, out bool isClosed);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterNextSubpath (IntPtr iterator, out int resultCount, out int startIndex, out int endIndex, out bool isClosed);
-		[DllImport("gdiplus.dll")]
-		internal static extern Status GdipPathIterRewind (IntPtr iterator);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipCreatePathIter (out IntPtr iterator, HandleRef path);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterGetCount (HandleRef iterator, out int count);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterGetSubpathCount (HandleRef iterator, out int count);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipDeletePathIter (HandleRef iterator);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterCopyData (HandleRef iterator, out int resultCount, /*PointF[]*/ IntPtr points, byte [] types, int startIndex, int endIndex);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterEnumerate (HandleRef iterator, out int resultCount, /*PointF[]*/ IntPtr points, byte [] types, int count);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterHasCurve (HandleRef iterator, out bool curve);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterNextMarkerPath (HandleRef iterator, out int resultCount, HandleRef path);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterNextMarker (HandleRef iterator, out int resultCount, out int startIndex, out int endIndex);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterNextPathType (HandleRef iterator, out int resultCount, out byte pathType, out int startIndex, out int endIndex);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterNextSubpathPath (HandleRef iterator, out int resultCount, HandleRef path, out bool isClosed);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterNextSubpath (HandleRef iterator, out int resultCount, out int startIndex, out int endIndex, out bool isClosed);
+		[DllImport(GdiPlus)]
+		internal static extern int GdipPathIterRewind (HandleRef iterator);
 
 		// ImageAttributes
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipCreateImageAttributes (out IntPtr imageattr);
-				
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipSetImageAttributesColorKeys (IntPtr imageattr,
-                                ColorAdjustType type, bool enableFlag, int colorLow, int colorHigh);
-                                
-                [DllImport ("gdiplus.dll")]     
-                internal static extern Status GdipDisposeImageAttributes (IntPtr imageattr);
-				
-                [DllImport ("gdiplus.dll")]     
-                internal static extern Status GdipSetImageAttributesColorMatrix (IntPtr imageattr,
-                                ColorAdjustType type, bool enableFlag, IntPtr colorMatrix,
-                                IntPtr grayMatrix,  ColorMatrixFlag flags);                                
-
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipSetImageAttributesGamma (IntPtr imageattr, 
-			ColorAdjustType type, bool enableFlag,  
+		[DllImport (GdiPlus)]
+		internal static extern int GdipCreateImageAttributes (out IntPtr imageattr);
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesColorKeys (HandleRef imageattr,
+				ColorAdjustType type, bool enableFlag, int colorLow, int colorHigh);
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipDisposeImageAttributes (HandleRef imageattr);
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesColorMatrix (HandleRef imageattr,
+				ColorAdjustType type, bool enableFlag, ColorMatrix colorMatrix,
+				ColorMatrix grayMatrix, ColorMatrixFlag flags);
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesGamma (HandleRef imageattr,
+			ColorAdjustType type, bool enableFlag,
 																			float gamma);
-		
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipSetImageAttributesNoOp (IntPtr imageattr, 
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesNoOp (HandleRef imageattr,
 			ColorAdjustType type, bool enableFlag);
-		
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipSetImageAttributesOutputChannel (IntPtr imageattr,
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesOutputChannel (HandleRef imageattr,
 			ColorAdjustType type, bool enableFlag, 	ColorChannelFlag channelFlags);
-		
-		[DllImport ("gdiplus.dll", CharSet=CharSet.Auto)]     
-		internal static extern Status GdipSetImageAttributesOutputChannelColorProfile (IntPtr imageattr,
+
+		[DllImport (GdiPlus, CharSet=CharSet.Auto)]
+		internal static extern int GdipSetImageAttributesOutputChannelColorProfile (HandleRef imageattr,
 			ColorAdjustType type, bool enableFlag, [MarshalAs (UnmanagedType.LPWStr)] string profileName);
-				
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipSetImageAttributesRemapTable (IntPtr imageattr,
-			ColorAdjustType type, bool enableFlag, 	uint mapSize, IntPtr colorMap);
-		
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipSetImageAttributesThreshold (IntPtr imageattr, 
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesRemapTable (HandleRef imageattr,
+			ColorAdjustType type, bool enableFlag, 	int mapSize, HandleRef colorMap);
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesThreshold (HandleRef imageattr,
 			ColorAdjustType type, bool enableFlag, float thresHold);
-			
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipCloneImageAttributes(IntPtr imageattr, out IntPtr cloneImageattr);
 
-		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipGetImageAttributesAdjustedPalette (IntPtr imageattr, IntPtr colorPalette,
+		[DllImport (GdiPlus)]
+		internal static extern int GdipCloneImageAttributes(HandleRef imageattr, out IntPtr cloneImageattr);
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipGetImageAttributesAdjustedPalette (HandleRef imageattr, HandleRef colorPalette,
 			ColorAdjustType colorAdjustType);
-    			
-    		[DllImport ("gdiplus.dll")]     
-		internal static extern Status GdipSetImageAttributesWrapMode(IntPtr imageattr,  WrapMode wrap,
-    			int argb, bool clamp);
-
-                               
-		// Font		
-		[DllImport("gdiplus.dll")]                   
-		internal static extern Status GdipCreateFont (IntPtr fontFamily, float emSize, FontStyle style, GraphicsUnit  unit,  out IntPtr font);
-		[DllImport("gdiplus.dll")]                   
-		internal static extern Status GdipDeleteFont (IntPtr font);		
-		[DllImport("gdiplus.dll", CharSet=CharSet.Auto)]
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipSetImageAttributesWrapMode(HandleRef imageattr, /*WrapMode*/ int wrap,
+			int argb, bool clamp);
+
+
+		// Font
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipCreateFont (IntPtr fontFamily, float emSize, FontStyle style, GraphicsUnit unit, out IntPtr font);
+		[DllImport(GdiPlus)]
+		internal static extern Status GdipDeleteFont (IntPtr font);
+		[DllImport(GdiPlus, CharSet=CharSet.Auto)]
 		internal static extern Status GdipGetLogFont(IntPtr font, IntPtr graphics, [MarshalAs(UnmanagedType.AsAny), Out] object logfontA);
 
-		[DllImport("gdiplus.dll")]                   
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateFontFromDC(IntPtr hdc, out IntPtr font);
-		[DllImport("gdiplus.dll", SetLastError=true, CharSet=CharSet.Auto)]
+		[DllImport(GdiPlus, SetLastError=true, CharSet=CharSet.Auto)]
 		internal static extern Status GdipCreateFontFromLogfont(IntPtr hdc, ref LOGFONT lf, out IntPtr ptr);
 
 		// These are our private functions, they exists in our own libgdiplus library, this way we
 		// avoid relying on wine in System.Drawing
-		[DllImport("gdiplus.dll", CharSet=CharSet.Ansi)]                   
+		[DllImport(GdiPlus, CharSet=CharSet.Ansi)]
 		internal static extern Status GdipCreateFontFromHfont(IntPtr hdc, out IntPtr font, ref LOGFONT lf);
 
 		// This is win32/gdi, not gdiplus, but it's easier to keep in here, also see above comment
 		[DllImport("gdi32.dll", CallingConvention=CallingConvention.StdCall, CharSet = CharSet.Auto)]
-		internal static extern IntPtr CreateFontIndirect (ref LOGFONT logfont);	
+		internal static extern IntPtr CreateFontIndirect (ref LOGFONT logfont);
 		[DllImport("user32.dll", EntryPoint="GetDC", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
-		internal static extern IntPtr GetDC(IntPtr hwnd);	
+		internal static extern IntPtr GetDC(IntPtr hwnd);
 		[DllImport("user32.dll", EntryPoint="ReleaseDC", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
 		internal static extern int ReleaseDC (IntPtr hWnd, IntPtr hDC);
 		[DllImport("gdi32.dll", EntryPoint="SelectObject", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Ansi)]
-		internal static extern IntPtr SelectObject(IntPtr hdc, IntPtr obj);	
+		internal static extern IntPtr SelectObject(IntPtr hdc, IntPtr obj);
 		[DllImport("user32.dll", SetLastError=true)]
 		internal static extern bool GetIconInfo (IntPtr hIcon, out IconInfo iconinfo);
 		[DllImport("user32.dll", CallingConvention = CallingConvention.StdCall, SetLastError=true)]
@@ -1469,7 +1486,7 @@ namespace System.Drawing
 		internal static extern IntPtr GetDesktopWindow ();
 
 		[DllImport("gdi32.dll", SetLastError=true)]
-		public static extern int BitBlt(IntPtr hdcDest, int nXDest, int nYDest, 
+		public static extern int BitBlt(IntPtr hdcDest, int nXDest, int nYDest,
 			int nWidth, int nHeight, IntPtr hdcSrc, int nXSrc, int nYSrc, int dwRop);
 
 		[DllImport ("user32.dll", EntryPoint = "GetSysColor", CallingConvention = CallingConvention.StdCall)]
@@ -1478,14 +1495,14 @@ namespace System.Drawing
 
 		// Some special X11 stuff
 		[DllImport("libX11", EntryPoint="XOpenDisplay")]
-		internal extern static IntPtr XOpenDisplay(IntPtr display);	
+		internal extern static IntPtr XOpenDisplay(IntPtr display);
 
 		[DllImport("libX11", EntryPoint="XCloseDisplay")]
-		internal extern static int XCloseDisplay(IntPtr display);	
+		internal extern static int XCloseDisplay(IntPtr display);
 
 		[DllImport ("libX11", EntryPoint="XRootWindow")]
 		internal extern static IntPtr XRootWindow(IntPtr display, int screen);
-			
+
 		[DllImport ("libX11", EntryPoint="XDefaultScreen")]
 		internal extern static int XDefaultScreen(IntPtr display);
 
@@ -1511,180 +1528,180 @@ namespace System.Drawing
 		internal extern static IntPtr XVisualIDFromVisual (IntPtr visual);
 
 		[DllImport ("libX11", EntryPoint="XFree")]
-		internal extern static void XFree (IntPtr data);	
-		
+		internal extern static void XFree (IntPtr data);
+
 		// FontCollection
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipGetFontCollectionFamilyCount (IntPtr collection, out int found);
-		
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipGetFontCollectionFamilyList (IntPtr collection, int getCount, IntPtr[] dest, out int retCount);
+		[DllImport (GdiPlus)]
+		internal static extern int GdipGetFontCollectionFamilyCount (HandleRef collection, out int found);
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipGetFontCollectionFamilyList (HandleRef collection, int getCount, IntPtr[] dest, out int retCount);
 		//internal static extern Status GdipGetFontCollectionFamilyList( IntPtr collection, int getCount, [Out] FontFamily [] familyList, out int retCount );
-		
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipNewInstalledFontCollection (out IntPtr collection);
-		
-		[DllImport ("gdiplus.dll")]
+
+		[DllImport (GdiPlus)]
+		internal static extern int GdipNewInstalledFontCollection (out IntPtr collection);
+
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipNewPrivateFontCollection (out IntPtr collection);
-		
-		[DllImport ("gdiplus.dll")]
+
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipDeletePrivateFontCollection (ref IntPtr collection);
-		
-		[DllImport ("gdiplus.dll", CharSet=CharSet.Auto)]
+
+		[DllImport (GdiPlus, CharSet=CharSet.Auto)]
 		internal static extern Status GdipPrivateAddFontFile (IntPtr collection,
-                                [MarshalAs (UnmanagedType.LPWStr)] string fileName );
-		
-		[DllImport ("gdiplus.dll")]
+				[MarshalAs (UnmanagedType.LPWStr)] string fileName );
+
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipPrivateAddMemoryFont (IntPtr collection, IntPtr mem, int length);
 
 		//FontFamily
-		[DllImport ("gdiplus.dll", CharSet=CharSet.Auto)]
+		[DllImport (GdiPlus, CharSet=CharSet.Auto)]
 		internal static extern Status GdipCreateFontFamilyFromName (
-                        [MarshalAs(UnmanagedType.LPWStr)] string fName, IntPtr collection, out IntPtr fontFamily);
+			[MarshalAs(UnmanagedType.LPWStr)] string fName, IntPtr collection, out IntPtr fontFamily);
 
-		[DllImport ("gdiplus.dll", CharSet=CharSet.Unicode)]
+		[DllImport (GdiPlus, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipGetFamilyName(IntPtr family, StringBuilder name, int language);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetGenericFontFamilySansSerif (out IntPtr fontFamily);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetGenericFontFamilySerif (out IntPtr fontFamily);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetGenericFontFamilyMonospace (out IntPtr fontFamily);
-		
-		[DllImport ("gdiplus.dll")]
+
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetCellAscent (IntPtr fontFamily, int style, out short ascent);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetCellDescent (IntPtr fontFamily, int style, out short descent);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetLineSpacing (IntPtr fontFamily, int style, out short spacing);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetEmHeight (IntPtr fontFamily, int style, out short emHeight);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipIsStyleAvailable (IntPtr fontFamily, int style, out bool styleAvailable);
 
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipDeleteFontFamily (IntPtr fontFamily);
-		
-		[DllImport ("gdiplus.dll")]
+
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetFontSize (IntPtr font, out float size);
-		
-		[DllImport ("gdiplus.dll")]
+
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetFontHeight (IntPtr font, IntPtr graphics, out float height);
-		
-		[DllImport ("gdiplus.dll")]
+
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetFontHeightGivenDPI (IntPtr font, float dpi, out float height);
 
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipCloneFontFamily (IntPtr fontFamily, out IntPtr clone);
-		
-		
+		[DllImport (GdiPlus)]
+		internal static extern int GdipCloneFontFamily (HandleRef fontFamily, out IntPtr clone);
+
+
 		// String Format
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipCreateStringFormat(int formatAttributes, int language, out IntPtr  format);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipCreateStringFormat(int formatAttributes, int language, out IntPtr format);
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipStringFormatGetGenericDefault(out IntPtr format);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipStringFormatGetGenericTypographic(out IntPtr format);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipDeleteStringFormat(IntPtr format);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipCloneStringFormat(IntPtr srcformat, out IntPtr format);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipSetStringFormatFlags(IntPtr format, StringFormatFlags flags);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetStringFormatFlags(IntPtr format, out StringFormatFlags flags);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipSetStringFormatAlign(IntPtr format, StringAlignment align);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetStringFormatAlign(IntPtr format, out StringAlignment align);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipSetStringFormatLineAlign(IntPtr format, StringAlignment align);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetStringFormatLineAlign(IntPtr format, out StringAlignment align);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipSetStringFormatTrimming(IntPtr format, StringTrimming trimming);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetStringFormatTrimming(IntPtr format, out StringTrimming trimming);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipSetStringFormatHotkeyPrefix(IntPtr format, HotkeyPrefix hotkeyPrefix);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetStringFormatHotkeyPrefix(IntPtr format, out HotkeyPrefix hotkeyPrefix);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipSetStringFormatTabStops(IntPtr format, float firstTabOffset, int count, float [] tabStops);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipGetStringFormatDigitSubstitution(IntPtr format, int language, out StringDigitSubstitute substitute);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipSetStringFormatDigitSubstitution(IntPtr format, int language, StringDigitSubstitute substitute);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipGetStringFormatTabStopCount(IntPtr format, out int count);
-                [DllImport ("gdiplus.dll")]
-                internal static extern Status GdipGetStringFormatTabStops(IntPtr format, int count, out float firstTabOffset, [In, Out] float [] tabStops);
-                		
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipSetStringFormatTabStops(IntPtr format, float firstTabOffset, int count, float [] tabStops);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetStringFormatDigitSubstitution(IntPtr format, int language, out StringDigitSubstitute substitute);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipSetStringFormatDigitSubstitution(IntPtr format, int language, StringDigitSubstitute substitute);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetStringFormatTabStopCount(IntPtr format, out int count);
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipGetStringFormatTabStops(IntPtr format, int count, out float firstTabOffset, [In, Out] float [] tabStops);
+
 		// metafile
-		[DllImport ("gdiplus.dll", CharSet = CharSet.Auto)]
+		[DllImport (GdiPlus, CharSet = CharSet.Auto)]
 		internal static extern Status GdipCreateMetafileFromFile ([MarshalAs (UnmanagedType.LPWStr)] string filename, out IntPtr metafile);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipCreateMetafileFromEmf (IntPtr hEmf, bool deleteEmf, out IntPtr metafile);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipCreateMetafileFromWmf (IntPtr hWmf, bool deleteWmf, WmfPlaceableFileHeader wmfPlaceableFileHeader, out IntPtr metafile);
-		[DllImport ("gdiplus.dll", CharSet = CharSet.Auto)]
+		[DllImport (GdiPlus, CharSet = CharSet.Auto)]
 		internal static extern Status GdipGetMetafileHeaderFromFile ([MarshalAs (UnmanagedType.LPWStr)] string filename, IntPtr header);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetMetafileHeaderFromMetafile (IntPtr metafile, IntPtr header);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetMetafileHeaderFromEmf (IntPtr hEmf, IntPtr header);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetMetafileHeaderFromWmf (IntPtr hWmf, IntPtr wmfPlaceableFileHeader, IntPtr header);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetHemfFromMetafile (IntPtr metafile, out IntPtr hEmf);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipGetMetafileDownLevelRasterizationLimit (IntPtr metafile, ref uint metafileRasterizationLimitDpi);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipSetMetafileDownLevelRasterizationLimit (IntPtr metafile, uint metafileRasterizationLimitDpi);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipPlayMetafileRecord (IntPtr metafile, EmfPlusRecordType recordType, int flags, int dataSize, byte[] data);
 
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipRecordMetafile (IntPtr hdc, EmfType type, ref RectangleF frameRect, 
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipRecordMetafile (IntPtr hdc, EmfType type, ref RectangleF frameRect,
 			MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipRecordMetafileI (IntPtr hdc, EmfType type, ref Rectangle frameRect, 
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipRecordMetafileI (IntPtr hdc, EmfType type, ref Rectangle frameRect,
 			MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipRecordMetafileFileName ([MarshalAs (UnmanagedType.LPWStr)] string filename, IntPtr hdc, EmfType type,
 			ref RectangleF frameRect, MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
-		[DllImport ("gdiplus.dll")]
+		[DllImport (GdiPlus)]
 		internal static extern Status GdipRecordMetafileFileNameI ([MarshalAs (UnmanagedType.LPWStr)] string filename, IntPtr hdc, EmfType type,
 			ref Rectangle frameRect, MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
 #if !TEST
-		[DllImport("gdiplus.dll", ExactSpelling=true, CharSet=CharSet.Unicode)]
+		[DllImport(GdiPlus, ExactSpelling=true, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipCreateMetafileFromStream([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, out IntPtr metafile);
-		[DllImport("gdiplus.dll", ExactSpelling=true, CharSet=CharSet.Unicode)]
+		[DllImport(GdiPlus, ExactSpelling=true, CharSet=CharSet.Unicode)]
 		internal static extern Status GdipGetMetafileHeaderFromStream([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, IntPtr header);
 
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipRecordMetafileStream ([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, IntPtr hdc, 
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipRecordMetafileStream ([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, IntPtr hdc,
 			EmfType type, ref RectangleF frameRect, MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
-		[DllImport ("gdiplus.dll")]
-		internal static extern Status GdipRecordMetafileStreamI ([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, IntPtr hdc, 
+		[DllImport (GdiPlus)]
+		internal static extern Status GdipRecordMetafileStreamI ([MarshalAs(UnmanagedType.CustomMarshaler, MarshalTypeRef=typeof(ComIStreamMarshaler))] IStream stream, IntPtr hdc,
 			EmfType type, ref Rectangle frameRect, MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
 #endif
 		//ImageCodecInfo functions
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetImageDecodersSize (out int decoderNums, out int arraySize);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetImageDecoders (int decoderNums, int arraySize, IntPtr decoders);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetImageEncodersSize (out int encoderNums, out int arraySize);
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetImageEncoders (int encoderNums, int arraySize, IntPtr encoders);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetImageDecodersSize (out int decoderNums, out int arraySize);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetImageDecoders (int decoderNums, int arraySize, IntPtr decoders);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetImageEncodersSize (out int encoderNums, out int arraySize);
+		[DllImport(GdiPlus)]
+		static internal extern int GdipGetImageEncoders (int encoderNums, int arraySize, IntPtr encoders);
 
 		//
 		// These are stuff that is unix-only
@@ -1698,7 +1715,7 @@ namespace System.Drawing
 
 		internal sealed class GdiPlusStreamHelper {
 			public Stream stream;
-			
+
 			private StreamGetHeaderDelegate sghd = null;
 			private StreamGetBytesDelegate sgbd = null;
 			private StreamSeekDelegate skd = null;
@@ -1708,20 +1725,20 @@ namespace System.Drawing
 			private byte[]	start_buf;
 			private int	start_buf_pos;
 			private int	start_buf_len;
-			private byte[]  managedBuf;
+			private byte[] managedBuf;
 			private const int default_bufsize = 4096;
-			
-			public GdiPlusStreamHelper (Stream s, bool seekToOrigin) 
-			{ 
+
+			public GdiPlusStreamHelper (Stream s, bool seekToOrigin)
+			{
 				managedBuf = new byte [default_bufsize];
-				
+
 				stream = s;
 				if (stream != null && stream.CanSeek && seekToOrigin) {
 					stream.Seek (0, SeekOrigin.Begin);
 				}
 			}
 
-			public int StreamGetHeaderImpl (IntPtr buf, int bufsz)  {
+			public int StreamGetHeaderImpl (IntPtr buf, int bufsz) {
 				int	bytesRead;
 
 				start_buf = new byte[bufsz];
@@ -1754,7 +1771,7 @@ namespace System.Drawing
 				}
 			}
 
-			public int StreamGetBytesImpl (IntPtr buf, int bufsz, bool peek) 
+			public int StreamGetBytesImpl (IntPtr buf, int bufsz, bool peek)
 			{
 				if (buf == IntPtr.Zero && peek) {
 					return -1;
@@ -1792,7 +1809,7 @@ namespace System.Drawing
 							return -1;
 						}
 					}
-			
+
 					if (bytesRead > 0 && buf != IntPtr.Zero) {
 						Marshal.Copy (managedBuf, 0, (IntPtr) (buf.ToInt64()), bytesRead);
 					}
@@ -1800,7 +1817,7 @@ namespace System.Drawing
 					if (!stream.CanSeek && (bufsz == 10) && peek) {
 						// Special 'hack' to support peeking of the type for gdi+ on non-seekable streams
 					}
-				
+
 					if (peek) {
 						if (stream.CanSeek) {
 							// If we are peeking bytes, then go back to original position before peeking
@@ -1810,7 +1827,7 @@ namespace System.Drawing
 						}
 					}
 				}
-				
+
 				return bytesRead;
 			}
 
@@ -1826,7 +1843,7 @@ namespace System.Drawing
 				}
 			}
 
-			public long StreamSeekImpl (int offset, int whence) 
+			public long StreamSeekImpl (int offset, int whence)
 			{
 				// Make sure we have a valid 'whence'.
 				if ((whence < 0) || (whence > 2))
@@ -1867,7 +1884,7 @@ namespace System.Drawing
 				}
 			}
 
-			public int StreamPutBytesImpl (IntPtr buf, int bufsz) 
+			public int StreamPutBytesImpl (IntPtr buf, int bufsz)
 			{
 				if (bufsz > managedBuf.Length)
 					managedBuf = new byte[bufsz];
@@ -1887,10 +1904,10 @@ namespace System.Drawing
 					return null;
 				}
 			}
-			
+
 			public void StreamCloseImpl ()
 			{
-				stream.Close ();
+				stream.Dispose ();
 			}
 
 			public StreamCloseDelegate CloseDelegate {
@@ -1904,7 +1921,7 @@ namespace System.Drawing
 					return null;
 				}
 			}
-			
+
 			public long StreamSizeImpl ()
 			{
 				try {
@@ -1927,49 +1944,49 @@ namespace System.Drawing
 			}
 
 		}
-		
+
 		/* Mac only function calls */
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateFromContext_macosx (IntPtr cgref, int width, int height, out IntPtr graphics);
 
 		/* Linux only function calls*/
-		[DllImport("gdiplus.dll")]
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipSetVisibleClip_linux (IntPtr graphics, ref Rectangle rect);
-		
-		[DllImport("gdiplus.dll")]
+
+		[DllImport(GdiPlus)]
 		internal static extern Status GdipCreateFromXDrawable_linux (IntPtr drawable, IntPtr display, out IntPtr graphics);
-		
+
 		// Stream functions for non-Win32 (libgdiplus specific)
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipLoadImageFromDelegate_linux (StreamGetHeaderDelegate getHeader, 
-			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, 
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipLoadImageFromDelegate_linux (StreamGetHeaderDelegate getHeader,
+			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek,
 			StreamCloseDelegate close, StreamSizeDelegate size, out IntPtr image);
 
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipSaveImageToDelegate_linux (IntPtr image, StreamGetBytesDelegate getBytes, 
-			StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, StreamCloseDelegate close, 
-			StreamSizeDelegate size, ref Guid encoderClsID, IntPtr encoderParameters);		
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipSaveImageToDelegate_linux (IntPtr image, StreamGetBytesDelegate getBytes,
+			StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, StreamCloseDelegate close,
+			StreamSizeDelegate size, ref Guid encoderClsID, IntPtr encoderParameters);
 
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipCreateMetafileFromDelegate_linux (StreamGetHeaderDelegate getHeader, 
-			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, 
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipCreateMetafileFromDelegate_linux (StreamGetHeaderDelegate getHeader,
+			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek,
 			StreamCloseDelegate close, StreamSizeDelegate size, out IntPtr metafile);
 
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipGetMetafileHeaderFromDelegate_linux (StreamGetHeaderDelegate getHeader, 
-			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, 
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipGetMetafileHeaderFromDelegate_linux (StreamGetHeaderDelegate getHeader,
+			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek,
 			StreamCloseDelegate close, StreamSizeDelegate size, IntPtr header);
 
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipRecordMetafileFromDelegate_linux (StreamGetHeaderDelegate getHeader, 
-			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, 
-			StreamCloseDelegate close, StreamSizeDelegate size, IntPtr hdc, EmfType type, ref RectangleF frameRect, 
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipRecordMetafileFromDelegate_linux (StreamGetHeaderDelegate getHeader,
+			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek,
+			StreamCloseDelegate close, StreamSizeDelegate size, IntPtr hdc, EmfType type, ref RectangleF frameRect,
 			MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
 
-		[DllImport("gdiplus.dll")]
-		static internal extern Status GdipRecordMetafileFromDelegateI_linux (StreamGetHeaderDelegate getHeader, 
-			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek, 
-			StreamCloseDelegate close, StreamSizeDelegate size, IntPtr hdc, EmfType type, ref Rectangle frameRect, 
+		[DllImport(GdiPlus)]
+		static internal extern Status GdipRecordMetafileFromDelegateI_linux (StreamGetHeaderDelegate getHeader,
+			StreamGetBytesDelegate getBytes, StreamPutBytesDelegate putBytes, StreamSeekDelegate doSeek,
+			StreamCloseDelegate close, StreamSizeDelegate size, IntPtr hdc, EmfType type, ref Rectangle frameRect,
 			MetafileFrameUnit frameUnit, [MarshalAs (UnmanagedType.LPWStr)] string description, out IntPtr metafile);
 
 		[DllImport ("libc")]