system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 07:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid direct access to the palette structure.

Browse source
This commit is contained in:
Alexandre Julliard 2004-01-13 05:25:30 +00:00
parent 219731197a
commit c0faca0755
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/x11drv/dib.c
View file

@ -40,7 +40,6 @@
#include "x11drv.h"
#include "wine/debug.h"
#include "gdi.h"
#include "palette.h"
WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
WINE_DECLARE_DEBUG_CHANNEL(x11drv);
@ -3731,18 +3730,15 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
{
X11DRV_DIBSECTION *dib;
X11DRV_DIB_IMAGEBITS_DESCR descr;
PALETTEOBJ * palette;
PALETTEENTRY palette[256];
BITMAPOBJ *bmp;
int height;
DC *dc = physDev->dc;
if (!(palette = (PALETTEOBJ*)GDI_GetObjPtr( dc->hPalette, PALETTE_MAGIC )))
return 0;
if (!(bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC )))
{
GDI_ReleaseObj( dc->hPalette );
return 0;
}
GetPaletteEntries( dc->hPalette, 0, 256, palette );
if (!(bmp = (BITMAPOBJ *) GDI_GetObjPtr( hbitmap, BITMAP_MAGIC ))) return 0;
dib = (X11DRV_DIBSECTION *) bmp->dib;
TRACE("%u scanlines of (%i,%i) -> (%i,%i) starting from %u\n",
@ -3798,7 +3794,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
}
descr.physDev = physDev;
descr.palentry = palette->logpalette.palPalEntry;
descr.palentry = palette;
descr.bits = bits;
descr.image = NULL;
descr.lines = lines;
@ -3852,7 +3848,6 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
}
done:
GDI_ReleaseObj( dc->hPalette );
GDI_ReleaseObj( hbitmap );
return lines;
}