July 2015 - Wine-commits - list.winehq.org

Michael Stefaniuc : dmsynth: Remove a now unused macro.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 7b5f3188345dce26c746420da216e1c224509eed URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b5f3188345dce26c746420da… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 6 00:34:58 2015 +0200 dmsynth: Remove a now unused macro. --- dlls/dmsynth/dmsynth_private.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 3635aed..f056581 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -104,12 +104,6 @@ typedef struct { } guid_info; /* used for initialising structs (primarily for DMUS_OBJECTDESC) */ -#define DM_STRUCT_INIT(x) \ - do { \ - memset((x), 0, sizeof(*(x))); \ - (x)->dwSize = sizeof(*x); \ - } while (0) - #define FE(x) { x, #x } #define GE(x) { &x, #x }

1 0

Nikolay Sivov : dwrite: Remove separate line count layout field.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 7a64715be3720bc1663c21e33d7f60b49d027239 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a64715be3720bc1663c21e33… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:04:43 2015 +0300 dwrite: Remove separate line count layout field. --- dlls/dwrite/layout.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 980eff5..693f046 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -243,7 +243,6 @@ struct dwrite_textlayout { FLOAT minwidth; DWRITE_LINE_METRICS *lines; - UINT32 line_count; UINT32 line_alloc; DWRITE_TEXT_METRICS1 metrics; @@ -1028,7 +1027,7 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ return E_OUTOFMEMORY; } - if (layout->line_count == layout->line_alloc) { + if (layout->metrics.lineCount == layout->line_alloc) { DWRITE_LINE_METRICS *l = heap_realloc(layout->lines, layout->line_alloc*2*sizeof(*layout->lines)); if (!l) return E_OUTOFMEMORY; @@ -1037,7 +1036,7 @@ static HRESULT layout_set_line_metrics(struct dwrite_textlayout *layout, DWRITE_ } layout->lines[*line] = *metrics; - layout->line_count += 1; + layout->metrics.lineCount += 1; *line += 1; return S_OK; } @@ -1094,7 +1093,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (FAILED(hr)) return hr; - layout->line_count = 0; + layout->metrics.lineCount = 0; origin_x = 0.0; line = 0; run = layout->clusters[0].run; @@ -1214,7 +1213,6 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->metrics.left = layout->metrics.top = 0.0; layout->metrics.maxBidiReorderingDepth = 1; /* FIXME */ - layout->metrics.lineCount = layout->line_count; layout->metrics.height = 0.0; /* Now all line info is here, update effective runs positions in flow direction */ @@ -1222,7 +1220,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) inrun = layout_get_next_inline_run(layout, NULL); origin_y = 0.0; - for (line = 0; line < layout->line_count; line++) { + for (line = 0; line < layout->metrics.lineCount; line++) { origin_y += layout->lines[line].baseline; @@ -2599,10 +2597,10 @@ static HRESULT WINAPI dwritetextlayout_GetLineMetrics(IDWriteTextLayout2 *iface, return hr; if (metrics) - memcpy(metrics, This->lines, sizeof(DWRITE_LINE_METRICS)*min(max_count, This->line_count)); + memcpy(metrics, This->lines, sizeof(*metrics)*min(max_count, This->metrics.lineCount)); - *count = This->line_count; - return max_count >= This->line_count ? S_OK : E_NOT_SUFFICIENT_BUFFER; + *count = This->metrics.lineCount; + return max_count >= This->metrics.lineCount ? S_OK : E_NOT_SUFFICIENT_BUFFER; } static HRESULT WINAPI dwritetextlayout_GetMetrics(IDWriteTextLayout2 *iface, DWRITE_TEXT_METRICS *metrics) @@ -3556,7 +3554,6 @@ static HRESULT init_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat * layout->clustermetrics = NULL; layout->clusters = NULL; layout->lines = NULL; - layout->line_count = 0; layout->line_alloc = 0; layout->minwidth = 0.0; list_init(&layout->eruns);

1 0

Nikolay Sivov : dwrite: Make it possible to set text alignment on created layout.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: de46f610fe61ed5f1ff99908682d33a32e8c9f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de46f610fe61ed5f1ff999086… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:05:10 2015 +0300 dwrite: Make it possible to set text alignment on created layout. --- dlls/dwrite/layout.c | 22 ++++++++--------- dlls/dwrite/tests/layout.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 693f046..13a9ce0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -328,6 +328,14 @@ static inline const char *debugstr_run(const struct regular_layout_run *run) run->descr.stringLength); } +static inline HRESULT format_set_textalignment(struct dwrite_textformat_data *format, DWRITE_TEXT_ALIGNMENT alignment) +{ + if ((UINT32)alignment > DWRITE_TEXT_ALIGNMENT_JUSTIFIED) + return E_INVALIDARG; + format->textalignment = alignment; + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -1955,7 +1963,6 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) static HRESULT WINAPI dwritetextlayout_SetTextAlignment(IDWriteTextLayout2 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%d)\n", This, alignment); return IDWriteTextFormat1_SetTextAlignment(&This->IDWriteTextFormat1_iface, alignment); } @@ -2013,7 +2020,6 @@ static HRESULT WINAPI dwritetextlayout_SetLineSpacing(IDWriteTextLayout2 *iface, static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextlayout_GetTextAlignment(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetTextAlignment(&This->IDWriteTextFormat1_iface); } @@ -2972,8 +2978,8 @@ static ULONG WINAPI dwritetextformat1_layout_Release(IDWriteTextFormat1 *iface) static HRESULT WINAPI dwritetextformat1_layout_SetTextAlignment(IDWriteTextFormat1 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, alignment); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, alignment); + return format_set_textalignment(&This->format, alignment); } static HRESULT WINAPI dwritetextformat1_layout_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) @@ -3846,14 +3852,8 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat1 *iface) static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat1 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - TRACE("(%p)->(%d)\n", This, alignment); - - if ((UINT32)alignment > DWRITE_TEXT_ALIGNMENT_JUSTIFIED) - return E_INVALIDARG; - - This->format.textalignment = alignment; - return S_OK; + return format_set_textalignment(&This->format, alignment); } static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index eee86a9..57d3a34 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2863,6 +2863,65 @@ todo_wine { IDWriteFactory_Release(factory); } +static void test_SetTextAlignment(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextFormat1 *format1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + DWRITE_TEXT_ALIGNMENT v; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetTextAlignment(format); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 300.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextLayout_GetTextAlignment(layout); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + hr = IDWriteTextLayout_SetTextAlignment(layout, DWRITE_TEXT_ALIGNMENT_TRAILING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetTextAlignment(format); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + v = IDWriteTextLayout_GetTextAlignment(layout); + ok(v == DWRITE_TEXT_ALIGNMENT_TRAILING, "got %d\n", v); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat1, (void**)&format1); + if (hr == S_OK) { + hr = IDWriteTextFormat1_SetTextAlignment(format1, DWRITE_TEXT_ALIGNMENT_CENTER); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetTextAlignment(format); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + v = IDWriteTextLayout_GetTextAlignment(layout); + ok(v == DWRITE_TEXT_ALIGNMENT_CENTER, "got %d\n", v); + + v = IDWriteTextFormat1_GetTextAlignment(format1); + ok(v == DWRITE_TEXT_ALIGNMENT_CENTER, "got %d\n", v); + + IDWriteTextFormat1_Release(format1); + } + else + win_skip("IDWriteTextFormat1 is not supported\n"); + + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2903,6 +2962,7 @@ START_TEST(layout) test_SetFlowDirection(); test_SetDrawingEffect(); test_GetLineMetrics(); + test_SetTextAlignment(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement leading and trailing text alignment modes.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 44c135dd179637076c53166485362e7e45ca7d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c135dd179637076c5316648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:05:41 2015 +0300 dwrite: Implement leading and trailing text alignment modes. --- dlls/dwrite/layout.c | 127 ++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/layout.c | 54 ++++++++++++++++++- 2 files changed, 173 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44c135dd179637076c531…

