January 2017 - Wine-commits

Jacek Caban : inetcomm: Properly handle boundary in the beginning of body stream in create_body_offset_list.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 3ccba10a0295f4cac74276826909669d612d250b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccba10a0295f4cac74276826… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:23 2017 +0100 inetcomm: Properly handle boundary in the beginning of body stream in create_body_offset_list. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 1471f99..679930d 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1942,18 +1942,16 @@ typedef struct static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struct list *body_offsets) { HRESULT hr; - DWORD read; + DWORD read, boundary_start; int boundary_len = strlen(boundary); - char *buf, *nl_boundary, *ptr, *overlap; + char *buf, *ptr, *overlap; DWORD start = 0, overlap_no; offset_entry_t *cur_body = NULL; + BOOL is_first_line = TRUE; ULARGE_INTEGER cur; LARGE_INTEGER zero; list_init(body_offsets); - nl_boundary = HeapAlloc(GetProcessHeap(), 0, 4 + boundary_len + 1); - memcpy(nl_boundary, "\r\n--", 4); - memcpy(nl_boundary + 4, boundary, boundary_len + 1); overlap_no = boundary_len + 5; @@ -1970,39 +1968,44 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc overlap[read] = '\0'; ptr = buf; - do { - ptr = strstr(ptr, nl_boundary); - if(ptr) - { - DWORD boundary_start = start + ptr - buf; - char *end = ptr + boundary_len + 4; - - if(*end == '\0' || *(end + 1) == '\0') + while(1) { + if(is_first_line) { + is_first_line = FALSE; + }else { + ptr = strstr(ptr, "\r\n"); + if(!ptr) break; + ptr += 2; + } - if(*end == '\r' && *(end + 1) == '\n') + boundary_start = start + ptr - buf; + + if(*ptr == '-' && *(ptr + 1) == '-' && !memcmp(ptr + 2, boundary, boundary_len)) { + ptr += boundary_len + 2; + + if(*ptr == '\r' && *(ptr + 1) == '\n') { + ptr += 2; if(cur_body) { - cur_body->offsets.cbBodyEnd = boundary_start; + cur_body->offsets.cbBodyEnd = boundary_start - 2; list_add_tail(body_offsets, &cur_body->entry); } cur_body = HeapAlloc(GetProcessHeap(), 0, sizeof(*cur_body)); - cur_body->offsets.cbBoundaryStart = boundary_start + 2; /* doesn't including the leading \r\n */ - cur_body->offsets.cbHeaderStart = boundary_start + boundary_len + 6; + cur_body->offsets.cbBoundaryStart = boundary_start; + cur_body->offsets.cbHeaderStart = start + ptr - buf; } - else if(*end == '-' && *(end + 1) == '-') + else if(*ptr == '-' && *(ptr + 1) == '-') { if(cur_body) { - cur_body->offsets.cbBodyEnd = boundary_start; + cur_body->offsets.cbBodyEnd = boundary_start - 2; list_add_tail(body_offsets, &cur_body->entry); goto end; } } - ptr = end + 2; } - } while(ptr); + } if(overlap == buf) /* 1st iteration */ { @@ -2018,7 +2021,6 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc } while(1); end: - HeapFree(GetProcessHeap(), 0, nl_boundary); HeapFree(GetProcessHeap(), 0, buf); return hr; }

1 0

Jacek Caban : inetcomm: Don' t include headers in data stream in create_sub_body.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: dec243fd2a7065e315e5fb7f5228a2f72591f90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec243fd2a7065e315e5fb7f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:31 2017 +0100 inetcomm: Don't include headers in data stream in create_sub_body. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 30 ++++++++++++++++-------------- dlls/inetcomm/tests/mimeole.c | 4 +--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 679930d..91c902f 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -2027,19 +2027,27 @@ end: static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *offset, body_t *parent) { + ULARGE_INTEGER start, length; MimeBody *mime_body; HRESULT hr; body_t *body; - ULARGE_INTEGER cur; - LARGE_INTEGER zero; + LARGE_INTEGER pos; + + pos.QuadPart = offset->cbHeaderStart; + IStream_Seek(pStm, pos, STREAM_SEEK_SET, NULL); mime_body = mimebody_create(); IMimeBody_Load(&mime_body->IMimeBody_iface, pStm); - zero.QuadPart = 0; - hr = IStream_Seek(pStm, zero, STREAM_SEEK_CUR, &cur); - offset->cbBodyStart = cur.u.LowPart + offset->cbHeaderStart; + + pos.QuadPart = 0; + hr = IStream_Seek(pStm, pos, STREAM_SEEK_CUR, &start); + offset->cbBodyStart = start.QuadPart; if (parent) MimeBody_set_offsets(mime_body, offset); - IMimeBody_SetData(&mime_body->IMimeBody_iface, IET_BINARY, NULL, NULL, &IID_IStream, pStm); + + length.QuadPart = offset->cbBodyEnd - offset->cbBodyStart; + create_sub_stream(pStm, start, length, (IStream**)&mime_body->data); + mime_body->data_iid = IID_IStream; + body = new_body_entry(mime_body, msg->next_index++, parent); if(IMimeBody_IsContentType(&mime_body->IMimeBody_iface, "multipart", NULL) == S_OK) @@ -2064,14 +2072,8 @@ static body_t *create_sub_body(MimeMessage *msg, IStream *pStm, BODYOFFSETS *off LIST_FOR_EACH_ENTRY_SAFE(cur, cursor2, &offset_list, offset_entry_t, entry) { body_t *sub_body; - IStream *sub_stream; - ULARGE_INTEGER start, length; - - start.QuadPart = cur->offsets.cbHeaderStart; - length.QuadPart = cur->offsets.cbBodyEnd - cur->offsets.cbHeaderStart; - create_sub_stream(pStm, start, length, &sub_stream); - sub_body = create_sub_body(msg, sub_stream, &cur->offsets, body); - IStream_Release(sub_stream); + + sub_body = create_sub_body(msg, pStm, &cur->offsets, body); list_add_tail(&body->children, &sub_body->entry); list_remove(&cur->entry); HeapFree(GetProcessHeap(), 0, cur); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 0765396..16ad06c 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -693,9 +693,7 @@ static void test_CreateMessage(void) hr = IMimeBody_IsContentType(attachment, "multipart", NULL); ok(hr == S_FALSE, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); - ok(hr == S_OK, "ret %08x\n", hr); - todo_wine ok(encoding == IET_7BIT, "ret %d\n", encoding); + test_current_encoding(attachment, IET_7BIT); prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop);

1 0

Jacek Caban : inetcomm: Read content encoding from MIME header.
by Alexandre Julliard 31 Jan '17

31 Jan '17

Module: wine Branch: master Commit: 56dc24695e6ac5141030e9c820cfd379a7a3a134 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56dc24695e6ac5141030e9c82… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 31 11:46:39 2017 +0100 inetcomm: Read content encoding from MIME header. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/mimeole.c | 24 +++++++++++++++++++++++- dlls/inetcomm/tests/mimeole.c | 10 ++-------- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 91c902f..d8253d9 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -765,6 +765,22 @@ static void init_content_type(MimeBody *body, header_t *header) body->content_sub_type = strdupA(slash + 1); } +static void init_content_encoding(MimeBody *body, header_t *header) +{ + const char *encoding = header->value.u.pszVal; + + if(!strcasecmp(encoding, "base64")) + body->encoding = IET_BASE64; + else if(!strcasecmp(encoding, "quoted-printable")) + body->encoding = IET_QP; + else if(!strcasecmp(encoding, "7bit")) + body->encoding = IET_7BIT; + else if(!strcasecmp(encoding, "8bit")) + body->encoding = IET_8BIT; + else + FIXME("unknown encoding %s\n", debugstr_a(encoding)); +} + static HRESULT parse_headers(MimeBody *body, IStream *stm) { char *header_buf, *cur_header_ptr; @@ -780,8 +796,14 @@ static HRESULT parse_headers(MimeBody *body, IStream *stm) read_value(header, &cur_header_ptr); list_add_tail(&body->headers, &header->entry); - if(header->prop->id == PID_HDR_CNTTYPE) + switch(header->prop->id) { + case PID_HDR_CNTTYPE: init_content_type(body, header); + break; + case PID_HDR_CNTXFER: + init_content_encoding(body, header); + break; + } } HeapFree(GetProcessHeap(), 0, header_buf); diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index 16ad06c..8028ca8 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -150,7 +150,6 @@ static void test_CreateBody(void) IStream *in; LARGE_INTEGER off; ULARGE_INTEGER pos; - ENCODINGTYPE enc; ULONG count, found_param, i; MIMEPARAMINFO *param_info; IMimeAllocator *alloc; @@ -191,9 +190,7 @@ static void test_CreateBody(void) hr = IMimeBody_IsContentType(body, "text", "plain"); todo_wine ok(hr == S_OK, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(body, &enc); - ok(hr == S_OK, "ret %08x\n", hr); - ok(enc == IET_8BIT, "encoding %d\n", enc); + test_current_encoding(body, IET_8BIT); memset(&offsets, 0xcc, sizeof(offsets)); hr = IMimeBody_GetOffsets(body, &offsets); @@ -658,7 +655,6 @@ static void test_CreateMessage(void) ok(count == 2, "got %d\n", count); if(count == 2) { - ENCODINGTYPE encoding; IMimeBody *attachment; PROPVARIANT prop; @@ -670,9 +666,7 @@ static void test_CreateMessage(void) hr = IMimeBody_IsContentType(attachment, "multipart", NULL); ok(hr == S_FALSE, "ret %08x\n", hr); - hr = IMimeBody_GetCurrentEncoding(attachment, &encoding); - ok(hr == S_OK, "ret %08x\n", hr); - todo_wine ok(encoding == IET_8BIT, "ret %d\n", encoding); + test_current_encoding(attachment, IET_8BIT); prop.vt = VT_LPSTR; hr = IMimeBody_GetProp(attachment, "Content-Transfer-Encoding", 0, &prop);

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

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

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

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

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

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 : 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