December 2015 - Wine-Commits

André Hentschel : winedev: Update informations on Win64.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

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 Dec. 25, 2015

Dec. 25, 2015

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

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

Dec. 25, 2015

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

Tag wine-1.9.0 : Alexandre Julliard : Release 1.9.0
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

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

Nikolay Sivov : dwrite: Fix identical ranges merging.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

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

Alexandre Julliard : Release 1.9.0.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

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: Store optical alignment property.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

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 Dec. 25, 2015

Dec. 25, 2015

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

Alex Henrie : ntdll: Increase maximum number of autodetected COM/ LPT ports to 256.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 65942760c4e7816c5345a8a451ab4511c0426874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65942760c4e7816c5345a8a45… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 23 21:58:43 2015 -0700 ntdll: Increase maximum number of autodetected COM/LPT ports to 256. Windows autodetects up to 256 serial ports and 256 parallel ports per system. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 23ebf48..f3c6aa2 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -331,28 +331,19 @@ static char *get_default_com_device( int num ) { char *ret = NULL; - if (!num || num > 9) return ret; + if (num < 1 || num > 256) return NULL; #ifdef linux - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/ttyS0") ); - if (ret) - { - strcpy( ret, "/dev/ttyS0" ); - ret[strlen(ret) - 1] = '0' + num - 1; - } + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/ttyS256") ); + if (!ret) return NULL; + sprintf( ret, "/dev/ttyS%d", num - 1 ); #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuau0") ); - if (ret) - { - strcpy( ret, "/dev/cuau0" ); - ret[strlen(ret) - 1] = '0' + num - 1; - } + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuau256") ); + if (!ret) return NULL; + sprintf( ret, "/dev/cuau%d", num - 1 ); #elif defined(__DragonFly__) - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuaa0") ); - if (ret) - { - strcpy( ret, "/dev/cuaa0" ); - ret[strlen(ret) - 1] = '0' + num - 1; - } + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuaa256") ); + if (!ret) return NULL; + sprintf( ret, "/dev/cuaa%d", num - 1 ); #else FIXME( "no known default for device com%d\n", num ); #endif @@ -369,14 +360,11 @@ static char *get_default_lpt_device( int num ) { char *ret = NULL; - if (!num || num > 9) return ret; + if (num < 1 || num > 256) return NULL; #ifdef linux - ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/lp0") ); - if (ret) - { - strcpy( ret, "/dev/lp0" ); - ret[strlen(ret) - 1] = '0' + num - 1; - } + ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/lp256") ); + if (!ret) return NULL; + sprintf( ret, "/dev/lp%d", num - 1 ); #else FIXME( "no known default for device lpt%d\n", num ); #endif

1 0

André Hentschel : sane.ds: Remove dead code (Clang).
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 3d80706129c3dbbcc93e514e1fc5f1867989342f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d80706129c3dbbcc93e514e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:31:01 2015 +0100 sane.ds: Remove dead code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sane.ds/capability.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 7d3376f..45c54a1 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -1081,11 +1081,6 @@ static TW_UINT16 SANE_CAPFeederEnabled (pTW_CAPABILITY pCapability, TW_UINT16 ac twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { - if (val) - enabled = TRUE; - else - enabled = FALSE; - strcpy(source, "ADF"); status = sane_option_set_str(activeDS.deviceHandle, SANE_NAME_SCAN_SOURCE, source, NULL); if (status != SANE_STATUS_GOOD) @@ -1109,7 +1104,6 @@ static TW_UINT16 SANE_CAPFeederEnabled (pTW_CAPABILITY pCapability, TW_UINT16 ac strcpy(source, "Auto"); if (sane_option_set_str(activeDS.deviceHandle, SANE_NAME_SCAN_SOURCE, source, NULL) == SANE_STATUS_GOOD) enabled = TRUE; - twCC = TWCC_SUCCESS; /* .. fall through intentional .. */ case MSG_GETCURRENT:

1 0

André Hentschel : wineboot: Remove dead code (Clang).
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 054ca8f3c7a5a449f619d3b825a5ce33780432d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=054ca8f3c7a5a449f619d3b82… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:27 2015 +0100 wineboot: Remove dead code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineboot/shutdown.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wineboot/shutdown.c b/programs/wineboot/shutdown.c index 52d37e7..b7752c4 100644 --- a/programs/wineboot/shutdown.c +++ b/programs/wineboot/shutdown.c @@ -133,7 +133,6 @@ static INT_PTR CALLBACK endtask_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LP { case WM_INITDIALOG: SetWindowLongPtrW( hwnd, DWLP_USER, lparam ); - data = (struct endtask_dlg_data *)lparam; ShowWindow( hwnd, SW_SHOWNORMAL ); return TRUE; case WM_COMMAND:

1 0

André Hentschel : secur32: Ignore pfQOP in VerifySignature (Clang).
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 63b392b144f27da6ab8740239f2c17969d66ab11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b392b144f27da6ab8740239… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 22:00:38 2015 +0100 secur32: Ignore pfQOP in VerifySignature (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 2 -- dlls/secur32/tests/ntlm.c | 8 ++++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 0fe64ed..a38d81a 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1630,7 +1630,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { PNegoHelper helper; - ULONG fQOP = 0; UINT i; int token_idx; SECURITY_STATUS ret; @@ -1689,7 +1688,6 @@ SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle phContext, ret = SEC_E_OK; HeapFree(GetProcessHeap(), 0, local_buff); - pfQOP = &fQOP; return ret; diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 8adbbb4..154d86b 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -928,7 +928,7 @@ static void testSignSeal(void) static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt; SecBuffer data[2], fake_data[2], complex_data[4]; - ULONG qop = 0; + ULONG qop = 0xdeadbeef; SecPkgContext_Sizes ctxt_sizes; static char test_user[] = "testuser", workgroup[] = "WORKGROUP", @@ -1041,12 +1041,13 @@ static void testSignSeal(void) ok(sec_status == SEC_E_MESSAGE_ALTERED, "VerifySignature returned %s, not SEC_E_MESSAGE_ALTERED.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); memcpy(data[0].pvBuffer, message_signature, data[0].cbBuffer); - sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); if (sec_status == SEC_E_UNSUPPORTED_FUNCTION) @@ -1093,6 +1094,7 @@ static void testSignSeal(void) ok(!memcmp(crypt.pBuffers[1].pvBuffer, message_binary, crypt.pBuffers[1].cbBuffer), "Failed to decrypt message correctly.\n"); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); } else trace( "A different session key is being used\n" ); @@ -1130,6 +1132,7 @@ static void testSignSeal(void) sec_status = pVerifySignature(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "VerifySignature returned %s, not SEC_E_OK\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); sec_status = pEncryptMessage(&client.ctxt, 0, &crypt, 0); ok(sec_status == SEC_E_OK, "EncryptMessage returned %s, not SEC_E_OK.\n", @@ -1161,6 +1164,7 @@ static void testSignSeal(void) sec_status = pDecryptMessage(&client.ctxt, &crypt, 0, &qop); ok(sec_status == SEC_E_OK, "DecryptMessage returned %s, not SEC_E_OK.\n", getSecError(sec_status)); + ok(qop == 0xdeadbeef, "qop changed to %u\n", qop); end:

1 0

Sebastian Lackner : pdh: Fix prototype of PdhGetLogFileType[A/W].
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 4933f08316ac78ae55be7e35de57472725e7bab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4933f08316ac78ae55be7e35d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Dec 24 23:08:08 2015 +0100 pdh: Fix prototype of PdhGetLogFileType[A/W]. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index 529b92d..41900c8 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -62,8 +62,8 @@ @ stub PdhGetFormattedCounterArrayW @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) @ stub PdhGetLogFileSize -@ stdcall PdhGetLogFileTypeA(ptr ptr) -@ stdcall PdhGetLogFileTypeW(ptr ptr) +@ stdcall PdhGetLogFileTypeA(str ptr) +@ stdcall PdhGetLogFileTypeW(wstr ptr) @ stub PdhGetLogSetGUID @ stub PdhGetRawCounterArrayA @ stub PdhGetRawCounterArrayW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 036d28b..8854fd7 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1273,17 +1273,17 @@ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) /*********************************************************************** * PdhGetLogFileTypeA (PDH.@) */ -PDH_STATUS WINAPI PdhGetLogFileTypeA(PDH_HLOG log, DWORD *type) +PDH_STATUS WINAPI PdhGetLogFileTypeA(const char *log, DWORD *type) { - FIXME("%p, %p: stub\n", log, type); + FIXME("%s, %p: stub\n", debugstr_a(log), type); return PDH_NOT_IMPLEMENTED; } /*********************************************************************** * PdhGetLogFileTypeW (PDH.@) */ -PDH_STATUS WINAPI PdhGetLogFileTypeW(PDH_HLOG log, DWORD *type) +PDH_STATUS WINAPI PdhGetLogFileTypeW(const WCHAR *log, DWORD *type) { - FIXME("%p, %p: stub\n", log, type); + FIXME("%s, %p: stub\n", debugstr_w(log), type); return PDH_NOT_IMPLEMENTED; }

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: d94032403d922e9b70987b75cd08ec18461f6aaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d94032403d922e9b70987b75c… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Dec 25 02:22:50 2015 +0200 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/fi.po b/po/fi.po index e41c1cd..97a9128 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1036,7 +1036,7 @@ msgstr "Valitse kansio" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Fonttikoon täytyy olla luku." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

André Hentschel : winedbg: Remove a dead assignment ( Clang).
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: 4f1ed54c7d3274201657eaef6492e727c4c6ab66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1ed54c7d3274201657eaef6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:24 2015 +0100 winedbg: Remove a dead assignment (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index c21336a..cabb75f 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -234,7 +234,7 @@ static int source_display(const char* sourcefile, int start, int end) * OK, I guess the user doesn't really want to see it * after all. */ - ol = source_add_file(sourcefile, NULL); + source_add_file(sourcefile, NULL); return FALSE; } }

1 0

Nikolay Sivov : dwrite/tests: One more test for duplicates in IDWriteTypography.
by Alexandre Julliard Dec. 25, 2015

Dec. 25, 2015

Module: wine Branch: master Commit: f845cca0dc4e9f2194e0ab60798a3e586cd4ad45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f845cca0dc4e9f2194e0ab607… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 25 15:57:56 2015 +0300 dwrite/tests: One more test for duplicates in IDWriteTypography. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6ea2734..5e38a07 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1611,13 +1611,13 @@ static void test_typography(void) count = IDWriteTypography_GetFontFeatureCount(typography); ok(count == 2, "got %u\n", count); - memset(&feature, 0, sizeof(feature)); + memset(&feature, 0xcc, sizeof(feature)); hr = IDWriteTypography_GetFontFeature(typography, 0, &feature); ok(hr == S_OK, "got 0x%08x\n", hr); ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); ok(feature.parameter == 1, "got %u\n", feature.parameter); - memset(&feature, 0, sizeof(feature)); + memset(&feature, 0xcc, sizeof(feature)); hr = IDWriteTypography_GetFontFeature(typography, 1, &feature); ok(hr == S_OK, "got 0x%08x\n", hr); ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); @@ -1626,6 +1626,21 @@ static void test_typography(void) hr = IDWriteTypography_GetFontFeature(typography, 2, &feature); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* duplicated with same parameter value */ + feature.nameTag = DWRITE_FONT_FEATURE_TAG_KERNING; + feature.parameter = 0; + hr = IDWriteTypography_AddFontFeature(typography, feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = IDWriteTypography_GetFontFeatureCount(typography); + ok(count == 3, "got %u\n", count); + + memset(&feature, 0xcc, sizeof(feature)); + hr = IDWriteTypography_GetFontFeature(typography, 2, &feature); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(feature.nameTag == DWRITE_FONT_FEATURE_TAG_KERNING, "got tag %x\n", feature.nameTag); + ok(feature.parameter == 0, "got %u\n", feature.parameter); + IDWriteTypography_Release(typography); IDWriteFactory_Release(factory); }

1 0

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

Dec. 25, 2015

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

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

Dec. 25, 2015

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

Austin English : api-ms-win-security-lsalookup-l1-1-0: New dll.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 6767ac4bb79ad774f0c850a8c4753a2e6fdea75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6767ac4bb79ad774f0c850a8c… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 19:16:16 2015 -0600 api-ms-win-security-lsalookup-l1-1-0: New dll. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in | 1 + .../api-ms-win-security-lsalookup-l1-1-0.spec | 11 +++++++++++ tools/make_specfiles | 1 + 5 files changed, 16 insertions(+) diff --git a/configure b/configure index 4d513c2..287f4ab 100755 --- a/configure +++ b/configure @@ -956,6 +956,7 @@ enable_api_ms_win_eventing_provider_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_security_base_l1_1_0 enable_api_ms_win_security_base_l1_2_0 +enable_api_ms_win_security_lsalookup_l1_1_0 enable_api_ms_win_security_sddl_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 @@ -17350,6 +17351,7 @@ wine_fn_config_dll api-ms-win-eventing-provider-l1-1-0 enable_api_ms_win_eventin wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-1-0 enable_api_ms_win_security_base_l1_1_0 wine_fn_config_dll api-ms-win-security-base-l1-2-0 enable_api_ms_win_security_base_l1_2_0 +wine_fn_config_dll api-ms-win-security-lsalookup-l1-1-0 enable_api_ms_win_security_lsalookup_l1_1_0 wine_fn_config_dll api-ms-win-security-sddl-l1-1-0 enable_api_ms_win_security_sddl_l1_1_0 wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 diff --git a/configure.ac b/configure.ac index 02eb144..a1d3f97 100644 --- a/configure.ac +++ b/configure.ac @@ -2688,6 +2688,7 @@ WINE_CONFIG_DLL(api-ms-win-eventing-provider-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-base-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-security-lsalookup-l1-1-0) WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in b/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in new file mode 100644 index 0000000..f686396 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-security-lsalookup-l1-1-0.dll diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec new file mode 100644 index 0000000..9b45265 --- /dev/null +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -0,0 +1,11 @@ +@ stub LookupAccountNameLocalA +@ stub LookupAccountNameLocalW +@ stub LookupAccountSidLocalA +@ stub LookupAccountSidLocalW +@ stub LsaLookupClose +@ stub LsaLookupFreeMemory +@ stub LsaLookupGetDomainInfo +@ stub LsaLookupManageSidNameMapping +@ stub LsaLookupOpenLocalPolicy +@ stub LsaLookupTranslateNames +@ stub LsaLookupTranslateSids diff --git a/tools/make_specfiles b/tools/make_specfiles index 986070f..16db908 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -153,6 +153,7 @@ my @dll_groups = "api-ms-win-core-registry-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-security-base-l1-2-0", + "api-ms-win-security-lsalookup-l1-1-0", "api-ms-win-security-sddl-l1-1-0", "api-ms-win-service-core-l1-1-1", "api-ms-win-service-management-l1-1-0",

1 0

Nikolay Sivov : ole32/tests: Remove some casts we don't need, fix a couple of others.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 88111ca2c03570f85f9bda94e1ac22f679c2c9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88111ca2c03570f85f9bda94e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:58 2015 +0300 ole32/tests: Remove some casts we don't need, fix a couple of others. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 28370ca..058e5ec 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -484,7 +484,7 @@ static IOleObject OleObject = { &OleObjectVtbl }; static HRESULT WINAPI OleObjectPersistStg_QueryInterface(IPersistStorage *iface, REFIID riid, void **ppv) { trace("OleObjectPersistStg_QueryInterface\n"); - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectPersistStg_AddRef(IPersistStorage *iface) @@ -582,7 +582,7 @@ static IPersistStorage OleObjectPersistStg = { &OleObjectPersistStgVtbl }; static HRESULT WINAPI OleObjectCache_QueryInterface(IOleCache *iface, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectCache_AddRef(IOleCache *iface) @@ -708,7 +708,7 @@ static ULONG WINAPI OleObjectCF_Release(IClassFactory *iface) static HRESULT WINAPI OleObjectCF_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static HRESULT WINAPI OleObjectCF_LockServer(IClassFactory *iface, BOOL lock) @@ -729,7 +729,7 @@ static IClassFactory OleObjectCF = { &OleObjectCFVtbl }; static HRESULT WINAPI OleObjectRunnable_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) { - return IUnknown_QueryInterface((IUnknown *)&OleObject, riid, ppv); + return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectRunnable_AddRef(IRunnableObject *iface) @@ -1912,13 +1912,13 @@ static void test_data_cache_dib_contents_stream(int num) CLSID cls; SIZEL sz; - hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void *)&unk ); + hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void **)&unk ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void *)&persist ); + hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void **)&persist ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void *)&data ); + hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void **)&data ); ok( SUCCEEDED(hr), "got %08x\n", hr ); - hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void *)&view ); + hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void **)&view ); ok( SUCCEEDED(hr), "got %08x\n", hr ); stg = create_storage( num ); @@ -2333,7 +2333,7 @@ static void test_OleLockRunning(void) { HRESULT hr; - hr = OleLockRunning((LPUNKNOWN)&unknown, TRUE, FALSE); + hr = OleLockRunning(&unknown, TRUE, FALSE); ok(hr == S_OK, "OleLockRunning failed 0x%08x\n", hr); }

