Changeset 1533 for trunk/src/gdi32/gdi32.cpp

Timestamp:

Oct 31, 1999, 10:38:20 PM (26 years ago)

Author:

achimha

Message:

Added DIB changes from Markus Montkowski to return initalized DIB structure + various bug fixes in DIB handling

File:

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

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.11 1999-10-20 22:36:53 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.12 1999-10-31 21:38:17 achimha Exp $ */
 
 /*
@@ -187 +187 @@
 int WIN32API GetObjectA( HGDIOBJ arg1, int arg2, void *  arg3)
 {
+
+    if(DIBSection::getSection() != NULL)
+    {
+      DIBSection *dsect = DIBSection::find(arg1);
+      if(dsect)
+      {
+        return dsect->GetDIBSection(arg2, (DIBSECTION*)arg3);
+      }
+    }
+
     dprintf(("GDI32: GetObject %X %X %X\n", arg1, arg2, arg3));
     return O32_GetObject(arg1, arg2, arg3);
@@ -1338 +1348 @@
     dprintf(("GDI32: OS2GetTextFaceW"));
     rc = O32_GetTextFace(arg1, arg2, astring);
-    AsciiToUnicode(astring, arg3);      
+    AsciiToUnicode(astring, arg3);
     return rc;
 }
@@ -1514 +1524 @@
 //******************************************************************************
 BOOL WIN32API Pie(HDC hdc, int nLeftRect, int nTopRect, int nRightRect,
-                  int nBottomRect, int nXRadial1, int nYRadial1, int nXRadial2, 
+                  int nBottomRect, int nXRadial1, int nYRadial1, int nXRadial2,
                   int nYRadial2)
 {
@@ -1740 +1750 @@
 //******************************************************************************
 //******************************************************************************
-INT WIN32API SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse)
+INT WIN32API SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan, UINT lines, LPCVOID bits, const BITMAPINFO *info, UINT coloruse)
 {
     INT result, imgsize, palsize;
@@ -2016 +2026 @@
   {
         DIBSection *dsect = new DIBSection((WINBITMAPINFOHEADER *)&pbmi->bmiHeader, (DWORD)res, fFlip);
-        *ppvBits = dsect->GetDIBObject();
+        dprintf(("Constructor returned\n",res));
+        if(ppvBits!=NULL)
+          *ppvBits = dsect->GetDIBObject();
+        dprintf(("GDI32: return %08X\n",res));
         return(res);
   }
@@ -3202 +3215 @@
 
 
+