1 0

Nikolay Sivov : dwrite: Implement paragraph alignment.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 862ac80a0dc2a04aa2e1ff74d387a437dfe4b199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=862ac80a0dc2a04aa2e1ff74d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:06:08 2015 +0300 dwrite: Implement paragraph alignment. --- dlls/dwrite/layout.c | 83 +++++++++++++++++++++++++++++++++++----- dlls/dwrite/tests/layout.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 168 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 18462b0..1fb49c1 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -342,6 +342,16 @@ static inline HRESULT format_set_textalignment(struct dwrite_textformat_data *fo return S_OK; } +static inline HRESULT format_set_paralignment(struct dwrite_textformat_data *format, + DWRITE_PARAGRAPH_ALIGNMENT alignment, BOOL *changed) +{ + if ((UINT32)alignment > DWRITE_PARAGRAPH_ALIGNMENT_CENTER) + return E_INVALIDARG; + if (changed) *changed = format->paralign != alignment; + format->paralign = alignment; + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -1182,6 +1192,50 @@ static void layout_apply_text_alignment(struct dwrite_textlayout *layout) } } +static void layout_apply_par_alignment(struct dwrite_textlayout *layout) +{ + struct layout_effective_inline *inrun; + struct layout_effective_run *erun; + FLOAT origin_y = 0.0; + UINT32 line; + + /* alignment mode defines origin, after that all run origins are updated + the same way */ + + switch (layout->format.paralign) + { + case DWRITE_PARAGRAPH_ALIGNMENT_NEAR: + origin_y = 0.0; + break; + case DWRITE_PARAGRAPH_ALIGNMENT_FAR: + origin_y = layout->metrics.layoutHeight - layout->metrics.height; + break; + case DWRITE_PARAGRAPH_ALIGNMENT_CENTER: + origin_y = (layout->metrics.layoutHeight - layout->metrics.height) / 2.0; + break; + default: + ; + } + + layout->metrics.top = origin_y; + + erun = layout_get_next_erun(layout, NULL); + inrun = layout_get_next_inline_run(layout, NULL); + for (line = 0; line < layout->metrics.lineCount; line++) { + origin_y += layout->lines[line].baseline; + + while (erun && erun->line == line) { + erun->origin_y = origin_y; + erun = layout_get_next_erun(layout, erun); + } + + while (inrun && inrun->line == line) { + inrun->origin_y = origin_y; + inrun = layout_get_next_inline_run(layout, inrun); + } + } +} + static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) { struct layout_effective_inline *inrun; @@ -1354,6 +1408,10 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (layout->format.textalignment != DWRITE_TEXT_ALIGNMENT_LEADING) layout_apply_text_alignment(layout); + /* initial paragraph alignment is always near */ + if (layout->format.paralign != DWRITE_PARAGRAPH_ALIGNMENT_NEAR) + layout_apply_par_alignment(layout); + layout->metrics.heightIncludingTrailingWhitespace = layout->metrics.height; /* FIXME: not true for vertical text */ layout->recompute &= ~RECOMPUTE_EFFECTIVE_RUNS; @@ -2072,7 +2130,6 @@ static HRESULT WINAPI dwritetextlayout_SetTextAlignment(IDWriteTextLayout2 *ifac static HRESULT WINAPI dwritetextlayout_SetParagraphAlignment(IDWriteTextLayout2 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%d)\n", This, alignment); return IDWriteTextFormat1_SetParagraphAlignment(&This->IDWriteTextFormat1_iface, alignment); } @@ -3100,8 +3157,20 @@ static HRESULT WINAPI dwritetextformat1_layout_SetTextAlignment(IDWriteTextForma static HRESULT WINAPI dwritetextformat1_layout_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, alignment); - return E_NOTIMPL; + BOOL changed; + HRESULT hr; + + TRACE("(%p)->(%d)\n", This, alignment); + + hr = format_set_paralignment(&This->format, alignment, &changed); + if (FAILED(hr)) + return hr; + + /* if layout is not ready there's nothing to align */ + if (changed && !(This->recompute & RECOMPUTE_EFFECTIVE_RUNS)) + layout_apply_par_alignment(This); + + return S_OK; } static HRESULT WINAPI dwritetextformat1_layout_SetWordWrapping(IDWriteTextFormat1 *iface, DWRITE_WORD_WRAPPING wrapping) @@ -3974,14 +4043,8 @@ static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat1 *ifac static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - TRACE("(%p)->(%d)\n", This, alignment); - - if ((UINT32)alignment > DWRITE_PARAGRAPH_ALIGNMENT_CENTER) - return E_INVALIDARG; - - This->format.paralign = alignment; - return S_OK; + return format_set_paralignment(&This->format, alignment, NULL); } static HRESULT WINAPI dwritetextformat_SetWordWrapping(IDWriteTextFormat1 *iface, DWRITE_WORD_WRAPPING wrapping) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 8e8651a..6e55c60 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2972,6 +2972,100 @@ static void test_SetTextAlignment(void) IDWriteFactory_Release(factory); } +static void test_SetParagraphAlignment(void) +{ + static const WCHAR strW[] = {'a',0}; + DWRITE_TEXT_METRICS metrics; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + DWRITE_PARAGRAPH_ALIGNMENT v; + DWRITE_LINE_METRICS lines[1]; + UINT32 count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetParagraphAlignment(format); + ok(v == DWRITE_PARAGRAPH_ALIGNMENT_NEAR, "got %d\n", v); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextLayout_GetParagraphAlignment(layout); + ok(v == DWRITE_PARAGRAPH_ALIGNMENT_NEAR, "got %d\n", v); + + hr = IDWriteTextLayout_SetParagraphAlignment(layout, DWRITE_PARAGRAPH_ALIGNMENT_FAR); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_SetParagraphAlignment(layout, DWRITE_PARAGRAPH_ALIGNMENT_FAR); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetParagraphAlignment(format); + ok(v == DWRITE_PARAGRAPH_ALIGNMENT_NEAR, "got %d\n", v); + + v = IDWriteTextLayout_GetParagraphAlignment(layout); + ok(v == DWRITE_PARAGRAPH_ALIGNMENT_FAR, "got %d\n", v); + + hr = IDWriteTextLayout_SetParagraphAlignment(layout, DWRITE_PARAGRAPH_ALIGNMENT_CENTER); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextLayout_GetParagraphAlignment(layout); + ok(v == DWRITE_PARAGRAPH_ALIGNMENT_CENTER, "got %d\n", v); + + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, lines, 1, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + /* maxheight is 100, near alignment */ + hr = IDWriteTextLayout_SetParagraphAlignment(layout, DWRITE_PARAGRAPH_ALIGNMENT_NEAR); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(metrics.top == 0.0, "got %.2f\n", metrics.top); + ok(metrics.height == lines[0].height, "got %.2f\n", metrics.height); + ok(metrics.layoutHeight == 100.0, "got %.2f\n", metrics.layoutHeight); + ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); + + /* maxwidth is 100, far alignment */ + hr = IDWriteTextLayout_SetParagraphAlignment(layout, DWRITE_PARAGRAPH_ALIGNMENT_FAR); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(metrics.top == metrics.layoutHeight - metrics.height, "got %.2f\n", metrics.top); + ok(metrics.height == lines[0].height, "got %.2f\n", metrics.height); + ok(metrics.layoutHeight == 100.0, "got %.2f\n", metrics.layoutHeight); + ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); + IDWriteTextLayout_Release(layout); + + /* initially created with centered alignment */ + hr = IDWriteTextFormat_SetParagraphAlignment(format, DWRITE_PARAGRAPH_ALIGNMENT_CENTER); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, format, 500.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "got 0x%08x\n", hr); + + ok(metrics.top == (metrics.layoutHeight - lines[0].height) / 2, "got %.2f\n", metrics.top); + ok(metrics.height == lines[0].height, "got %.2f\n", metrics.height); + ok(metrics.lineCount == 1, "got %d\n", metrics.lineCount); + IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -3013,6 +3107,7 @@ START_TEST(layout) test_SetDrawingEffect(); test_GetLineMetrics(); test_SetTextAlignment(); + test_SetParagraphAlignment(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/tests: Test that pair kerning affects shaping.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: b49f9f609a9882372e2876ac5647a9452bf899d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49f9f609a9882372e2876ac5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:06:38 2015 +0300 dwrite/tests: Test that pair kerning affects shaping. --- dlls/dwrite/tests/layout.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6e55c60..232f127 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1839,13 +1839,15 @@ if (0) /* crashes on native */ static void test_SetPairKerning(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; + static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ + DWRITE_CLUSTER_METRICS clusters[4]; IDWriteTextLayout1 *layout1; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; BOOL kerning; + UINT32 count; HRESULT hr; factory = create_factory(); @@ -1881,9 +1883,22 @@ if (0) { /* crashes on native */ hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, &range); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!kerning, "got %d\n", kerning); + ok(range.length == ~0u, "got %u\n", range.length); + count = 0; + hr = IDWriteTextLayout1_GetClusterMetrics(layout1, clusters, 4, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); +if (count == 3) { + ok(clusters[0].length == 1, "got %u\n", clusters[0].length); + ok(clusters[1].length == 2, "got %u\n", clusters[1].length); + ok(clusters[2].length == 1, "got %u\n", clusters[2].length); +} + /* pair kerning flag participates in itemization - combining characters + breaks */ range.startPosition = 0; - range.length = 1; + range.length = 2; hr = IDWriteTextLayout1_SetPairKerning(layout1, 2, range); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1892,6 +1907,15 @@ if (0) { /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(kerning == TRUE, "got %d\n", kerning); + count = 0; + hr = IDWriteTextLayout1_GetClusterMetrics(layout1, clusters, 4, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + ok(clusters[0].length == 1, "got %u\n", clusters[0].length); + ok(clusters[1].length == 1, "got %u\n", clusters[1].length); + ok(clusters[2].length == 1, "got %u\n", clusters[2].length); + ok(clusters[3].length == 1, "got %u\n", clusters[3].length); + IDWriteTextLayout1_Release(layout1); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : shell32: Handle string-to-guid conversion errors (Coverity ).
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 69733d65e82035a4375042e283bf9720f833ca69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69733d65e82035a4375042e28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:09:06 2015 +0300 shell32: Handle string-to-guid conversion errors (Coverity). --- dlls/shell32/shellpath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 42f34a2..1a4528f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5334,7 +5334,11 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szParentFolder, RRF_RT_REG_SZ, NULL, parentGuid, &dwSize)); if(SUCCEEDED(hr)) - IIDFromString(parentGuid, &pKFD->fidParent); + { + hr = IIDFromString(parentGuid, &pKFD->fidParent); + if(FAILED(hr)) + return hr; + } get_known_folder_dword(knownfolder->registryPath, szAttributes, &pKFD->dwAttributes);

