winex11: Copy icon color table in 256-color mode (Valgrind).

Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winex11: Copy icon color table in 256-color mode (Valgrind).
7dd3abe6 · Alex Henrie · Alexandre Julliard · 293dae8f · 7dd3abe6
Commit 7dd3abe6 authored Oct 15, 2019 by Alex Henrie Committed by Alexandre Julliard Oct 17, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

bitblt.c dlls/winex11.drv/bitblt.c +2 -1

No files found.
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -924,13 +924,14 @@ static void free_ximage_bits( struct gdi_image_bits *bits )
    XFree( bits->ptr );
 }

-/* only for use on sanitized BITMAPINFO structures */
 static inline int get_dib_info_size( const BITMAPINFO *info, UINT coloruse )
 {
    if (info->bmiHeader.biCompression == BI_BITFIELDS)
        return sizeof(BITMAPINFOHEADER) + 3 * sizeof(DWORD);
    if (coloruse == DIB_PAL_COLORS)
        return sizeof(BITMAPINFOHEADER) + info->bmiHeader.biClrUsed * sizeof(WORD);
+    if (!info->bmiHeader.biClrUsed && info->bmiHeader.biBitCount <= 8)
+        return FIELD_OFFSET( BITMAPINFO, bmiColors[1 << info->bmiHeader.biBitCount] );
    return FIELD_OFFSET( BITMAPINFO, bmiColors[info->bmiHeader.biClrUsed] );
 }