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

Timestamp:

Feb 3, 2000, 12:45:07 AM (26 years ago)

Author:

sandervl

Message:

RGB 555 conversion in SetDIBitsToDevice + quake 2 BitBlt fix

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.14 2000-02-01 12:53:29 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.15 2000-02-02 23:45:06 sandervl Exp $ */
 
 /*
@@ -15 +15 @@
 #include <stdlib.h>
 #include <string.h>
-#include "win32type.h"
-#include "misc.h"
+#include <win32type.h>
+#include <misc.h>
 #define  OS2_ONLY
 #include "dibsect.h"
 #include <vmutex.h>
+#include <winconst.h>
 
 HWND WIN32API WindowFromDC(HDC hdc);
@@ -43 +44 @@
 //******************************************************************************
 //******************************************************************************
-DIBSection::DIBSection(WINBITMAPINFOHEADER *pbmi, DWORD iUsage, DWORD handle, int fFlip)
+DIBSection::DIBSection(BITMAPINFOHEADER_W *pbmi, char *pColors, DWORD iUsage, DWORD handle, int fFlip)
                 : bmpBits(NULL), pOS2bmp(NULL), next(NULL)
 {
@@ -97 +98 @@
    pOS2bmp->ulCompression = pbmi->biCompression;
    //SvL: Ignore BI_BITFIELDS type (GpiDrawBits fails otherwise)
-   if(pOS2bmp->ulCompression == 3) {
+   if(pOS2bmp->ulCompression == BI_BITFIELDS) {
         pOS2bmp->ulCompression = 0;
    }
@@ -110 +111 @@
    dprintf(("Bits at %x, size %d",bmpBits, bmpsize*pbmi->biHeight));
 
+   // clear DIBSECTION structure
+   memset(&dibinfo, 0, sizeof(dibinfo));
+
+   // copy BITMAPINFOHEADER data into DIBSECTION structure
+   memcpy(&dibinfo.dsBmih, pbmi, sizeof(*pbmi));
+   dibinfo.dsBm.bmType      = 0;
+   dibinfo.dsBm.bmWidth     = pbmi->biWidth;
+   dibinfo.dsBm.bmHeight    = pbmi->biHeight;
+   dibinfo.dsBm.bmWidthBytes= bmpsize;
+   dibinfo.dsBm.bmPlanes    = pbmi->biPlanes;
+   dibinfo.dsBm.bmBitsPixel = pbmi->biBitCount;
+   dibinfo.dsBm.bmBits      = bmpBits;
+
+   dibinfo.dshSection       = handle;
+   dibinfo.dsOffset         = 0; // TODO: put the correct value here (if createdibsection with file handle)
+
+   if(pbmi->biCompression == BI_BITFIELDS) {
+        dibinfo.dsBitfields[0] = *((DWORD *)pColors);
+        dibinfo.dsBitfields[1] = *((DWORD *)pColors+1);
+        dibinfo.dsBitfields[2] = *((DWORD *)pColors+2);
+        dprintf(("BI_BITFIELDS %x %x %x", dibinfo.dsBitfields[0], dibinfo.dsBitfields[1], dibinfo.dsBitfields[2]));
+   }
+
    this->handle = handle;
    this->iUsage = iUsage;
@@ -165 +189 @@
 //******************************************************************************
 int DIBSection::SetDIBits(HDC hdc, HBITMAP hbitmap, UINT startscan, UINT
-                          lines, const VOID *bits, WINBITMAPINFOHEADER *pbmi,
+                          lines, const VOID *bits, BITMAPINFOHEADER_W *pbmi,
                           UINT coloruse)
 {
@@ -383 +407 @@
 {
  DIBSECTION *pDIBSection = (DIBSECTION *)lpBuffer;
- LPWINBITMAP dsBm        = (LPWINBITMAP)lpBuffer;
+ LPBITMAP_W  dsBm        = (LPBITMAP_W)lpBuffer;
 
   dprintf2(("GetDIBSection %x %d %x", handle, iSize, lpBuffer));
   if(iSize == sizeof(DIBSECTION))
   {
-    // BITMAP struct
-    pDIBSection->dsBm.bmType       = 0;  // TODO: put the correct value here
-    pDIBSection->dsBm.bmWidth      = pOS2bmp->cx;
-    pDIBSection->dsBm.bmHeight     = pOS2bmp->cy;
-    pDIBSection->dsBm.bmWidthBytes = bmpsize;
-    pDIBSection->dsBm.bmPlanes     = pOS2bmp->cPlanes;
-    pDIBSection->dsBm.bmBitsPixel  = pOS2bmp->cBitCount;
-    pDIBSection->dsBm.bmBits       = bmpBits;
-    // BITMAPINFOHEADER data
-    pDIBSection->dsBmih.biSize = sizeof(BITMAPINFOHEADER);
-    pDIBSection->dsBmih.biWidth       = pOS2bmp->cx;
-    pDIBSection->dsBmih.biHeight      = pOS2bmp->cy;
-    pDIBSection->dsBmih.biPlanes      = pOS2bmp->cPlanes;
-    pDIBSection->dsBmih.biBitCount    = pOS2bmp->cBitCount;
-    pDIBSection->dsBmih.biCompression = pOS2bmp->ulCompression;
-    pDIBSection->dsBmih.biSizeImage   = pOS2bmp->cbImage;
-    pDIBSection->dsBmih.biXPelsPerMeter = 0; // TODO: put the correct value here
-    pDIBSection->dsBmih.biYPelsPerMeter = 0;
-    pDIBSection->dsBmih.biClrUsed       = (1<< pOS2bmp->cBitCount);
-    pDIBSection->dsBmih.biClrImportant  = 0;
-
-    pDIBSection->dsBitfields[0] = 0; // TODO: put the correct value here
-    pDIBSection->dsBitfields[1] = 0;
-    pDIBSection->dsBitfields[2] = 0;
-
-    pDIBSection->dshSection = this->handle;
-
-    pDIBSection->dsOffset = 0; // TODO: put the correct value here
-
-    return sizeof(DIBSECTION);
+        memcpy(pDIBSection, &dibinfo, sizeof(dibinfo));
+        return sizeof(DIBSECTION);
   }
   else
-  if(iSize == sizeof(WINBITMAP))
-  {
-        dsBm->bmType       = 0;  // TODO: put the correct value here
-        dsBm->bmWidth      = pOS2bmp->cx;
-        dsBm->bmHeight     = pOS2bmp->cy;
-        dsBm->bmWidthBytes = bmpsize;
-        dsBm->bmPlanes     = pOS2bmp->cPlanes;
-        dsBm->bmBitsPixel  = pOS2bmp->cBitCount;
-        dsBm->bmBits       = bmpBits;
-        return sizeof(WINBITMAP);
+  if(iSize == sizeof(BITMAP_W))
+  {
+        memcpy(dsBm, &dibinfo.dsBm, sizeof(dibinfo.dsBm));
+        return sizeof(BITMAP_W);
   }
   return 0;