August 2016 - Wine-Commits - list.winehq.org

Daniel Lehman : concrt140: Add concrt140 stub.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 6682824d77ddc065318893f7b662e0538eaf6c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6682824d77ddc065318893f7b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Aug 3 16:57:08 2016 -0700 concrt140: Add concrt140 stub. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/concrt140/Makefile.in | 1 + dlls/concrt140/concrt140.spec | 533 ++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 538 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6682824d77ddc06531889…

1 0

Iván Matellanes : msvcirt: Implement ostream_withassign copy constructor.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 8d3a30c626e7c416b95711ed06ee95276e357af1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d3a30c626e7c416b95711ed0… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Aug 5 17:56:29 2016 +0100 msvcirt: Implement ostream_withassign copy constructor. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 31 ++++++- dlls/msvcirt/tests/msvcirt.c | 191 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 219 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d3a30c626e7c416b9571…

1 0

Vincent Povirk : gdiplus: Implement recording/ playback for SetWorldTransform.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 690e0f269caf110ce92ec5701a5ab30b5847ed38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690e0f269caf110ce92ec5701… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 5 16:14:39 2016 -0500 gdiplus: Implement recording/playback for SetWorldTransform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 9 +++++++++ dlls/gdiplus/metafile.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 34 ++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index e42e429..a4a2c53 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -90,6 +90,7 @@ extern GpStatus METAFILE_GraphicsClear(GpMetafile* metafile, ARGB color) DECLSPE extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* transform) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* matrix, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixOrder order) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5cab9cb..c04a847 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5488,6 +5488,8 @@ GpStatus WINGDIPAPI GdipSetTextRenderingHint(GpGraphics *graphics, GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix) { + GpStatus stat; + TRACE("(%p, %p)\n", graphics, matrix); if(!graphics || !matrix) @@ -5500,6 +5502,13 @@ GpStatus WINGDIPAPI GdipSetWorldTransform(GpGraphics *graphics, GpMatrix *matrix matrix->matrix[0], matrix->matrix[1], matrix->matrix[2], matrix->matrix[3], matrix->matrix[4], matrix->matrix[5]); + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + stat = METAFILE_SetWorldTransform((GpMetafile*)graphics->image, matrix); + + if (stat != Ok) + return stat; + } + graphics->worldtrans = *matrix; return Ok; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index aa0da21..7dbbf6d 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -84,6 +84,12 @@ typedef struct EmfPlusRect SHORT Height; } EmfPlusRect; +typedef struct EmfPlusSetWorldTransform +{ + EmfPlusRecordHeader Header; + REAL MatrixData[6]; +} EmfPlusSetWorldTransform; + typedef struct EmfPlusScaleWorldTransform { EmfPlusRecordHeader Header; @@ -574,6 +580,29 @@ GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale return Ok; } +GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* transform) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusSetWorldTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusSetWorldTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeSetWorldTransform; + record->Header.Flags = 0; + memcpy(record->MatrixData, transform->matrix, sizeof(record->MatrixData)); + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) @@ -1003,6 +1032,17 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeSetWorldTransform: + { + EmfPlusSetWorldTransform *record = (EmfPlusSetWorldTransform*)header; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusSetWorldTransform)) + return InvalidParameter; + + memcpy(real_metafile->world_transform->matrix, record->MatrixData, sizeof(record->MatrixData)); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } case EmfPlusRecordTypeScaleWorldTransform: { EmfPlusScaleWorldTransform *record = (EmfPlusScaleWorldTransform*)header; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 67e2b9d..49a1dd7 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1296,6 +1296,8 @@ static const emfplus_record worldtransform_records[] = { {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeRotateWorldTransform}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeSetWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -1448,6 +1450,34 @@ static void test_worldtransform(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + /* set transform */ + stat = GdipSetMatrixElements(transform, 1.0, 0.0, 0.0, 3.0, 0.0, 0.0); + expect(Ok, stat); + + stat = GdipSetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetMatrixElements(transform, elements); + expect(Ok, stat); + expectf(1.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(3.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + + stat = GdipCreateSolidFill((ARGB)0xffffff00, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0, 1.0, 1.0, 1.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + stat = GdipDeleteMatrix(transform); expect(Ok, stat); @@ -1490,6 +1520,10 @@ static void test_worldtransform(void) expect(Ok, stat); expect(0xffff00ff, color); + stat = GdipBitmapGetPixel(bitmap, 30, 90, &color); + expect(Ok, stat); + expect(0xffffff00, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Implement recording/ playback for RotateWorldTransform.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: cfae34a7e20b3fc6ce26b08766822ad3e715a9ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfae34a7e20b3fc6ce26b0876… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 5 16:14:38 2016 -0500 gdiplus: Implement recording/playback for RotateWorldTransform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 9 +++++++++ dlls/gdiplus/metafile.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 65135f8..e42e429 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -92,6 +92,7 @@ extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* matrix, MatrixOrder order) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 9b0d9b5..5cab9cb 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5156,6 +5156,8 @@ GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState stat GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, GpMatrixOrder order) { + GpStatus stat; + TRACE("(%p, %.2f, %d)\n", graphics, angle, order); if(!graphics) @@ -5164,6 +5166,13 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + stat = METAFILE_RotateWorldTransform((GpMetafile*)graphics->image, angle, order); + + if (stat != Ok) + return stat; + } + return GdipRotateMatrix(&graphics->worldtrans, angle, order); } diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 8d4002c..aa0da21 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -97,6 +97,12 @@ typedef struct EmfPlusMultiplyWorldTransform REAL MatrixData[6]; } EmfPlusMultiplyWorldTransform; +typedef struct EmfPlusRotateWorldTransform +{ + EmfPlusRecordHeader Header; + REAL Angle; +} EmfPlusRotateWorldTransform; + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -615,6 +621,29 @@ GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatri return Ok; } +GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixOrder order) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusRotateWorldTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusRotateWorldTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeRotateWorldTransform; + record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); + record->Angle = angle; + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) @@ -1001,6 +1030,18 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeRotateWorldTransform: + { + EmfPlusRotateWorldTransform *record = (EmfPlusRotateWorldTransform*)header; + MatrixOrder order = (flags & 0x2000) ? MatrixOrderAppend : MatrixOrderPrepend; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusRotateWorldTransform)) + return InvalidParameter; + + GdipRotateMatrix(real_metafile->world_transform, record->Angle, order); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } case EmfPlusRecordTypeResetWorldTransform: { GdipSetMatrixElements(real_metafile->world_transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 98b3f3e..67e2b9d 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1294,6 +1294,8 @@ static const emfplus_record worldtransform_records[] = { {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeMultiplyWorldTransform}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeRotateWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -1421,6 +1423,31 @@ static void test_worldtransform(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + /* rotate transform */ + stat = GdipRotateWorldTransform(graphics, 90.0, MatrixOrderAppend); + expect(Ok, stat); + + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetMatrixElements(transform, elements); + expect(Ok, stat); + expectf(0.0, elements[0]); + expectf(2.0, elements[1]); + expectf(-1.0, elements[2]); + expectf(0.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + + stat = GdipCreateSolidFill((ARGB)0xffff00ff, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0, -1.0, 0.5, 1.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + stat = GdipDeleteMatrix(transform); expect(Ok, stat); @@ -1459,6 +1486,10 @@ static void test_worldtransform(void) expect(Ok, stat); expect(0xffff0000, color); + stat = GdipBitmapGetPixel(bitmap, 10, 50, &color); + expect(Ok, stat); + expect(0xffff00ff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Implement recording/ playback for MultiplyWorldTransform.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 69a7c2c6a24b1000a7cba00e447b4e4dd3942778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69a7c2c6a24b1000a7cba00e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 5 16:14:37 2016 -0500 gdiplus: Implement recording/playback for MultiplyWorldTransform. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 7 +++++++ dlls/gdiplus/metafile.c | 44 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/metafile.c | 34 ++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 3eebaed..65135f8 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -91,6 +91,7 @@ extern GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, GDIPCONST GpRectF* rects, INT count) DECLSPEC_HIDDEN; extern GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, MatrixOrder order) DECLSPEC_HIDDEN; +extern GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* matrix, MatrixOrder order) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6003a19..9b0d9b5 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5744,6 +5744,13 @@ GpStatus WINGDIPAPI GdipMultiplyWorldTransform(GpGraphics *graphics, GDIPCONST G if(graphics->busy) return ObjectBusy; + if (graphics->image && graphics->image->type == ImageTypeMetafile) { + ret = METAFILE_MultiplyWorldTransform((GpMetafile*)graphics->image, matrix, order); + + if (ret != Ok) + return ret; + } + m = graphics->worldtrans; ret = GdipMultiplyMatrix(&m, matrix, order); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f869b90..8d4002c 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -91,6 +91,12 @@ typedef struct EmfPlusScaleWorldTransform REAL Sy; } EmfPlusScaleWorldTransform; +typedef struct EmfPlusMultiplyWorldTransform +{ + EmfPlusRecordHeader Header; + REAL MatrixData[6]; +} EmfPlusMultiplyWorldTransform; + static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) { DWORD size_needed; @@ -586,6 +592,29 @@ GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, Ma return Ok; } +GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* matrix, MatrixOrder order) +{ + if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) + { + EmfPlusMultiplyWorldTransform *record; + GpStatus stat; + + stat = METAFILE_AllocateRecord(metafile, + sizeof(EmfPlusMultiplyWorldTransform), + (void**)&record); + if (stat != Ok) + return stat; + + record->Header.Type = EmfPlusRecordTypeMultiplyWorldTransform; + record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); + memcpy(record->MatrixData, matrix->matrix, sizeof(record->MatrixData)); + + METAFILE_WriteRecords(metafile); + } + + return Ok; +} + GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) { if (metafile->metafile_type == MetafileTypeEmfPlusOnly || metafile->metafile_type == MetafileTypeEmfPlusDual) @@ -957,6 +986,21 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, return METAFILE_PlaybackUpdateWorldTransform(real_metafile); } + case EmfPlusRecordTypeMultiplyWorldTransform: + { + EmfPlusMultiplyWorldTransform *record = (EmfPlusMultiplyWorldTransform*)header; + MatrixOrder order = (flags & 0x2000) ? MatrixOrderAppend : MatrixOrderPrepend; + GpMatrix matrix; + + if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusMultiplyWorldTransform)) + return InvalidParameter; + + memcpy(matrix.matrix, record->MatrixData, sizeof(matrix.matrix)); + + GdipMultiplyMatrix(real_metafile->world_transform, &matrix, order); + + return METAFILE_PlaybackUpdateWorldTransform(real_metafile); + } case EmfPlusRecordTypeResetWorldTransform: { GdipSetMatrixElements(real_metafile->world_transform, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0); diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index a8fc67e..98b3f3e 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -1292,6 +1292,8 @@ static const emfplus_record worldtransform_records[] = { {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeResetWorldTransform}, {0, EmfPlusRecordTypeFillRects}, + {0, EmfPlusRecordTypeMultiplyWorldTransform}, + {0, EmfPlusRecordTypeFillRects}, {0, EmfPlusRecordTypeEndOfFile}, {0, EMR_EOF}, {0} @@ -1391,6 +1393,34 @@ static void test_worldtransform(void) stat = GdipDeleteBrush(brush); expect(Ok, stat); + /* multiply transform */ + stat = GdipSetMatrixElements(transform, 2.0, 0.0, 0.0, 1.0, 0.0, 0.0); + expect(Ok, stat); + + stat = GdipMultiplyWorldTransform(graphics, transform, MatrixOrderPrepend); + expect(Ok, stat); + + stat = GdipGetWorldTransform(graphics, transform); + expect(Ok, stat); + + stat = GdipGetMatrixElements(transform, elements); + expect(Ok, stat); + expectf(2.0, elements[0]); + expectf(0.0, elements[1]); + expectf(0.0, elements[2]); + expectf(1.0, elements[3]); + expectf(0.0, elements[4]); + expectf(0.0, elements[5]); + + stat = GdipCreateSolidFill((ARGB)0xffff0000, (GpSolidFill**)&brush); + expect(Ok, stat); + + stat = GdipFillRectangle(graphics, brush, 1.0, 1.0, 0.5, 1.0); + expect(Ok, stat); + + stat = GdipDeleteBrush(brush); + expect(Ok, stat); + stat = GdipDeleteMatrix(transform); expect(Ok, stat); @@ -1425,6 +1455,10 @@ static void test_worldtransform(void) expect(Ok, stat); expect(0xff00ffff, color); + stat = GdipBitmapGetPixel(bitmap, 50, 30, &color); + expect(Ok, stat); + expect(0xffff0000, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus/tests: Add feature for loading emf files.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 25e8c83a8a0dd5496193ecdb007320313d0fc60c URL: http://source.winehq.org/git/wine.git/?a=commit;h=25e8c83a8a0dd5496193ecdb0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 5 16:14:36 2016 -0500 gdiplus/tests: Add feature for loading emf files. This enables testing for mutual compatibility of emf's, by saving the files on Wine and loading them on Windows, or vice versa. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/metafile.c | 46 ++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index e514eb5..a8fc67e 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -29,6 +29,7 @@ #define expectf(expected, got) expectf_((expected), (got), 0.001) static BOOL save_metafiles; +static BOOL load_metafiles; typedef struct emfplus_record { @@ -239,15 +240,17 @@ static void play_metafile(GpMetafile *metafile, GpGraphics *graphics, const emfp expect(Ok, stat); } -static void save_metafile(GpMetafile *metafile, const char *filename) +/* When 'save' or 'load' is specified on the command line, save or + * load the specified filename. */ +static void sync_metafile(GpMetafile **metafile, const char *filename) { + GpStatus stat; if (save_metafiles) { GpMetafile *clone; HENHMETAFILE hemf; - GpStatus stat; - stat = GdipCloneImage((GpImage*)metafile, (GpImage**)&clone); + stat = GdipCloneImage((GpImage*)*metafile, (GpImage**)&clone); expect(Ok, stat); stat = GdipGetHemfFromMetafile(clone, &hemf); @@ -260,6 +263,20 @@ static void save_metafile(GpMetafile *metafile, const char *filename) stat = GdipDisposeImage((GpImage*)clone); expect(Ok, stat); } + else if (load_metafiles) + { + HENHMETAFILE hemf; + + stat = GdipDisposeImage((GpImage*)*metafile); + expect(Ok, stat); + *metafile = NULL; + + hemf = GetEnhMetaFileA(filename); + ok(hemf != NULL, "%s could not be opened\n", filename); + + stat = GdipCreateMetafileFromEmf(hemf, TRUE, metafile); + expect(Ok, stat); + } } static const emfplus_record empty_records[] = { @@ -327,7 +344,7 @@ static void test_empty(void) check_metafile(metafile, empty_records, "empty metafile", dst_points, &frame, UnitPixel); - save_metafile(metafile, "empty.emf"); + sync_metafile(&metafile, "empty.emf"); stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); expect(Ok, stat); @@ -479,7 +496,7 @@ static void test_getdc(void) check_metafile(metafile, getdc_records, "getdc metafile", dst_points, &frame, UnitPixel); - save_metafile(metafile, "getdc.emf"); + sync_metafile(&metafile, "getdc.emf"); stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -617,7 +634,7 @@ static void test_emfonly(void) check_metafile(metafile, emfonly_records, "emfonly metafile", dst_points, &frame, UnitPixel); - save_metafile(metafile, "emfonly.emf"); + sync_metafile(&metafile, "emfonly.emf"); stat = GdipGetImageBounds((GpImage*)metafile, &bounds, &unit); expect(Ok, stat); @@ -806,7 +823,7 @@ static void test_fillrect(void) check_metafile(metafile, fillrect_records, "fillrect metafile", dst_points, &frame, UnitPixel); - save_metafile(metafile, "fillrect.emf"); + sync_metafile(&metafile, "fillrect.emf"); stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -910,7 +927,7 @@ static void test_clear(void) stat = GdipDeleteGraphics(graphics); expect(Ok, stat); - save_metafile(metafile, "clear.emf"); + sync_metafile(&metafile, "clear.emf"); stat = GdipCreateBitmapFromScan0(30, 30, 0, PixelFormat32bppRGB, NULL, &bitmap); expect(Ok, stat); @@ -1223,7 +1240,7 @@ static void test_pagetransform(void) check_metafile(metafile, pagetransform_records, "pagetransform metafile", dst_points, &frame, UnitPixel); - save_metafile(metafile, "pagetransform.emf"); + sync_metafile(&metafile, "pagetransform.emf"); stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -1382,7 +1399,7 @@ static void test_worldtransform(void) check_metafile(metafile, worldtransform_records, "worldtransform metafile", dst_points, &frame, UnitPixel); - save_metafile(metafile, "worldtransform.emf"); + sync_metafile(&metafile, "worldtransform.emf"); stat = GdipCreateBitmapFromScan0(100, 100, 0, PixelFormat32bppARGB, NULL, &bitmap); expect(Ok, stat); @@ -1578,8 +1595,13 @@ START_TEST(metafile) myARGC = winetest_get_mainargs( &myARGV ); - if (myARGC >= 3 && !strcmp(myARGV[2], "save")) - save_metafiles = TRUE; + if (myARGC >= 3) + { + if (!strcmp(myARGV[2], "save")) + save_metafiles = TRUE; + else if (!strcmp(myARGV[2], "load")) + load_metafiles = TRUE; + } test_empty(); test_getdc();

1 0

André Hentschel : kernel32/tests: Remove superfluous filler definitions.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 2ecbdb85827fa28ac4037af32670855881bc2438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecbdb85827fa28ac4037af32… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 7 22:16:09 2016 +0200 kernel32/tests: Remove superfluous filler definitions. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/loader.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 9aaecc2..6ee9e38 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2128,7 +2128,6 @@ static void test_ExitProcess(void) } section_data = { 0xb8, dll_entry_point, { 0xff,0xe0 } }; #endif #include "poppack.h" - static const char filler[0x1000]; DWORD dummy, file_align; HANDLE file, thread, process, hmap, hmap_dup; char temp_path[MAX_PATH], dll_name[MAX_PATH], cmdline[MAX_PATH * 2]; @@ -2630,7 +2629,6 @@ static void test_ResolveDelayLoadedAPI(void) { static const char test_dll[] = "secur32.dll"; static const char test_func[] = "SealMessage"; - static const char filler[0x1000]; char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; IMAGE_DELAYLOAD_DESCRIPTOR idd, *delaydir;

1 0

Daniel Lehman : msvcp140: Add _Mtx_init/destroy_in_situ.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: 4b41672f9f48395254eaa91c98594a02b6430340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b41672f9f48395254eaa91c9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu May 26 20:52:21 2016 -0700 msvcp140: Add _Mtx_init/destroy_in_situ. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 4 ++-- dlls/msvcp90/misc.c | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 05d62be..fedb05f 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3675,10 +3675,10 @@ @ stub _Mtx_clear_owner @ cdecl _Mtx_current_owns(ptr) msvcp110._Mtx_current_owns @ cdecl _Mtx_destroy(ptr) _Mtx_destroy -@ stub _Mtx_destroy_in_situ +@ cdecl _Mtx_destroy_in_situ(ptr) _Mtx_destroy_in_situ @ cdecl _Mtx_getconcrtcs(ptr) _Mtx_getconcrtcs @ cdecl _Mtx_init(ptr long) _Mtx_init -@ stub _Mtx_init_in_situ +@ cdecl _Mtx_init_in_situ(ptr long) _Mtx_init_in_situ @ cdecl _Mtx_lock(ptr) _Mtx_lock @ stub _Mtx_reset_owner @ stub _Mtx_timedlock diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 18b6a19..322e937 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -478,19 +478,29 @@ typedef _Mtx_t *_Mtx_arg_t; #define MTX_T_TO_ARG(m) (&(m)) #endif -int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) +void __cdecl _Mtx_init_in_situ(_Mtx_t mtx, int flags) { if(flags & ~MTX_MULTI_LOCK) FIXME("unknown flags ignored: %x\n", flags); + mtx->flags = flags; + call_func1(critical_section_ctor, &mtx->cs); + mtx->thread_id = -1; + mtx->count = 0; +} + +int __cdecl _Mtx_init(_Mtx_t *mtx, int flags) +{ *mtx = MSVCRT_operator_new(sizeof(**mtx)); - (*mtx)->flags = flags; - call_func1(critical_section_ctor, &(*mtx)->cs); - (*mtx)->thread_id = -1; - (*mtx)->count = 0; + _Mtx_init_in_situ(*mtx, flags); return 0; } +void __cdecl _Mtx_destroy_in_situ(_Mtx_t mtx) +{ + call_func1(critical_section_dtor, &mtx->cs); +} + void __cdecl _Mtx_destroy(_Mtx_arg_t mtx) { call_func1(critical_section_dtor, &MTX_T_FROM_ARG(mtx)->cs);

1 0

Iván Matellanes : msvcirt/tests: Add tests of ostream_withassign assignment operators.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: f7b88bc5453658ef508223fef54e2b31b2fb7ae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b88bc5453658ef508223fef… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Aug 5 17:56:30 2016 +0100 msvcirt/tests: Add tests of ostream_withassign assignment operators. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/tests/msvcirt.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 86029e3..7b83cfb 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -307,6 +307,9 @@ static ostream* (*__thiscall p_ostream_withassign_copy_ctor)(ostream*, const ost static ostream* (*__thiscall p_ostream_withassign_ctor)(ostream*, BOOL); static void (*__thiscall p_ostream_withassign_dtor)(ios*); static void (*__thiscall p_ostream_withassign_vbase_dtor)(ostream*); +static ostream* (*__thiscall p_ostream_withassign_assign_sb)(ostream*, streambuf*); +static ostream* (*__thiscall p_ostream_withassign_assign_os)(ostream*, const ostream*); +static ostream* (*__thiscall p_ostream_withassign_assign)(ostream*, const ostream*); /* istream */ static istream* (*__thiscall p_istream_copy_ctor)(istream*, const istream*, BOOL); @@ -541,6 +544,9 @@ static BOOL init(void) SET(p_ostream_withassign_ctor, "??0ostream_withassign@@QEAA(a)XZ"); SET(p_ostream_withassign_dtor, "??1ostream_withassign@@UEAA(a)XZ"); SET(p_ostream_withassign_vbase_dtor, "??_Dostream_withassign@@QEAAXXZ"); + SET(p_ostream_withassign_assign_sb, "??4ostream_withassign@@QEAAAEAVostream@@PEAVstreambuf@@@Z"); + SET(p_ostream_withassign_assign_os, "??4ostream_withassign@@QEAAAEAVostream@@AEBV1@@Z"); + SET(p_ostream_withassign_assign, "??4ostream_withassign@@QEAAAEAV0(a)AEBV0@@Z"); SET(p_istream_copy_ctor, "??0istream@@IEAA(a)AEBV0@@Z"); SET(p_istream_ctor, "??0istream@@IEAA(a)XZ"); @@ -696,6 +702,9 @@ static BOOL init(void) SET(p_ostream_withassign_ctor, "??0ostream_withassign@@QAE(a)XZ"); SET(p_ostream_withassign_dtor, "??1ostream_withassign@@UAE(a)XZ"); SET(p_ostream_withassign_vbase_dtor, "??_Dostream_withassign@@QAEXXZ"); + SET(p_ostream_withassign_assign_sb, "??4ostream_withassign@@QAEAAVostream@@PAVstreambuf@@@Z"); + SET(p_ostream_withassign_assign_os, "??4ostream_withassign@@QAEAAVostream@@ABV1@@Z"); + SET(p_ostream_withassign_assign, "??4ostream_withassign@@QAEAAV0(a)ABV0@@Z"); SET(p_istream_copy_ctor, "??0istream@@IAE(a)ABV0@@Z"); SET(p_istream_ctor, "??0istream@@IAE(a)XZ"); @@ -3682,6 +3691,67 @@ todo_wine ok(osa1.base_ios.width == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.base_ios.width); ok(osa1.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.base_ios.do_lock); call_func1(p_ostream_withassign_dtor, &osa1.base_ios); + + /* assignment */ + osa1.unknown = 0xabababab; + osa1.base_ios.sb = (streambuf*) 0xabababab; +if (0) /* crashes on native */ + osa1.base_ios.delbuf = 0xabababab; + posa = call_func2(p_ostream_withassign_assign_sb, &osa1, &sb); + ok(posa == &osa1, "wrong return, expected %p got %p\n", &osa1, posa); + ok(osa1.unknown == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.unknown); + ok(osa1.base_ios.sb == &sb, "expected %p got %p\n", &sb, osa1.base_ios.sb); + ok(osa1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, osa1.base_ios.state); + ok(osa1.base_ios.delbuf == 0, "expected 0 got %d\n", osa1.base_ios.delbuf); + ok(osa1.base_ios.tie == NULL, "expected %p got %p\n", NULL, osa1.base_ios.tie); + ok(osa1.base_ios.flags == 0, "expected 0 got %x\n", osa1.base_ios.flags); + ok(osa1.base_ios.precision == 6, "expected 6 got %d\n", osa1.base_ios.precision); + ok(osa1.base_ios.fill == ' ', "expected 32 got %d\n", osa1.base_ios.fill); + ok(osa1.base_ios.width == 0, "expected 0 got %d\n", osa1.base_ios.width); + ok(osa1.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.base_ios.do_lock); + memset(&osa1.base_ios, 0xab, sizeof(ios)); + osa1.base_ios.delbuf = 0; + posa = call_func2(p_ostream_withassign_assign_sb, &osa1, NULL); + ok(posa == &osa1, "wrong return, expected %p got %p\n", &osa1, posa); + ok(osa1.unknown == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.unknown); + ok(osa1.base_ios.sb == NULL, "expected %p got %p\n", NULL, osa1.base_ios.sb); + ok(osa1.base_ios.state == IOSTATE_badbit, "expected %d got %d\n", IOSTATE_badbit, osa1.base_ios.state); + ok(osa1.base_ios.delbuf == 0, "expected 0 got %d\n", osa1.base_ios.delbuf); + ok(osa1.base_ios.tie == NULL, "expected %p got %p\n", NULL, osa1.base_ios.tie); + ok(osa1.base_ios.flags == 0, "expected 0 got %x\n", osa1.base_ios.flags); + ok(osa1.base_ios.precision == 6, "expected 6 got %d\n", osa1.base_ios.precision); + ok(osa1.base_ios.fill == ' ', "expected 32 got %d\n", osa1.base_ios.fill); + ok(osa1.base_ios.width == 0, "expected 0 got %d\n", osa1.base_ios.width); + ok(osa1.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.base_ios.do_lock); + memset(&osa1.base_ios, 0xab, sizeof(ios)); + osa1.base_ios.delbuf = 0; + osa2.base_ios.sb = &sb; + posa = call_func2(p_ostream_withassign_assign_os, &osa1, &osa2); + ok(posa == &osa1, "wrong return, expected %p got %p\n", &osa1, posa); + ok(osa1.unknown == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.unknown); + ok(osa1.base_ios.sb == &sb, "expected %p got %p\n", &sb, osa1.base_ios.sb); + ok(osa1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, osa1.base_ios.state); + ok(osa1.base_ios.delbuf == 0, "expected 0 got %d\n", osa1.base_ios.delbuf); + ok(osa1.base_ios.tie == NULL, "expected %p got %p\n", NULL, osa1.base_ios.tie); + ok(osa1.base_ios.flags == 0, "expected 0 got %x\n", osa1.base_ios.flags); + ok(osa1.base_ios.precision == 6, "expected 6 got %d\n", osa1.base_ios.precision); + ok(osa1.base_ios.fill == ' ', "expected 32 got %d\n", osa1.base_ios.fill); + ok(osa1.base_ios.width == 0, "expected 0 got %d\n", osa1.base_ios.width); + ok(osa1.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.base_ios.do_lock); + memset(&osa1.base_ios, 0xab, sizeof(ios)); + osa1.base_ios.delbuf = 0; + posa = call_func2(p_ostream_withassign_assign, &osa1, &osa2); + ok(posa == &osa1, "wrong return, expected %p got %p\n", &osa1, posa); + ok(osa1.unknown == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.unknown); + ok(osa1.base_ios.sb == &sb, "expected %p got %p\n", &sb, osa1.base_ios.sb); + ok(osa1.base_ios.state == IOSTATE_goodbit, "expected %d got %d\n", IOSTATE_goodbit, osa1.base_ios.state); + ok(osa1.base_ios.delbuf == 0, "expected 0 got %d\n", osa1.base_ios.delbuf); + ok(osa1.base_ios.tie == NULL, "expected %p got %p\n", NULL, osa1.base_ios.tie); + ok(osa1.base_ios.flags == 0, "expected 0 got %x\n", osa1.base_ios.flags); + ok(osa1.base_ios.precision == 6, "expected 6 got %d\n", osa1.base_ios.precision); + ok(osa1.base_ios.fill == ' ', "expected 32 got %d\n", osa1.base_ios.fill); + ok(osa1.base_ios.width == 0, "expected 0 got %d\n", osa1.base_ios.width); + ok(osa1.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, osa1.base_ios.do_lock); } static void test_istream(void)

1 0

Vincent Povirk : gdiplus: Fix matrix append flag in metafile transform records.
by Alexandre Julliard Aug. 8, 2016

Aug. 8, 2016

Module: wine Branch: master Commit: d4d18aa511d2adadc1f854d8aa2fe0cf131ab574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4d18aa511d2adadc1f854d8a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Aug 5 16:14:35 2016 -0500 gdiplus: Fix matrix append flag in metafile transform records. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f0c0bd1..f869b90 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -576,7 +576,7 @@ GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, Ma return stat; record->Header.Type = EmfPlusRecordTypeScaleWorldTransform; - record->Header.Flags = (order == MatrixOrderAppend ? 4 : 0); + record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); record->Sx = sx; record->Sy = sy; @@ -948,7 +948,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, case EmfPlusRecordTypeScaleWorldTransform: { EmfPlusScaleWorldTransform *record = (EmfPlusScaleWorldTransform*)header; - MatrixOrder order = (flags & 0x4) ? MatrixOrderAppend : MatrixOrderPrepend; + MatrixOrder order = (flags & 0x2000) ? MatrixOrderAppend : MatrixOrderPrepend; if (dataSize + sizeof(EmfPlusRecordHeader) < sizeof(EmfPlusScaleWorldTransform)) return InvalidParameter;

1 0