Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawImage.
Alexandre Julliard
julliard at winehq.org
Thu Nov 2 17:28:50 CDT 2017
Module: wine
Branch: master
Commit: 5787727f9e6e8566e81692235abad12ced1db7a9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5787727f9e6e8566e81692235abad12ced1db7a9
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Nov 2 14:10:42 2017 +0300
gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawImage.
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/metafile.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index 8e9ad87..9beb3a3 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -398,6 +398,19 @@ typedef struct EmfPlusPointF
float Y;
} EmfPlusPointF;
+typedef struct EmfPlusDrawImage
+{
+ EmfPlusRecordHeader Header;
+ DWORD ImageAttributesID;
+ DWORD SrcUnit;
+ EmfPlusRectF SrcRect;
+ union
+ {
+ EmfPlusRect rect;
+ EmfPlusRectF rectF;
+ } RectData;
+} EmfPlusDrawImage;
+
typedef struct EmfPlusDrawImagePoints
{
EmfPlusRecordHeader Header;
@@ -2696,6 +2709,46 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile,
{
return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data);
}
+ case EmfPlusRecordTypeDrawImage:
+ {
+ EmfPlusDrawImage *draw = (EmfPlusDrawImage *)header;
+ BYTE image = flags & 0xff;
+ GpPointF points[3];
+
+ if (image >= EmfPlusObjectTableSize || real_metafile->objtable[image].type != ObjectTypeImage)
+ return InvalidParameter;
+
+ if (dataSize != FIELD_OFFSET(EmfPlusDrawImage, RectData) - sizeof(EmfPlusRecordHeader) +
+ (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF)))
+ return InvalidParameter;
+
+ if (draw->ImageAttributesID >= EmfPlusObjectTableSize ||
+ real_metafile->objtable[draw->ImageAttributesID].type != ObjectTypeImageAttributes)
+ return InvalidParameter;
+
+ if (flags & 0x4000) /* C */
+ {
+ points[0].X = draw->RectData.rect.X;
+ points[0].Y = draw->RectData.rect.Y;
+ points[1].X = points[0].X + draw->RectData.rect.Width;
+ points[1].Y = points[0].Y;
+ points[2].X = points[1].X;
+ points[2].Y = points[1].Y + draw->RectData.rect.Height;
+ }
+ else
+ {
+ points[0].X = draw->RectData.rectF.X;
+ points[0].Y = draw->RectData.rectF.Y;
+ points[1].X = points[0].X + draw->RectData.rectF.Width;
+ points[1].Y = points[0].Y;
+ points[2].X = points[1].X;
+ points[2].Y = points[1].Y + draw->RectData.rectF.Height;
+ }
+
+ return GdipDrawImagePointsRect(real_metafile->playback_graphics, real_metafile->objtable[image].u.image,
+ points, 3, draw->SrcRect.X, draw->SrcRect.Y, draw->SrcRect.Width, draw->SrcRect.Height, draw->SrcUnit,
+ real_metafile->objtable[draw->ImageAttributesID].u.image_attributes, NULL, NULL);
+ }
case EmfPlusRecordTypeDrawImagePoints:
{
EmfPlusDrawImagePoints *draw = (EmfPlusDrawImagePoints *)header;
More information about the wine-cvs
mailing list