From e6f16250b29fbdddba7359fa68eb29df4471ad1e Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@codeweavers.com>
Date: Tue, 21 Mar 2006 12:00:43 +0800
Subject: [PATCH] gdi: Fix a couple of todos in the bitmap test.

---
 dlls/gdi/bitmap.c       | 15 +++++++--------
 dlls/gdi/tests/gdiobj.c |  4 ----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c
index a5b249b8757..2a562dede14 100644
--- a/dlls/gdi/bitmap.c
+++ b/dlls/gdi/bitmap.c
@@ -653,9 +653,9 @@ static INT BITMAP_GetObject16( HGDIOBJ handle, void *obj, INT count, LPVOID buff
 	bmp16.bmPlanes     = bmp->bitmap.bmPlanes;
 	bmp16.bmBitsPixel  = bmp->bitmap.bmBitsPixel;
 	bmp16.bmBits       = (SEGPTR)0;
-	if (count > sizeof(bmp16)) count = sizeof(bmp16);
-	memcpy( buffer, &bmp16, count );
-	return count;
+	if (count < sizeof(bmp16)) return 0;
+	memcpy( buffer, &bmp16, sizeof(bmp16) );
+	return sizeof(bmp16);
     }
 }
 
@@ -685,11 +685,10 @@ static INT BITMAP_GetObject( HGDIOBJ handle, void *obj, INT count, LPVOID buffer
     }
     else
     {
-        if( !buffer )
-            return sizeof(BITMAP);
-	if (count > sizeof(BITMAP)) count = sizeof(BITMAP);
-	memcpy( buffer, &bmp->bitmap, count );
-	return count;
+        if( !buffer ) return sizeof(BITMAP);
+        if (count < sizeof(BITMAP)) return 0;
+        memcpy( buffer, &bmp->bitmap, sizeof(BITMAP) );
+        return sizeof(BITMAP);
     }
 }
 
diff --git a/dlls/gdi/tests/gdiobj.c b/dlls/gdi/tests/gdiobj.c
index 4de266c0858..35b19a3ab59 100644
--- a/dlls/gdi/tests/gdiobj.c
+++ b/dlls/gdi/tests/gdiobj.c
@@ -1044,17 +1044,13 @@ static void test_bitmap(void)
     ok(ret == sizeof(bm), "%d != %d\n", ret, sizeof(bm));
 
     ret = GetObject(hbmp, sizeof(bm) / 2, &bm);
-todo_wine {
     ok(ret == 0, "%d != 0\n", ret);
-}
 
     ret = GetObject(hbmp, 0, &bm);
     ok(ret == 0, "%d != 0\n", ret);
 
     ret = GetObject(hbmp, 1, &bm);
-todo_wine {
     ok(ret == 0, "%d != 0\n", ret);
-}
 
     DeleteObject(hbmp);
     DeleteDC(hdc);