Changeset 2592 for trunk/src/gdi32/dibsect.cpp

Timestamp:

Feb 1, 2000, 1:53:31 PM (26 years ago)

Author:

sandervl

Message:

cleaned up + dibsection fixes

File:

• trunk/src/gdi32/dibsect.cpp (modified) (7 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.13 2000-01-31 22:30:07 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.14 2000-02-01 12:53:29 sandervl Exp $ */
 
 /*
@@ -43 +43 @@
 //******************************************************************************
 //******************************************************************************
-DIBSection::DIBSection(WINBITMAPINFOHEADER *pbmi, DWORD handle, int fFlip)
+DIBSection::DIBSection(WINBITMAPINFOHEADER *pbmi, DWORD iUsage, DWORD handle, int fFlip)
                 : bmpBits(NULL), pOS2bmp(NULL), next(NULL)
 {
@@ -96 +96 @@
    pOS2bmp->cBitCount     = pbmi->biBitCount;
    pOS2bmp->ulCompression = pbmi->biCompression;
+   //SvL: Ignore BI_BITFIELDS type (GpiDrawBits fails otherwise)
+   if(pOS2bmp->ulCompression == 3) {
+        pOS2bmp->ulCompression = 0;
+   }
    pOS2bmp->cbImage       = pbmi->biSizeImage;
    dprintf(("handle                 %x", handle));
@@ -104 +108 @@
    dprintf(("pOS2bmp->ulCompression %d\n", pOS2bmp->ulCompression));
    dprintf(("pOS2bmp->cbImage       %d\n", pOS2bmp->cbImage));
-   dprintf(("Bits at 0x%08X\n",bmpBits));
+   dprintf(("Bits at %x, size %d",bmpBits, bmpsize*pbmi->biHeight));
 
    this->handle = handle;
+   this->iUsage = iUsage;
 
    dibMutex.enter();
@@ -312 +317 @@
     WinReleasePS(hps);
   }
-  if(rc == GPI_OK)
-    return(TRUE);
-
+  if(rc == GPI_OK) {
+        return(TRUE);
+  }
   dprintf(("DIBSection::BitBlt %X (%d,%d) (%d,%d) to (%d,%d) (%d,%d) returned %d\n", hps, point[0].x, point[0].y, point[1].x, point[1].y, point[2].x, point[2].y, point[3].x, point[3].y, rc));
   dprintf(("WinGetLastError returned %X\n", WinGetLastError(WinQueryAnchorBlock(hwndDest)) & 0xFFFF));
@@ -325 +330 @@
   this->hdc  = hdc;
   hwndParent = WinWindowFromDC(hdc);
-  dprintf(("SelectDIBObject(0x%08X) hwndParent = 0x%08X\n",hdc, hwndParent));
+  dprintf(("SelectDIBObject %x into %x hwndParent = %x", handle, hdc, hwndParent));
 }
 //******************************************************************************
@@ -380 +385 @@
  LPWINBITMAP dsBm        = (LPWINBITMAP)lpBuffer;
 
+  dprintf2(("GetDIBSection %x %d %x", handle, iSize, lpBuffer));
   if(iSize == sizeof(DIBSECTION))
   {