[PATCH 3/4] gdiplus/metafile: Implement EmfPlusImage deserialization for ImageDataTypeBitmap image type

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/gdiplus/gdiplus_private.h |  1 +
 dlls/gdiplus/metafile.c        | 59 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 95445e879a..f659ccf1c1 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -394,6 +394,7 @@ struct emfplus_object {
     EmfPlusObjectType type;
     union {
         GpBrush *brush;
+        GpImage *image;
         GpImageAttributes *image_attributes;
         void *object;
     } u;
diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index 5542bfea62..0683b797e9 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -367,6 +367,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id)
     case ObjectTypeBrush:
         GdipDeleteBrush(object->u.brush);
         break;
+    case ObjectTypeImage:
+        GdipDisposeImage(object->u.image);
+        break;
     case ObjectTypeImageAttributes:
         GdipDisposeImageAttributes(object->u.image_attributes);
         break;
@@ -1483,6 +1486,62 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d
         }
         break;
     }
+    case ObjectTypeImage:
+    {
+        EmfPlusImage *data = (EmfPlusImage *)record_data;
+        GpImage *image = NULL;
+
+        if (data_size < FIELD_OFFSET(EmfPlusImage, ImageData))
+            return InvalidParameter;
+
+        data_size -= FIELD_OFFSET(EmfPlusImage, ImageData);
+
+        switch (data->Type)
+        {
+        case ImageDataTypeBitmap:
+        {
+            EmfPlusBitmap *bitmapdata = &data->ImageData.bitmap;
+
+            if (data_size <= FIELD_OFFSET(EmfPlusBitmap, BitmapData))
+                return InvalidParameter;
+            data_size -= FIELD_OFFSET(EmfPlusBitmap, BitmapData);
+
+            switch (bitmapdata->Type)
+            {
+            case BitmapDataTypePixel:
+            {
+                if (data_size < bitmapdata->Height * bitmapdata->Stride)
+                    return InvalidParameter;
+
+                status = GdipCreateBitmapFromScan0(bitmapdata->Width, bitmapdata->Height, bitmapdata->Stride,
+                    bitmapdata->PixelFormat, bitmapdata->BitmapData, (GpBitmap **)&image);
+                break;
+            }
+            case BitmapDataTypeCompressed:
+            {
+                IStream *stream;
+
+                if (!(stream = SHCreateMemStream(bitmapdata->BitmapData, data_size)))
+                    return OutOfMemory;
+
+                status = GdipCreateBitmapFromStream(stream, (GpBitmap **)&image);
+                IStream_Release(stream);
+                break;
+            }
+            default:
+                WARN("Invalid bitmap type %d.\n", bitmapdata->Type);
+                return InvalidParameter;
+            }
+        break;
+        }
+        default:
+            FIXME("image type %d not supported.\n", data->Type);
+            return NotImplemented;
+        }
+
+        object = image;
+        break;
+    }
     case ObjectTypeImageAttributes:
     {
         EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;
-- 
2.14.2