October 2017 - Wine-commits

Nikolay Sivov : gdiplus/metafile: Partially implement EmfPlusPen support for playback.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 9f45ef729c41f97414af17ce333d3fd8be890ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f45ef729c41f97414af17ce3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:45:38 2017 +0300 gdiplus/metafile: Partially implement EmfPlusPen support for playback. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> 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/metafile.c | 232 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 233 insertions(+) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index d4c1fd9..f39838e 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -394,6 +394,7 @@ struct emfplus_object { EmfPlusObjectType type; union { GpBrush *brush; + GpPen *pen; GpPath *path; GpImage *image; GpFont *font; diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index b67f565..6c18632 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -199,6 +199,30 @@ enum LineStyle LineStyleCustom }; +typedef struct EmfPlusDashedLineData +{ + DWORD DashedLineDataSize; + BYTE data[1]; +} EmfPlusDashedLineData; + +typedef struct EmfPlusCompoundLineData +{ + DWORD CompoundLineDataSize; + BYTE data[1]; +} EmfPlusCompoundLineData; + +typedef struct EmfPlusCustomStartCapData +{ + DWORD CustomStartCapSize; + BYTE data[1]; +} EmfPlusCustomStartCapData; + +typedef struct EmfPlusCustomEndCapData +{ + DWORD CustomEndCapSize; + BYTE data[1]; +} EmfPlusCustomEndCapData; + typedef struct EmfPlusPenData { DWORD PenDataFlags; @@ -399,6 +423,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypeBrush: GdipDeleteBrush(object->u.brush); break; + case ObjectTypePen: + GdipDeletePen(object->u.pen); + break; case ObjectTypePath: GdipDeletePath(object->u.path); break; @@ -1685,6 +1712,93 @@ static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_si return status; } +static GpStatus metafile_get_pen_brush_data_offset(EmfPlusPen *data, UINT data_size, DWORD *ret) +{ + EmfPlusPenData *pendata = (EmfPlusPenData *)data->data; + DWORD offset = FIELD_OFFSET(EmfPlusPen, data); + + if (data_size <= offset) + return InvalidParameter; + + offset += FIELD_OFFSET(EmfPlusPenData, OptionalData); + if (data_size <= offset) + return InvalidParameter; + + if (pendata->PenDataFlags & PenDataTransform) + offset += sizeof(EmfPlusTransformMatrix); + + if (pendata->PenDataFlags & PenDataStartCap) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataEndCap) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataJoin) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataMiterLimit) + offset += sizeof(REAL); + + if (pendata->PenDataFlags & PenDataLineStyle) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataDashedLineCap) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataDashedLineOffset) + offset += sizeof(REAL); + + if (pendata->PenDataFlags & PenDataDashedLine) + { + EmfPlusDashedLineData *dashedline = (EmfPlusDashedLineData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusDashedLineData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += dashedline->DashedLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataNonCenter) + offset += sizeof(DWORD); + + if (pendata->PenDataFlags & PenDataCompoundLine) + { + EmfPlusCompoundLineData *compoundline = (EmfPlusCompoundLineData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusCompoundLineData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += compoundline->CompoundLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataCustomStartCap) + { + EmfPlusCustomStartCapData *startcap = (EmfPlusCustomStartCapData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusCustomStartCapData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += startcap->CustomStartCapSize; + } + + if (pendata->PenDataFlags & PenDataCustomEndCap) + { + EmfPlusCustomEndCapData *endcap = (EmfPlusCustomEndCapData *)((BYTE *)data + offset); + + offset += FIELD_OFFSET(EmfPlusCustomEndCapData, data); + if (data_size <= offset) + return InvalidParameter; + + offset += endcap->CustomEndCapSize; + } + + *ret = offset; + return Ok; +} + static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT data_size, const BYTE *record_data) { BYTE type = (flags >> 8) & 0xff; @@ -1700,6 +1814,124 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypeBrush: status = metafile_deserialize_brush(record_data, data_size, (GpBrush **)&object); break; + case ObjectTypePen: + { + EmfPlusPen *data = (EmfPlusPen *)record_data; + EmfPlusPenData *pendata = (EmfPlusPenData *)data->data; + GpBrush *brush; + DWORD offset; + GpPen *pen; + + status = metafile_get_pen_brush_data_offset(data, data_size, &offset); + if (status != Ok) + return status; + + status = metafile_deserialize_brush(record_data + offset, data_size - offset, &brush); + if (status != Ok) + return status; + + status = GdipCreatePen2(brush, pendata->PenWidth, pendata->PenUnit, &pen); + GdipDeleteBrush(brush); + if (status != Ok) + return status; + + offset = FIELD_OFFSET(EmfPlusPenData, OptionalData); + + if (pendata->PenDataFlags & PenDataTransform) + { + FIXME("PenDataTransform is not supported.\n"); + offset += sizeof(EmfPlusTransformMatrix); + } + + if (pendata->PenDataFlags & PenDataStartCap) + { + if ((status = GdipSetPenStartCap(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataEndCap) + { + if ((status = GdipSetPenEndCap(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataJoin) + { + if ((status = GdipSetPenLineJoin(pen, *(DWORD *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataMiterLimit) + { + if ((status = GdipSetPenMiterLimit(pen, *(REAL *)((BYTE *)pendata + offset)) != Ok)) + goto penfailed; + offset += sizeof(REAL); + } + + if (pendata->PenDataFlags & PenDataLineStyle) + { + if ((status = GdipSetPenDashStyle(pen, *(DWORD *)((BYTE *)pendata + offset)) != Ok)) + goto penfailed; + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataDashedLineCap) + { + FIXME("PenDataDashedLineCap is not supported.\n"); + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataDashedLineOffset) + { + if ((status = GdipSetPenDashOffset(pen, *(REAL *)((BYTE *)pendata + offset))) != Ok) + goto penfailed; + offset += sizeof(REAL); + } + + if (pendata->PenDataFlags & PenDataDashedLine) + { + EmfPlusDashedLineData *dashedline = (EmfPlusDashedLineData *)((BYTE *)pendata + offset); + FIXME("PenDataDashedLine is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusDashedLineData, data) + dashedline->DashedLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataNonCenter) + { + FIXME("PenDataNonCenter is not supported.\n"); + offset += sizeof(DWORD); + } + + if (pendata->PenDataFlags & PenDataCompoundLine) + { + EmfPlusCompoundLineData *compoundline = (EmfPlusCompoundLineData *)((BYTE *)pendata + offset); + FIXME("PenDataCompundLine is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusCompoundLineData, data) + compoundline->CompoundLineDataSize * sizeof(float); + } + + if (pendata->PenDataFlags & PenDataCustomStartCap) + { + EmfPlusCustomStartCapData *startcap = (EmfPlusCustomStartCapData *)((BYTE *)pendata + offset); + FIXME("PenDataCustomStartCap is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusCustomStartCapData, data) + startcap->CustomStartCapSize; + } + + if (pendata->PenDataFlags & PenDataCustomEndCap) + { + EmfPlusCustomEndCapData *endcap = (EmfPlusCustomEndCapData *)((BYTE *)pendata + offset); + FIXME("PenDataCustomEndCap is not supported.\n"); + offset += FIELD_OFFSET(EmfPlusCustomEndCapData, data) + endcap->CustomEndCapSize; + } + + object = pen; + break; + + penfailed: + GdipDeletePen(pen); + return status; + } case ObjectTypePath: status = metafile_deserialize_path(record_data, data_size, (GpPath **)&object); break;

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawPath records.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 363d24d45882e63c041fe360da34471d8c327730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=363d24d45882e63c041fe360d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:45:39 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeDrawPath records. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 6c18632..f18411b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2547,6 +2547,24 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeDrawPath: + { + EmfPlusDrawPath *draw = (EmfPlusDrawPath *)header; + BYTE path = flags & 0xff; + + if (dataSize != sizeof(draw->PenId)) + return InvalidParameter; + + if (path >= EmfPlusObjectTableSize || draw->PenId >= EmfPlusObjectTableSize) + return InvalidParameter; + + if (real_metafile->objtable[path].type != ObjectTypePath || + real_metafile->objtable[draw->PenId].type != ObjectTypePen) + return InvalidParameter; + + return GdipDrawPath(real_metafile->playback_graphics, real_metafile->objtable[draw->PenId].u.pen, + real_metafile->objtable[path].u.path); + } default: FIXME("Not implemented for record type %x\n", recordType); return NotImplemented;

1 0

Nikolay Sivov : gdiplus/metafile: Implement EmfPlusRegion deserialization.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: aef2f0799f09595f3458d3495e85bba0c9059865 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef2f0799f09595f3458d3495… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:45:40 2017 +0300 gdiplus/metafile: Implement EmfPlusRegion deserialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 25 ++++++++ dlls/gdiplus/metafile.c | 138 +++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/region.c | 24 ------- dlls/gdiplus/tests/metafile.c | 2 +- 4 files changed, 164 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index f39838e..ca2c022 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -396,6 +396,7 @@ struct emfplus_object { GpBrush *brush; GpPen *pen; GpPath *path; + GpRegion *region; GpImage *image; GpFont *font; GpImageAttributes *image_attributes; @@ -561,6 +562,30 @@ struct GpRegion{ region_element node; }; +struct memory_buffer +{ + const BYTE *buffer; + INT size, pos; +}; + +static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) +{ + mbuf->buffer = buffer; + mbuf->size = size; + mbuf->pos = 0; +} + +static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) +{ + if (mbuf->size - mbuf->pos >= size) + { + const void *data = mbuf->buffer + mbuf->pos; + mbuf->pos += size; + return data; + } + return NULL; +} + typedef GpStatus (*gdip_format_string_callback)(HDC hdc, GDIPCONST WCHAR *string, INT index, INT length, GDIPCONST GpFont *font, GDIPCONST RectF *rect, GDIPCONST GpStringFormat *format, diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index f18411b..7289ea5 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -265,6 +265,12 @@ typedef struct EmfPlusPath BYTE data[1]; } EmfPlusPath; +typedef struct EmfPlusRegionNodePath +{ + DWORD RegionNodePathLength; + EmfPlusPath RegionNodePath; +} EmfPlusRegionNodePath; + typedef struct EmfPlusRegion { DWORD Version; @@ -429,6 +435,9 @@ static void metafile_free_object_table_entry(GpMetafile *metafile, BYTE id) case ObjectTypePath: GdipDeletePath(object->u.path); break; + case ObjectTypeRegion: + GdipDeleteRegion(object->u.region); + break; case ObjectTypeImage: GdipDisposeImage(object->u.image); break; @@ -1685,6 +1694,132 @@ static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_siz return Ok; } +static GpStatus metafile_read_region_node(struct memory_buffer *mbuf, GpRegion *region, region_element *node, UINT *count) +{ + const DWORD *type; + GpStatus status; + + type = buffer_read(mbuf, sizeof(*type)); + if (!type) return Ok; + + node->type = *type; + + switch (node->type) + { + case CombineModeReplace: + case CombineModeIntersect: + case CombineModeUnion: + case CombineModeXor: + case CombineModeExclude: + case CombineModeComplement: + { + region_element *left, *right; + + left = heap_alloc_zero(sizeof(*left)); + if (!left) + return OutOfMemory; + + right = heap_alloc_zero(sizeof(*right)); + if (!right) + { + heap_free(left); + return OutOfMemory; + } + + status = metafile_read_region_node(mbuf, region, left, count); + if (status == Ok) + { + status = metafile_read_region_node(mbuf, region, right, count); + if (status == Ok) + { + node->elementdata.combine.left = left; + node->elementdata.combine.right = right; + region->num_children += 2; + return Ok; + } + } + + heap_free(left); + heap_free(right); + return status; + } + case RegionDataRect: + { + const EmfPlusRectF *rect; + + rect = buffer_read(mbuf, sizeof(*rect)); + if (!rect) + return InvalidParameter; + + memcpy(&node->elementdata.rect, rect, sizeof(*rect)); + *count += 1; + return Ok; + } + case RegionDataPath: + { + const BYTE *path_data; + const UINT *data_size; + GpPath *path; + + data_size = buffer_read(mbuf, FIELD_OFFSET(EmfPlusRegionNodePath, RegionNodePath)); + if (!data_size) + return InvalidParameter; + + path_data = buffer_read(mbuf, *data_size); + if (!path_data) + return InvalidParameter; + + status = metafile_deserialize_path(path_data, *data_size, &path); + if (status == Ok) + { + node->elementdata.path = path; + *count += 1; + } + return Ok; + } + case RegionDataEmptyRect: + case RegionDataInfiniteRect: + *count += 1; + return Ok; + default: + FIXME("element type %#x is not supported\n", *type); + break; + } + + return InvalidParameter; +} + +static GpStatus metafile_deserialize_region(const BYTE *record_data, UINT data_size, GpRegion **region) +{ + struct memory_buffer mbuf; + GpStatus status; + UINT count; + + *region = NULL; + + init_memory_buffer(&mbuf, record_data, data_size); + + if (!buffer_read(&mbuf, FIELD_OFFSET(EmfPlusRegion, RegionNode))) + return InvalidParameter; + + status = GdipCreateRegion(region); + if (status != Ok) + return status; + + count = 0; + status = metafile_read_region_node(&mbuf, *region, &(*region)->node, &count); + if (status == Ok && !count) + status = InvalidParameter; + + if (status != Ok) + { + GdipDeleteRegion(*region); + *region = NULL; + } + + return status; +} + static GpStatus metafile_deserialize_brush(const BYTE *record_data, UINT data_size, GpBrush **brush) { static const UINT header_size = FIELD_OFFSET(EmfPlusBrush, BrushData); @@ -1935,6 +2070,9 @@ static GpStatus METAFILE_PlaybackObject(GpMetafile *metafile, UINT flags, UINT d case ObjectTypePath: status = metafile_deserialize_path(record_data, data_size, (GpPath **)&object); break; + case ObjectTypeRegion: + status = metafile_deserialize_region(record_data, data_size, (GpRegion **)&object); + break; case ObjectTypeImage: status = metafile_deserialize_image(record_data, data_size, (GpImage **)&object); break; diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 8a2ca6b..8eb3ff3 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -76,12 +76,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); #define FLAGS_INTPATH 0x4000 -struct memory_buffer -{ - const BYTE *buffer; - INT size, pos; -}; - struct region_header { DWORD magic; @@ -778,24 +772,6 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, return Ok; } -static inline void init_memory_buffer(struct memory_buffer *mbuf, const BYTE *buffer, INT size) -{ - mbuf->buffer = buffer; - mbuf->size = size; - mbuf->pos = 0; -} - -static inline const void *buffer_read(struct memory_buffer *mbuf, INT size) -{ - if (mbuf->size - mbuf->pos >= size) - { - const void *data = mbuf->buffer + mbuf->pos; - mbuf->pos += size; - return data; - } - return NULL; -} - static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, region_element *node, INT *count) { GpStatus status; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 0e47607..f232210 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2170,7 +2170,7 @@ static const emfplus_record clipping_records[] = { { EmfPlusRecordTypeRestore }, { EmfPlusRecordTypeSetClipRect, 0x300 }, { EmfPlusRecordTypeFillRects, 0xc000 }, - { EmfPlusRecordTypeObject, ObjectTypeRegion << 8, 0, 1 }, + { EmfPlusRecordTypeObject, ObjectTypeRegion << 8 }, { EmfPlusRecordTypeSetClipRegion, 0x100, 0, 1 }, { EmfPlusRecordTypeEndOfFile }, { EMR_EOF },

1 0

Nikolay Sivov : include: Fix DWRITE_FONT_PROPERTY_ID enum.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 699c65ab1a9a53a434378d96b829faef1400d1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699c65ab1a9a53a434378d96b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:25:15 2017 +0300 include: Fix DWRITE_FONT_PROPERTY_ID enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index b80d033..6b4931c 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -57,6 +57,7 @@ typedef enum DWRITE_FONT_PROPERTY_ID DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG, + DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG, DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG, DWRITE_FONT_PROPERTY_ID_WEIGHT, DWRITE_FONT_PROPERTY_ID_STRETCH,

1 0

Nikolay Sivov : dwrite/tests: Some tests for font set properties.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: f577fc8fa22da5645bd33f26a68a053d9bfc0132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f577fc8fa22da5645bd33f26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:25:16 2017 +0300 dwrite/tests: Some tests for font set properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c28f27a..7a14180 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8305,6 +8305,149 @@ static void test_AnalyzeContainerType(void) IDWriteFactory5_Release(factory); } +static void test_fontsetbuilder(void) +{ + IDWriteFontCollection1 *collection; + IDWriteFontSetBuilder *builder; + IDWriteFactory3 *factory; + UINT32 count, i, ref; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory3); + if (!factory) { + skip("IDWriteFontSetBuilder is not supported.\n"); + return; + } + + EXPECT_REF(factory, 1); + hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); +todo_wine + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + if (FAILED(hr)) { + IDWriteFactory3_Release(factory); + return; + } + + EXPECT_REF(factory, 2); + IDWriteFontSetBuilder_Release(builder); + + hr = IDWriteFactory3_GetSystemFontCollection(factory, FALSE, &collection, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + + for (i = 0; i < count; i++) { + IDWriteFontFamily1 *family; + UINT32 j, fontcount; + IDWriteFont3 *font; + + hr = IDWriteFontCollection1_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); + + fontcount = IDWriteFontFamily1_GetFontCount(family); + for (j = 0; j < fontcount; j++) { + IDWriteFontFaceReference *ref, *ref2; + IDWriteFontSet *fontset; + UINT32 setcount, id; + + hr = IDWriteFontFamily1_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + /* Create a set with a single font reference, test set properties. */ + hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + hr = IDWriteFont3_GetFontFaceReference(font, &ref); + ok(hr == S_OK, "Failed to get fontface reference, hr %#x.\n", hr); + + EXPECT_REF(ref, 1); + hr = IDWriteFontSetBuilder_AddFontFaceReference(builder, ref); + ok(hr == S_OK, "Failed to add fontface reference, hr %#x.\n", hr); + EXPECT_REF(ref, 1); + + hr = IDWriteFontSetBuilder_CreateFontSet(builder, &fontset); + ok(hr == S_OK, "Failed to create a font set, hr %#x.\n", hr); + + setcount = IDWriteFontSet_GetFontCount(fontset); + ok(setcount == 1, "Unexpected font count %u.\n", setcount); + + hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref2); + ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); + ok(ref2 != ref, "Unexpected reference.\n"); + IDWriteFontFaceReference_Release(ref2); + + for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; id++) { + static const WCHAR fmtW[] = {'%','u',0}; + IDWriteLocalizedStrings *values; + WCHAR buffW[255], buff2W[255]; + UINT32 c, ivalue; + BOOL exists; + + hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values); + ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + + if (!exists) + continue; + + switch (id) + { + case DWRITE_FONT_PROPERTY_ID_WEIGHT: + ivalue = IDWriteFont3_GetWeight(font); + break; + case DWRITE_FONT_PROPERTY_ID_STRETCH: + ivalue = IDWriteFont3_GetStretch(font); + break; + case DWRITE_FONT_PROPERTY_ID_STYLE: + ivalue = IDWriteFont3_GetStyle(font); + break; + default: + ; + } + + switch (id) + { + case DWRITE_FONT_PROPERTY_ID_WEIGHT: + case DWRITE_FONT_PROPERTY_ID_STRETCH: + case DWRITE_FONT_PROPERTY_ID_STYLE: + c = IDWriteLocalizedStrings_GetCount(values); + ok(c == 1, "Unexpected string count %u.\n", c); + + buffW[0] = 'a'; + hr = IDWriteLocalizedStrings_GetLocaleName(values, 0, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(hr == S_OK, "Failed to get locale name, hr %#x.\n", hr); + ok(!*buffW, "Unexpected locale %s.\n", wine_dbgstr_w(buffW)); + + buff2W[0] = 0; + hr = IDWriteLocalizedStrings_GetString(values, 0, buff2W, sizeof(buff2W)/sizeof(buff2W[0])); + ok(hr == S_OK, "Failed to get property string, hr %#x.\n", hr); + + wsprintfW(buffW, fmtW, ivalue); + ok(!lstrcmpW(buffW, buff2W), "Unexpected property value %s, expected %s.\n", wine_dbgstr_w(buff2W), + wine_dbgstr_w(buffW)); + break; + default: + ; + } + + IDWriteLocalizedStrings_Release(values); + } + + IDWriteFontSet_Release(fontset); + IDWriteFontFaceReference_Release(ref); + IDWriteFontSetBuilder_Release(builder); + + IDWriteFont3_Release(font); + } + + IDWriteFontFamily1_Release(family); + } + + IDWriteFontCollection1_Release(collection); + + ref = IDWriteFactory3_Release(factory); + ok(ref == 0, "factory not released, %u\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -8371,6 +8514,7 @@ START_TEST(font) test_CreateCustomRenderingParams(); test_localfontfileloader(); test_AnalyzeContainerType(); + test_fontsetbuilder(); IDWriteFactory_Release(factory); }

1 0

Alexandre Julliard : makedep: Output empty rule for source makefiles.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 83fbb78d5f186fd2a38134689296142ae91a0609 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fbb78d5f186fd2a38134689… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 10:03:17 2017 +0200 makedep: Output empty rule for source makefiles. This should avoid breaking the build when a makefile is removed. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 296356b..ec339e0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3151,6 +3151,8 @@ static struct strarray output_sources( const struct makefile *make ) output( "Makefile:" ); output_filenames( makefile_deps ); output( "\n" ); + output_filenames( makefile_deps ); + output( ":\n" ); output( "distclean::\n"); output( "\trm -f" ); output_filenames( distclean_files );

1 0

Alexandre Julliard : configure: Silence error when krb5-config is missing.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 56cb45456b8146d4c2aaa67298afdbaa4084bfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=56cb45456b8146d4c2aaa6729… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 18:59:00 2017 +0200 configure: Silence error when krb5-config is missing. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 ++-- configure.ac | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 8b6fc45..0c090eb 100755 --- a/configure +++ b/configure @@ -13753,13 +13753,13 @@ then KRB5_CFLAGS=`$PKG_CONFIG --cflags krb5 2>/dev/null` fi fi -test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`krb5-config --cflags`} +test "$cross_compiling" = yes || KRB5_CFLAGS=${KRB5_CFLAGS:-`${KRB5_CONFIG:-krb5-config} --cflags 2>/dev/null`} if ${KRB5_LIBS:+false} :; then : if ${PKG_CONFIG+:} false; then : KRB5_LIBS=`$PKG_CONFIG --libs krb5 2>/dev/null` fi fi -test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`krb5-config --libs`} +test "$cross_compiling" = yes || KRB5_LIBS=${KRB5_LIBS:-`${KRB5_CONFIG:-krb5-config} --libs 2>/dev/null`} $as_echo "$as_me:${as_lineno-$LINENO}: krb5 cflags: $KRB5_CFLAGS" >&5 $as_echo "$as_me:${as_lineno-$LINENO}: krb5 libs: $KRB5_LIBS" >&5 diff --git a/configure.ac b/configure.ac index 0ad9028..c02253b 100644 --- a/configure.ac +++ b/configure.ac @@ -1629,7 +1629,9 @@ WINE_NOTICE_WITH(gsm,[test "x$ac_cv_lib_soname_gsm" = "x"], dnl **** Check for krb5 **** if test "x$with_krb5" != "xno" then - WINE_PACKAGE_FLAGS(KRB5,[krb5],,[`krb5-config --cflags`],[`krb5-config --libs`], + WINE_PACKAGE_FLAGS(KRB5,[krb5],, + [`${KRB5_CONFIG:-krb5-config} --cflags 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs 2>/dev/null`], [AC_CHECK_HEADERS([krb5/krb5.h]) if test "$ac_cv_header_krb5_krb5_h" = "yes" then

1 0

Dmitry Timoshkov : ole32/tests: Add a test for saving an IOleCache storage.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 970c5b1dd2a971c5bac69e1f4e6f8e494c37fd8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=970c5b1dd2a971c5bac69e1f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:41:56 2017 +0800 ole32/tests: Add a test for saving an IOleCache storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 205 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 195 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=970c5b1dd2a971c5bac69…

1 0

Dmitry Timoshkov : ole32/tests: Add a test for IOleCache storage contents created by IPersistStorage_Save ().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 19385780ca630a553051e8e4f009a11eb82bcac8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19385780ca630a553051e8e4f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:42:39 2017 +0800 ole32/tests: Add a test for IOleCache storage contents created by IPersistStorage_Save(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 402 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 402 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19385780ca630a553051e…

1 0

Dmitry Timoshkov : ole32: Remove an optimization from DataCache_Save() that copies whole original storage.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: f7eabdf3a8ebdcc388772949749f36808ba7fea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7eabdf3a8ebdcc3887729497… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 20 17:43:28 2017 +0800 ole32: Remove an optimization from DataCache_Save() that copies whole original storage. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 6 ------ dlls/ole32/tests/ole2.c | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 808c2dc..360ecd8 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1665,12 +1665,6 @@ static HRESULT WINAPI DataCache_Save( } } - /* this is a shortcut if nothing changed */ - if (!dirty && !fSameAsLoad && This->presentationStorage) - { - return IStorage_CopyTo(This->presentationStorage, 0, NULL, NULL, pStg); - } - /* assign stream numbers to the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 16c6d88..08b6a27 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2980,9 +2980,7 @@ static HRESULT WINAPI Storage_SetElementTimes(IStorage *iface, LPCOLESTR pwcsNam static HRESULT WINAPI Storage_SetClass(IStorage *iface, REFCLSID clsid) { -todo_wine_if(!expect_Storage_SetClass) CHECK_EXPECT(Storage_SetClass); -todo_wine_if(IsEqualIID(Storage_SetClass_CLSID, &CLSID_NULL)) ok(IsEqualIID(clsid, Storage_SetClass_CLSID), "expected %s, got %s\n", wine_dbgstr_guid(Storage_SetClass_CLSID), wine_dbgstr_guid(clsid)); return S_OK; @@ -3491,7 +3489,6 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ hr = IStorage_Stat(stg, &stat, STATFLAG_NONAME); ok(hr == S_OK, "unexpected %#x\n", hr); -todo_wine_if(!IsEqualCLSID(stg_def->clsid, &stat.clsid)) ok(IsEqualCLSID(stg_def->clsid, &stat.clsid), "expected %s, got %s\n", wine_dbgstr_guid(stg_def->clsid), wine_dbgstr_guid(&stat.clsid)); @@ -3702,10 +3699,10 @@ todo_wine_if(test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_8 || t enumerated_streams = matched_streams = -1; check_storage_contents(doc2, test_data[i].out, &enumerated_streams, &matched_streams); -todo_wine +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2)) ok(enumerated_streams == matched_streams, "%d out: enumerated %d != matched %d\n", i, enumerated_streams, matched_streams); -todo_wine +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_5)) ok(enumerated_streams == test_data[i].out->stream_count, "%d: saved streams %d != def streams %d\n", i, enumerated_streams, test_data[i].out->stream_count);

1 0