[patch] wine-20050310-dib.c.patch

wine-20050310-dib.c.patch (text/plain), 1.19 KB, created by Alan Jones on 2005-04-11 06:53:55 UTC

--- dlls/x11drv/dib.c	1 Mar 2005 10:43:19 -0000	1.23
+++ dlls/x11drv/dib.c	23 Mar 2005 21:16:18 -0000
@@ -415,18 +415,25 @@
     else
     {
         HPALETTE hpal = GetCurrentObject(physDev->hdc, OBJ_PAL);
-        PALETTEENTRY pal_ents[256];
+	PALETTEOBJ * palPtr = GDI_GetObjPtr( hpal, PALETTE_MAGIC );
         WORD *index = (WORD*) ((LPBYTE) info + (WORD) info->bmiHeader.biSize);
+	int entry;
 
-        GetPaletteEntries(hpal, 0, 256, pal_ents);
+	if( !palPtr ) return 0;
 
         for(i = 0; i < colors; i++, index++)
         {
-            colorTable[i].rgbRed = pal_ents[*index].peRed;
-            colorTable[i].rgbGreen = pal_ents[*index].peGreen;
-            colorTable[i].rgbBlue = pal_ents[*index].peBlue;
+	    if( *index > palPtr->logpalette.palNumEntries )
+		entry = palPtr->logpalette.palNumEntries;
+	    else
+		entry = *index;
+
+            colorTable[i].rgbRed = palPtr->logpalette.palPalEntry[entry].peRed;
+            colorTable[i].rgbGreen = palPtr->logpalette.palPalEntry[entry].peGreen;
+            colorTable[i].rgbBlue = palPtr->logpalette.palPalEntry[entry].peBlue;
             colorTable[i].rgbReserved = 0;
         }
+	GDI_ReleaseObj( hpal );
     }
     return colorTable;
 }