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> +<p> The Wine development release 1.9.0 is now available.</p> +<p> <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> +<p>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>. +</p></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

Jeremy White : kernel32: Preserve a '/' delimiter in GetLongPathName and GetShortPathName.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 9f3f918f2c0ff0c6117b3020623eeb430030ef23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f3f918f2c0ff0c6117b30206… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:11 2015 -0600 kernel32: Preserve a '/' delimiter in GetLongPathName and GetShortPathName. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 12 ++++++------ dlls/kernel32/tests/path.c | 3 --- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ec14b35..ae211cc 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -334,10 +334,10 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen /* check for path delimiters and reproduce them */ if (shortpath[sp] == '\\' || shortpath[sp] == '/') { - if (!lp || tmplongpath[lp-1] != '\\') + if (!lp || (tmplongpath[lp-1] != '\\' && tmplongpath[lp-1] != '/')) { - /* strip double "\\" */ - tmplongpath[lp++] = '\\'; + /* strip double delimiters */ + tmplongpath[lp++] = shortpath[sp]; } tmplongpath[lp] = 0; /* terminate string */ sp++; @@ -492,10 +492,10 @@ DWORD WINAPI GetShortPathNameW( LPCWSTR longpath, LPWSTR shortpath, DWORD shortl /* check for path delimiters and reproduce them */ if (longpath[lp] == '\\' || longpath[lp] == '/') { - if (!sp || tmpshortpath[sp-1] != '\\') + if (!sp || (tmpshortpath[sp-1] != '\\' && tmpshortpath[sp-1] != '/')) { - /* strip double "\\" */ - tmpshortpath[sp] = '\\'; + /* strip double delimiters */ + tmpshortpath[sp] = longpath[lp]; sp++; } tmpshortpath[sp] = 0; /* terminate string */ diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 63666c6..37d14cc 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -863,18 +863,15 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) if (pGetLongPathNameA) { sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); - todo_wine ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr);

1 0

Jeremy White : kernel32/tests: Add path tests for the ./../foo case.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 81ccc7b8167da592d32d882f435aa5b39f8b8059 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ccc7b8167da592d32d882f4… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:07 2015 -0600 kernel32/tests: Add path tests for the ./../foo case. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 85c4ec3..e90a260 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2136,6 +2136,17 @@ static void test_relative_path(void) ok(ret, "GetShortPathName error %d\n", GetLastError()); ok(!strcmp(buf, "..\\foo\\file"), "expected ..\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); + todo_wine + ok(ret, "GetLongPathName error %d\n", GetLastError()); + todo_wine + ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + strcpy(buf, "deadbeef"); + ret = GetShortPathNameA(".\\..\\foo\\file", buf, MAX_PATH); + ok(ret, "GetShortPathName error %d\n", GetLastError()); + ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); + SetCurrentDirectoryA(".."); DeleteFileA("foo\\file"); RemoveDirectoryA("foo");

1 0

Austin English : ntoskrnl.exe: Add RtlInitializeGenericTableAvl/ RtlInsertElementGenericTableAvl stubs.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: f12241ae143fe5725cfddb276e9ad4ff80237bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12241ae143fe5725cfddb276… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 18 19:10:36 2015 -0600 ntoskrnl.exe: Add RtlInitializeGenericTableAvl/RtlInsertElementGenericTableAvl stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/rtl.c | 18 +++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- include/ddk/ntddk.h | 39 +++++++++++++++++++++++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c3b6bf0..8cabf95 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -686,7 +686,7 @@ @ stdcall RtlInitializeCriticalSectionAndSpinCount(ptr long) @ stdcall RtlInitializeCriticalSectionEx(ptr long long) @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) -# @ stub RtlInitializeGenericTableAvl +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) @ stdcall RtlInitializeHandleTable(long long ptr) @ stub RtlInitializeRXact # @ stub RtlInitializeRangeList @@ -696,7 +696,7 @@ @ stdcall RtlInitializeSid(ptr ptr long) # @ stub RtlInitializeStackTraceDataBase @ stub RtlInsertElementGenericTable -# @ stub RtlInsertElementGenericTableAvl +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr wstr) @ stdcall RtlInt64ToUnicodeString(int64 long ptr) @ stdcall RtlIntegerToChar(long long long ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8eb3e9f..74ad35a 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -45,6 +45,7 @@ #include "wine/unicode.h" #include "ntdll_misc.h" #include "inaddr.h" +#include "ddk/ntddk.h" WINE_DEFAULT_DEBUG_CHANNEL(ntdll); @@ -1595,3 +1596,20 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor) processor->Number = NtGetCurrentProcessorNumber(); processor->Reserved = 0; } + +/*********************************************************************** + * RtlInitializeGenericTableAvl (NTDLL.@) + */ +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ROUTINE compare, + PRTL_AVL_ALLOCATE_ROUTINE allocate, PRTL_AVL_FREE_ROUTINE free, void *context) +{ + FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); +} + +/*********************************************************************** + * RtlInsertElementGenericTableAvl (NTDLL.@) + */ +void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, ULONG size, BOOL *element) +{ + FIXME("%p %p %u %p: stub\n", table, buffer, size, element); +} diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index db15265..1319ada 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1055,12 +1055,12 @@ @ stdcall RtlInitUnicodeString(ptr wstr) ntdll.RtlInitUnicodeString @ stdcall RtlInitializeBitMap(ptr long long) ntdll.RtlInitializeBitMap @ stdcall RtlInitializeGenericTable(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTable -@ stub RtlInitializeGenericTableAvl +@ stdcall RtlInitializeGenericTableAvl(ptr ptr ptr ptr ptr) ntdll.RtlInitializeGenericTableAvl @ stub RtlInitializeRangeList @ stdcall RtlInitializeSid(ptr ptr long) ntdll.RtlInitializeSid @ stub RtlInitializeUnicodePrefix @ stub RtlInsertElementGenericTable -@ stub RtlInsertElementGenericTableAvl +@ stdcall RtlInsertElementGenericTableAvl(ptr ptr long ptr) ntdll.RtlInsertElementGenericTableAvl @ stub RtlInsertElementGenericTableFull @ stub RtlInsertElementGenericTableFullAvl @ stub RtlInsertUnicodePrefix diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index bccfd39..6aae257 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -149,6 +149,43 @@ typedef struct _KWAIT_BLOCK { USHORT WaitType; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; +typedef struct _RTL_BALANCED_LINKS { + struct _RTL_BALANCED_LINKS *Parent; + struct _RTL_BALANCED_LINKS *LeftChild; + struct _RTL_BALANCED_LINKS *RightChild; + CHAR Balance; + UCHAR Reserved[3]; +} RTL_BALANCED_LINKS; +typedef RTL_BALANCED_LINKS *PRTL_BALANCED_LINKS; + +struct _RTL_AVL_TABLE; + +typedef enum _RTL_GENERIC_COMPARE_RESULTS { + GenericLessThan, + GenericGreaterThan, + GenericEqual +} RTL_GENERIC_COMPARE_RESULTS; + +typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *); + +typedef void (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); + +typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer); + +typedef struct _RTL_AVL_TABLE { + RTL_BALANCED_LINKS BalancedRoot; + void *OrderedPointer; + ULONG WhichOrderedElement; + ULONG NumberGenericTableElements; + ULONG DepthOfTree; + PRTL_BALANCED_LINKS RestartKey; + ULONG DeleteCount; + PRTL_AVL_COMPARE_ROUTINE CompareRoutine; + PRTL_AVL_ALLOCATE_ROUTINE AllocateRoutine; + PRTL_AVL_FREE_ROUTINE FreeRoutine; + void *TableContext; +} RTL_AVL_TABLE, *PRTL_AVL_TABLE; + typedef VOID (WINAPI *PDRIVER_NOTIFICATION_CALLBACK_ROUTINE)(PVOID,PVOID); typedef VOID (WINAPI *PDRIVER_REINITIALIZE)(PDRIVER_OBJECT,PVOID,ULONG); typedef VOID (WINAPI *PLOAD_IMAGE_NOTIFY_ROUTINE)(PUNICODE_STRING,HANDLE,PIMAGE_INFO); @@ -160,5 +197,7 @@ NTSTATUS WINAPI IoQueryDeviceDescription(PINTERFACE_TYPE,PULONG,PCONFIGURATION_ void WINAPI IoRegisterDriverReinitialization(PDRIVER_OBJECT,PDRIVER_REINITIALIZE,PVOID); NTSTATUS WINAPI IoRegisterShutdownNotification(PDEVICE_OBJECT); NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE); +void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); +void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); #endif

1 0

Nikolay Sivov : ole32: Ignore GetMiscStatus() returned value in OleCreate( ).
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 73008a6c04e9284e617bd4007491c304b8efd2c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73008a6c04e9284e617bd4007… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:56 2015 +0300 ole32: Ignore GetMiscStatus() returned value in OleCreate(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 2 +- dlls/ole32/tests/ole2.c | 56 +++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 7f532c3..5bfd8a3 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2545,7 +2545,7 @@ HRESULT WINAPI OleCreate( if (SUCCEEDED(hres)) { DWORD dwStatus; - hres = IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); + IOleObject_GetMiscStatus(pOleObject, DVASPECT_CONTENT, &dwStatus); } } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 08253a1..28370ca 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -111,7 +111,7 @@ static FORMATETC *g_expected_fetc = NULL; static BOOL g_showRunnable = TRUE; static BOOL g_isRunning = TRUE; -static BOOL g_failGetMiscStatus; +static HRESULT g_GetMiscStatusFailsWith = S_OK; static HRESULT g_QIFailsWith; static UINT cf_test_1, cf_test_2, cf_test_3; @@ -421,12 +421,15 @@ static HRESULT WINAPI OleObject_EnumAdvise static HRESULT WINAPI OleObject_GetMiscStatus ( IOleObject *iface, - DWORD dwAspect, + DWORD aspect, DWORD *pdwStatus ) { CHECK_EXPECTED_METHOD("OleObject_GetMiscStatus"); - if(!g_failGetMiscStatus) + + ok(aspect == DVASPECT_CONTENT, "got aspect %d\n", aspect); + + if (g_GetMiscStatusFailsWith == S_OK) { *pdwStatus = OLEMISC_RECOMPOSEONRESIZE; return S_OK; @@ -434,7 +437,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus else { *pdwStatus = 0x1234; - return E_FAIL; + return g_GetMiscStatusFailsWith; } } @@ -917,6 +920,30 @@ static void test_OleCreate(IStorage *pStorage) { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; + static const struct expected_method methods_olerender_draw_with_site[] = + { + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObject_AddRef", 0 }, + { "OleObject_GetMiscStatus", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectPersistStg_AddRef", 0 }, + { "OleObjectPersistStg_InitNew", 0 }, + { "OleObjectPersistStg_Release", 0 }, + { "OleObject_SetClientSite", 0 }, + { "OleObject_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectRunnable_AddRef", 0 }, + { "OleObjectRunnable_Run", 0 }, + { "OleObjectRunnable_Release", 0 }, + { "OleObject_QueryInterface", 0 }, + { "OleObjectCache_AddRef", 0 }, + { "OleObjectCache_Cache", 0 }, + { "OleObjectCache_Release", 0 }, + { "OleObject_Release", 0 }, + { NULL, 0 } + }; static const struct expected_method methods_olerender_format[] = { { "OleObject_QueryInterface", 0 }, @@ -1019,6 +1046,23 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + + /* GetMiscStatus fails */ + g_GetMiscStatusFailsWith = 0x8fafefaf; + expected_method_list = methods_olerender_draw_with_site; + trace("OleCreate with OLERENDER_DRAW, with site:\n"); + hr = OleCreate(&CLSID_Equation3, &IID_IOleObject, OLERENDER_DRAW, NULL, (IOleClientSite*)0xdeadbeef, pStorage, (void **)&pObject); + ok_ole_success(hr, "OleCreate"); + IOleObject_Release(pObject); + CHECK_NO_EXTRA_METHODS(); + g_GetMiscStatusFailsWith = S_OK; + formatetc.cfFormat = CF_TEXT; formatetc.ptd = NULL; formatetc.dwAspect = DVASPECT_CONTENT; @@ -1092,7 +1136,7 @@ static void test_OleLoad(IStorage *pStorage) /* Test once with IOleObject_GetMiscStatus failing */ expected_method_list = methods_oleload; - g_failGetMiscStatus = TRUE; + g_GetMiscStatusFailsWith = E_FAIL; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject); ok(hr == S_OK || @@ -1108,9 +1152,9 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + g_GetMiscStatusFailsWith = S_OK; /* Test again, let IOleObject_GetMiscStatus succeed. */ - g_failGetMiscStatus = FALSE; expected_method_list = methods_oleload; trace("OleLoad:\n"); hr = OleLoad(pStorage, &IID_IOleObject, (IOleClientSite *)0xdeadbeef, (void **)&pObject);

1 0

Nikolay Sivov : ole32/tests: Some tests for OleRegGetUserType().
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 7ad896d54169ef14e4619bfd2cdcca53f3d271e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad896d54169ef14e4619bfd2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:55 2015 +0300 ole32/tests: Some tests for OleRegGetUserType(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 3 +++ dlls/ole32/tests/compobj.c | 54 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 41fe4bd..7f532c3 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -685,6 +685,9 @@ HRESULT WINAPI OleRegGetUserType( TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwFormOfType, pszUserType); + if (!pszUserType) + return E_INVALIDARG; + *pszUserType = NULL; hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &clsidKey); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1913e1f..792d7dc 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -271,12 +271,12 @@ static const char actctx_manifest[] = " progid=\"ProgId.ProgId\"" " miscStatusIcon=\"recomposeonresize\"" " />" -" <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" +" <comClass description=\"CustomFont Description\" clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb851}\"" " progid=\"CustomFont\"" " miscStatusIcon=\"recomposeonresize\"" " miscStatusContent=\"insideout\"" " />" -" <comClass clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" +" <comClass description=\"StdFont Description\" clsid=\"{0be35203-8f91-11ce-9de3-00aa004bb852}\"" " progid=\"StdFont\"" " />" " <comClass clsid=\"{62222222-1234-1234-1234-56789abcdef0}\" >" @@ -2225,6 +2225,55 @@ static void test_OleRegGetMiscStatus(void) } } +static void test_OleRegGetUserType(void) +{ + static const WCHAR stdfont_usertypeW[] = {'S','t','a','n','d','a','r','d',' ','F','o','n','t',0}; + static const WCHAR stdfont2_usertypeW[] = {'C','L','S','I','D','_','S','t','d','F','o','n','t',0}; + ULONG_PTR cookie; + HANDLE handle; + HRESULT hr; + WCHAR *str; + DWORD form; + + for (form = 0; form <= USERCLASSTYPE_APPNAME+1; form++) { + hr = OleRegGetUserType(&CLSID_Testclass, form, NULL); + ok(hr == E_INVALIDARG, "form %u: got 0x%08x\n", form, hr); + + str = (void*)0xdeadbeef; + hr = OleRegGetUserType(&CLSID_Testclass, form, &str); + ok(hr == REGDB_E_CLASSNOTREG, "form %u: got 0x%08x\n", form, hr); + ok(str == NULL, "form %u: got %p\n", form, str); + + /* same string returned for StdFont for all form types */ + str = NULL; + hr = OleRegGetUserType(&CLSID_StdFont, form, &str); + ok(hr == S_OK, "form %u: got 0x%08x\n", form, hr); + ok(!lstrcmpW(str, stdfont_usertypeW) || !lstrcmpW(str, stdfont2_usertypeW) /* winxp */, + "form %u, got %s\n", form, wine_dbgstr_w(str)); + CoTaskMemFree(str); + } + + if ((handle = activate_context(actctx_manifest, &cookie))) + { + for (form = 0; form <= USERCLASSTYPE_APPNAME+1; form++) { + str = (void*)0xdeadbeef; + hr = OleRegGetUserType(&CLSID_Testclass, form, &str); + ok(hr == REGDB_E_CLASSNOTREG, "form %u: got 0x%08x\n", form, hr); + ok(str == NULL, "form %u: got %s\n", form, wine_dbgstr_w(str)); + + /* same string returned for StdFont for all form types */ + str = NULL; + hr = OleRegGetUserType(&CLSID_StdFont, form, &str); + ok(hr == S_OK, "form %u: got 0x%08x\n", form, hr); + ok(!lstrcmpW(str, stdfont_usertypeW) || !lstrcmpW(str, stdfont2_usertypeW) /* winxp */, + "form %u, got %s\n", form, wine_dbgstr_w(str)); + CoTaskMemFree(str); + } + + pDeactivateActCtx(0, cookie); + pReleaseActCtx(handle); + } +} static void test_CoCreateGuid(void) { HRESULT hr; @@ -2722,4 +2771,5 @@ START_TEST(compobj) test_CoCreateGuid(); test_CoWaitForMultipleHandles(); test_CoGetMalloc(); + test_OleRegGetUserType(); }

1 0

Austin English : pdh: Add PdhGetLogFileTypeA/W stubs.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: a0e2a3f20a472a642ad85111ad06eb5436a28146 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e2a3f20a472a642ad85111a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:31:20 2015 -0600 pdh: Add PdhGetLogFileTypeA/W stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index fc1aa4f..529b92d 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 -@ stub PdhGetLogFileTypeA -@ stub PdhGetLogFileTypeW +@ stdcall PdhGetLogFileTypeA(ptr ptr) +@ stdcall PdhGetLogFileTypeW(ptr ptr) @ stub PdhGetLogSetGUID @ stub PdhGetRawCounterArrayA @ stub PdhGetRawCounterArrayW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 2631fe1..036d28b 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1269,3 +1269,21 @@ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) FIXME("%u\n", source); return ERROR_SUCCESS; } + +/*********************************************************************** + * PdhGetLogFileTypeA (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeA(PDH_HLOG log, DWORD *type) +{ + FIXME("%p, %p: stub\n", log, type); + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhGetLogFileTypeW (PDH.@) + */ +PDH_STATUS WINAPI PdhGetLogFileTypeW(PDH_HLOG log, DWORD *type) +{ + FIXME("%p, %p: stub\n", log, type); + return PDH_NOT_IMPLEMENTED; +}

