marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Don't make a copy of the DIB color table when selecting it into a DC.

oldstable
Alexandre Julliard 2011-12-08 17:04:14 +01:00
parent 910fb48291
commit 71199eab77
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/gdi32/dibdrv/dc.c
View File

@ -422,7 +422,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap )
free_dib_info(&pdev->dib);
pdev->defer = 0;
if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table))
if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, 0))
pdev->defer |= DEFER_FORMAT;
GDI_ReleaseObj( bitmap );
@ -495,11 +495,8 @@ static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RG
dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
TRACE("(%p, %d, %d, %p)\n", dev, pos, count, colors);
if( pdev->dib.color_table && pos < pdev->dib.color_table_size )
if (pdev->dib.color_table)
{
if( pos + count > pdev->dib.color_table_size ) count = pdev->dib.color_table_size - pos;
memcpy( pdev->dib.color_table + pos, colors, count * sizeof(RGBQUAD) );
pdev->bkgnd_color = get_pixel_color( pdev, GetBkColor( dev->hdc ), FALSE );
update_fg_colors( pdev );