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

gdiplus: Add helper for saving path objects in metafile. 

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Vincent Povirk <vincent@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Piotr Caban 2017-07-13 11:53:48 +02:00 committed by Alexandre Julliard
parent 8608bf532e
commit e502a8dd07
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
dlls/gdiplus/metafile.c
View File

@ -157,6 +157,17 @@ typedef struct container
GpRegion *clip; GpRegion *clip;
} container; } container;
typedef struct EmfPlusPath
{
DWORD Version;
DWORD PathPointCount;
DWORD PathPointFlags;
/* PathPoints[] */
/* PathPointTypes[] */
/* AlignmentPadding */
BYTE data[1];
} EmfPlusPath;
typedef enum typedef enum
{ {
BitmapDataTypePixel, BitmapDataTypePixel,
@ -235,6 +246,7 @@ typedef struct EmfPlusObject
EmfPlusRecordHeader Header; EmfPlusRecordHeader Header;
union union
{ {
EmfPlusPath path;
EmfPlusImage image; EmfPlusImage image;
EmfPlusImageAttributes image_attributes; EmfPlusImageAttributes image_attributes;
} ObjectData; } ObjectData;
@ -2570,8 +2582,57 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val)
return Ok; return Ok;
} }
static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD *id)
{
EmfPlusObject *object_record;
EmfPlusPointF *points;
BYTE *types;
GpStatus stat;
DWORD i, size;
if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual)
return Ok;
/* TODO: Add support for more point formats */
size = sizeof(EmfPlusPointF)*path->pathdata.Count + path->pathdata.Count;
size = (size + 3) & ~3;
stat = METAFILE_AllocateRecord(metafile,
FIELD_OFFSET(EmfPlusObject, ObjectData.path.data[size]),
(void**)&object_record);
if (stat != Ok) return stat;
*id = METAFILE_AddObjectId(metafile);
object_record->Header.Type = EmfPlusRecordTypeObject;
object_record->Header.Flags = *id | ObjectTypePath << 8;
object_record->ObjectData.path.Version = 0xDBC01002;
object_record->ObjectData.path.PathPointCount = path->pathdata.Count;
object_record->ObjectData.path.PathPointFlags = 0;
points = (EmfPlusPointF*)object_record->ObjectData.path.data;
for (i=0; i<path->pathdata.Count; i++)
{
points[i].X = path->pathdata.Points[i].X;
points[i].Y = path->pathdata.Points[i].Y;
}
types = (BYTE*)(points + path->pathdata.Count);
for (i=0; i<path->pathdata.Count; i++)
types[i] = path->pathdata.Types[i];
return Ok;
}
GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path)
{ {
FIXME("stub\n"); DWORD path_id;
GpStatus stat;
FIXME("stub!\n");
stat = METAFILE_AddPathObject(metafile, path, &path_id);
if (stat != Ok) return stat;
METAFILE_WriteRecords(metafile);
return NotImplemented; return NotImplemented;
} }

2
dlls/gdiplus/tests/metafile.c
View File

@ -2486,7 +2486,7 @@ static void test_properties(void)
static const emfplus_record draw_path_records[] = { static const emfplus_record draw_path_records[] = {
{0, EMR_HEADER}, {0, EMR_HEADER},
{0, EmfPlusRecordTypeHeader}, {0, EmfPlusRecordTypeHeader},
{1, EmfPlusRecordTypeObject}, {0, EmfPlusRecordTypeObject},
{1, EmfPlusRecordTypeObject}, {1, EmfPlusRecordTypeObject},
{1, EmfPlusRecordTypeDrawPath}, {1, EmfPlusRecordTypeDrawPath},
{1, EMR_SAVEDC}, {1, EMR_SAVEDC},