1 0

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

Dec. 24, 2015

Module: wine Branch: master Commit: ded403c4f315e08c61a0cd7e6f41650af452da39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ded403c4f315e08c61a0cd7e6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 22 19:29:13 2015 +0100 version: Remove dead assignments (Clang). Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/version/version.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index b2b0b08..43f5c18 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1199,7 +1199,6 @@ DWORD WINAPI VerFindFileA( GetSystemDirectoryA(systemDir, sizeof(systemDir)); curDir = ""; - destDir = ""; if(flags & VFFF_ISSHAREDFILE) { @@ -1296,7 +1295,6 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR)); curDir = &emptyW; - destDir = &emptyW; if(flags & VFFF_ISSHAREDFILE) {

1 0

Jeremy White : kernel32/tests: Test GetLongPathNameA when the file name case differs from the input.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: ee1260e0d2c50a7eec7d9e7444b8ff4d622bbad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1260e0d2c50a7eec7d9e744… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:12 2015 -0600 kernel32/tests: Test GetLongPathNameA when the file name case differs from the input. This shows that the original buffer is unmodified if the filename is long, but the actual file name is returned when the filename is short. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 37d14cc..9475aa0 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -861,14 +861,25 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) /* Don't Starve relies on GetLongPathName returning the passed in filename, even if the actual file on disk has a different case or separator */ if (pGetLongPathNameA) { + int len = lstrlenA(LONGDIR) + 1; sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "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); ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + len = lstrlenA(SHORTDIR) + 1; + tmpstr[len] = toupper(tmpstr[len]); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + ok(lstrcmpiA(tmpstr,tmpstr1)==0 && lstrcmpA(tmpstr,tmpstr1) != 0, + "GetLongPathNameA returned '%s' instead of '%s/%s'\n",tmpstr1,SHORTDIR,SHORTFILE); } sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n");

