gdi32: Calculate the stride from the image size.

This allows bitmaps to be created by D3DKMTCreateDCFromMemory() which have more freedom in their choice of stride. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Calculate the stride from the image size.
0bec2f79 · Huw Davies · Alexandre Julliard · a4f0415a · 0bec2f79
Commit 0bec2f79 authored Feb 13, 2017 by Huw Davies Committed by Alexandre Julliard Feb 13, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

dc.c dlls/gdi32/dibdrv/dc.c +4 -1

No files found.
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -154,7 +154,10 @@ static void init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, int stride,

 void init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits)
 {
-    init_dib_info( dib, &info->bmiHeader, get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ),
+    int width_bytes = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount );
+    if (info->bmiHeader.biSizeImage)
+        width_bytes = info->bmiHeader.biSizeImage / abs( info->bmiHeader.biHeight );
+    init_dib_info( dib, &info->bmiHeader, width_bytes,
                   (const DWORD *)info->bmiColors, info->bmiColors, bits );
 }