gdi32: Fix GDI locking in SetBitmapBits.

c7b45aa8 · Dmitry Timoshkov · Alexandre Julliard · 1719f8fa · c7b45aa8
Commit c7b45aa8 authored Mar 10, 2010 by Dmitry Timoshkov Committed by Alexandre Julliard Mar 15, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

bitmap.c dlls/gdi32/bitmap.c +5 -3

No files found.
--- 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 );