Changeset 5855 for trunk/src

Timestamp:

Jun 1, 2001, 9:49:30 AM (24 years ago)

Author:

sandervl

Message:

GetDIBits fix for querying the bitmap information

File:

• trunk/src/gdi32/dibitmap.cpp (modified) (3 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.17 2001-05-29 09:45:21 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.18 2001-06-01 07:49:30 sandervl Exp $ */
 
 /*
@@ -284 +284 @@
  int rc;
 
+    dprintf(("GDI32: GetDIBits %x %x %d %d %x %x (biBitCount %d) %d", hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, lpbi->bmiHeader.biBitCount, uUsage));
     rc = O32_GetDIBits(hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage);
     // set proper color masks!
@@ -299 +300 @@
        break;
     }
-
-    dprintf(("GDI32: GetDIBits %x %x %d %d %x %x %d returned %d", hdc, hBitmap, uStartScan, cScanLines, lpvBits, lpbi, uUsage, rc));
+    //WGSS/Open32 returns 0 when querying the bitmap info; must return nr of scanlines
+    //as 0 signals failure
+    if(lpvBits == NULL) {
+       rc = cScanLines;
+    }
+    dprintf(("GDI32: GetDIBits return rc %d", rc));
     return rc;
 }