Dmitry Timoshkov : gdi32: Fix GDI locking in SetBitmapBits.

Alexandre Julliard julliard at winehq.org
Mon Mar 15 12:19:31 CDT 2010


Module: wine
Branch: master
Commit: c7b45aa8d335b15b00755edd14a47fc90dd2f725
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=c7b45aa8d335b15b00755edd14a47fc90dd2f725

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Wed Mar 10 16:30:28 2010 +0800

gdi32: Fix GDI locking in SetBitmapBits.

---

 dlls/gdi32/bitmap.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c
index dfb8916..937a67d 100644
--- a/dlls/gdi32/bitmap.c
+++ b/dlls/gdi32/bitmap.c
@@ -436,11 +436,13 @@ LONG WINAPI SetBitmapBits(
     LONG count,        /* [in] Number of bytes in bitmap array */
     LPCVOID bits)      /* [in] Address of array with bitmap bits */
 {
-    BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP );
+    BITMAPOBJ *bmp;
     LONG height, ret;
 
-    if ((!bmp) || (!bits))
-	return 0;
+    if (!bits) return 0;
+
+    bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP );
+    if (!bmp) return 0;
 
     if (count < 0) {
 	WARN("(%d): Negative number of bytes passed???\n", count );




More information about the wine-cvs mailing list