Changeset 1830 for trunk/src

Timestamp:

Nov 24, 1999, 8:30:18 PM (26 years ago)

Author:

sandervl

Message:

EB's dibsection updates

Location:

trunk/src/gdi32

Files:

• dibsect.cpp (modified) (2 diffs)
• dibsect.h (modified) (2 diffs)
• gdi32.cpp (modified) (2 diffs)

trunk/src/gdi32/dibsect.cpp

@@ -1 @@
-/* $Id: dibsect.cpp,v 1.8 1999-11-12 11:38:38 sandervl Exp $ */
+/* $Id: dibsect.cpp,v 1.9 1999-11-24 19:30:18 sandervl Exp $ */
 
 /*
@@ -145 +145 @@
         dsect->next = this->next;
    }
+}
+//******************************************************************************
+//******************************************************************************
+int DIBSection::SetDIBits(HDC hdc, HBITMAP hbitmap, UINT startscan, UINT
+                          lines, const VOID *bits, WINBITMAPINFOHEADER *pbmi,
+                          UINT coloruse)
+{
+  lines = (int)lines >= 0 ? (int)lines : (int)-lines;
+  int  os2bmpsize;
+  int  palsize=0;
+
+  bmpsize = pbmi->biWidth;
+  os2bmpsize = sizeof(BITMAPINFO2);
+
+  switch(pbmi->biBitCount)
+  {
+        case 1:
+                bmpsize /= 8;
+                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+                os2bmpsize += palsize;
+                break;
+        case 4:
+                bmpsize /= 2;
+                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+                os2bmpsize += palsize;
+                break;
+        case 8:
+                palsize = ((1 << pbmi->biBitCount))*sizeof(RGB2);
+                os2bmpsize += palsize;
+                break;
+        case 16:
+                bmpsize *= 2;
+                break;
+        case 24:
+                bmpsize *= 3;
+                break;
+        case 32:
+                bmpsize *= 4;
+                break;
+   }
+   if(bmpsize & 3) {
+        bmpsize = (bmpsize + 3) & ~3;
+   }
+
+   bmpBits    = (char *)realloc(bmpBits, bmpsize*pbmi->biHeight);
+   pOS2bmp    = (BITMAPINFO2 *)realloc(pOS2bmp, os2bmpsize);
+
+   pOS2bmp->cbFix         = sizeof(BITMAPINFO2) - sizeof(RGB2);
+   pOS2bmp->cx            = pbmi->biWidth;
+   pOS2bmp->cy            = pbmi->biHeight;
+   pOS2bmp->cPlanes       = pbmi->biPlanes;
+   pOS2bmp->cBitCount     = pbmi->biBitCount;
+   pOS2bmp->ulCompression = pbmi->biCompression;
+   pOS2bmp->cbImage       = pbmi->biSizeImage;
+
+   if(palsize)
+     memcpy(pOS2bmp->argbColor, (char *)pbmi + 1 , palsize);
+
+   if(bits)
+   {
+     int size = bmpsize*lines;
+     memcpy(bmpBits+bmpsize*startscan, bits, size);
+   }
+   return(lines);
 }
 //******************************************************************************

trunk/src/gdi32/dibsect.h

@@ -1 @@
-/* $Id: dibsect.h,v 1.5 1999-11-10 14:15:23 sandervl Exp $ */
+/* $Id: dibsect.h,v 1.6 1999-11-24 19:30:18 sandervl Exp $ */
 
 /*
@@ -75 +75 @@
                int  SetDIBColorTable(int startIdx, int cEntries, RGBQUAD *rgb);
 
+               int  SetDIBits(HDC hdc, HBITMAP hbitmap, UINT startscan, UINT
+                              lines, const VOID *bits, WINBITMAPINFOHEADER *pbmi,
+                              UINT coloruse);
+
                int  GetDIBSection(int iSize , DIBSECTION *pDIBSection);
 

trunk/src/gdi32/gdi32.cpp

@@ -1 @@
-/* $Id: gdi32.cpp,v 1.16 1999-11-11 13:16:40 sandervl Exp $ */
+/* $Id: gdi32.cpp,v 1.17 1999-11-24 19:30:18 sandervl Exp $ */
 
 /*
@@ -1903 +1903 @@
 int WIN32API SetDIBits( HDC arg1, HBITMAP arg2, UINT arg3, UINT arg4, const VOID * arg5, const BITMAPINFO * arg6, UINT  arg7)
 {
-    dprintf(("GDI32: SetDIBits\n"));
+    dprintf(("GDI32: SetDIBits %x %x %x %x %x %x %x\n", arg1, arg2, arg3, arg4, arg5, arg6, arg7));
+
+    if(DIBSection::getSection() != NULL) {
+        DIBSection *dsect;
+
+        dsect = DIBSection::find((DWORD)arg2);
+        if(dsect) {
+           return dsect->SetDIBits(arg1, arg2, arg3, arg4, arg5, (WINBITMAPINFOHEADER *)&arg6->bmiHeader, arg7);
+        }
+    }
     return O32_SetDIBits(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
 }