Skip to content

W
wine-winehq
Commit c011267b authored by Eric Kohl's avatar Eric Kohl Committed by Alexandre Julliard
Browse files
Options

Fixed retrieval of invalid palette data in GetDIBits().

parent 04e57f97
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 5 deletions
objects/dib.c
View file @ c011267b
...@@ -461,12 +461,13 @@ INT32 WINAPI GetDIBits32( ...@@ -461,12 +461,13 @@ INT32 WINAPI GetDIBits32(
return 0; return 0;
} }
/* Transfer color info */ /* Transfer color info (FIXME) */
if (info->bmiHeader.biBitCount<=8) { if (info && (info->bmiHeader.biBitCount <= 8) &&
int colors = info->bmiHeader.biClrUsed; (bmp->bitmap.bmBitsPixel <= 8))
if (!colors && (info->bmiHeader.biBitCount <= 8)) {
colors = 1 << info->bmiHeader.biBitCount; int colors = 1 << info->bmiHeader.biBitCount;
info->bmiHeader.biClrUsed = 0;
palEntry = palette->logpalette.palPalEntry; palEntry = palette->logpalette.palPalEntry;
for (i = 0; i < colors; i++, palEntry++) for (i = 0; i < colors; i++, palEntry++)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment