wine-commits December 2015

wine-commits@winehq.org

2 participants
327 discussions

André Hentschel : winedev: Update informations on Win64.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: docs Branch: master Commit: bb708fe5a182eca11320299e6afe3091eff50457 URL: http://source.winehq.org/git/docs.git/?a=commit;h=bb708fe5a182eca11320299e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:07:27 2015 +0100 winedev: Update informations on Win64. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- en/winedev-architecture.sgml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/winedev-architecture.sgml b/en/winedev-architecture.sgml index 0bf152f..6fe756a 100644 --- a/en/winedev-architecture.sgml +++ b/en/winedev-architecture.sgml @@ -170,7 +170,7 @@ 32-bit offsets (hence the 32-bit name). </entry> <entry> - Only available on AMD64 architectures. + Only available on AMD64 and AArch64 architectures. </entry> <entry> Flat model, with 32/64-bit addresses.

1 0

Alexandre Julliard : Wine release 1.9.0
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: website Branch: master Commit: a20fa0282ab3dff0bfcc0a16e2ff797154eb11c1 URL: http://source.winehq.org/git/website.git/?a=commit;h=a20fa0282ab3dff0bfcc0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 25 18:19:30 2015 +0100 Wine release 1.9.0 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2015122501.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2015122501.xml b/news/en/2015122501.xml new file mode 100644 index 0000000..b72ffff --- /dev/null +++ b/news/en/2015122501.xml @@ -0,0 +1,16 @@ +<news> +<date>December 25, 2015</date> +<title>Wine 1.9.0 Released</title> +<body> + The Wine development release 1.9.0 is now available. + <a href="{$root}/announce/1.9.0">What's new</a> in this release: +<ul> + <li>A number of fixes that were deferred during code freeze.</li> + <li>WSAPoll implementation.</li> + <li>Standard font dialog fixes.</li> + <li>X11 drag&drop improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.0.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.9.0 : Alexandre Julliard : Release 1.9.0
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: refs/tags/wine-1.9.0 Tag: b9aba85efd1d96c555e16b1ff180699b25c92aea URL: http://source.winehq.org/git/wine.git/?a=tag;h=b9aba85efd1d96c555e16b1ff180… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 25 18:09:55 2015 +0100 Release 1.9.0

1 0

Alexandre Julliard : Release 1.9.0.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: master Commit: 93d7356290bfe5bfd2104f98592790841e33420e URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d7356290bfe5bfd2104f985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 25 18:09:55 2015 +0100 Release 1.9.0. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 671 ++++++++++++++++++++++---------------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 254 insertions(+), 440 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=93d7356290bfe5bfd2104…

1 0

Nikolay Sivov : dwrite: Fix identical ranges merging.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: master Commit: b02e61c4b3e61f11f1c426d4fca8a358d936d8dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02e61c4b3e61f11f1c426d4f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:58:02 2015 +0300 dwrite: Fix identical ranges merging. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 ++-- dlls/dwrite/tests/layout.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 62beea4..ef8d8bf 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -2136,7 +2136,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo /* for all existing ranges covered by new one update value */ while (cur && is_in_layout_range(&value->range, &cur->range)) { - changed = set_layout_range_attrval(cur, attr, value); + changed |= set_layout_range_attrval(cur, attr, value); cur = LIST_ENTRY(list_next(ranges, &cur->entry), struct layout_range_header, entry); } @@ -2145,7 +2145,7 @@ static HRESULT set_layout_range_attr(struct dwrite_textlayout *layout, enum layo r.startPosition = cur->range.startPosition; r.length = value->range.startPosition + value->range.length - cur->range.startPosition; left = alloc_layout_range_from(cur, &r); - changed = set_layout_range_attrval(left, attr, value); + changed |= set_layout_range_attrval(left, attr, value); cur->range.startPosition += left->range.length; cur->range.length -= left->range.length; list_add_before(&cur->entry, &left->entry); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index da7dfe9..637a8ea 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2056,17 +2056,17 @@ if (0) /* crashes on native */ range.length = 0; hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), &range); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { +todo_wine ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); -} + /* check what's returned for positions after the text */ buffW[0] = 0; range.length = 0; hr = IDWriteTextLayout_GetLocaleName(layout, 100, buffW, sizeof(buffW)/sizeof(WCHAR), &range); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); todo_wine + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); IDWriteTextLayout_Release(layout);

1 0

Nikolay Sivov : dwrite: Locale layout ranged attribute is case-insensitive.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: master Commit: 3c16587ed46f6cfad283dbc694c014ecb379f1d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c16587ed46f6cfad283dbc69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:58:01 2015 +0300 dwrite: Locale layout ranged attribute is case-insensitive. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 6 +++--- dlls/dwrite/tests/layout.c | 28 +++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 30fade6..62beea4 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1600,7 +1600,7 @@ static BOOL is_same_layout_attrvalue(struct layout_range_header const *h, enum l case LAYOUT_RANGE_ATTR_FONTCOLL: return range->collection == value->u.collection; case LAYOUT_RANGE_ATTR_LOCALE: - return strcmpW(range->locale, value->u.locale) == 0; + return strcmpiW(range->locale, value->u.locale) == 0; case LAYOUT_RANGE_ATTR_FONTFAMILY: return strcmpW(range->fontfamily, value->u.fontfamily) == 0; case LAYOUT_RANGE_ATTR_SPACING: @@ -1632,7 +1632,7 @@ static inline BOOL is_same_layout_attributes(struct layout_range_header const *h left->underline == right->underline && left->pair_kerning == right->pair_kerning && left->collection == right->collection && - !strcmpW(left->locale, right->locale) && + !strcmpiW(left->locale, right->locale) && !strcmpW(left->fontfamily, right->fontfamily); } case LAYOUT_RANGE_STRIKETHROUGH: @@ -1973,7 +1973,7 @@ static BOOL set_layout_range_attrval(struct layout_range_header *h, enum layout_ changed = set_layout_range_iface_attr((IUnknown**)&dest->collection, (IUnknown*)value->u.collection); break; case LAYOUT_RANGE_ATTR_LOCALE: - changed = strcmpW(dest->locale, value->u.locale) != 0; + changed = strcmpiW(dest->locale, value->u.locale) != 0; if (changed) strcpyW(dest->locale, value->u.locale); break; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6bcc538..da7dfe9 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1982,6 +1982,7 @@ todo_wine { static void test_SetLocaleName(void) { + static const WCHAR eNuSW[] = {'e','N','-','u','S',0}; static const WCHAR strW[] = {'a','b','c','d',0}; WCHAR buffW[LOCALE_NAME_MAX_LENGTH+sizeof(strW)/sizeof(WCHAR)]; IDWriteTextFormat *format; @@ -2018,9 +2019,11 @@ if (0) /* crashes on native */ hr = IDWriteTextLayout_GetLocaleName(layout, 0, NULL, 1, NULL); buffW[0] = 0; - hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), NULL); + range.length = 0; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), &range); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + ok(range.startPosition == 0 && range.length == 1, "got %u,%u\n", range.startPosition, range.length); /* get with a shorter buffer */ buffW[0] = 0xa; @@ -2043,6 +2046,29 @@ if (0) /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(!lstrcmpW(buffW, strW), "got %s\n", wine_dbgstr_w(buffW)); + /* set initial locale name for whole text, except with a different casing */ + range.startPosition = 0; + range.length = 4; + hr = IDWriteTextLayout_SetLocaleName(layout, eNuSW, range); + ok(hr == S_OK, "got 0x%08x\n", hr); + + buffW[0] = 0; + range.length = 0; + hr = IDWriteTextLayout_GetLocaleName(layout, 0, buffW, sizeof(buffW)/sizeof(WCHAR), &range); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); + ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); +} + /* check what's returned for positions after the text */ + buffW[0] = 0; + range.length = 0; + hr = IDWriteTextLayout_GetLocaleName(layout, 100, buffW, sizeof(buffW)/sizeof(WCHAR), &range); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, enusW), "got %s\n", wine_dbgstr_w(buffW)); +todo_wine + ok(range.startPosition == 0 && range.length == ~0u, "got %u,%u\n", range.startPosition, range.length); + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory);