1 0

Jeremy White : kernel32: Advance over the input buffer when stripping ./.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 440030b93848d1c41f532cac21320f75a8c67231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440030b93848d1c41f532cac2… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:08 2015 -0600 kernel32: Advance over the input buffer when stripping ./. This is the same fix for GetLongPathName that was contained in a fix for GetShortPathName in commit 9178d037d71e823f5d5eaa5008a3cdd574377bac. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 1 + dlls/kernel32/tests/path.c | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index ff94227..ec14b35 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -349,6 +349,7 @@ DWORD WINAPI GetLongPathNameW( LPCWSTR shortpath, LPWSTR longpath, DWORD longlen { tmplongpath[lp++] = *p++; tmplongpath[lp++] = *p++; + sp += 2; } for (; *p && *p != '/' && *p != '\\'; p++); tmplen = p - (shortpath + sp); diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index e90a260..4504603 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -2138,9 +2138,7 @@ static void test_relative_path(void) strcpy(buf, "deadbeef"); ret = pGetLongPathNameA(".\\..\\foo\\file", buf, MAX_PATH); - todo_wine ok(ret, "GetLongPathName error %d\n", GetLastError()); - todo_wine ok(!strcmp(buf, ".\\..\\foo\\file"), "expected .\\..\\foo\\file, got %s\n", buf); strcpy(buf, "deadbeef"); ret = GetShortPathNameA(".\\..\\foo\\file", buf, MAX_PATH);

1 0

Sebastian Lackner : kernel32/tests: Add test for process object destruction.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: a0b6bf86f74438c574f7165ab220060681bb66cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0b6bf86f74438c574f7165ab… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 13:06:37 2015 +0100 kernel32/tests: Add test for process object destruction. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 161 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index f186c94..b88db45 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -33,11 +33,14 @@ #include "wincon.h" #include "winnls.h" #include "winternl.h" +#include "tlhelp32.h" #include "wine/test.h" /* PROCESS_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ #define PROCESS_ALL_ACCESS_NT4 (PROCESS_ALL_ACCESS & ~0xf000) +/* THREAD_ALL_ACCESS in Vista+ PSDKs is incompatible with older Windows versions */ +#define THREAD_ALL_ACCESS_NT4 (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0x3ff) #define expect_eq_d(expected, actual) \ do { \ @@ -79,6 +82,12 @@ static BOOL (WINAPI *pGetNumaProcessorNode)(UCHAR, PUCHAR); static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG, PULONG); static BOOL (WINAPI *pProcessIdToSessionId)(DWORD,DWORD*); static DWORD (WINAPI *pWTSGetActiveConsoleSessionId)(void); +static HANDLE (WINAPI *pCreateToolhelp32Snapshot)(DWORD, DWORD); +static BOOL (WINAPI *pProcess32First)(HANDLE, PROCESSENTRY32*); +static BOOL (WINAPI *pProcess32Next)(HANDLE, PROCESSENTRY32*); +static BOOL (WINAPI *pThread32First)(HANDLE, THREADENTRY32*); +static BOOL (WINAPI *pThread32Next)(HANDLE, THREADENTRY32*); + /* ############################### */ static char base[MAX_PATH]; @@ -237,6 +246,12 @@ static BOOL init(void) pGetNumaProcessorNode = (void *)GetProcAddress(hkernel32, "GetNumaProcessorNode"); pProcessIdToSessionId = (void *)GetProcAddress(hkernel32, "ProcessIdToSessionId"); pWTSGetActiveConsoleSessionId = (void *)GetProcAddress(hkernel32, "WTSGetActiveConsoleSessionId"); + pCreateToolhelp32Snapshot = (void *)GetProcAddress(hkernel32, "CreateToolhelp32Snapshot"); + pProcess32First = (void *)GetProcAddress(hkernel32, "Process32First"); + pProcess32Next = (void *)GetProcAddress(hkernel32, "Process32Next"); + pThread32First = (void *)GetProcAddress(hkernel32, "Thread32First"); + pThread32Next = (void *)GetProcAddress(hkernel32, "Thread32Next"); + return TRUE; } @@ -287,6 +302,8 @@ static void doChild(const char* file, const char* option) char bufA[MAX_PATH]; WCHAR bufW[MAX_PATH]; HANDLE hFile = CreateFileA(file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + HANDLE snapshot; + PROCESSENTRY32 pe; BOOL ret; if (hFile == INVALID_HANDLE_VALUE) return; @@ -341,6 +358,26 @@ static void doChild(const char* file, const char* option) childPrintf(hFile, "CommandLineA=%s\n", encodeA(GetCommandLineA())); childPrintf(hFile, "CommandLineW=%s\n\n", encodeW(GetCommandLineW())); + /* output toolhelp information */ + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&pe, 0, sizeof(pe)); + pe.dwSize = sizeof(pe); + if (pProcess32First(snapshot, &pe)) + { + while (pe.th32ProcessID != GetCurrentProcessId()) + if (!pProcess32Next(snapshot, &pe)) break; + } + CloseHandle(snapshot); + ok(pe.th32ProcessID == GetCurrentProcessId(), "failed to find current process in snapshot\n"); + childPrintf(hFile, + "[Toolhelp]\ncntUsage=%u\nth32DefaultHeapID=%lu\n" + "th32ModuleID=%u\ncntThreads=%u\nth32ParentProcessID=%u\n" + "pcPriClassBase=%u\ndwFlags=%u\nszExeFile=%s\n\n", + pe.cntUsage, pe.th32DefaultHeapID, pe.th32ModuleID, + pe.cntThreads, pe.th32ParentProcessID, pe.pcPriClassBase, + pe.dwFlags, encodeA(pe.szExeFile)); + /* output of environment (Ansi) */ ptrA_save = ptrA = GetEnvironmentStringsA(); if (ptrA) @@ -1065,6 +1102,112 @@ static void test_Directory(void) ok(!TerminateProcess(info.hProcess, 0), "Child process should not exist\n"); } +static void test_Toolhelp(void) +{ + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + HANDLE process, thread, snapshot; + PROCESSENTRY32 pe; + THREADENTRY32 te; + DWORD ret; + int i; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("Toolhelp", "cntUsage", 0); + okChildInt("Toolhelp", "th32DefaultHeapID", 0); + okChildInt("Toolhelp", "th32ModuleID", 0); + okChildInt("Toolhelp", "th32ParentProcessID", GetCurrentProcessId()); + todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + okChildInt("Toolhelp", "dwFlags", 0); + + release_memory(); + DeleteFileA(resfile); + + get_file_name(resfile); + sprintf(buffer, "\"%s\" tests/process.c nested \"%s\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, info.dwProcessId); + ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); + CloseHandle(process); + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + for (i = 0; i < 20; i++) + { + SetLastError(0xdeadbeef); + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, info.dwProcessId); + ok(process || GetLastError() == ERROR_INVALID_PARAMETER, "OpenProcess failed %u\n", GetLastError()); + if (!process) break; + CloseHandle(process); + Sleep(100); + } + /* The following test fails randomly on some Windows versions, but Gothic 2 depends on it */ + todo_wine ok(i < 20 || broken(i == 20), "process object not released\n"); + + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&pe, 0, sizeof(pe)); + pe.dwSize = sizeof(pe); + if (pProcess32First(snapshot, &pe)) + { + while (pe.th32ParentProcessID != info.dwProcessId) + if (!pProcess32Next(snapshot, &pe)) break; + } + CloseHandle(snapshot); + ok(pe.th32ParentProcessID == info.dwProcessId, "failed to find nested child process\n"); + + process = OpenProcess(PROCESS_ALL_ACCESS_NT4, FALSE, pe.th32ProcessID); + ok(process != NULL, "OpenProcess failed %u\n", GetLastError()); + + snapshot = pCreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0); + ok(snapshot != INVALID_HANDLE_VALUE, "CreateToolhelp32Snapshot failed %u\n", GetLastError()); + memset(&te, 0, sizeof(te)); + te.dwSize = sizeof(te); + if (pThread32First(snapshot, &te)) + { + while (te.th32OwnerProcessID != pe.th32ProcessID) + if (!pThread32Next(snapshot, &te)) break; + } + CloseHandle(snapshot); + ok(te.th32OwnerProcessID == pe.th32ProcessID, "failed to find suspended thread\n"); + + thread = OpenThread(THREAD_ALL_ACCESS_NT4, FALSE, te.th32ThreadID); + ok(thread != NULL, "OpenThread failed %u\n", GetLastError()); + ret = ResumeThread(thread); + ok(ret == 1, "expected 1, got %u\n", ret); + CloseHandle(thread); + + ok(WaitForSingleObject(process, 30000) == WAIT_OBJECT_0, "Child process termination\n"); + CloseHandle(process); + + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + okChildInt("Toolhelp", "cntUsage", 0); + okChildInt("Toolhelp", "th32DefaultHeapID", 0); + okChildInt("Toolhelp", "th32ModuleID", 0); + okChildInt("Toolhelp", "th32ParentProcessID", info.dwProcessId); + todo_wine okChildInt("Toolhelp", "pcPriClassBase", 8); + okChildInt("Toolhelp", "dwFlags", 0); + + release_memory(); + DeleteFileA(resfile); +} + static BOOL is_str_env_drive_dir(const char* str) { return str[0] == '=' && str[1] >= 'A' && str[1] <= 'Z' && str[2] == ':' && @@ -2989,6 +3132,23 @@ START_TEST(process) Sleep(100); return; } + else if (!strcmp(myARGV[2], "nested") && myARGC >= 4) + { + char buffer[MAX_PATH]; + STARTUPINFOA startup; + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + sprintf(buffer, "\"%s\" tests/process.c dump \"%s\"", selfname, myARGV[3]); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess failed\n"); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + return; + } ok(0, "Unexpected command %s\n", myARGV[2]); return; @@ -2998,6 +3158,7 @@ START_TEST(process) test_Startup(); test_CommandLine(); test_Directory(); + test_Toolhelp(); test_Environment(); test_SuspendFlag(); test_DebuggingFlag();

1 0

Jeremy White : kernel32/tests: Add tests for GetLongPathName using a slash delimiter.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 60836b41fa7cfc6505763a357d2296598edd5fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60836b41fa7cfc6505763a357… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:09 2015 -0600 kernel32/tests: Add tests for GetLongPathName using a slash delimiter. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 4504603..0e9415c 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -858,6 +858,21 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(SHORTFILE,strptr)==0, "GetFullPathNameA returned part '%s' instead of '%s'\n",strptr,SHORTFILE); } + /* Don't Starve relies on GetLongPathName returning the passed in filename, + even if the actual file on disk has a different case or separator */ + if (pGetLongPathNameA) { + sprintf(tmpstr,"%s/%s",LONGDIR,LONGFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); + ok(GetLongPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetLongPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); + } + /**/ sprintf(tmpstr,"%c:%s/%s",curdir[0],SHORTDIR,SHORTFILE); ok(GetFullPathNameA(tmpstr,MAX_PATH,tmpstr1,&strptr),"GetFullPathNameA failed\n");

