Nikolay Sivov : gdiplus/metafile: Implement DrawRectangles() recording.
Alexandre Julliard
julliard at winehq.org
Mon Mar 22 17:15:52 CDT 2021
Module: wine
Branch: master
Commit: 81bbc4872e8f5fb88916cd79bc6ef8b2c15dff83
URL: https://source.winehq.org/git/wine.git/?a=commit;h=81bbc4872e8f5fb88916cd79bc6ef8b2c15dff83
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Mar 18 15:18:03 2021 +0300
gdiplus/metafile: Implement DrawRectangles() recording.
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Esme Povirk <esme at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gdiplus/gdiplus_private.h | 1 +
dlls/gdiplus/graphics.c | 3 +++
dlls/gdiplus/metafile.c | 56 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 60 insertions(+)
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index 9b608035909..a617ca4803e 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -112,6 +112,7 @@ extern GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush,
extern void METAFILE_Free(GpMetafile *metafile) DECLSPEC_HIDDEN;
extern GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) DECLSPEC_HIDDEN;
extern GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rect) DECLSPEC_HIDDEN;
+extern GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count) DECLSPEC_HIDDEN;
extern void calc_curve_bezier(const GpPointF *pts, REAL tension, REAL *x1,
REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN;
diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index c2c116acf94..2c18ced3e92 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -4132,6 +4132,9 @@ GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen,
if(graphics->busy)
return ObjectBusy;
+ if (is_metafile_graphics(graphics))
+ return METAFILE_DrawRectangles((GpMetafile *)graphics->image, pen, rects, count);
+
status = GdipCreatePath(FillModeAlternate, &path);
if (status != Ok) return status;
diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index c285dc58f40..eafcdaee963 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -5102,3 +5102,59 @@ GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* reg
return Ok;
}
+
+GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF *rects, INT count)
+{
+ EmfPlusDrawRects *record;
+ GpStatus stat;
+ BOOL integer_rects = TRUE;
+ DWORD pen_id;
+ int i;
+
+ if (metafile->metafile_type == MetafileTypeEmf)
+ {
+ FIXME("stub!\n");
+ return NotImplemented;
+ }
+
+ stat = METAFILE_AddPenObject(metafile, pen, &pen_id);
+ if (stat != Ok) return stat;
+
+ for (i = 0; i < count; i++)
+ {
+ if (!is_integer_rect(&rects[i]))
+ {
+ integer_rects = FALSE;
+ break;
+ }
+ }
+
+ stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawRects, RectData) +
+ count * (integer_rects ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF)),
+ (void **)&record);
+ if (stat != Ok)
+ return stat;
+
+ record->Header.Type = EmfPlusRecordTypeDrawRects;
+ record->Header.Flags = pen_id;
+ if (integer_rects)
+ record->Header.Flags |= 0x4000;
+ record->Count = count;
+
+ if (integer_rects)
+ {
+ for (i = 0; i < count; i++)
+ {
+ record->RectData.rect[i].X = (SHORT)rects[i].X;
+ record->RectData.rect[i].Y = (SHORT)rects[i].Y;
+ record->RectData.rect[i].Width = (SHORT)rects[i].Width;
+ record->RectData.rect[i].Height = (SHORT)rects[i].Height;
+ }
+ }
+ else
+ memcpy(record->RectData.rectF, rects, sizeof(*rects) * count);
+
+ METAFILE_WriteRecords(metafile);
+
+ return Ok;
+}
More information about the wine-cvs
mailing list