1 0

Austin English : kernel32: Make CompareStringEx semi-stub flag FIXME only show once.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 5d186034c14d7e424e5f07e8e4ca0eb492453ca9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d186034c14d7e424e5f07e8e… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:13:40 2015 -0600 kernel32: Make CompareStringEx semi-stub flag FIXME only show once. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 3b632b4..5e7ca90 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3265,6 +3265,7 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; + static int once; if (version) FIXME("unexpected version parameter\n"); if (reserved) FIXME("unexpected reserved value\n"); @@ -3283,7 +3284,10 @@ INT WINAPI CompareStringEx(LPCWSTR locale, DWORD flags, LPCWSTR str1, INT len1, } if (flags & semistub_flags) - FIXME("semi-stub behavor for flag(s) 0x%x\n", flags & semistub_flags); + { + if (!once++) + FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags); + } if (len1 < 0) len1 = strlenW(str1); if (len2 < 0) len2 = strlenW(str2);

1 0

Austin English : hal: Add READ_PORT_ULONG stub.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 3e16c3343ad6cf3e0ab076343dd651f5bbc73750 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e16c3343ad6cf3e0ab076343… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 22 19:35:00 2015 -0600 hal: Add READ_PORT_ULONG stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 6 ++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index 96bc895..bca688e 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -155,3 +155,9 @@ KIRQL WINAPI KeGetCurrentIrql(VOID) FIXME( " stub!\n"); return 0; } + +ULONG WINAPI READ_PORT_ULONG(ULONG *port) +{ + FIXME("(%p) stub!\n", port); + return 0; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index 3046c65..02f778c 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -82,7 +82,7 @@ @ stub READ_PORT_BUFFER_ULONG @ stub READ_PORT_BUFFER_USHORT @ stub READ_PORT_UCHAR -@ stub READ_PORT_ULONG +@ stdcall READ_PORT_ULONG(ptr) @ stub READ_PORT_USHORT @ stub WRITE_PORT_BUFFER_UCHAR @ stub WRITE_PORT_BUFFER_ULONG

1 0

André Hentschel : setupapi: Remove dead code (Clang).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 9edfb14c6be13f599aafe5e300986f10e6fb999d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9edfb14c6be13f599aafe5e30… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:18 2015 +0100 setupapi: Remove dead code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/queue.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index d57f8e1..d2e2a1d 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -126,11 +126,9 @@ static void concat_W( WCHAR *buffer, const WCHAR *src1, const WCHAR *src2, const if (buffer[-1] != '\\') *buffer++ = '\\'; if (src3) while (*src3 == '\\') src3++; } + if (src3) - { strcpyW( buffer, src3 ); - buffer += strlenW(buffer ); - } }

