commit a08e2cf19f9a60f5e75edeb16c1a35f1a8de35ce
author Alexandre Julliard <julliard@winehq.org> Tue Mar 28 13:37:50 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 28 13:37:50 2000 +0000
tree ce0dc17f86fb22e465aaf8f1ed67c7a52448ba77
parent 199aebaa5713ce10b77c0155012006e176f204a4

Merged DDBitmap and physBitmap into the generic bitmap structure
(suggested by Andrew Lewycky).

objects/bitmap.c

diff --git a/objects/bitmap.c b/objects/bitmap.c
index 8f74c7f..62a47f0 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -140,7 +140,8 @@
     bmp->bitmap.bmWidthBytes = BITMAP_GetWidthBytes( width, bpp );
     bmp->bitmap.bmBits = NULL;
 
-    bmp->DDBitmap = NULL;
+    bmp->funcs = NULL;
+    bmp->physBitmap = NULL;
     bmp->dib = NULL;
 
     if (bits) /* Set bitmap bits */
@@ -273,12 +274,11 @@
           hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
           1 << bmp->bitmap.bmBitsPixel, height );
 
-    if(bmp->DDBitmap) { 
+    if(bmp->funcs) { 
 
         TRACE("Calling device specific BitmapBits\n");
-	if(bmp->DDBitmap->funcs->pBitmapBits)
-	    ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, bits, count,
-						    DDB_GET);
+	if(bmp->funcs->pBitmapBits)
+	    ret = bmp->funcs->pBitmapBits(hbitmap, bits, count, DDB_GET);
 	else {
 	    ERR("BitmapBits == NULL??\n");
 	    ret = 0;
@@ -342,12 +342,11 @@
           hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
           1 << bmp->bitmap.bmBitsPixel, height );
 
-    if(bmp->DDBitmap) {
+    if(bmp->funcs) {
 
         TRACE("Calling device specific BitmapBits\n");
-	if(bmp->DDBitmap->funcs->pBitmapBits)
-	    ret = bmp->DDBitmap->funcs->pBitmapBits(hbitmap, (void *) bits,
-						    count, DDB_SET);
+	if(bmp->funcs->pBitmapBits)
+	    ret = bmp->funcs->pBitmapBits(hbitmap, (void *) bits, count, DDB_SET);
 	else {
 	    ERR("BitmapBits == NULL??\n");
 	    ret = 0;
@@ -403,10 +402,8 @@
  */
 BOOL BITMAP_DeleteObject( HBITMAP16 hbitmap, BITMAPOBJ * bmp )
 {
-    if( bmp->DDBitmap ) {
-        if( bmp->DDBitmap->funcs->pDeleteObject )
-	    bmp->DDBitmap->funcs->pDeleteObject( hbitmap );
-    }
+    if (bmp->funcs && bmp->funcs->pDeleteObject)
+        bmp->funcs->pDeleteObject( hbitmap );
 
     if( bmp->bitmap.bmBits )
         HeapFree( GetProcessHeap(), 0, bmp->bitmap.bmBits );