marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus/metafile: Support solid brushes in EmfPlusRecordTypeObject record playback. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Nikolay Sivov 2017-10-13 14:10:26 +03:00 committed by Alexandre Julliard
parent bcc8791bc1
commit ce315b9f86
2 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/gdiplus/gdiplus_private.h
View File

@ -393,6 +393,7 @@ typedef enum EmfPlusObjectType
struct emfplus_object {
EmfPlusObjectType type;
union {
GpBrush *brush;
GpImageAttributes *image_attributes;
void *object;
} u;

33
dlls/gdiplus/metafile.c
View File

@ -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;