1 0

Nikolay Sivov : ole32: Use OleRun() in OleCreate() instead of unrolling what it does.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: b19ad3af80684b92e5555284d57e78d0bcdec226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b19ad3af80684b92e5555284d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:57 2015 +0300 ole32: Use OleRun() in OleCreate() instead of unrolling what it does. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 5bfd8a3..cec8c00 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2574,21 +2574,12 @@ HRESULT WINAPI OleCreate( if (((renderopt == OLERENDER_DRAW) || (renderopt == OLERENDER_FORMAT)) && SUCCEEDED(hres)) { - IRunnableObject *pRunnable; - IOleCache *pOleCache; - HRESULT hres2; - - hres2 = IUnknown_QueryInterface(pUnk, &IID_IRunnableObject, (void **)&pRunnable); - if (SUCCEEDED(hres2)) - { - hres = IRunnableObject_Run(pRunnable, NULL); - IRunnableObject_Release(pRunnable); - } - + hres = OleRun(pUnk); if (SUCCEEDED(hres)) { - hres2 = IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache); - if (SUCCEEDED(hres2)) + IOleCache *pOleCache; + + if (SUCCEEDED(IUnknown_QueryInterface(pUnk, &IID_IOleCache, (void **)&pOleCache))) { DWORD dwConnection; if (renderopt == OLERENDER_DRAW && !pFormatEtc) {

1 0

Austin English : setupapi: Add SetupDiSelectBestCompatDrv stubs.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 9ad0bc63725bc32176b5bb75b58c7341c7bdebcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ad0bc63725bc32176b5bb75b… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Dec 23 00:39:14 2015 -0600 setupapi: Add SetupDiSelectBestCompatDrv stubs. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/stubs.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c1dbed5..4486994 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -381,6 +381,7 @@ @ stdcall SetupDiRegisterDeviceInfo(ptr ptr long ptr ptr ptr) @ stdcall SetupDiRemoveDevice(ptr ptr) @ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a57f5fe..ffc766b 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -594,6 +594,17 @@ BOOL WINAPI SetupDiLoadClassIcon(const GUID *ClassGuid, HICON *LargeIcon, PINT M } /*********************************************************************** + * SetupDiSelectBestCompatDrv (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData) +{ + FIXME(": stub %p, %p\n", DeviceInfoSet, DeviceInfoData); + + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * SetupDiSetSelectedDevice (SETUPAPI.@) */ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVINFO_DATA DeviceInfoData)

1 0

Jeremy White : kernel32/tests: Add a test for GetShortPathName using a slash delimieter.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 17ddd0474f1a310ad6fe169fcee44c40fde92b44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ddd0474f1a310ad6fe169fc… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Mon Dec 21 15:20:10 2015 -0600 kernel32/tests: Add a test for GetShortPathName using a slash delimieter. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/kernel32/tests/path.c b/dlls/kernel32/tests/path.c index 0e9415c..63666c6 100644 --- a/dlls/kernel32/tests/path.c +++ b/dlls/kernel32/tests/path.c @@ -872,6 +872,11 @@ static void test_PathNameA(CHAR *curdir, CHAR curDrive, CHAR otherDrive) ok(lstrcmpiA(tmpstr,tmpstr1)==0, "GetLongPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); } + sprintf(tmpstr,"%s/%s",SHORTDIR,SHORTFILE); + ok(GetShortPathNameA(tmpstr,tmpstr1,MAX_PATH),"GetShortPathNameA failed\n"); + todo_wine + ok(lstrcmpiA(tmpstr,tmpstr1)==0, + "GetShortPathNameA returned '%s' instead of '%s'\n",tmpstr1,tmpstr); /**/ sprintf(tmpstr,"%c:%s/%s",curdir[0],SHORTDIR,SHORTFILE);

1 0

Nikolay Sivov : ole32/tests: Simple test for aggregation in CreateDataCache().
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: d66af9c185985bae3fc804c2adff7ceb7ec91f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66af9c185985bae3fc804c2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 24 13:33:59 2015 +0300 ole32/tests: Simple test for aggregation in CreateDataCache(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 73 +++++++++++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 058e5ec..3845ec2 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1496,6 +1496,39 @@ static IDataObjectVtbl DataObjectVtbl = static IDataObject DataObject = { &DataObjectVtbl }; +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; + if (*ppv) + { + IUnknown_AddRef((IUnknown *)*ppv); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + ok(0, "unexpected AddRef\n"); + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + ok(0, "unexpected Release\n"); + return 1; +} + +static const IUnknownVtbl UnknownVtbl = +{ + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release +}; + +static IUnknown unknown = { &UnknownVtbl }; + static void test_data_cache(void) { HRESULT hr; @@ -1566,6 +1599,17 @@ static void test_data_cache(void) hr = StgCreateDocfile(NULL, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE | STGM_DELETEONRELEASE, 0, &pStorage); ok_ole_success(hr, "StgCreateDocfile"); + /* aggregation */ + + /* requested is not IUnknown */ + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IOleCache2, (void**)&pOleCache); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); + IOleCache2_Release(pOleCache); + /* Test with new data */ hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IOleCache2, (LPVOID *)&pOleCache); @@ -2214,34 +2258,6 @@ static void test_runnable(void) g_showRunnable = TRUE; } -static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) *ppv = iface; - if (*ppv) - { - IUnknown_AddRef((IUnknown *)*ppv); - return S_OK; - } - return E_NOINTERFACE; -} - -static ULONG WINAPI Unknown_AddRef(IUnknown *iface) -{ - return 2; -} - -static ULONG WINAPI Unknown_Release(IUnknown *iface) -{ - return 1; -} - -static const IUnknownVtbl UnknownVtbl = -{ - Unknown_QueryInterface, - Unknown_AddRef, - Unknown_Release -}; static HRESULT WINAPI OleRun_QueryInterface(IRunnableObject *iface, REFIID riid, void **ppv) { @@ -2314,7 +2330,6 @@ static const IRunnableObjectVtbl oleruntestvtbl = OleRun_SetContainedObject }; -static IUnknown unknown = { &UnknownVtbl }; static IRunnableObject testrunnable = { &oleruntestvtbl }; static void test_OleRun(void)

