Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawRects.

Alexandre Julliard julliard at winehq.org
Fri Nov 3 18:05:39 CDT 2017


Module: wine
Branch: master
Commit: e934c4c06fee9de9cca8d053632cc5301e496f5a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e934c4c06fee9de9cca8d053632cc5301e496f5a

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Nov  3 09:49:12 2017 +0300

gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawRects.

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 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index c5c72e2..614fc43 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -444,6 +444,17 @@ typedef struct EmfPlusDrawPie
     } RectData;
 } EmfPlusDrawPie;
 
+typedef struct EmfPlusDrawRects
+{
+    EmfPlusRecordHeader Header;
+    DWORD Count;
+    union
+    {
+        EmfPlusRect rect[1];
+        EmfPlusRectF rectF[1];
+    } RectData;
+} EmfPlusDrawRects;
+
 typedef struct EmfPlusFillPath
 {
     EmfPlusRecordHeader Header;
@@ -2895,6 +2906,44 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile,
                     draw->RectData.rectF.X, draw->RectData.rectF.Y, draw->RectData.rectF.Width,
                     draw->RectData.rectF.Height, draw->StartAngle, draw->SweepAngle);
         }
+        case EmfPlusRecordTypeDrawRects:
+        {
+            EmfPlusDrawRects *draw = (EmfPlusDrawRects *)header;
+            BYTE pen = flags & 0xff;
+            GpRectF *rects = NULL;
+
+            if (pen >= EmfPlusObjectTableSize || real_metafile->objtable[pen].type != ObjectTypePen)
+                return InvalidParameter;
+
+            if (dataSize <= FIELD_OFFSET(EmfPlusDrawRects, RectData) - sizeof(EmfPlusRecordHeader))
+                return InvalidParameter;
+            dataSize -= FIELD_OFFSET(EmfPlusDrawRects, RectData) - sizeof(EmfPlusRecordHeader);
+
+            if (dataSize != draw->Count * (flags & 0x4000 ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF)))
+                return InvalidParameter;
+
+            if (flags & 0x4000)
+            {
+                DWORD i;
+
+                rects = GdipAlloc(draw->Count * sizeof(*rects));
+                if (!rects)
+                    return OutOfMemory;
+
+                for (i = 0; i < draw->Count; i++)
+                {
+                    rects[i].X = draw->RectData.rect[i].X;
+                    rects[i].Y = draw->RectData.rect[i].Y;
+                    rects[i].Width = draw->RectData.rect[i].Width;
+                    rects[i].Height = draw->RectData.rect[i].Height;
+                }
+            }
+
+            stat = GdipDrawRectangles(real_metafile->playback_graphics, real_metafile->objtable[pen].u.pen,
+                    rects ? rects : (GpRectF *)draw->RectData.rectF, draw->Count);
+            GdipFree(rects);
+            return stat;
+        }
         default:
             FIXME("Not implemented for record type %x\n", recordType);
             return NotImplemented;




More information about the wine-cvs mailing list