1 0

Nikolay Sivov : gdiplus: Remove always true condition (Coverity).
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 07f8493895d7567b70d84bd1a176c5fb6f332d16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07f8493895d7567b70d84bd1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:09:34 2015 +0300 gdiplus: Remove always true condition (Coverity). --- dlls/gdiplus/graphics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 92bc194..1b7d8c4 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2168,8 +2168,8 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, GpMatrix xform = *matrix; GdipTransformMatrixPoints(&xform, pt, 3); } - if (graphics) - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X));

1 0

Dmitry Timoshkov : ole32: Accept STG_E_UNIMPLEMENTEDFUNCTION when ILockBytes implementation doesn' t support locking.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: 1f17334fc298d40459aca511702525d2f15d84db URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f17334fc298d40459aca5117… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jul 3 15:27:22 2015 +0800 ole32: Accept STG_E_UNIMPLEMENTEDFUNCTION when ILockBytes implementation doesn't support locking. Some custom implementations return it instead of STG_E_INVALIDFUNCTION. --- dlls/ole32/storage32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 220e17e..aa53758 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -5015,7 +5015,7 @@ static HRESULT StorageImpl_GrabLocks(StorageImpl *This, DWORD openFlags) hr = StorageImpl_LockRegionSync(This, offset, cb, LOCK_ONLYONCE); /* If the ILockBytes doesn't support locking that's ok. */ - if (hr == STG_E_INVALIDFUNCTION) return S_OK; + if (hr == STG_E_INVALIDFUNCTION || hr == STG_E_UNIMPLEMENTEDFUNCTION) return S_OK; else if (FAILED(hr)) return hr; hr = S_OK;

