From: Alexandre Julliard Date: Wed, 21 Apr 2010 12:56:22 +0000 (+0200) Subject: gdi32: Fix handling of bitmap header size for V4/V5 bitmaps. X-Git-Tag: wine-1.1.44~461 X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=50500d1a0b35a9b4dfcff8f70e93dcfe5f50fe31;p=wine%2Feterwine.git gdi32: Fix handling of bitmap header size for V4/V5 bitmaps. --- diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index eebc321765..1b34a34104 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -139,7 +139,7 @@ int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) if (!colors && (info->bmiHeader.biBitCount <= 8)) colors = 1 << info->bmiHeader.biBitCount; if (info->bmiHeader.biCompression == BI_BITFIELDS) masks = 3; - return sizeof(BITMAPINFOHEADER) + masks * sizeof(DWORD) + colors * + return info->bmiHeader.biSize + masks * sizeof(DWORD) + colors * ((coloruse == DIB_RGB_COLORS) ? sizeof(RGBQUAD) : sizeof(WORD)); } }