Vincent Povirk : gdiplus: Copy palettes with bitmaps.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 500a96d07964970b7d6e3f4d699dc28051180bb8
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=500a96d07964970b7d6e3f4d69...

Author: Vincent Povirk 
Date:   Mon Mar 24 16:36:35 2014 -0500

gdiplus: Copy palettes with bitmaps.

---

dlls/gdiplus/image.c |   22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index f734274..20098ca 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -1252,6 +1252,28 @@ GpStatus WINGDIPAPI GdipCloneBitmapArea(REAL x, REAL y, REAL width, REAL height,
                               srcBitmap->stride,
                               srcBitmap->bits + srcBitmap->stride * area.Y + PIXELFORMATBPP(srcBitmap->format) * area.X / 8,
                               srcBitmap->format, srcBitmap->image.palette);
+
+        if (stat == Ok && srcBitmap->image.palette)
+        {
+            ColorPalette *src_palette, *dst_palette;
+
+            src_palette = srcBitmap->image.palette;
+
+            dst_palette = GdipAlloc(sizeof(UINT) * 2 + sizeof(ARGB) * src_palette->Count);
+
+            if (dst_palette)
+            {
+                dst_palette->Flags = src_palette->Flags;
+                dst_palette->Count = src_palette->Count;
+                memcpy(dst_palette->Entries, src_palette->Entries, sizeof(ARGB) * src_palette->Count);
+
+                GdipFree((*dstBitmap)->image.palette);
+                (*dstBitmap)->image.palette = dst_palette;
+            }
+            else
+                stat = OutOfMemory;
+        }
+
         if (stat != Ok)
             GdipDisposeImage((GpImage*)*dstBitmap);
     }