Changeset 5825 for trunk/src/gdi32/dibitmap.cpp

Timestamp:

May 29, 2001, 11:45:21 AM (24 years ago)

Author:

sandervl

Message:

Set/GetDIBColorTable fixes + SelectPalette hack

File:

• trunk/src/gdi32/dibitmap.cpp (modified) (3 diffs)

trunk/src/gdi32/dibitmap.cpp

@@ -1 @@
-/* $Id: dibitmap.cpp,v 1.16 2001-05-25 10:05:28 sandervl Exp $ */
+/* $Id: dibitmap.cpp,v 1.17 2001-05-29 09:45:21 sandervl Exp $ */
 
 /*
@@ -203 +203 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API GetDIBColorTable( HDC hdc, UINT uStartIndex, UINT cEntries,
-                                  RGBQUAD *pColors)
-{
- HPALETTE hpal = GetCurrentObject(hdc, OBJ_PAL);
+UINT WIN32API GetDIBColorTable(HDC hdc, UINT uStartIndex, UINT cEntries,
+                               RGBQUAD *pColors)
+{
+ DIBSection *dsect = DIBSection::findHDC(hdc);
  UINT rc;
  int i;
 
-  rc = O32_GetPaletteEntries(hpal,
-                         uStartIndex,
-                         cEntries,
-                         (PALETTEENTRY *)pColors);
+  dprintf(("GetDIBColorTable %x %d->%d %x", hdc, uStartIndex, cEntries, pColors));
+
+  if(dsect)
+  {
+       return(dsect->GetDIBColorTable(uStartIndex, cEntries, pColors));
+  }
+  //TODO: Is this correct?????
+  //      Wine returns 0 if bitmap selected into dc with bpp > 8
+  HPALETTE hpal = GetCurrentObject(hdc, OBJ_PAL);
+  rc = O32_GetPaletteEntries(hpal, uStartIndex,
+                             cEntries, (PALETTEENTRY *)pColors);
   for(i=0;
       i<cEntries;
@@ -230 +237 @@
 //******************************************************************************
 UINT WIN32API SetDIBColorTable(HDC hdc, UINT uStartIndex, UINT cEntries,
-                                  RGBQUAD *pColors)
+                               RGBQUAD *pColors)
 {
  DIBSection *dsect = DIBSection::findHDC(hdc);
 
-  dprintf(("GDI32: SetDIBColorTable\n"));
+  dprintf(("GDI32: SetDIBColorTable %x %d,%d %x", hdc, uStartIndex, cEntries, pColors));
   if(dsect)
   {