1 0

Nikolay Sivov : dwrite: Store optical alignment property.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: master Commit: 6ba2c25d45b1db8a5bdd01a8010ce8bdc6a3b0fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba2c25d45b1db8a5bdd01a80… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:58:00 2015 +0300 dwrite: Store optical alignment property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 40 ++++++++++++++++++--------- dlls/dwrite/tests/layout.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 4823390..30fade6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -50,6 +50,7 @@ struct dwrite_textformat_data { DWRITE_FLOW_DIRECTION flow; DWRITE_LINE_SPACING_METHOD spacingmethod; DWRITE_VERTICAL_GLYPH_ORIENTATION vertical_orientation; + DWRITE_OPTICAL_ALIGNMENT optical_alignment; FLOAT spacing; FLOAT baseline; @@ -408,6 +409,15 @@ static HRESULT set_fontfallback_for_format(struct dwrite_textformat_data *format return S_OK; } +static HRESULT format_set_optical_alignment(struct dwrite_textformat_data *format, + DWRITE_OPTICAL_ALIGNMENT alignment) +{ + if ((UINT32)alignment > DWRITE_OPTICAL_ALIGNMENT_NO_SIDE_BEARINGS) + return E_INVALIDARG; + format->optical_alignment = alignment; + return S_OK; +} + static struct layout_run *alloc_layout_run(enum layout_run_kind kind) { struct layout_run *ret; @@ -3217,15 +3227,15 @@ static BOOL WINAPI dwritetextlayout2_GetLastLineWrapping(IDWriteTextLayout2 *ifa static HRESULT WINAPI dwritetextlayout2_SetOpticalAlignment(IDWriteTextLayout2 *iface, DWRITE_OPTICAL_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d): stub\n", This, alignment); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, alignment); + return IDWriteTextFormat1_SetOpticalAlignment(&This->IDWriteTextFormat1_iface, alignment); } static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextlayout2_GetOpticalAlignment(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p): stub\n", This); - return DWRITE_OPTICAL_ALIGNMENT_NONE; + TRACE("(%p)\n", This); + return IDWriteTextFormat1_GetOpticalAlignment(&This->IDWriteTextFormat1_iface); } static HRESULT WINAPI dwritetextlayout2_SetFontFallback(IDWriteTextLayout2 *iface, IDWriteFontFallback *fallback) @@ -3627,15 +3637,15 @@ static BOOL WINAPI dwritetextformat1_layout_GetLastLineWrapping(IDWriteTextForma static HRESULT WINAPI dwritetextformat1_layout_SetOpticalAlignment(IDWriteTextFormat1 *iface, DWRITE_OPTICAL_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_optical_alignment(&This->format, alignment); } static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_layout_GetOpticalAlignment(IDWriteTextFormat1 *iface) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); - return DWRITE_OPTICAL_ALIGNMENT_NONE; + TRACE("(%p)\n", This); + return This->format.optical_alignment; } static HRESULT WINAPI dwritetextformat1_layout_SetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback *fallback) @@ -3969,11 +3979,14 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); if (hr == S_OK) { layout->format.vertical_orientation = IDWriteTextFormat1_GetVerticalGlyphOrientation(format1); + layout->format.optical_alignment = IDWriteTextFormat1_GetOpticalAlignment(format1); IDWriteTextFormat1_GetFontFallback(format1, &layout->format.fallback); IDWriteTextFormat1_Release(format1); } - else + else { layout->format.vertical_orientation = DWRITE_VERTICAL_GLYPH_ORIENTATION_DEFAULT; + layout->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; + } return IDWriteTextFormat_GetFontCollection(format, &layout->format.collection); } @@ -4563,15 +4576,15 @@ static BOOL WINAPI dwritetextformat1_GetLastLineWrapping(IDWriteTextFormat1 *ifa static HRESULT WINAPI dwritetextformat1_SetOpticalAlignment(IDWriteTextFormat1 *iface, DWRITE_OPTICAL_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, alignment); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, alignment); + return format_set_optical_alignment(&This->format, alignment); } static DWRITE_OPTICAL_ALIGNMENT WINAPI dwritetextformat1_GetOpticalAlignment(IDWriteTextFormat1 *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); - return DWRITE_OPTICAL_ALIGNMENT_NONE; + TRACE("(%p)\n", This); + return This->format.optical_alignment; } static HRESULT WINAPI dwritetextformat1_SetFontFallback(IDWriteTextFormat1 *iface, IDWriteFontFallback *fallback) @@ -4654,6 +4667,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.fontsize = size; This->format.stretch = stretch; This->format.textalignment = DWRITE_TEXT_ALIGNMENT_LEADING; + This->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; This->format.paralign = DWRITE_PARAGRAPH_ALIGNMENT_NEAR; This->format.wrapping = DWRITE_WORD_WRAPPING_WRAP; This->format.last_line_wrapping = TRUE; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 7e93994..6bcc538 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4177,6 +4177,74 @@ static void test_SetLastLineWrapping(void) IDWriteFactory_Release(factory); } +static void test_SetOpticalAlignment(void) +{ + static const WCHAR strW[] = {'a',0}; + DWRITE_OPTICAL_ALIGNMENT alignment; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); + IDWriteTextFormat_Release(format); + if (hr != S_OK) { + win_skip("SetOpticalAlignment() is not supported\n"); + IDWriteFactory_Release(factory); + return; + } + + alignment = IDWriteTextFormat1_GetOpticalAlignment(format1); + ok(alignment == DWRITE_OPTICAL_ALIGNMENT_NONE, "got %d\n", alignment); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, (IDWriteTextFormat*)format1, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat1_Release(format1); + + alignment = IDWriteTextLayout2_GetOpticalAlignment(layout2); + ok(alignment == DWRITE_OPTICAL_ALIGNMENT_NONE, "got %d\n", alignment); + + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + alignment = IDWriteTextFormat1_GetOpticalAlignment(format1); + ok(alignment == DWRITE_OPTICAL_ALIGNMENT_NONE, "got %d\n", alignment); + + hr = IDWriteTextLayout2_SetOpticalAlignment(layout2, DWRITE_OPTICAL_ALIGNMENT_NO_SIDE_BEARINGS); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout2_SetOpticalAlignment(layout2, DWRITE_OPTICAL_ALIGNMENT_NO_SIDE_BEARINGS+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + alignment = IDWriteTextFormat1_GetOpticalAlignment(format1); + ok(alignment == DWRITE_OPTICAL_ALIGNMENT_NO_SIDE_BEARINGS, "got %d\n", alignment); + + hr = IDWriteTextFormat1_SetOpticalAlignment(format1, DWRITE_OPTICAL_ALIGNMENT_NONE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat1_SetOpticalAlignment(format1, DWRITE_OPTICAL_ALIGNMENT_NO_SIDE_BEARINGS+1); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + alignment = IDWriteTextLayout2_GetOpticalAlignment(layout2); + ok(alignment == DWRITE_OPTICAL_ALIGNMENT_NONE, "got %d\n", alignment); + + IDWriteTextLayout2_Release(layout2); + IDWriteTextFormat1_Release(format1); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -4226,6 +4294,7 @@ START_TEST(layout) test_FontFallbackBuilder(); test_SetTypography(); test_SetLastLineWrapping(); + test_SetOpticalAlignment(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Store last line wrapping property.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: master Commit: 3905ed8c47588a7f6481140d624f7ebf849e1615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3905ed8c47588a7f6481140d6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:57:59 2015 +0300 dwrite: Store last line wrapping property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 32 +++++++++++++++++++------------ dlls/dwrite/tests/layout.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index b341ad5..4823390 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -45,6 +45,7 @@ struct dwrite_textformat_data { DWRITE_PARAGRAPH_ALIGNMENT paralign; DWRITE_READING_DIRECTION readingdir; DWRITE_WORD_WRAPPING wrapping; + BOOL last_line_wrapping; DWRITE_TEXT_ALIGNMENT textalignment; DWRITE_FLOW_DIRECTION flow; DWRITE_LINE_SPACING_METHOD spacingmethod; @@ -3202,15 +3203,15 @@ static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextlayout2_GetVerticalGly static HRESULT WINAPI dwritetextlayout2_SetLastLineWrapping(IDWriteTextLayout2 *iface, BOOL lastline_wrapping_enabled) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p)->(%d): stub\n", This, lastline_wrapping_enabled); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, lastline_wrapping_enabled); + return IDWriteTextFormat1_SetLastLineWrapping(&This->IDWriteTextFormat1_iface, lastline_wrapping_enabled); } static BOOL WINAPI dwritetextlayout2_GetLastLineWrapping(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return IDWriteTextFormat1_GetLastLineWrapping(&This->IDWriteTextFormat1_iface); } static HRESULT WINAPI dwritetextlayout2_SetOpticalAlignment(IDWriteTextLayout2 *iface, DWRITE_OPTICAL_ALIGNMENT alignment) @@ -3609,15 +3610,18 @@ static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_layout_GetVert static HRESULT WINAPI dwritetextformat1_layout_SetLastLineWrapping(IDWriteTextFormat1 *iface, BOOL lastline_wrapping_enabled) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, lastline_wrapping_enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, lastline_wrapping_enabled); + + This->format.last_line_wrapping = !!lastline_wrapping_enabled; + return S_OK; } static BOOL WINAPI dwritetextformat1_layout_GetLastLineWrapping(IDWriteTextFormat1 *iface) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return This->format.last_line_wrapping; } static HRESULT WINAPI dwritetextformat1_layout_SetOpticalAlignment(IDWriteTextFormat1 *iface, DWRITE_OPTICAL_ALIGNMENT alignment) @@ -4542,15 +4546,18 @@ static DWRITE_VERTICAL_GLYPH_ORIENTATION WINAPI dwritetextformat1_GetVerticalGly static HRESULT WINAPI dwritetextformat1_SetLastLineWrapping(IDWriteTextFormat1 *iface, BOOL lastline_wrapping_enabled) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, lastline_wrapping_enabled); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, lastline_wrapping_enabled); + + This->format.last_line_wrapping = !!lastline_wrapping_enabled; + return S_OK; } static BOOL WINAPI dwritetextformat1_GetLastLineWrapping(IDWriteTextFormat1 *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - FIXME("(%p): stub\n", This); - return FALSE; + TRACE("(%p)\n", This); + return This->format.last_line_wrapping; } static HRESULT WINAPI dwritetextformat1_SetOpticalAlignment(IDWriteTextFormat1 *iface, DWRITE_OPTICAL_ALIGNMENT alignment) @@ -4649,6 +4656,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.textalignment = DWRITE_TEXT_ALIGNMENT_LEADING; This->format.paralign = DWRITE_PARAGRAPH_ALIGNMENT_NEAR; This->format.wrapping = DWRITE_WORD_WRAPPING_WRAP; + This->format.last_line_wrapping = TRUE; This->format.readingdir = DWRITE_READING_DIRECTION_LEFT_TO_RIGHT; This->format.flow = DWRITE_FLOW_DIRECTION_TOP_TO_BOTTOM; This->format.spacingmethod = DWRITE_LINE_SPACING_METHOD_DEFAULT; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 186e257..7e93994 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4130,6 +4130,53 @@ static void test_SetTypography(void) IDWriteFactory_Release(factory); } +static void test_SetLastLineWrapping(void) +{ + static const WCHAR strW[] = {'a',0}; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + HRESULT hr; + BOOL ret; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_QueryInterface(format, &IID_IDWriteTextFormat1, (void**)&format1); + IDWriteTextFormat_Release(format); + if (hr != S_OK) { + win_skip("SetLastLineWrapping() is not supported\n"); + IDWriteFactory_Release(factory); + return; + } + + ret = IDWriteTextFormat1_GetLastLineWrapping(format1); + ok(ret, "got %d\n", ret); + + hr = IDWriteTextFormat1_SetLastLineWrapping(format1, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 1, (IDWriteTextFormat*)format1, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextLayout_Release(layout); + + ret = IDWriteTextLayout2_GetLastLineWrapping(layout2); + ok(!ret, "got %d\n", ret); + + hr = IDWriteTextLayout2_SetLastLineWrapping(layout2, TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -4178,6 +4225,7 @@ START_TEST(layout) test_MapCharacters(); test_FontFallbackBuilder(); test_SetTypography(); + test_SetLastLineWrapping(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Optimize for the most common case of layout object initialization.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: master Commit: 7a83be7bd273a02a6c558f75e9d8a4af6145de5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a83be7bd273a02a6c558f75e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:57:58 2015 +0300 dwrite: Optimize for the most common case of layout object initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 66998b6..b341ad5 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -326,6 +326,8 @@ static inline struct dwrite_textformat *impl_from_IDWriteTextFormat1(IDWriteText return CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat1_iface); } +static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat*); + static inline struct dwrite_trimmingsign *impl_from_IDWriteInlineObject(IDWriteInlineObject *iface) { return CONTAINING_RECORD(iface, struct dwrite_trimmingsign, IDWriteInlineObject_iface); @@ -3896,10 +3898,29 @@ static const IDWriteTextAnalysisSourceVtbl dwritetextlayoutsourcevtbl = { static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, IDWriteTextFormat *format) { + struct dwrite_textformat *textformat; IDWriteTextFormat1 *format1; UINT32 len; HRESULT hr; + if ((textformat = unsafe_impl_from_IDWriteTextFormat(format))) { + layout->format = textformat->format; + + layout->format.locale = heap_strdupW(textformat->format.locale); + layout->format.family_name = heap_strdupW(textformat->format.family_name); + if (!layout->format.locale || !layout->format.family_name) + return E_OUTOFMEMORY; + + if (layout->format.trimmingsign) + IDWriteInlineObject_AddRef(layout->format.trimmingsign); + if (layout->format.collection) + IDWriteFontCollection_AddRef(layout->format.collection); + if (layout->format.fallback) + IDWriteFontFallback_AddRef(layout->format.fallback); + + return S_OK; + } + layout->format.weight = IDWriteTextFormat_GetFontWeight(format); layout->format.style = IDWriteTextFormat_GetFontStyle(format); layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); @@ -4599,6 +4620,12 @@ static const IDWriteTextFormat1Vtbl dwritetextformatvtbl = { dwritetextformat1_GetFontFallback }; +static struct dwrite_textformat *unsafe_impl_from_IDWriteTextFormat(IDWriteTextFormat *iface) +{ + return (iface->lpVtbl == (IDWriteTextFormatVtbl*)&dwritetextformatvtbl) ? + CONTAINING_RECORD(iface, struct dwrite_textformat, IDWriteTextFormat1_iface) : NULL; +} + HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *collection, DWRITE_FONT_WEIGHT weight, DWRITE_FONT_STYLE style, DWRITE_FONT_STRETCH stretch, FLOAT size, const WCHAR *locale, IDWriteTextFormat **format) {

1 0

Nikolay Sivov : dwrite: Store per-range typography property.
by Alexandre Julliard 25 Dec '15

25 Dec '15

Module: wine Branch: master Commit: e9d4725326ab8d9d3be50c2f4d75606abded2363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d4725326ab8d9d3be50c2f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:57:57 2015 +0300 dwrite: Store per-range typography property. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 101 +++++++++++++++++++++++++++++++-------------- dlls/dwrite/tests/layout.c | 57 +++++++++++++++++++++++++ 2 files changed, 126 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9d4725326ab8d9d3be50…

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2015