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

gdiplus: Implement drawing metafiles with an emf handle.

Browse Source
This commit is contained in:
Vincent Povirk 2012-10-31 13:36:00 -05:00 committed by Alexandre Julliard
parent 954b49382f
commit 0cbec5508b
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/gdiplus/graphics.c
View File

@ -3085,6 +3085,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image,
return GdipDrawImagePoints(graphics, image, ptf, count); return GdipDrawImagePoints(graphics, image, ptf, count);
} }
static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned int flags,
unsigned int dataSize, const unsigned char *pStr, void *userdata)
{
GdipPlayMetafileRecord(userdata, record_type, flags, dataSize, pStr);
return TRUE;
}
GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image,
GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth,
REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes,
@ -3379,10 +3386,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
DeleteObject(hbitmap); DeleteObject(hbitmap);
} }
} }
else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf)
{
GpRectF rc;
rc.X = srcx;
rc.Y = srcy;
rc.Width = srcwidth;
rc.Height = srcheight;
return GdipEnumerateMetafileSrcRectDestPoints(graphics, (GpMetafile*)image,
points, count, &rc, srcUnit, play_metafile_proc, image, imageAttributes);
}
else else
{ {
ERR("GpImage with no IPicture or HBITMAP?!\n"); WARN("GpImage with nothing we can draw (metafile in wrong state?)\n");
return NotImplemented; return InvalidParameter;
} }
return Ok; return Ok;

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

@ -431,7 +431,7 @@ static void test_getdc(void)
stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3,
0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL);
todo_wine expect(Ok, stat); expect(Ok, stat);
stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); stat = GdipBitmapGetPixel(bitmap, 15, 15, &color);
expect(Ok, stat); expect(Ok, stat);
@ -439,7 +439,7 @@ static void test_getdc(void)
stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); stat = GdipBitmapGetPixel(bitmap, 50, 50, &color);
expect(Ok, stat); expect(Ok, stat);
todo_wine expect(0xff0000ff, color); expect(0xff0000ff, color);
stat = GdipDeleteGraphics(graphics); stat = GdipDeleteGraphics(graphics);
expect(Ok, stat); expect(Ok, stat);
@ -550,7 +550,7 @@ static void test_emfonly(void)
stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3,
0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL);
todo_wine expect(Ok, stat); expect(Ok, stat);
stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); stat = GdipBitmapGetPixel(bitmap, 15, 15, &color);
expect(Ok, stat); expect(Ok, stat);
@ -558,7 +558,7 @@ static void test_emfonly(void)
stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); stat = GdipBitmapGetPixel(bitmap, 50, 50, &color);
expect(Ok, stat); expect(Ok, stat);
todo_wine expect(0xff0000ff, color); expect(0xff0000ff, color);
stat = GdipDeleteGraphics(graphics); stat = GdipDeleteGraphics(graphics);
expect(Ok, stat); expect(Ok, stat);