Improve error checking

svn path=/trunk/mcs/; revision=24285
baulig · Mar 18, 2004 · a4b9a48 · a4b9a48
1 parent 9360275
commit a4b9a48
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
@@ -152,7 +152,12 @@ public Bitmap (string filename, bool useIcm)
 
 		public Bitmap (Type type, string resource)
 		{
-			throw new NotImplementedException ();
+			using (Stream s = type.Assembly.GetManifestResourceStream (resource)){
+				if (s == null)
+					throw new FileNotFoundException ("Resource name was not found: `" + resource + "'");
+
+				InitFromStream (s);
+			}
 		}
 
 		public Bitmap (Image original, int width, int heigth) 

diff --git a/mcs/class/System.Drawing/System.Drawing/Graphics.cs b/mcs/class/System.Drawing/System.Drawing/Graphics.cs
@@ -34,6 +34,8 @@ public sealed class Graphics : MarshalByRefObject, IDisposable
 
 		private Graphics (IntPtr nativeGraphics)
 		{
+			if (nativeGraphics == IntPtr.Zero)
+				Console.WriteLine ("Here: " + Environment.StackTrace);
 			nativeObject = nativeGraphics;
 		}
 
@@ -1040,7 +1042,11 @@ public void Flush (FlushIntention intention)
 		public static Graphics FromHdc (IntPtr hdc)
 		{
 			int graphics;
-			GDIPlus.GdipCreateFromHDC (hdc, out graphics);
+			if (GDIPlus.GdipCreateFromHDC (hdc, out graphics) != Status.Ok){
+				Console.WriteLine ("Graphics.FromHdc: the HDC is an invalid handle");
+				return null;
+			}
+
 			Graphics result = new Graphics ((IntPtr) graphics);
 			return result;
 		}