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

Timestamp:

Dec 30, 1999, 12:21:30 PM (26 years ago)

Author:

sandervl

Message:

Fixed GetObject for dib sections

File:

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

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.11 1999-12-04 13:53:12 hugh Exp $ */
+/* $Id: dibsect.cpp,v 1.12 1999-12-30 11:21:29 sandervl Exp $ */
 
 /*
@@ -113 +113 @@
    {
      DIBSection *dsect = section;
-     dprintf(("Increment section starting at %08X\n",dsect));
+     dprintf2(("Increment section starting at %08X\n",dsect));
 
      /* @@@PH 98/07/11 fix for dsect->next == NULL */
@@ -119 +119 @@
              (dsect->next != NULL) )
      {
-       dprintf(("Increment section to %08X\n",dsect->next));
+       dprintf2(("Increment section to %08X\n",dsect->next));
        dsect = dsect->next;
      }
@@ -125 +125 @@
    }
 
-   dprintf(("Class created"));
+   dprintf2(("Class created"));
 }
 //******************************************************************************
@@ -366 +366 @@
 //******************************************************************************
 //******************************************************************************
-int DIBSection::GetDIBSection(int iSize , DIBSECTION *pDIBSection)
-{
-  if( (sizeof(DIBSECTION)==iSize) &&
-      (pDIBSection !=NULL))
+int DIBSection::GetDIBSection(int iSize, void *lpBuffer)
+{
+ DIBSECTION *pDIBSection = (DIBSECTION *)lpBuffer;
+ LPWINBITMAP dsBm        = (LPWINBITMAP)lpBuffer;
+
+  if(iSize == sizeof(DIBSECTION))
   {
     // BITMAP struct
@@ -400 +402 @@
     pDIBSection->dsOffset = 0; // TODO: put the correct value here
 
-    return 0; //ERROR_SUCCESS
-  }
-  return 87;    //ERROR_INVALID_PARAMETER
+    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);
+  }
+  return 0;
 
 }