- Wine-Devel - list.winehq.org

[PATCH] mshtml: Fix NULL offset parent handling in HTMLElement_get_offsetParent()
by Dmitry Kislyuk March 28, 2021

March 28, 2021

2 1

[PATCH v2 resend 4/4] gdi32: Get rid of redundant ntmCellHeight member.
by Akihiro Sagawa March 28, 2021

March 28, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/font.c | 6 ++++-- dlls/gdi32/freetype.c | 1 - dlls/gdi32/gdi_private.h | 1 - 3 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH v2 3/4] gdi32: Fix text metrics used in EnumFonts families.
by Akihiro Sagawa March 28, 2021

March 28, 2021

In v2, use the default font height for non-scalable faces. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50818 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/font.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/font.c | 19 +++++++++++++++++++ 2 files changed, 53 insertions(+), 2 deletions(-)

1 0

[PATCH v2 resend 2/4] gdi32: Move otmEMSquare initialization to freetype_load_font.
by Akihiro Sagawa March 28, 2021

March 28, 2021

In preparation for the next commit. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH v2 1/4] gdi32/tests: Remove unreliable height tests.
by Akihiro Sagawa March 28, 2021

March 28, 2021

New in v2 to fix Alexandre's test failures. I decide to remove these tests because we'll add more reliable ones in the later patch. In detail, Latin Modern Math causes test failures at these points. The 212 height is too high. However, this is correct as manual test shows it is the same value in native. Moreover, the upper bound is a heuristic value. So, there might be a font face that is over 212 height. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 -- 1 file changed, 2 deletions(-)

1 0

Wine staging 6.5 release
by Alistair Leslie-Hughes March 28, 2021

March 28, 2021

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.5 (661 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * windows.media.speech: Add stub dll. * windows.media.speech: Implement IInstalledVoicesStatic stub. * windows.media.speech: Implement IInstalledVoicesStatic::AllVoices stub. * windows.media.speech: Fake empty IInstalledVoicesStatic::AllVoices vector. * windows.gaming.input: Add stub dll. * windows.gaming.input: Implement IGamepadStatics stubs. * windows.gaming.input: Implement IGamepadStatics::Gamepads stubs. * opencl: Add OpenCL 1.0 function pointer loader. * opencl: Use function pointer instead of call the function directly. * opencl: Add OpenCL 1.1 implementation. * opencl: Add OpenCL 1.2 implementation. * opencl: Expose all extensions list to wine. * windows.gaming.input: Fake empty IGamepadStatics::Gamepads vector. * windows.gaming.input: Fake IEventHandler_Gamepad support. * windows.gaming.input: Implement IRawGameControllerStatics stubs. * windows.gaming.input: Implement IRawGameControllerStatics::RawGameControllers stubs. * windows.gaming.input: Fake empty IRawGameControllerStatics::RawGameControllers vector. * windows.gaming.input: Fake IEventHandler_RawGameController support. * ddraw: Allow setting texture without DDSCAPS_TEXTURE for software device. * windows.globalization: Implement IGlobalizationPreferencesStatics::HomeGeographicRegion semi-stub. * windows.globalization: Implement IGlobalizationPreferencesStatics::Languages semi-stub. * windows.globalization: Fake empty IGlobalizationPreferencesStatics properties. Added: * None Updated: * None Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH 6/6] amstream/tests: Move WINE_NO_NAMELESS_EXTENSION to source file.
by Jacek Caban March 27, 2021

March 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/amstream/tests/Makefile.in | 1 - dlls/amstream/tests/amstream.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-)

2 1

[PATCH 1/5] gdiplus/metafile: Fully initialize record header on allocation.
by Nikolay Sivov March 27, 2021