1 0

Sebastian Lackner : ntdll/tests: Add more tests for SystemHandleInformation.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: e4e906c871ffe3e4acc055d5158a8b971f212aea URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e906c871ffe3e4acc055d51… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Dec 21 12:51:49 2015 +0100 ntdll/tests: Add more tests for SystemHandleInformation. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 54 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index a521447..3219dbb 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -474,30 +474,62 @@ static void test_query_module(void) static void test_query_handle(void) { NTSTATUS status; - ULONG ReturnLength; + ULONG ExpectedLength, ReturnLength; ULONG SystemInformationLength = sizeof(SYSTEM_HANDLE_INFORMATION); SYSTEM_HANDLE_INFORMATION* shi = HeapAlloc(GetProcessHeap(), 0, SystemInformationLength); + HANDLE EventHandle; + BOOL found; + INT i; + + EventHandle = CreateEventA(NULL, FALSE, FALSE, NULL); + ok( EventHandle != NULL, "CreateEventA failed %u\n", GetLastError() ); /* Request the needed length : a SystemInformationLength greater than one struct sets ReturnLength */ + ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); todo_wine ok( status == STATUS_INFO_LENGTH_MISMATCH, "Expected STATUS_INFO_LENGTH_MISMATCH, got %08x\n", status); + ok( ReturnLength != 0xdeadbeef, "Expected valid ReturnLength\n" ); SystemInformationLength = ReturnLength; shi = HeapReAlloc(GetProcessHeap(), 0, shi , SystemInformationLength); + + ReturnLength = 0xdeadbeef; status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); - if (status != STATUS_INFO_LENGTH_MISMATCH) /* vista */ + while (status == STATUS_INFO_LENGTH_MISMATCH) /* Vista / 2008 */ { - ok( status == STATUS_SUCCESS, - "Expected STATUS_SUCCESS, got %08x\n", status); + SystemInformationLength *= 2; + shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength); + status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); + } + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + ExpectedLength = FIELD_OFFSET(SYSTEM_HANDLE_INFORMATION, Handle[shi->Count]); + todo_wine ok( ReturnLength == ExpectedLength || broken(ReturnLength == ExpectedLength - sizeof(DWORD)), /* Vista / 2008 */ + "Expected length %u, got %u\n", ExpectedLength, ReturnLength ); + todo_wine ok( shi->Count > 1, "Expected more than 1 handle, got %u\n", shi->Count ); + for (i = 0, found = FALSE; i < shi->Count && !found; i++) + found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && + ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); + todo_wine ok( found, "Expected to find event handle in handle list\n" ); + + CloseHandle(EventHandle); - /* Check if we have some return values */ - trace("Number of Handles : %d\n", shi->Count); - todo_wine - { - /* our implementation is a stub for now */ - ok( shi->Count > 1, "Expected more than 1 handles, got (%d)\n", shi->Count); - } + ReturnLength = 0xdeadbeef; + status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); + while (status == STATUS_INFO_LENGTH_MISMATCH) /* Vista / 2008 */ + { + SystemInformationLength *= 2; + shi = HeapReAlloc(GetProcessHeap(), 0, shi, SystemInformationLength); + status = pNtQuerySystemInformation(SystemHandleInformation, shi, SystemInformationLength, &ReturnLength); } + ok( status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status ); + for (i = 0, found = FALSE; i < shi->Count && !found; i++) + found = (shi->Handle[i].OwnerPid == GetCurrentProcessId()) && + ((HANDLE)(ULONG_PTR)shi->Handle[i].HandleValue == EventHandle); + ok( !found, "Unexpectedly found event handle in handle list\n" ); + + status = pNtQuerySystemInformation(SystemHandleInformation, NULL, SystemInformationLength, &ReturnLength); + ok( status == STATUS_ACCESS_VIOLATION, "Expected STATUS_ACCESS_VIOLATION, got %08x\n", status ); + HeapFree( GetProcessHeap(), 0, shi); }

1 0

