ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdiplus/metafile: Added support for EmfPlusFont objects. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-10-17 15:49:12 +03:00 committed by Alexandre Julliard
parent b203b76190
commit 7b99fe6f09
2 changed files with 43 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

@ -396,6 +396,7 @@ struct emfplus_object {
GpBrush *brush;
GpPath *path;
GpImage *image;
GpFont *font;
GpImageAttributes *image_attributes;
void *object;
} u;

42
dlls/gdiplus/metafile.c
View File

@ -377,6 +377,17 @@ typedef struct EmfPlusFillPath
} data;
} EmfPlusFillPath;
typedef struct EmfPlusFont
{
DWORD Version;
float EmSize;
DWORD SizeUnit;
DWORD FontStyleFlags;
DWORD Reserved;
DWORD Length;
WCHAR FamilyName[1];
} EmfPlusFont;
static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id)
{
struct emfplus_object *object = &metafile->objtable[id];
@ -394,6 +405,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id)
case ObjectTypeImage:
GdipDisposeImage(object->u.image);
break;
case ObjectTypeFont:
GdipDeleteFont(object->u.font);
break;
case ObjectTypeImageAttributes:
GdipDisposeImageAttributes(object->u.image_attributes);
break;
@ -1692,6 +1706,34 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d
case ObjectTypeImage:
status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object);
break;
case ObjectTypeFont:
{
EmfPlusFont *data = (EmfPlusFont *)record_data;
GpFontFamily *family;
WCHAR *familyname;
if (data_size <= FIELD_OFFSET(EmfPlusFont, FamilyName))
return InvalidParameter;
data_size -= FIELD_OFFSET(EmfPlusFont, FamilyName);
if (data_size < data->Length * sizeof(WCHAR))
return InvalidParameter;
if (!(familyname = GdipAlloc((data->Length + 1) * sizeof(*familyname))))
return OutOfMemory;
memcpy(familyname, data->FamilyName, data->Length * sizeof(*familyname));
familyname[data->Length] = 0;
status = GdipCreateFontFamilyFromName(familyname, NULL, &family);
GdipFree(familyname);
if (status != Ok)
return InvalidParameter;
status = GdipCreateFont(family, data->EmSize, data->FontStyleFlags, data->SizeUnit, (GpFont **)&object);
GdipDeleteFontFamily(family);
break;
}
case ObjectTypeImageAttributes:
{
EmfPlusImageAttributes *data = (EmfPlusImageAttributes *)record_data;