1 0

André Hentschel : services: Fix access adjustment by reordering code (Clang).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 67e5e8edf6aee9599cde3d037f443257fd07f5a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67e5e8edf6aee9599cde3d037… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:16 2015 +0100 services: Fix access adjustment by reordering code (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/rpc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 89a8c91..dd44965 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -352,12 +352,13 @@ static DWORD create_handle_for_service(struct service_entry *entry, DWORD dwDesi return ERROR_NOT_ENOUGH_SERVER_MEMORY; } + if (dwDesiredAccess & MAXIMUM_ALLOWED) + dwDesiredAccess |= SERVICE_ALL_ACCESS; + service->hdr.type = SC_HTYPE_SERVICE; service->hdr.access = dwDesiredAccess; RtlMapGenericMask(&service->hdr.access, &g_svc_generic); service->service_entry = entry; - if (dwDesiredAccess & MAXIMUM_ALLOWED) - dwDesiredAccess |= SERVICE_ALL_ACCESS; *phService = &service->hdr; return ERROR_SUCCESS;

1 0

Jeremy White : kernel32: Revise GetLongPathNameA to avoid overriding the input on long names.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 7dea64279ee9b80a44c2eca9ed72b1ce57f64fe8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dea64279ee9b80a44c2eca9e… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:13 2015 -0600 kernel32: Revise GetLongPathNameA to avoid overriding the input on long names. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 10 ++++++++-- dlls/kernel32/tests/path.c | 1 - 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ae211cc..b12c71e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -292,6 +292,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen BOOL unixabsolute; WIN32_FIND_DATAW wfd; HANDLE goit; + BOOL is_legal_8dot3; if (!shortpath) { @@ -365,7 +366,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen } } - /* Check if the file exists and use the existing file name */ + /* Check if the file exists */ goit = FindFirstFileW(tmplongpath, &wfd); if (goit == INVALID_HANDLE_VALUE) { @@ -374,7 +375,12 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen return 0; } FindClose(goit); - strcpyW(tmplongpath + lp, wfd.cFileName); + + is_legal_8dot3 = FALSE; + CheckNameLegalDOS8Dot3W(tmplongpath + lp, NULL, 0, NULL, &is_legal_8dot3); + /* Use the existing file name if it's a short name */ + if (is_legal_8dot3) + strcpyW(tmplongpath + lp, wfd.cFileName); lp += strlenW(tmplongpath + lp); sp += tmplen; } diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 9475aa0..830c93d 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -868,7 +868,6 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); tmpstr[len] = tolower(tmpstr[len]); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE);

1 0