commit 2a2321bbca3ef72649dc34a185bc6f7cef4a58fa
author Alexandre Julliard <julliard@winehq.org> Sat Aug 19 21:38:55 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Aug 19 21:38:55 2000 +0000
tree 4d6b9768a706f9aca41ae05b8b8d1e65d49977f0
parent 9fcb4f551e680e90168131ba4c2a85f8a773bb86

Authors: Alexandre Julliard <julliard@codeweavers.com> (for Corel), Albert den Haan <albertd@corel.com>
Added syslevel locking for GDI operations.
Propagate the changes through the graphics code.

objects/bitmap.c

diff --git a/objects/bitmap.c b/objects/bitmap.c
index cc1aa5c..aea222e 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -122,14 +122,11 @@
     if (width < 0) width = -width;
 
       /* Create the BITMAPOBJ */
-    hbitmap = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC );
-    if (!hbitmap) return 0;
+    if (!(bmp = GDI_AllocObject( sizeof(BITMAPOBJ), BITMAP_MAGIC, &hbitmap ))) return 0;
 
     TRACE("%dx%d, %d colors returning %08x\n", width, height,
 	  1 << (planes*bpp), hbitmap);
 
-    bmp = (BITMAPOBJ *) GDI_HEAP_LOCK( hbitmap );
-
     bmp->size.cx = 0;
     bmp->size.cy = 0;
     bmp->bitmap.bmType = 0;
@@ -147,7 +144,7 @@
     if (bits) /* Set bitmap bits */
 	SetBitmapBits( hbitmap, height * bmp->bitmap.bmWidthBytes,
                          bits );
-    GDI_HEAP_UNLOCK( hbitmap );
+    GDI_ReleaseObj( hbitmap );
     return hbitmap;
 }
 
@@ -193,7 +190,7 @@
 	    dc->funcs->pCreateBitmap( hbmpRet );
     }
     TRACE("\t\t%04x\n", hbmpRet);
-    GDI_HEAP_UNLOCK(hdc);
+    GDI_ReleaseObj(hdc);
     return hbmpRet;
 }
 
@@ -251,7 +248,10 @@
     
     /* If the bits vector is null, the function should return the read size */
     if(bits == NULL)
-	return bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight;
+    {
+        ret = bmp->bitmap.bmWidthBytes * bmp->bitmap.bmHeight;
+        goto done;
+    }
 
     if (count < 0) {
 	WARN("(%ld): Negative number of bytes passed???\n", count );
@@ -265,8 +265,8 @@
     if (count == 0)
       {
 	WARN("Less then one entire line requested\n");
-	GDI_HEAP_UNLOCK( hbitmap );
-	return 0;
+        ret = 0;
+        goto done;
       }
 
 
@@ -295,8 +295,8 @@
 	}
 
     }
-
-    GDI_HEAP_UNLOCK( hbitmap );
+ done:
+    GDI_ReleaseObj( hbitmap );
     return ret;
 }
 
@@ -365,7 +365,7 @@
 	}
     }
 
-    GDI_HEAP_UNLOCK( hbitmap );
+    GDI_ReleaseObj( hbitmap );
     return ret;
 }
 
@@ -393,7 +393,7 @@
 	HeapFree( GetProcessHeap(), 0, buf );
     }
 
-    GDI_HEAP_UNLOCK( hbitmap );
+    GDI_ReleaseObj( hbitmap );
     return res;
 }
 
@@ -410,7 +410,7 @@
 
     DIB_DeleteDIBSection( bmp );
 
-    return GDI_FreeObject( hbitmap );
+    return GDI_FreeObject( hbitmap, bmp );
 }
 
 	
@@ -523,7 +523,7 @@
     BITMAPOBJ * bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     if (!bmp) return FALSE;
     CONV_SIZE32TO16( &bmp->size, size );
-    GDI_HEAP_UNLOCK( hbitmap );
+    GDI_ReleaseObj( hbitmap );
     return TRUE;
 }
 
@@ -542,7 +542,7 @@
     BITMAPOBJ * bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC );
     if (!bmp) return FALSE;
     *size = bmp->size;
-    GDI_HEAP_UNLOCK( hbitmap );
+    GDI_ReleaseObj( hbitmap );
     return TRUE;
 }
 
@@ -569,7 +569,7 @@
     if (prevSize) CONV_SIZE32TO16( &bmp->size, prevSize );
     bmp->size.cx = x;
     bmp->size.cy = y;
-    GDI_HEAP_UNLOCK( hbitmap );
+    GDI_ReleaseObj( hbitmap );
     return TRUE;
 }
 
@@ -592,7 +592,7 @@
     if (prevSize) *prevSize = bmp->size;
     bmp->size.cx = x;
     bmp->size.cy = y;
-    GDI_HEAP_UNLOCK( hbitmap );
+    GDI_ReleaseObj( hbitmap );
     return TRUE;
 }