wine-commits January 2017

wine-commits@winehq.org

2 participants
492 discussions

Nikolay Sivov : usp10: Fix LB27 rule that should check for prefix, not suffix.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 7e6a4b2bf54fb37836679eb6426a1c1a9a6b8cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e6a4b2bf54fb37836679eb64… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:43:48 2017 +0300 usp10: Fix LB27 rule that should check for prefix, not suffix. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/breaking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 9746f5d..b1220c1 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -384,7 +384,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT if (break_class[i+1] == b_IN || break_class[i+1] == b_PO) else_break(&break_before[i+1],b_x); } - if (break_class[i] == b_PO) + if (break_class[i] == b_PR) { switch (break_class[i+1]) {

1 0

Nikolay Sivov : usp10: Fixed LB30 condition, breaking after CP class.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: c4626bba01f7b8b91ffc8c9cdba661bb7d9ab205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4626bba01f7b8b91ffc8c9cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:43:47 2017 +0300 usp10: Fixed LB30 condition, breaking after CP class. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/breaking.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index eb3fc00..9746f5d 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -414,7 +414,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT break_class[i+1] == b_OP) else_break(&break_before[i+1],b_x); if (break_class[i] == b_CP && - (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) + (break_class[i+1] == b_AL || break_class[i+1] == b_HL || break_class[i+1] == b_NU)) else_break(&break_before[i+1],b_x); /* LB30a */

1 0

Nikolay Sivov : msxml3: Accept AllowXsltScript and AllowDocumentFunction properties.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 45dd9d17962d438837e209e2a373060508abe183 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45dd9d17962d438837e209e2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 16:22:55 2017 +0300 msxml3: Accept AllowXsltScript and AllowDocumentFunction properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/domdoc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 3643219..62b48fc 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -71,6 +71,8 @@ static const WCHAR PropertyNewParserW[] = {'N','e','w','P','a','r','s','e','r',0 static const WCHAR PropValueXPathW[] = {'X','P','a','t','h',0}; static const WCHAR PropValueXSLPatternW[] = {'X','S','L','P','a','t','t','e','r','n',0}; static const WCHAR PropertyResolveExternalsW[] = {'R','e','s','o','l','v','e','E','x','t','e','r','n','a','l','s',0}; +static const WCHAR PropertyAllowXsltScriptW[] = {'A','l','l','o','w','X','s','l','t','S','c','r','i','p','t',0}; +static const WCHAR PropertyAllowDocumentFunctionW[] = {'A','l','l','o','w','D','o','c','u','m','e','n','t','F','u','n','c','t','i','o','n',0}; /* Anything that passes the test_get_ownerDocument() * tests can go here (data shared between all instances). @@ -3072,7 +3074,9 @@ static HRESULT WINAPI domdoc_setProperty( } else if (lstrcmpiW(p, PropertyProhibitDTDW) == 0 || lstrcmpiW(p, PropertyNewParserW) == 0 || - lstrcmpiW(p, PropertyResolveExternalsW) == 0) + lstrcmpiW(p, PropertyResolveExternalsW) == 0 || + lstrcmpiW(p, PropertyAllowXsltScriptW) == 0 || + lstrcmpiW(p, PropertyAllowDocumentFunctionW) == 0) { /* Ignore */ FIXME("Ignoring property %s, value %s\n", debugstr_w(p), debugstr_variant(&value));

1 0

Nikolay Sivov : msxml3: Duplicate stylesheet document before passing it to libxslt.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 2191d9776508132a9073e37dabe444a251938c2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2191d9776508132a9073e37da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:47:44 2017 +0300 msxml3: Duplicate stylesheet document before passing it to libxslt. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index ccecaa8..c5a180b 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1320,6 +1320,7 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, { #ifdef SONAME_LIBXSLT xsltStylesheetPtr xsltSS; + xmlDocPtr sheet_doc; HRESULT hr = S_OK; xmlnode *sheet; @@ -1331,8 +1332,9 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, sheet = get_node_obj(stylesheet); if(!sheet) return E_FAIL; - xsltSS = pxsltParseStylesheetDoc(sheet->node->doc); - if(xsltSS) + sheet_doc = xmlCopyDoc(sheet->node->doc, 1); + xsltSS = pxsltParseStylesheetDoc(sheet_doc); + if (xsltSS) { const char **xslparams = NULL; xmlDocPtr result; @@ -1377,11 +1379,11 @@ HRESULT node_transform_node_params(const xmlnode *This, IXMLDOMNode *stylesheet, hr = node_transform_write_to_bstr(xsltSS, result, p); xmlFreeDoc(result); } - /* libxslt "helpfully" frees the XML document the stylesheet was - generated from, too */ - xsltSS->doc = NULL; + pxsltFreeStylesheet(xsltSS); } + else + xmlFreeDoc(sheet_doc); if(!*p) *p = SysAllocStringLen(NULL, 0);

1 0

Nikolay Sivov : dwrite: Improve line breaking logic.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: b280c3bf2ea4148d9f1eee8c4a00c0658964e5b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b280c3bf2ea4148d9f1eee8c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:43:11 2017 +0300 dwrite: Improve line breaking logic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 99 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 65 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b280c3bf2ea4148d9f1ee…

1 0

Nikolay Sivov : dwrite: Added support for DWRITE_WORD_WRAPPING_CHARACTER mode.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 76c31950fea8dd354b89ea961a3f6a4e840d8e32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76c31950fea8dd354b89ea961… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 31 14:43:10 2017 +0300 dwrite: Added support for DWRITE_WORD_WRAPPING_CHARACTER mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 3d931cb..adc3493 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -1868,6 +1868,14 @@ static void layout_add_line(struct dwrite_textlayout *layout, UINT32 first_clust *textpos += metrics.length; } +static BOOL layout_can_wrap_after(const struct dwrite_textlayout *layout, UINT32 cluster) +{ + if (layout->format.wrapping == DWRITE_WORD_WRAPPING_CHARACTER) + return TRUE; + + return layout->clustermetrics[cluster].canWrapLineAfter; +} + static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) { BOOL is_rtl = layout->format.readingdir == DWRITE_READING_DIRECTION_RIGHT_TO_LEFT; @@ -1907,7 +1915,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (overflow) break; - if (layout->clustermetrics[i].canWrapLineAfter) + if (layout_can_wrap_after(layout, i)) last_breaking_point = i; width += layout->clustermetrics[i].width; i++; @@ -1916,7 +1924,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) if (overflow) { /* Overflown on whitespace, ignore it */ - if (layout->clustermetrics[i].isWhitespace && layout->clustermetrics[i].canWrapLineAfter) + if (layout->clustermetrics[i].isWhitespace && layout_can_wrap_after(layout, i)) i = i; /* Use most recently found breaking point */ else if (last_breaking_point != ~0u) { @@ -1926,7 +1934,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) else { /* Otherwise proceed forward to next newline or breaking point */ for (; i < layout->cluster_count; i++) - if (layout->clustermetrics[i].canWrapLineAfter || layout->clustermetrics[i].isNewline) + if (layout_can_wrap_after(layout, i) || layout->clustermetrics[i].isNewline) break; } }

1 0

Hans Leidekker : wintrust/tests: Disable a test that crashes on 64-bit Windows 10.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: bdc309b9492820b91816ad6b0e1b60424e25df0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdc309b9492820b91816ad6b0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jan 31 12:08:25 2017 +0100 wintrust/tests: Disable a test that crashes on 64-bit Windows 10. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/crypt.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index 503831e..5a4344b 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -203,17 +203,11 @@ static void test_context(void) "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* NULL GUID */ + if (0) { /* crashes on 64-bit win10 */ ret = pCryptCATAdminAcquireContext(&hca, NULL, 0); ok(ret, "Expected success, got FALSE with %d\n", GetLastError()); ok(hca != NULL, "Expected a context handle, got NULL\n"); - /* All NULL */ - SetLastError(0xdeadbeef); - ret = pCryptCATAdminReleaseContext(NULL, 0); - ok(!ret, "Expected failure\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - /* Proper release */ SetLastError(0xdeadbeef); ret = pCryptCATAdminReleaseContext(hca, 0); @@ -225,6 +219,14 @@ static void test_context(void) ok(!ret, "Expected failure\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + } + + /* All NULL */ + SetLastError(0xdeadbeef); + ret = pCryptCATAdminReleaseContext(NULL, 0); + ok(!ret, "Expected failure\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, + "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); /* NULL context handle and dummy GUID */ SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : make_announce: Update version number parsing for the new versioning scheme.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 9629bb6ad2136593ac6c5026a57614640be41453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9629bb6ad2136593ac6c5026a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:56:07 2017 +0100 make_announce: Update version number parsing for the new versioning scheme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/make_announce | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/make_announce b/tools/make_announce index c65f900..83d869a 100755 --- a/tools/make_announce +++ b/tools/make_announce @@ -109,7 +109,7 @@ my $old = get_current_version(); my $new = $ARGV[0]; unless ($new) { - if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1.$2.1"; } + if ($old =~ /^([0-9]+)\.([0-9]+)$/) { $new = "$1." . ($2 + 1); } elsif ($old =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) { $new = "$1.$2." . ($3 + 1); } elsif ($old =~ /^([0-9]+)\.([0-9]+)-rc([0-9]+)$/) { $new = "$1.$2-rc" . ($3 + 1); } else { die "unknown version format $old"; } @@ -117,8 +117,12 @@ unless ($new) print "Updating files for release $new\n"; -(my $reldir = $new) =~ s/^([0-9]+\.[0-9]+).*/$1/; -my $is_stable = ($new =~ /^([0-9]+)\.([0-9]+)\.([0-9]+)$/) && !($2 % 2); # stable releases have an even minor number +my $reldir = $new; +if ($reldir =~ /^([0-9]+\.0)/) { $reldir = $1; } +elsif ($reldir =~ /^([0-9]+)\./) { $reldir = "$1.x"; } +else { die "unknown version format $reldir"; } + +my $is_stable = ($new =~ /^([0-9]+)\.0\.([0-9]+)$/); # stable releases have a 0 minor number my $filter = "product=Wine&resolution=FIXED&" . ($is_stable ? "target_milestone=$reldir.x" : "bug_status=RESOLVED"); my %bugs = get_bugs( $filter ); @@ -128,11 +132,16 @@ my %authors = get_authors(); open ANNOUNCE, "<ANNOUNCE" or die "cannot open ANNOUNCE"; open NEW, ">ANNOUNCE.new" or die "cannot create ANNOUNCE.new"; + +# replace version number in first line +$_ = <ANNOUNCE>; +s/(([0-9]+)\.)+[0-9]+(-rc[0-9]+)?/$new/; +print NEW $_; + while (<ANNOUNCE>) { last if /^------------------/; - s!http://mirrors.ibiblio.org/wine/source/.*!http://mirrors.ibiblio.org/wine…!; - s!http://dl.winehq.org/wine/source/.*!http://dl.winehq.org/wine/source/$rel…!; + s!(https?://.*/wine/source/).*\.tar!$1$reldir/wine-$new.tar!; print NEW $_; }

1 0

Jacek Caban : inetcomm: Added tests reading MHTML page as MIME message.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 242cbb1673d06714e55bc7910914c62f8e7f4676 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242cbb1673d06714e55bc7910… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:56 2017 +0100 inetcomm: Added tests reading MHTML page as MIME message. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/tests/mimeole.c | 71 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 8028ca8..15b267f 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -90,6 +90,22 @@ static const char msg1[] = "More stuff\r\n" "--------------1.5.0.6--\r\n"; +static const char mhtml_page1[] = + "MIME-Version: 1.0\r\n" + "Content-Type: multipart/related; type:=\"text/html\"; boundary=\"----=_NextPart_000_00\"\r\n" + "\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: text/html; charset=\"Windows-1252\"\r\n" + "Content-Transfer-Encoding: quoted-printable\r\n" + "\r\n" + "<HTML></HTML>\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: Image/Jpeg\r\n" + "Content-Transfer-Encoding: base64\r\n" + "Content-Location: http://winehq.org/mhtmltest.html\r\n" + "\r\n\t\t\t\tVGVzdA==\r\n\r\n" + "------=_NextPart_000_00--"; + static void test_CreateVirtualStream(void) { HRESULT hr; @@ -721,6 +737,60 @@ static void test_CreateMessage(void) IStream_Release(stream); } +static void test_mhtml_message(void) +{ + IMimeMessage *mime_message; + IMimeBody *mime_body; + HBODY *body_list; + IStream *stream; + ULONG count; + HRESULT hres; + + hres = MimeOleCreateMessage(NULL, &mime_message); + ok(hres == S_OK, "MimeOleCreateMessage failed: %08x\n", hres); + + stream = create_stream_from_string(mhtml_page1); + hres = IMimeMessage_Load(mime_message, stream); + IStream_Release(stream); + ok(hres == S_OK, "Load failed: %08x\n", hres); + + hres = IMimeMessage_CountBodies(mime_message, HBODY_ROOT, TRUE, &count); + ok(hres == S_OK, "CountBodies failed: %08x\n", hres); + ok(count == 3, "got %d\n", count); + + hres = IMimeMessage_GetAttachments(mime_message, &count, &body_list); + ok(hres == S_OK, "GetAttachments failed: %08x\n", hres); + ok(count == 2, "count = %u\n", count); + + hres = IMimeMessage_BindToObject(mime_message, body_list[0], &IID_IMimeBody, (void**)&mime_body); + ok(hres == S_OK, "BindToObject failed: %08x\n", hres); + + hres = IMimeBody_GetData(mime_body, IET_BINARY, &stream); + ok(hres == S_OK, "GetData failed: %08x\n", hres); + test_stream_read(stream, S_OK, "<HTML></HTML>", -1); + IStream_Release(stream); + + test_current_encoding(mime_body, IET_QP); + + IMimeBody_Release(mime_body); + + hres = IMimeMessage_BindToObject(mime_message, body_list[1], &IID_IMimeBody, (void**)&mime_body); + ok(hres == S_OK, "BindToObject failed: %08x\n", hres); + + test_current_encoding(mime_body, IET_BASE64); + + hres = IMimeBody_GetData(mime_body, IET_BINARY, &stream); + ok(hres == S_OK, "GetData failed: %08x\n", hres); + test_stream_read(stream, S_OK, "Test", -1); + IStream_Release(stream); + + IMimeBody_Release(mime_body); + + CoTaskMemFree(body_list); + + IMimeMessage_Release(mime_message); +} + static void test_MessageSetProp(void) { static const char topic[] = "wine topic"; @@ -1152,6 +1222,7 @@ START_TEST(mimeole) test_BindToObject(); test_BodyDeleteProp(); test_MimeOleGetPropertySchema(); + test_mhtml_message(); test_mhtml_protocol(); OleUninitialize(); }

1 0

Jacek Caban : inetcomm: Removed unneeded type check in init_content_type.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: eb0bd223120a91135523234ce329767691d42f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0bd223120a91135523234ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:47 2017 +0100 inetcomm: Removed unneeded type check in init_content_type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index d8253d9..de37f09 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -746,12 +746,6 @@ static void init_content_type(MimeBody *body, header_t *header) char *slash; DWORD len; - if(header->prop->id != PID_HDR_CNTTYPE) - { - ERR("called with header %s\n", header->prop->name); - return; - } - slash = strchr(header->value.u.pszVal, '/'); if(!slash) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2017