gdiplus: Fix GdipCreateBitmapFromHBITMAP flipping images vertically.

GdipCreateBitmapFromHBITMAP currently assumes that all bitmaps are top-down, even though a positive height (which it also assumes) signals a bottom-up DIB. The net result is that GdipCreateBitmapFromHBITMAP flips images vertically.

gdiplus: Fix GdipCreateBitmapFromHBITMAP flipping images vertically.
f365ef46 · Vincent Povirk · Alexandre Julliard · 65750fab · f365ef46
Commit f365ef46 authored Feb 17, 2009 by Vincent Povirk Committed by Alexandre Julliard Feb 18, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

image.c dlls/gdiplus/image.c +11 -2

No files found.
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -1499,6 +1499,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi
    BITMAP bm;
    GpStatus retval;
    PixelFormat format;
+    BYTE* bits;

    TRACE("%p %p %p\n", hbm, hpal, bitmap);

@@ -1539,8 +1540,16 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHBITMAP(HBITMAP hbm, HPALETTE hpal, GpBi
            return InvalidParameter;
    }

-    retval = GdipCreateBitmapFromScan0(bm.bmWidth, bm.bmHeight, bm.bmWidthBytes,
-        format, bm.bmBits, bitmap);
+    if (bm.bmBits)
+        bits = (BYTE*)bm.bmBits + (bm.bmHeight - 1) * bm.bmWidthBytes;
+    else
+    {
+        FIXME("can only get image data from DIB sections\n");
+        bits = NULL;
+    }
+
+    retval = GdipCreateBitmapFromScan0(bm.bmWidth, bm.bmHeight, -bm.bmWidthBytes,
+        format, bits, bitmap);

    return retval;
 }