Sebastian Lackner : advapi32: Add stubs for RegCreateKeyTransacted[A/W] functions.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: wine Branch: master Commit: 723146ca6d3953ed0465e189ab8ead1d9cbce4bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=723146ca6d3953ed0465e189a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Dec 23 17:18:38 2015 +0100 advapi32: Add stubs for RegCreateKeyTransacted[A/W] functions. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/registry.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index ff2b0de..36f176b 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -581,8 +581,8 @@ @ stdcall RegCreateKeyExA(long str long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyExW(long wstr long ptr long long ptr ptr ptr) @ stdcall RegCreateKeyW(long wstr ptr) -# @ stub RegCreateKeyTransactedA -# @ stub RegCreateKeyTransactedW +@ stdcall RegCreateKeyTransactedA(long str long ptr long long ptr ptr ptr long ptr) +@ stdcall RegCreateKeyTransactedW(long wstr long ptr long long ptr ptr ptr long ptr) @ stdcall RegDeleteKeyA(long str) @ stdcall RegDeleteKeyExA(long str long long) @ stdcall RegDeleteKeyExW(long wstr long long) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 4f33fe6..8317698 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -479,6 +479,31 @@ LSTATUS WINAPI RegCreateKeyA( HKEY hkey, LPCSTR lpSubKey, PHKEY phkResult ) } +/****************************************************************************** + * RegCreateKeyTransactedW [ADVAPI32.@] + */ +LSTATUS WINAPI RegCreateKeyTransactedW( HKEY hkey, LPCWSTR name, DWORD reserved, LPWSTR class, + DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, + PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 ) +{ + FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_w(name), reserved, + debugstr_w(class), options, access, sa, retkey, dispos, transaction, reserved2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/****************************************************************************** + * RegCreateKeyTransactedA [ADVAPI32.@] + */ +LSTATUS WINAPI RegCreateKeyTransactedA( HKEY hkey, LPCSTR name, DWORD reserved, LPSTR class, + DWORD options, REGSAM access, SECURITY_ATTRIBUTES *sa, + PHKEY retkey, LPDWORD dispos, HANDLE transaction, PVOID reserved2 ) +{ + FIXME( "(%p,%s,%u,%s,%u,%u,%p,%p,%p,%p,%p): stub\n", hkey, debugstr_a(name), reserved, + debugstr_a(class), options, access, sa, retkey, dispos, transaction, reserved2 ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + /****************************************************************************** * RegOpenKeyExW [ADVAPI32.@]

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.11.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: bugzilla Branch: master Commit: 6f9bf887fbf23b4c5ca77b6ad2043acd5f49bf63 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=6f9bf887fbf23b4c5ca77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 14:33:49 2015 +0100 Import of upstream bugzilla release 4.4.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .htaccess | 7 +--- Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 45 ++++------------------- Bugzilla/Template.pm | 3 ++ Bugzilla/WebService/Product.pm | 1 + docs/bugzilla.ent | 12 +++--- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +++--- docs/en/xml/installation.xml | 2 +- mod_perl.pl | 2 +- showdependencygraph.cgi | 11 ++++-- template/en/default/pages/release-notes.html.tmpl | 19 ++++++++++ 12 files changed, 55 insertions(+), 65 deletions(-) diff --git a/.htaccess b/.htaccess index 8b50250..22e6658 100644 --- a/.htaccess +++ b/.htaccess @@ -5,12 +5,7 @@ Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 64356c0..f35e416 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -182,7 +182,7 @@ use Memoize; # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "4.4.10"; +use constant BUGZILLA_VERSION => "4.4.11"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 457f66f..eaca1f8 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -48,12 +48,7 @@ use constant HT_DEFAULT_DENY => <<EOT; Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -349,12 +344,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -368,12 +358,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -393,14 +378,8 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from 192.20.225.0/24 - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require ip 192.20.225.0/24 - Require all denied - </IfModule> + Require ip 192.20.225.0/24 + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -416,12 +395,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -435,12 +409,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 72d899c..cfcbc66 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -719,6 +719,9 @@ sub create { { my ($var) = @_; $var = ' ' . $var if substr($var, 0, 1) eq '='; + # backslash is not special to CSV, but it can be used to confuse some browsers... + # so we do not allow it to happen. We only do this for logged-in users. + $var =~ s/\\/\x{FF3C}/g if Bugzilla->user->id; $var =~ s/\"/\"\"/g; if ($var !~ /^-?(\d+\.)?\d*$/) { $var = "\"$var\""; diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm index 1c8d75b..e383cb5 100644 --- a/Bugzilla/WebService/Product.pm +++ b/Bugzilla/WebService/Product.pm @@ -28,6 +28,7 @@ use constant PUBLIC_METHODS => qw( get get_accessible_products get_enterable_products + get_products get_selectable_products update ); diff --git a/docs/bugzilla.ent b/docs/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/bugzilla.ent +++ b/docs/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl index cb37c0e..f81421a 100644 --- a/docs/bugzilla.ent.tmpl +++ b/docs/bugzilla.ent.tmpl @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> diff --git a/docs/en/xml/bugzilla.ent b/docs/en/xml/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/en/xml/bugzilla.ent +++ b/docs/en/xml/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index 5ef6be5..4bc2da7 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1058,7 +1058,7 @@ SetEnv LD_LIBRARY_PATH /u01/app/oracle/product/10.2.0/lib/ AddHandler cgi-script .cgi Options +ExecCGI DirectoryIndex index.cgi index.html -AllowOverride Limit FileInfo Indexes Options +AllowOverride All </Directory> </programlisting> diff --git a/mod_perl.pl b/mod_perl.pl index ae15ae5..4794e28 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -73,7 +73,7 @@ PerlChildInitHandler "sub { Bugzilla::RNG::srand(); srand(); }" PerlCleanupHandler Apache2::SizeLimit Bugzilla::ModPerl::CleanupHandler PerlOptions +ParseHeaders Options +ExecCGI - AllowOverride Limit FileInfo Indexes Options + AllowOverride All DirectoryIndex index.cgi index.html </Directory> EOT diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi index 4187bdd..00fd206 100755 --- a/showdependencygraph.cgi +++ b/showdependencygraph.cgi @@ -58,7 +58,7 @@ sub CreateImagemap { # Pick up bugid from the mapdata label field. Getting the title from # bugtitle hash instead of mapdata allows us to get the summary even # when showsummary is off, and also gives us status and resolution. - my $bugtitle = html_quote(clean_text($bugtitles{$bugid})); + my $bugtitle = $bugtitles{$bugid}; $map .= qq{<area alt="bug $bugid" name="bug$bugid" shape="rect" } . qq{title="$bugtitle" href="$url" } . qq{coords="$leftx,$topy,$rightx,$bottomy">\n}; @@ -176,13 +176,16 @@ foreach my $k (@bug_ids) { # Retrieve bug information from the database my ($stat, $resolution, $summary) = $dbh->selectrow_array($sth, undef, $k); + $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); + # Resolution and summary are shown only if user can see the bug - if (!$user->can_see_bug($k)) { + if ($user->can_see_bug($k)) { + $summary = html_quote(clean_text($summary)); + } + else { $resolution = $summary = ''; } - $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); - my @params; if ($summary ne "" && $cgi->param('showsummary')) { diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index d810688..7763413 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -45,6 +45,25 @@ <h2 id="v44_point">Updates in this 4.4.x Release</h2> +<h3>4.4.11</h3> + +<p>This release fixes two security issues. See the + <a href="https://www.bugzilla.org/security/4.2.15/">Security Advisory</a> + for details.</p> + +<p>This release also contains the following [% terms.bug %] fix:</p> + +<ul> + <li>mod_perl now works correctly with mod_access_compat turned off on + Apache 2.4. The (incorrect) fix implemented in [% terms.Bugzilla %] 4.4.9 + has been backed out. To regenerate the <kbd>.htaccess</kbd> files, you + must first delete all existing ones in subdirectories: + <pre>find . -mindepth 2 -name .htaccess -exec rm -f {} \;</pre> + You must then run <kbd>checksetup.pl</kbd> again to recreate them with + the correct syntax. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1223790">[% terms.Bug %] 1223790</a>)</li> +</ul> + <h3>4.4.10</h3> <p>This release fixes one security issue. See the

1 0

Alexandre Julliard : Import of upstream bugzilla release 4.4.11.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: bugzilla Branch: upstream Commit: 6f9bf887fbf23b4c5ca77b6ad2043acd5f49bf63 URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=6f9bf887fbf23b4c5ca77… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 14:33:49 2015 +0100 Import of upstream bugzilla release 4.4.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .htaccess | 7 +--- Bugzilla/Constants.pm | 2 +- Bugzilla/Install/Filesystem.pm | 45 ++++------------------- Bugzilla/Template.pm | 3 ++ Bugzilla/WebService/Product.pm | 1 + docs/bugzilla.ent | 12 +++--- docs/bugzilla.ent.tmpl | 4 +- docs/en/xml/bugzilla.ent | 12 +++--- docs/en/xml/installation.xml | 2 +- mod_perl.pl | 2 +- showdependencygraph.cgi | 11 ++++-- template/en/default/pages/release-notes.html.tmpl | 19 ++++++++++ 12 files changed, 55 insertions(+), 65 deletions(-) diff --git a/.htaccess b/.htaccess index 8b50250..22e6658 100644 --- a/.htaccess +++ b/.htaccess @@ -5,12 +5,7 @@ Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 64356c0..f35e416 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -182,7 +182,7 @@ use Memoize; # CONSTANTS # # Bugzilla version -use constant BUGZILLA_VERSION => "4.4.10"; +use constant BUGZILLA_VERSION => "4.4.11"; # Location of the remote and local XML files to track new releases. use constant REMOTE_FILE => 'http://updates.bugzilla.org/bugzilla-update.xml'; diff --git a/Bugzilla/Install/Filesystem.pm b/Bugzilla/Install/Filesystem.pm index 457f66f..eaca1f8 100644 --- a/Bugzilla/Install/Filesystem.pm +++ b/Bugzilla/Install/Filesystem.pm @@ -48,12 +48,7 @@ use constant HT_DEFAULT_DENY => <<EOT; Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -349,12 +344,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -368,12 +358,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -393,14 +378,8 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from 192.20.225.0/24 - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require ip 192.20.225.0/24 - Require all denied - </IfModule> + Require ip 192.20.225.0/24 + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -416,12 +395,7 @@ EOT Allow from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Allow from all - </IfModule> - <IfModule !mod_perl.c> - Require all granted - </IfModule> + Require all granted </IfVersion> </IfModule> <IfModule !mod_version.c> @@ -435,12 +409,7 @@ EOT Deny from all </IfVersion> <IfVersion >= 2.4> - <IfModule mod_perl.c> - Deny from all - </IfModule> - <IfModule !mod_perl.c> - Require all denied - </IfModule> + Require all denied </IfVersion> </IfModule> <IfModule !mod_version.c> diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm index 72d899c..cfcbc66 100644 --- a/Bugzilla/Template.pm +++ b/Bugzilla/Template.pm @@ -719,6 +719,9 @@ sub create { { my ($var) = @_; $var = ' ' . $var if substr($var, 0, 1) eq '='; + # backslash is not special to CSV, but it can be used to confuse some browsers... + # so we do not allow it to happen. We only do this for logged-in users. + $var =~ s/\\/\x{FF3C}/g if Bugzilla->user->id; $var =~ s/\"/\"\"/g; if ($var !~ /^-?(\d+\.)?\d*$/) { $var = "\"$var\""; diff --git a/Bugzilla/WebService/Product.pm b/Bugzilla/WebService/Product.pm index 1c8d75b..e383cb5 100644 --- a/Bugzilla/WebService/Product.pm +++ b/Bugzilla/WebService/Product.pm @@ -28,6 +28,7 @@ use constant PUBLIC_METHODS => qw( get get_accessible_products get_enterable_products + get_products get_selectable_products update ); diff --git a/docs/bugzilla.ent b/docs/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/bugzilla.ent +++ b/docs/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/bugzilla.ent.tmpl b/docs/bugzilla.ent.tmpl index cb37c0e..f81421a 100644 --- a/docs/bugzilla.ent.tmpl +++ b/docs/bugzilla.ent.tmpl @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> diff --git a/docs/en/xml/bugzilla.ent b/docs/en/xml/bugzilla.ent index 34b6472..5a9e044 100644 --- a/docs/en/xml/bugzilla.ent +++ b/docs/en/xml/bugzilla.ent @@ -1,5 +1,5 @@ -<!ENTITY bz-ver "4.4.10"> -<!ENTITY bz-date "2015-09-10"> +<!ENTITY bz-ver "4.4.11"> +<!ENTITY bz-date "2015-12-22"> <!ENTITY current-year "2015"> <!ENTITY min-perl-ver "5.8.1"> @@ -52,11 +52,11 @@ <!ENTITY min-io-scalar-ver "any">  -<!ENTITY min-dbd-mysql-ver "4.001"> -<!ENTITY min-mysql-ver "5.0.15"> -<!ENTITY min-dbd-oracle-ver "1.19"> -<!ENTITY min-oracle-ver "10.02.0"> <!ENTITY min-dbd-pg-ver "2.7.0"> <!ENTITY min-pg-ver "8.03.0000"> +<!ENTITY min-dbd-mysql-ver "4.001"> +<!ENTITY min-mysql-ver "5.0.15"> <!ENTITY min-dbd-sqlite-ver "1.29"> <!ENTITY min-sqlite-ver "3.6.22"> +<!ENTITY min-dbd-oracle-ver "1.19"> +<!ENTITY min-oracle-ver "10.02.0"> diff --git a/docs/en/xml/installation.xml b/docs/en/xml/installation.xml index 5ef6be5..4bc2da7 100644 --- a/docs/en/xml/installation.xml +++ b/docs/en/xml/installation.xml @@ -1058,7 +1058,7 @@ SetEnv LD_LIBRARY_PATH /u01/app/oracle/product/10.2.0/lib/ AddHandler cgi-script .cgi Options +ExecCGI DirectoryIndex index.cgi index.html -AllowOverride Limit FileInfo Indexes Options +AllowOverride All </Directory> </programlisting> diff --git a/mod_perl.pl b/mod_perl.pl index ae15ae5..4794e28 100644 --- a/mod_perl.pl +++ b/mod_perl.pl @@ -73,7 +73,7 @@ PerlChildInitHandler "sub { Bugzilla::RNG::srand(); srand(); }" PerlCleanupHandler Apache2::SizeLimit Bugzilla::ModPerl::CleanupHandler PerlOptions +ParseHeaders Options +ExecCGI - AllowOverride Limit FileInfo Indexes Options + AllowOverride All DirectoryIndex index.cgi index.html </Directory> EOT diff --git a/showdependencygraph.cgi b/showdependencygraph.cgi index 4187bdd..00fd206 100755 --- a/showdependencygraph.cgi +++ b/showdependencygraph.cgi @@ -58,7 +58,7 @@ sub CreateImagemap { # Pick up bugid from the mapdata label field. Getting the title from # bugtitle hash instead of mapdata allows us to get the summary even # when showsummary is off, and also gives us status and resolution. - my $bugtitle = html_quote(clean_text($bugtitles{$bugid})); + my $bugtitle = $bugtitles{$bugid}; $map .= qq{<area alt="bug $bugid" name="bug$bugid" shape="rect" } . qq{title="$bugtitle" href="$url" } . qq{coords="$leftx,$topy,$rightx,$bottomy">\n}; @@ -176,13 +176,16 @@ foreach my $k (@bug_ids) { # Retrieve bug information from the database my ($stat, $resolution, $summary) = $dbh->selectrow_array($sth, undef, $k); + $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); + # Resolution and summary are shown only if user can see the bug - if (!$user->can_see_bug($k)) { + if ($user->can_see_bug($k)) { + $summary = html_quote(clean_text($summary)); + } + else { $resolution = $summary = ''; } - $vars->{'short_desc'} = $summary if ($k eq $cgi->param('id')); - my @params; if ($summary ne "" && $cgi->param('showsummary')) { diff --git a/template/en/default/pages/release-notes.html.tmpl b/template/en/default/pages/release-notes.html.tmpl index d810688..7763413 100644 --- a/template/en/default/pages/release-notes.html.tmpl +++ b/template/en/default/pages/release-notes.html.tmpl @@ -45,6 +45,25 @@ <h2 id="v44_point">Updates in this 4.4.x Release</h2> +<h3>4.4.11</h3> + +<p>This release fixes two security issues. See the + <a href="https://www.bugzilla.org/security/4.2.15/">Security Advisory</a> + for details.</p> + +<p>This release also contains the following [% terms.bug %] fix:</p> + +<ul> + <li>mod_perl now works correctly with mod_access_compat turned off on + Apache 2.4. The (incorrect) fix implemented in [% terms.Bugzilla %] 4.4.9 + has been backed out. To regenerate the <kbd>.htaccess</kbd> files, you + must first delete all existing ones in subdirectories: + <pre>find . -mindepth 2 -name .htaccess -exec rm -f {} \;</pre> + You must then run <kbd>checksetup.pl</kbd> again to recreate them with + the correct syntax. + (<a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1223790">[% terms.Bug %] 1223790</a>)</li> +</ul> + <h3>4.4.10</h3> <p>This release fixes one security issue. See the

1 0

Alexandre Julliard : Merge branch 'upstream'.
by Alexandre Julliard Dec. 24, 2015

Dec. 24, 2015

Module: bugzilla Branch: master Commit: 0205fb7815123c9703815447aedf89fe6a9bc9ed URL: http://source.winehq.org/git/bugzilla.git/?a=commit;h=0205fb7815123c9703815… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 24 14:37:44 2015 +0100 Merge branch 'upstream'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: b30167e2403ff39f33205e5c6bd069b1517b1cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b30167e2403ff39f33205e5c6… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Dec 23 17:36:00 2015 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index f016adf..7c78f2f 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2015-11-20 09:57+0300\n" +"PO-Revision-Date: 2015-12-23 17:35+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -1042,7 +1042,7 @@ msgstr "Parinkite aplanką" #: comdlg32.rc:148 msgid "Font size has to be a number." -msgstr "" +msgstr "Šrifto dydis turi būti skaičius." #: comdlg32.rc:83 oleview.rc:98 msgid "Ready"

1 0

Thomas Petazzoni : configure: Allow to override the location of the *-config scripts.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 4ab21edfb10d0a910e24709aab9f3afff8a84ae7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ab21edfb10d0a910e24709aa… Author: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> Date: Tue Dec 22 22:29:20 2015 +0100 configure: Allow to override the location of the *-config scripts. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 28 ++++++++++++++-------------- configure.ac | 20 ++++++++++---------- 2 files changed, 24 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ab21edfb10d0a910e247…

1 0

Austin English : api-ms-win-core-path-l1-1-0: Add stub dll.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 88b1a5fa21e3d799153f7fe12683d92d7e35d777 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b1a5fa21e3d799153f7fe12… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 23:12:26 2015 -0600 api-ms-win-core-path-l1-1-0: Add stub 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-core-path-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-path-l1-1-0.spec | 22 ++++++++++++++++++++++ 4 files changed, 26 insertions(+) diff --git a/configure b/configure index 8fe1910..a1b7247 100755 --- a/configure +++ b/configure @@ -901,6 +901,7 @@ enable_api_ms_win_core_memory_l1_1_1 enable_api_ms_win_core_misc_l1_1_0 enable_api_ms_win_core_namedpipe_l1_1_0 enable_api_ms_win_core_namedpipe_l1_2_0 +enable_api_ms_win_core_path_l1_1_0 enable_api_ms_win_core_processenvironment_l1_1_0 enable_api_ms_win_core_processenvironment_l1_2_0 enable_api_ms_win_core_processthreads_l1_1_0 @@ -17294,6 +17295,7 @@ wine_fn_config_dll api-ms-win-core-memory-l1-1-1 enable_api_ms_win_core_memory_l wine_fn_config_dll api-ms-win-core-misc-l1-1-0 enable_api_ms_win_core_misc_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-1-0 enable_api_ms_win_core_namedpipe_l1_1_0 wine_fn_config_dll api-ms-win-core-namedpipe-l1-2-0 enable_api_ms_win_core_namedpipe_l1_2_0 +wine_fn_config_dll api-ms-win-core-path-l1-1-0 enable_api_ms_win_core_path_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-1-0 enable_api_ms_win_core_processenvironment_l1_1_0 wine_fn_config_dll api-ms-win-core-processenvironment-l1-2-0 enable_api_ms_win_core_processenvironment_l1_2_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 diff --git a/configure.ac b/configure.ac index ffeecf4..01c481b 100644 --- a/configure.ac +++ b/configure.ac @@ -2633,6 +2633,7 @@ WINE_CONFIG_DLL(api-ms-win-core-memory-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-misc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-namedpipe-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-path-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processenvironment-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) diff --git a/dlls/api-ms-win-core-path-l1-1-0/Makefile.in b/dlls/api-ms-win-core-path-l1-1-0/Makefile.in new file mode 100644 index 0000000..af2c5f6 --- /dev/null +++ b/dlls/api-ms-win-core-path-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-path-l1-1-0.dll diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec new file mode 100644 index 0000000..cb10d89 --- /dev/null +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stub PathAllocCanonicalize +@ stub PathAllocCombine +@ stub PathCchAddBackslash +@ stub PathCchAddBackslashEx +@ stub PathCchAddExtension +@ stub PathCchAppend +@ stub PathCchAppendEx +@ stub PathCchCanonicalize +@ stub PathCchCanonicalizeEx +@ stub PathCchCombine +@ stub PathCchCombineEx +@ stub PathCchFindExtension +@ stub PathCchIsRoot +@ stub PathCchRemoveBackslash +@ stub PathCchRemoveBackslashEx +@ stub PathCchRemoveExtension +@ stub PathCchRemoveFileSpec +@ stub PathCchRenameExtension +@ stub PathCchSkipRoot +@ stub PathCchStripPrefix +@ stub PathCchStripToRoot +@ stub PathIsUNCEx

1 0

Andrew Eikum : maintainers: Alphabetize.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 101d70fd48b7f62d7f34427ef7d74017f55fb502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101d70fd48b7f62d7f34427ef… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Dec 23 09:03:19 2015 -0600 maintainers: Alphabetize. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index a32c686..f622df0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -28,6 +28,13 @@ Maintainers List ----------------------------------- +ARM, ARM64 +M: André Hentschel <nerv(a)dawncrow.de> +F: dlls/dbghelp/cpu_arm* +F: dlls/msvcrt/except_arm.c +F: dlls/ntdll/signal_arm* +F: programs/winedbg/be_arm* + Audio I/O M: Andrew Eikum <aeikum(a)codeweavers.com> F: dlls/dsound/ @@ -42,13 +49,6 @@ F: dlls/x3daudio*/ F: dlls/xapofx*/ F: dlls/xaudio*/ -ARM, ARM64 -M: André Hentschel <nerv(a)dawncrow.de> -F: dlls/dbghelp/cpu_arm* -F: dlls/msvcrt/except_arm.c -F: dlls/ntdll/signal_arm* -F: programs/winedbg/be_arm* - Common Controls Library P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ @@ -113,8 +113,8 @@ F: dlls/hidclass.sys/ HTML rendering (Gecko) M: Jacek Caban <jacek(a)codeweavers.com> -F: dlls/mshtml/ F: dlls/ieframe/ +F: dlls/mshtml/ F: dlls/shdocvw/ Input methods @@ -131,8 +131,8 @@ F: dlls/winemac.drv/ Media format conversion M: Andrew Eikum <aeikum(a)codeweavers.com> -F: dlls/msacm32/ F: dlls/*.acm/ +F: dlls/msacm32/ Microsoft C Runtime M: Piotr Caban <piotr(a)codeweavers.com>

1 0

Nikolay Sivov : ole32: Simplify OleRegGetUserType() using existing helper.
by Alexandre Julliard Dec. 23, 2015

Dec. 23, 2015

Module: wine Branch: master Commit: 98505b40763bac5f42575cc21b47c07370798726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98505b40763bac5f42575cc21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 23 00:36:12 2015 +0300 ole32: Simplify OleRegGetUserType() using existing helper. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f28b9d0..41fe4bd 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -677,47 +677,26 @@ HRESULT WINAPI OleRegGetUserType( DWORD dwFormOfType, LPOLESTR* pszUserType) { - WCHAR keyName[60]; DWORD dwKeyType; DWORD cbData; HKEY clsidKey; - LONG hres; - - /* - * Initialize the out parameter. - */ - *pszUserType = NULL; + HRESULT hres; + LONG ret; - /* - * Build the key name we're looking for - */ - sprintfW( keyName, clsidfmtW, - clsid->Data1, clsid->Data2, clsid->Data3, - clsid->Data4[0], clsid->Data4[1], clsid->Data4[2], clsid->Data4[3], - clsid->Data4[4], clsid->Data4[5], clsid->Data4[6], clsid->Data4[7] ); + TRACE("(%s, %d, %p)\n", debugstr_guid(clsid), dwFormOfType, pszUserType); - TRACE("(%s, %d, %p)\n", debugstr_w(keyName), dwFormOfType, pszUserType); + *pszUserType = NULL; - /* - * Open the class id Key - */ - hres = open_classes_key(HKEY_CLASSES_ROOT, keyName, MAXIMUM_ALLOWED, &clsidKey); - if (hres != ERROR_SUCCESS) - return REGDB_E_CLASSNOTREG; + hres = COM_OpenKeyForCLSID(clsid, NULL, KEY_READ, &clsidKey); + if (FAILED(hres)) + return hres; /* * Retrieve the size of the name string. */ cbData = 0; - hres = RegQueryValueExW(clsidKey, - emptyW, - NULL, - &dwKeyType, - NULL, - &cbData); - - if (hres!=ERROR_SUCCESS) + if (RegQueryValueExW(clsidKey, emptyW, NULL, &dwKeyType, NULL, &cbData)) { RegCloseKey(clsidKey); return REGDB_E_READREGDB; @@ -734,7 +713,7 @@ HRESULT WINAPI OleRegGetUserType( return E_OUTOFMEMORY; } - hres = RegQueryValueExW(clsidKey, + ret = RegQueryValueExW(clsidKey, emptyW, NULL, &dwKeyType, @@ -743,11 +722,10 @@ HRESULT WINAPI OleRegGetUserType( RegCloseKey(clsidKey); - if (hres != ERROR_SUCCESS) + if (ret != ERROR_SUCCESS) { CoTaskMemFree(*pszUserType); *pszUserType = NULL; - return REGDB_E_READREGDB; }

1 0