reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-25 12:49:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Select the dibsection into a dc before calling GetDIBColorTable.

Browse Source
This commit is contained in:
Huw Davies 2004-03-30 20:38:45 +00:00 committed by Alexandre Julliard
parent 96db7b27f8
commit fddf5ce12c
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
objects/dib.c
View File

@ -415,12 +415,19 @@ INT WINAPI GetDIBits(
DC * dc;
BITMAPOBJ * bmp;
int i;
HDC memdc;
if (!info) return 0;
if (!(dc = DC_GetDCUpdate( hdc ))) return 0;
memdc = CreateCompatibleDC(hdc);
if (!(dc = DC_GetDCUpdate( hdc )))
{
DeleteDC(memdc);
return 0;
}
if (!(bmp = (BITMAPOBJ *)GDI_GetObjPtr( hbitmap, BITMAP_MAGIC )))
{
GDI_ReleaseObj( hdc );
DeleteDC(memdc);
return 0;
}
@ -433,8 +440,12 @@ INT WINAPI GetDIBits(
/* If the bitmap object already has a dib section at the
same color depth then get the color map from it */
if (bmp->dib && bmp->dib->dsBm.bmBitsPixel == info->bmiHeader.biBitCount) {
if(coloruse == DIB_RGB_COLORS)
GetDIBColorTable(hdc, 0, 1 << info->bmiHeader.biBitCount, info->bmiColors);
if(coloruse == DIB_RGB_COLORS) {
HBITMAP oldbm;
oldbm = SelectObject(memdc, hbitmap);
GetDIBColorTable(memdc, 0, 1 << info->bmiHeader.biBitCount, info->bmiColors);
SelectObject(memdc, oldbm);
}
else {
WORD *index = (WORD*)info->bmiColors;
int i;
@ -450,6 +461,7 @@ INT WINAPI GetDIBits(
if (!(palette = (PALETTEOBJ*)GDI_GetObjPtr( dc->hPalette, PALETTE_MAGIC ))) {
GDI_ReleaseObj( hdc );
GDI_ReleaseObj( hbitmap );
DeleteDC(memdc);
return 0;
}
palEntry = palette->logpalette.palPalEntry;
@ -742,7 +754,7 @@ INT WINAPI GetDIBits(
GDI_ReleaseObj( hdc );
GDI_ReleaseObj( hbitmap );
DeleteDC(memdc);
return lines;
}