1 0

Huw Davies : dwrite/tests: Add tests for GetGdiCompatibleMetrics.
by Alexandre Julliard 06 Jul '15

06 Jul '15

Module: wine Branch: master Commit: bbf5b249ca882df07b326b50027d27baa5b586c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf5b249ca882df07b326b500… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 3 15:53:07 2015 +0100 dwrite/tests: Add tests for GetGdiCompatibleMetrics. --- dlls/dwrite/tests/font.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 221 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 111762c..d3ac83c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -19,9 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #define COBJMACROS #include "windows.h" +#include "winternl.h" #include "dwrite_2.h" #include "initguid.h" #include "d2d1.h" @@ -33,6 +36,7 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') +#define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -87,6 +91,7 @@ static inline BOOL heap_free(void *mem) static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR arialW[] = {'A','r','i','a','l',0}; static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; @@ -2255,11 +2260,11 @@ static void test_GetFontFromFontFace(void) DELETE_FONTFILE(path); } -static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style) +static IDWriteFont *get_font(IDWriteFactory *factory, const WCHAR *name, DWRITE_FONT_STYLE style) { IDWriteFontCollection *collection; IDWriteFontFamily *family; - IDWriteFont *font; + IDWriteFont *font = NULL; UINT32 index; BOOL exists; HRESULT hr; @@ -2269,9 +2274,9 @@ static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STY index = ~0; exists = FALSE; - hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &index, &exists); + hr = IDWriteFontCollection_FindFamilyName(collection, name, &index, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(exists, "got %d\n", exists); + if (!exists) goto not_found; hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2281,10 +2286,18 @@ static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STY ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFamily_Release(family); +not_found: IDWriteFontCollection_Release(collection); return font; } +static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style) +{ + IDWriteFont *font = get_font(factory, tahomaW, style); + ok(font != NULL, "failed to get Tahoma\n"); + return font; +} + static void test_GetFirstMatchingFont(void) { DWRITE_FONT_SIMULATIONS simulations; @@ -3418,6 +3431,209 @@ static void test_CreateGlyphRunAnalysis(void) IDWriteFactory_Release(factory); } +#define round(x) ((int)floor((x) + 0.5)) + +struct VDMX_Header +{ + WORD version; + WORD numRecs; + WORD numRatios; +}; + +struct VDMX_Ratio +{ + BYTE bCharSet; + BYTE xRatio; + BYTE yStartRatio; + BYTE yEndRatio; +}; + +struct VDMX_group +{ + WORD recs; + BYTE startsz; + BYTE endsz; +}; + +struct VDMX_vTable +{ + WORD yPelHeight; + SHORT yMax; + SHORT yMin; +}; + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#endif + +static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) +{ + WORD num_ratios, i, group_offset = 0; + struct VDMX_Ratio *ratios = (struct VDMX_Ratio*)(hdr + 1); + BYTE dev_x_ratio = 1, dev_y_ratio = 1; + + num_ratios = GET_BE_WORD(hdr->numRatios); + + for (i = 0; i < num_ratios; i++) + { + if (!ratios[i].bCharSet) continue; + + if ((ratios[i].xRatio == 0 && ratios[i].yStartRatio == 0 && + ratios[i].yEndRatio == 0) || + (ratios[i].xRatio == dev_x_ratio && ratios[i].yStartRatio <= dev_y_ratio && + ratios[i].yEndRatio >= dev_y_ratio)) + { + group_offset = GET_BE_WORD(*((WORD *)(ratios + num_ratios) + i)); + break; + } + } + if (group_offset) + return (const struct VDMX_group *)((BYTE *)hdr + group_offset); + return NULL; +} + +static BOOL get_vdmx_size(const struct VDMX_group *group, int emsize, int *a, int *d) +{ + WORD recs, i; + const struct VDMX_vTable *tables; + + if (!group) return FALSE; + + recs = GET_BE_WORD(group->recs); + if (emsize < group->startsz || emsize >= group->endsz) return FALSE; + + tables = (const struct VDMX_vTable *)(group + 1); + for (i = 0; i < recs; i++) + { + WORD ppem = GET_BE_WORD(tables[i].yPelHeight); + if (ppem > emsize) + { + /* FIXME: Supposed to interpolate */ + trace("FIXME interpolate %d\n", emsize); + return FALSE; + } + + if (ppem == emsize) + { + *a = (SHORT)GET_BE_WORD(tables[i].yMax); + *d = -(SHORT)GET_BE_WORD(tables[i].yMin); + return TRUE; + } + } + return FALSE; +} + +static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face) +{ + HRESULT hr; + DWRITE_FONT_METRICS design_metrics, comp_metrics; + FLOAT emsize, scale; + int ascent, descent, expect; + const struct VDMX_Header *vdmx; + UINT32 vdmx_len; + void *vdmx_ctx; + BOOL exists; + const struct VDMX_group *vdmx_group = NULL; + + IDWriteFontFace_GetMetrics(face, &design_metrics); + + hr = IDWriteFontFace_TryGetFontTable(face, MS_VDMX_TAG, (const void **)&vdmx, + &vdmx_len, &vdmx_ctx, &exists); + if (hr != S_OK || !exists) + vdmx = NULL; + else + vdmx_group = find_vdmx_group(vdmx); + + for (emsize = 5; emsize <= design_metrics.designUnitsPerEm; emsize++) + { + scale = emsize / design_metrics.designUnitsPerEm; + hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, emsize, 1.0, NULL, &comp_metrics); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); + if (hr != S_OK) return; + + if (!get_vdmx_size(vdmx_group, emsize, &ascent, &descent)) + { + ascent = round(design_metrics.ascent * scale); + descent = round(design_metrics.descent * scale); + } + + ok(comp_metrics.designUnitsPerEm == design_metrics.designUnitsPerEm, + "%.2f: emsize: got %d expect %d\n", + emsize, comp_metrics.designUnitsPerEm, design_metrics.designUnitsPerEm); + + ok(comp_metrics.ascent == round(ascent / scale), "%.2f a: got %d expect %d\n", + emsize, comp_metrics.ascent, round(ascent / scale)); + + ok(comp_metrics.descent == round(descent / scale), "%.2f d: got %d expect %d\n", + emsize, comp_metrics.descent, round(descent / scale)); + + expect = round(round(design_metrics.lineGap * scale) / scale); + ok(comp_metrics.lineGap == expect, "%.2f lg: got %d expect %d\n", + emsize, comp_metrics.lineGap, expect); + + expect = round(round(design_metrics.capHeight * scale) / scale); + ok(comp_metrics.capHeight == expect, "%.2f capH: got %d expect %d\n", + emsize, comp_metrics.capHeight, expect); + + expect = round(round(design_metrics.xHeight * scale) / scale); + ok(comp_metrics.xHeight == expect, "%.2f xH: got %d expect %d\n", + emsize, comp_metrics.xHeight, expect); + + expect = round(round(design_metrics.underlinePosition * scale) / scale); + ok(comp_metrics.underlinePosition == expect, "%.2f ulP: got %d expect %d\n", + emsize, comp_metrics.underlinePosition, expect); + + expect = round(round(design_metrics.underlineThickness * scale) / scale); + ok(comp_metrics.underlineThickness == expect, "%.2f ulTh: got %d expect %d\n", + emsize, comp_metrics.underlineThickness, expect); + + expect = round(round(design_metrics.strikethroughPosition * scale) / scale); + ok(comp_metrics.strikethroughPosition == expect, "%.2f stP: got %d expect %d\n", + emsize, comp_metrics.strikethroughPosition, expect); + + expect = round(round(design_metrics.strikethroughThickness * scale) / scale); + ok(comp_metrics.strikethroughThickness == expect, "%.2f stTh: got %d expect %d\n", + emsize, comp_metrics.strikethroughThickness, expect); + } + + if (vdmx) IDWriteFontFace_ReleaseFontTable(face, vdmx_ctx); +} + +static void test_GetGdiCompatibleMetrics(void) +{ + IDWriteFactory *factory; + IDWriteFont *font; + IDWriteFontFace *fontface; + HRESULT hr; + + factory = create_factory(); + + font = get_font(factory, tahomaW, DWRITE_FONT_STYLE_NORMAL); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + test_GetGdiCompatibleMetrics_face(fontface); + IDWriteFontFace_Release(fontface); + + font = get_font(factory, arialW, DWRITE_FONT_STYLE_NORMAL); + if (!font) + skip("Skipping tests with Arial\n"); + else + { + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + test_GetGdiCompatibleMetrics_face(fontface); + IDWriteFontFace_Release(fontface); + } + + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -3461,6 +3677,7 @@ START_TEST(font) test_GetKerningPairAdjustments(); test_CreateRenderingParams(); test_CreateGlyphRunAnalysis(); + test_GetGdiCompatibleMetrics(); IDWriteFactory_Release(factory); }

1 0