March 27, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdiplus/metafile.c | 175 ++++++++++++++-------------------------- 1 file changed, 60 insertions(+), 115 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 41950eb31c7..d9fa9e77c91 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -639,7 +639,8 @@ static DWORD METAFILE_AddObjectId(GpMetafile *metafile) return (metafile->next_object_id++) % EmfPlusObjectTableSize; } -static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void **result) +static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, EmfPlusRecordType record_type, + DWORD size, void **result) { DWORD size_needed; EmfPlusRecordHeader *record; @@ -679,6 +680,8 @@ static GpStatus METAFILE_AllocateRecord(GpMetafile *metafile, DWORD size, void * metafile->comment_data_length += size; record = (EmfPlusRecordHeader*)*result; + record->Type = record_type; + record->Flags = 0; record->Size = size; record->DataSize = size - sizeof(EmfPlusRecordHeader); @@ -708,16 +711,12 @@ static GpStatus METAFILE_WriteHeader(GpMetafile *metafile, HDC hdc) { EmfPlusHeader *header; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusHeader), (void**)&header); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeHeader, sizeof(EmfPlusHeader), (void**)&header); if (stat != Ok) return stat; - header->Header.Type = EmfPlusRecordTypeHeader; - if (metafile->metafile_type == MetafileTypeEmfPlusDual) header->Header.Flags = 1; - else - header->Header.Flags = 0; header->Version = VERSION_MAGIC2; @@ -743,13 +742,10 @@ static GpStatus METAFILE_WriteEndOfFile(GpMetafile *metafile) { EmfPlusRecordHeader *record; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusRecordHeader), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeEndOfFile, sizeof(EmfPlusRecordHeader), (void**)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeEndOfFile; - record->Flags = 0; - METAFILE_WriteRecords(metafile); } @@ -876,13 +872,10 @@ GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) EmfPlusRecordHeader *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusRecordHeader), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeGetDC, sizeof(EmfPlusRecordHeader), (void**)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeGetDC; - record->Flags = 0; - METAFILE_WriteRecords(metafile); } @@ -898,12 +891,10 @@ GpStatus METAFILE_GraphicsClear(GpMetafile* metafile, ARGB color) EmfPlusClear *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusClear), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeClear, sizeof(EmfPlusClear), (void**)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeClear; - record->Header.Flags = 0; record->Color = color; METAFILE_WriteRecords(metafile); @@ -1063,12 +1054,11 @@ static GpStatus METAFILE_AddBrushObject(GpMetafile *metafile, GDIPCONST GpBrush stat = METAFILE_PrepareBrushData(brush, &size); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeBrush << 8; METAFILE_FillBrushData(brush, &object_record->ObjectData.brush); return Ok; @@ -1110,13 +1100,12 @@ GpStatus METAFILE_FillRectangles(GpMetafile* metafile, GpBrush* brush, if (integer_rects) flags |= 0x4000; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillRects, sizeof(EmfPlusFillRects) + count * (integer_rects ? sizeof(EmfPlusRect) : sizeof(GpRectF)), (void**)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeFillRects; record->Header.Flags = flags; record->BrushID = brushid; record->Count = count; @@ -1171,13 +1160,11 @@ GpStatus METAFILE_SetClipRect(GpMetafile* metafile, REAL x, REAL y, REAL width, EmfPlusSetClipRect *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusSetClipRect), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetClipRect, + sizeof(EmfPlusSetClipRect), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeSetClipRect; record->Header.Flags = (mode & 0xf) << 8; record->ClipRect.X = x; record->ClipRect.Y = y; @@ -1201,12 +1188,11 @@ static GpStatus METAFILE_AddRegionObject(GpMetafile *metafile, GpRegion *region, return Ok; size = write_region_data(region, NULL); - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.region) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeRegion << 8; write_region_data(region, &object_record->ObjectData.region); return Ok; @@ -1227,10 +1213,9 @@ GpStatus METAFILE_SetClipRegion(GpMetafile* metafile, GpRegion* region, CombineM stat = METAFILE_AddRegionObject(metafile, region, &region_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetClipRegion, sizeof(*record), (void**)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeSetClipRegion; record->Flags = region_id | mode << 8; METAFILE_WriteRecords(metafile); @@ -1244,13 +1229,11 @@ GpStatus METAFILE_SetPageTransform(GpMetafile* metafile, GpUnit unit, REAL scale EmfPlusSetPageTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusSetPageTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetPageTransform, + sizeof(EmfPlusSetPageTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeSetPageTransform; record->Header.Flags = unit; record->PageScale = scale; @@ -1267,14 +1250,11 @@ GpStatus METAFILE_SetWorldTransform(GpMetafile* metafile, GDIPCONST GpMatrix* tr EmfPlusSetWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusSetWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSetWorldTransform, + 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); @@ -1290,13 +1270,11 @@ GpStatus METAFILE_ScaleWorldTransform(GpMetafile* metafile, REAL sx, REAL sy, Ma EmfPlusScaleWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusScaleWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeScaleWorldTransform, + sizeof(EmfPlusScaleWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeScaleWorldTransform; record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); record->Sx = sx; record->Sy = sy; @@ -1314,13 +1292,11 @@ GpStatus METAFILE_MultiplyWorldTransform(GpMetafile* metafile, GDIPCONST GpMatri EmfPlusMultiplyWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusMultiplyWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeMultiplyWorldTransform, + 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)); @@ -1337,13 +1313,11 @@ GpStatus METAFILE_RotateWorldTransform(GpMetafile* metafile, REAL angle, MatrixO EmfPlusRotateWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusRotateWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeRotateWorldTransform, + sizeof(EmfPlusRotateWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeRotateWorldTransform; record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); record->Angle = angle; @@ -1360,13 +1334,11 @@ GpStatus METAFILE_TranslateWorldTransform(GpMetafile* metafile, REAL dx, REAL dy EmfPlusTranslateWorldTransform *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusTranslateWorldTransform), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeTranslateWorldTransform, + sizeof(EmfPlusTranslateWorldTransform), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeTranslateWorldTransform; record->Header.Flags = (order == MatrixOrderAppend ? 0x2000 : 0); record->dx = dx; record->dy = dy; @@ -1384,15 +1356,11 @@ GpStatus METAFILE_ResetWorldTransform(GpMetafile* metafile) EmfPlusRecordHeader *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusRecordHeader), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeResetWorldTransform, + sizeof(EmfPlusRecordHeader), (void **)&record); if (stat != Ok) return stat; - record->Type = EmfPlusRecordTypeResetWorldTransform; - record->Flags = 0; - METAFILE_WriteRecords(metafile); } @@ -1407,11 +1375,10 @@ GpStatus METAFILE_BeginContainer(GpMetafile* metafile, GDIPCONST GpRectF *dstrec EmfPlusBeginContainer *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeBeginContainer, sizeof(*record), (void**)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeBeginContainer; record->Header.Flags = unit & 0xff; record->DestRect = *dstrect; record->SrcRect = *srcrect; @@ -1430,14 +1397,11 @@ GpStatus METAFILE_BeginContainerNoParams(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeBeginContainerNoParams, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeBeginContainerNoParams; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -1453,14 +1417,11 @@ GpStatus METAFILE_EndContainer(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeEndContainer, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeEndContainer; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -1476,14 +1437,11 @@ GpStatus METAFILE_SaveGraphics(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeSave, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeSave; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -1499,14 +1457,11 @@ GpStatus METAFILE_RestoreGraphics(GpMetafile* metafile, DWORD StackIndex) EmfPlusContainerRecord *record; GpStatus stat; - stat = METAFILE_AllocateRecord(metafile, - sizeof(EmfPlusContainerRecord), - (void**)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeRestore, + sizeof(EmfPlusContainerRecord), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeRestore; - record->Header.Flags = 0; record->StackIndex = StackIndex; METAFILE_WriteRecords(metafile); @@ -4363,7 +4318,7 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW if (stat != Ok) return stat; aligned_size = (size + 3) & ~3; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.image.ImageData.bitmap.BitmapData[aligned_size]), (void**)&object_record); if (stat != Ok) @@ -4374,7 +4329,6 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW memset(object_record->ObjectData.image.ImageData.bitmap.BitmapData + size, 0, aligned_size - size); *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeImage << 8; object_record->ObjectData.image.Version = VERSION_MAGIC2; object_record->ObjectData.image.Type = ImageDataTypeBitmap; @@ -4394,13 +4348,12 @@ static GpStatus METAFILE_AddImageObject(GpMetafile *metafile, GpImage *image, DW size = GetEnhMetaFileBits(hemf, 0, NULL); if (!size) return GenericError; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.image.ImageData.metafile.MetafileData[size]), (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeImage << 8; object_record->ObjectData.image.Version = VERSION_MAGIC2; object_record->ObjectData.image.Type = ImageDataTypeMetafile; @@ -4435,13 +4388,12 @@ static GpStatus METAFILE_AddImageAttributesObject(GpMetafile *metafile, const Gp if (!attrs) return Ok; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.image_attributes) + sizeof(EmfPlusImageAttributes), (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | (ObjectTypeImageAttributes << 8); attrs_record = &object_record->ObjectData.image_attributes; attrs_record->Version = VERSION_MAGIC2; @@ -4516,9 +4468,10 @@ GpStatus METAFILE_DrawImagePointsRect(GpMetafile *metafile, GpImage *image, stat = METAFILE_AddImageAttributesObject(metafile, imageAttributes, &attributes_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawImagePoints), (void**)&draw_image_record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawImagePoints, + sizeof(EmfPlusDrawImagePoints), (void **)&draw_image_record); if (stat != Ok) return stat; - draw_image_record->Header.Type = EmfPlusRecordTypeDrawImagePoints; + draw_image_record->Header.Flags = image_id; draw_image_record->ImageAttributesID = attributes_id; draw_image_record->SrcUnit = UnitPixel; @@ -4540,10 +4493,9 @@ GpStatus METAFILE_AddSimpleProperty(GpMetafile *metafile, SHORT prop, SHORT val) if (metafile->metafile_type != MetafileTypeEmfPlusOnly && metafile->metafile_type != MetafileTypeEmfPlusDual) return Ok; - stat = METAFILE_AllocateRecord(metafile, sizeof(*record), (void**)&record); + stat = METAFILE_AllocateRecord(metafile, prop, sizeof(*record), (void**)&record); if (stat != Ok) return stat; - record->Type = prop; record->Flags = val; METAFILE_WriteRecords(metafile); @@ -4561,13 +4513,12 @@ static GpStatus METAFILE_AddPathObject(GpMetafile *metafile, GpPath *path, DWORD return Ok; size = write_path_data(path, NULL); - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.path) + size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypePath << 8; write_path_data(path, &object_record->ObjectData.path); return Ok; @@ -4649,13 +4600,12 @@ static GpStatus METAFILE_AddPenObject(GpMetafile *metafile, GpPen *pen, DWORD *i stat = METAFILE_PrepareBrushData(pen->brush, &brush_size); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.pen.data) + pen_data_size + brush_size, (void**)&object_record); if (stat != Ok) return stat; *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypePen << 8; object_record->ObjectData.pen.Version = VERSION_MAGIC2; object_record->ObjectData.pen.Type = 0; @@ -4758,7 +4708,8 @@ GpStatus METAFILE_DrawPath(GpMetafile *metafile, GpPen *pen, GpPath *path) stat = METAFILE_AddPathObject(metafile, path, &path_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawPath), (void**)&draw_path_record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawPath, + sizeof(EmfPlusDrawPath), (void **)&draw_path_record); if (stat != Ok) return stat; draw_path_record->Header.Type = EmfPlusRecordTypeDrawPath; draw_path_record->Header.Flags = path_id; @@ -4783,7 +4734,8 @@ GpStatus METAFILE_DrawEllipse(GpMetafile *metafile, GpPen *pen, GpRectF *rect) stat = METAFILE_AddPenObject(metafile, pen, &pen_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusDrawEllipse), (void **)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawEllipse, + sizeof(EmfPlusDrawEllipse), (void **)&record); if (stat != Ok) return stat; record->Header.Type = EmfPlusRecordTypeDrawEllipse; record->Header.Flags = pen_id; @@ -4825,10 +4777,9 @@ GpStatus METAFILE_FillPath(GpMetafile *metafile, GpBrush *brush, GpPath *path) stat = METAFILE_AddPathObject(metafile, path, &path_id); if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillPath, sizeof(EmfPlusFillPath), (void**)&fill_path_record); if (stat != Ok) return stat; - fill_path_record->Header.Type = EmfPlusRecordTypeFillPath; if (inline_color) { fill_path_record->Header.Flags = 0x8000 | path_id; @@ -4864,9 +4815,8 @@ GpStatus METAFILE_FillEllipse(GpMetafile *metafile, GpBrush *brush, GpRectF *rec if (stat != Ok) return stat; } - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusFillEllipse), (void **)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillEllipse, sizeof(EmfPlusFillEllipse), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeFillEllipse; if (inline_color) { record->Header.Flags = 0x8000; @@ -4913,10 +4863,10 @@ GpStatus METAFILE_FillPie(GpMetafile *metafile, GpBrush *brush, const GpRectF *r is_int_rect = is_integer_rect(rect); - stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusFillPie, RectData) + - is_int_rect ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF), (void **)&record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillPie, + FIELD_OFFSET(EmfPlusFillPie, RectData) + is_int_rect ? sizeof(EmfPlusRect) : sizeof(EmfPlusRectF), + (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeFillPie; if (inline_color) { record->Header.Flags = 0x8000; @@ -4964,7 +4914,7 @@ static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *f return stat; fn_len = lstrlenW(font->family->FamilyName); - stat = METAFILE_AllocateRecord(metafile, + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeObject, FIELD_OFFSET(EmfPlusObject, ObjectData.font.FamilyName[(fn_len + 1) & ~1]), (void**)&object_record); if (stat != Ok) @@ -4972,7 +4922,6 @@ static GpStatus METAFILE_AddFontObject(GpMetafile *metafile, GDIPCONST GpFont *f *id = METAFILE_AddObjectId(metafile); - object_record->Header.Type = EmfPlusRecordTypeObject; object_record->Header.Flags = *id | ObjectTypeFont << 8; font_record = &object_record->ObjectData.font; @@ -5044,11 +4993,10 @@ GpStatus METAFILE_DrawDriverString(GpMetafile *metafile, GDIPCONST UINT16 *text, /* Pad record to DWORD alignment. */ alloc_size = (alloc_size + 3) & ~3; - stat = METAFILE_AllocateRecord(metafile, alloc_size, (void**)&draw_string_record); + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawDriverString, alloc_size, (void**)&draw_string_record); if (stat != Ok) return stat; - draw_string_record->Header.Type = EmfPlusRecordTypeDrawDriverString; draw_string_record->Header.Flags = font_id; draw_string_record->DriverStringOptionsFlags = flags; draw_string_record->MatrixPresent = include_matrix; @@ -5129,12 +5077,11 @@ GpStatus METAFILE_FillRegion(GpMetafile* metafile, GpBrush* brush, GpRegion* reg if (stat != Ok) return stat; - stat = METAFILE_AllocateRecord(metafile, sizeof(EmfPlusFillRegion), + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeFillRegion, sizeof(EmfPlusFillRegion), (void**)&fill_region_record); if (stat != Ok) return stat; - fill_region_record->Header.Type = EmfPlusRecordTypeFillRegion; fill_region_record->Header.Flags = region_id; if (inline_color) @@ -5176,13 +5123,12 @@ GpStatus METAFILE_DrawRectangles(GpMetafile *metafile, GpPen *pen, const GpRectF } } - stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawRects, RectData) + + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawRects, 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; @@ -5224,13 +5170,12 @@ GpStatus METAFILE_DrawArc(GpMetafile *metafile, GpPen *pen, const GpRectF *rect, integer_rect = is_integer_rect(rect); - stat = METAFILE_AllocateRecord(metafile, FIELD_OFFSET(EmfPlusDrawArc, RectData) + + stat = METAFILE_AllocateRecord(metafile, EmfPlusRecordTypeDrawArc, FIELD_OFFSET(EmfPlusDrawArc, RectData) + integer_rect ? sizeof(record->RectData.rect) : sizeof(record->RectData.rectF), (void **)&record); if (stat != Ok) return stat; - record->Header.Type = EmfPlusRecordTypeDrawArc; record->Header.Flags = pen_id; if (integer_rect) record->Header.Flags |= 0x4000; -- 2.30.2

2 9

[PATCH 5/6] gdiplus: Use nameless unions.
by Jacek Caban March 27, 2021

March 27, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/gdiplus/Makefile.in | 1 - dlls/gdiplus/image.c | 58 ++++++++++++++++++++-------------------- 2 files changed, 29 insertions(+), 30 deletions(-)

2 1

[PATCH] mscoree: Update Wine Mono to 6.1.0.
by Esme Povirk March 27, 2021

March 27, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- dlls/appwiz.cpl/addons.c | 4 ++-- dlls/mscoree/mscoree_private.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index b2e726422da..7659efc9541 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -57,10 +57,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(appwizcpl); #define GECKO_SHA "???" #endif -#define MONO_VERSION "6.0.0" +#define MONO_VERSION "6.1.0" #if defined(__i386__) || defined(__x86_64__) #define MONO_ARCH "x86" -#define MONO_SHA "5c7af5976d101be359a77045c9cc8fc40feac028263d00e731578864e8b183d0" +#define MONO_SHA "e430d054a14e6859ca3e4f849187ddb8d01032f8305f07684d3b27f0f870ce4a" #else #define MONO_ARCH "" #define MONO_SHA "???" diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 69c30e5e3e0..3a5f7d80fcf 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -45,7 +45,7 @@ extern HRESULT assembly_get_runtime_version(ASSEMBLY *assembly, LPSTR *version) extern HRESULT assembly_get_vtable_fixups(ASSEMBLY *assembly, VTableFixup **fixups, DWORD *count) DECLSPEC_HIDDEN; extern HRESULT assembly_get_native_entrypoint(ASSEMBLY *assembly, NativeEntryPointFunc *func) DECLSPEC_HIDDEN; -#define WINE_MONO_VERSION "6.0.0" +#define WINE_MONO_VERSION "6.1.0" /* Mono embedding */ typedef struct _MonoDomain MonoDomain; -- 2.25.1

3 2