Nikolay Sivov : gdiplus/metafile: Support solid brushes in EmfPlusRecordTypeObject record playback.
Alexandre Julliard
julliard at winehq.org
Fri Oct 13 18:44:16 CDT 2017
Module: wine
Branch: master
Commit: ce315b9f86b4acb0759e7b4bcf085059d5df3d83
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce315b9f86b4acb0759e7b4bcf085059d5df3d83
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Fri Oct 13 14:10:26 2017 +0300
gdiplus/metafile: Support solid brushes in EmfPlusRecordTypeObject record playback.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Vincent Povirk <vincent at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdiplus/gdiplus_private.h | 1 +
dlls/gdiplus/metafile.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index d6ccb95..95445e8 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -393,6 +393,7 @@ typedef enum EmfPlusObjectType
struct emfplus_object {
EmfPlusObjectType type;
union {
+ GpBrush *brush;
GpImageAttributes *image_attributes;
void *object;
} u;
diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index 78ea854..de208a8 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -364,6 +364,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id)
{
case ObjectTypeInvalid:
break;
+ case ObjectTypeBrush:
+ GdipDeleteBrush(object->u.brush);
+ break;
case ObjectTypeImageAttributes:
GdipDisposeImageAttributes(object->u.image_attributes);
break;
@@ -1443,6 +1446,33 @@ static void metafile_set_object_table_entry(GpMetafile *metafile, BYTE id, BYTE
metafile->objtable[id].u.object = object;
}
+static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush)
+{
+ static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData);
+ EmfPlusBrush *data = (EmfPlusBrush *)record_data;
+ GpStatus status;
+
+ *brush = NULL;
+
+ if (data_size < header_size)
+ return InvalidParameter;
+
+ switch (data->Type)
+ {
+ case BrushTypeSolidColor:
+ if (data_size != header_size + sizeof(EmfPlusSolidBrushData))
+ return InvalidParameter;
+
+ status = GdipCreateSolidFill(*(ARGB *)&data->BrushData.solid.SolidColor, (GpSolidFill **)brush);
+ break;
+ default:
+ FIXME("brush type %u is not supported.\n", data->Type);
+ return NotImplemented;
+ }
+
+ return status;
+}
+
static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT data_size, const BYTE *record_data)
{
BYTE type = (flags >> 8) & 0xff;
@@ -1455,6 +1485,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d
switch (type)
{
+ case ObjectTypeBrush:
+ status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object);
+ break;
case ObjectTypeImageAttributes:
{
EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;
More information about the wine-cvs
mailing list