Changeset 2600 for trunk/src/gdi32/dibitmap.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/dibitmap.cpp (modified) (6 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.1 2000-02-01 12:53:29 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.2 2000-02-02 23:45:06 sandervl Exp $ */
 
 /*
@@ -82 +82 @@
  HBITMAP res = 0;
  BOOL    fFlip = 0;
- int iHeight, iWidth;
+ int     iHeight, iWidth;
 
   dprintf(("GDI32: CreateDIBSection %x %x %x %x %d", hdc, iUsage, ppvBits, hSection, dwOffset));
@@ -110 +110 @@
   if (res)
   {
-    ULONG Pal[256];
     char PalSize;
-    LOGPALETTE tmpPal = { 0x300,1,{0,0,0,0}};
-    HPALETTE hpalCur, hpalTmp;
-    DIBSection *dsect = new DIBSection((WINBITMAPINFOHEADER *)&pbmi->bmiHeader, iUsage, (DWORD)res, fFlip);
-
-    if(NULL!=dsect)
+    DIBSection *dsect = new DIBSection((BITMAPINFOHEADER_W *)&pbmi->bmiHeader, (char *)&pbmi->bmiColors, iUsage, (DWORD)res, fFlip);
+
+    if(dsect != NULL)
     {
       PalSize = dsect->GetBitCount();
-      if(PalSize<=8)
+      if(PalSize <= 8)
       {
+       ULONG Pal[256];
+       LOGPALETTE tmpPal = { 0x300,1,{0,0,0,0}};
+       HPALETTE hpalCur, hpalTmp;
+
         // Now get the current Palette from the DC
         hpalTmp = CreatePalette(&tmpPal);
@@ -170 +171 @@
                                   RGBQUAD *pColors)
 {
- HPALETTE hpal = O32_GetCurrentObject(hdc, OBJ_PAL);
+ HPALETTE hpal = GetCurrentObject(hdc, OBJ_PAL);
  UINT rc;
  int i;
@@ -208 +209 @@
 //******************************************************************************
 //******************************************************************************
-LONG WIN32API GetBitmapBits( HBITMAP arg1, LONG arg2, PVOID  arg3)
-{
-    dprintf(("GDI32: GetBitmapBits"));
-    return O32_GetBitmapBits(arg1, arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
-LONG WIN32API SetBitmapBits( HBITMAP arg1, LONG arg2, const VOID *  arg3)
-{
-    dprintf(("GDI32: SetBitmapBits"));
-    return O32_SetBitmapBits(arg1, (DWORD)arg2, arg3);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL WIN32API GetBitmapDimensionEx( HBITMAP arg1, PSIZE  arg2)
-{
-    dprintf(("GDI32: GetBitmapDimensionEx"));
-    return O32_GetBitmapDimensionEx(arg1, arg2);
+LONG WIN32API GetBitmapBits( HBITMAP hBitmap, LONG arg2, PVOID  arg3)
+{
+    dprintf(("GDI32: GetBitmapBits %x", hBitmap));
+    return O32_GetBitmapBits(hBitmap, arg2, arg3);
+}
+//******************************************************************************
+//******************************************************************************
+LONG WIN32API SetBitmapBits( HBITMAP hBitmap, LONG arg2, const VOID *  arg3)
+{
+    dprintf(("GDI32: SetBitmapBits %x", hBitmap));
+    return O32_SetBitmapBits(hBitmap, (DWORD)arg2, arg3);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL WIN32API GetBitmapDimensionEx( HBITMAP hBitmap, PSIZE pSize)
+{
+    dprintf(("GDI32: GetBitmapDimensionEx %x (%d,%d)", hBitmap, pSize->cx, pSize->cy));
+    return O32_GetBitmapDimensionEx(hBitmap, pSize);
 }
 //******************************************************************************
@@ -251 +252 @@
     dprintf(("GDI32: SetDIBits %x %x %x %x %x %x %x\n", arg1, arg2, arg3, arg4, arg5, arg6, arg7));
 
-    if(DIBSection::getSection() != NULL) {
+    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 dsect->SetDIBits(arg1, arg2, arg3, arg4, arg5, (BITMAPINFOHEADER_W *)&arg6->bmiHeader, arg7);
         }
     }