March 2017 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 2.5
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: website Branch: master Commit: c802487fde64939eec594b9b022526892081f6ba URL: http://source.winehq.org/git/website.git/?a=commit;h=c802487fde64939eec594b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 21:26:39 2017 +0200 Wine release 2.5 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017033101.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2017033101.xml b/news/en/2017033101.xml new file mode 100644 index 0000000..3c2a335 --- /dev/null +++ b/news/en/2017033101.xml @@ -0,0 +1,18 @@ +<news> +<date>March 31, 2017</date> +<title>Wine 2.5 Released</title> +<body> + The Wine development release 2.5 is now available. + <a href="{$root}/announce/2.5">What's new</a> in this release: +<ul> + <li>Support for message-mode named pipes.</li> + <li>Translation of version resources through po files.</li> + <li>Transform feedback support in Direct3D.</li> + <li>Scheduler classes in C++ runtime.</li> + <li>Better scrolling in popup menus.</li> + <li>More improvements to the XML reader.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.x/wine-2.5.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : xmllite: Return local name stored in namespace for prefixed namespace attribute values.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: 9506e7da5e60fbcfb499c8ec1f207339ebe5d540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9506e7da5e60fbcfb499c8ec1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 31 15:58:29 2017 +0200 xmllite: Return local name stored in namespace for prefixed namespace attribute values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 6 ++++++ dlls/xmllite/tests/reader.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e7b8364..b4b455b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3225,6 +3225,12 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U *name = xmlnsW; *len = 5; } + else if (This->attr->flags & ATTRIBUTE_NS_DEFINITION) + { + const struct ns *ns = reader_lookup_ns(This, &This->attr->localname); + *name = ns->prefix.str; + *len = ns->prefix.len; + } else { *name = This->attr->localname.str; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index ea163de..819f812 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2550,13 +2550,13 @@ static void test_string_pointers(void) ok(xmlns_ns == reader_namespace(reader, "http://www.w3.org/2000/xmlns/"), "xmlns_ns != namespace\n"); read_node(reader, XmlNodeType_Element); - ptr = reader_prefix(reader, "p"); todo_wine ok(p == ptr, "p != prefix\n"); + ok(p == reader_prefix(reader, "p"), "p != prefix\n"); ok(ns == reader_namespace(reader, "myns"), "empty != namespace\n"); name = reader_qname(reader, "p:elem2"); next_attribute(reader); ok(empty != reader_value(reader, ""), "empty == value\n"); - ptr = reader_prefix(reader, "q"); todo_wine ok(q == ptr, "q != prefix\n"); + ok(q == reader_prefix(reader, "q"), "q != prefix\n"); ok(nsq == reader_namespace(reader, "mynsq"), "nsq != namespace\n"); read_node(reader, XmlNodeType_EndElement);

1 0

Jacek Caban : xmllite/tests: Added move_to_element helper.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: def55873793a4640dcef7bb81a215edfcc579687 URL: http://source.winehq.org/git/wine.git/?a=commit;h=def55873793a4640dcef7bb81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 31 15:57:27 2017 +0200 xmllite/tests: Added move_to_element helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 666432e..731c7b8 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -256,6 +256,14 @@ static void _next_attribute(unsigned line, IXmlReader *reader) ok_(__FILE__,line)(hr == S_OK, "MoveToNextAttribute returned %08x\n", hr); } +#define move_to_element(a) _move_to_element(__LINE__,a) +static void _move_to_element(unsigned line, IXmlReader *reader) +{ + HRESULT hr; + hr = IXmlReader_MoveToElement(reader); + ok_(__FILE__,line)(hr == S_OK, "MoveToElement failed: %08x\n", hr); +} + static void test_read_state(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, int line) { @@ -943,8 +951,7 @@ static void test_read_xmldeclaration(void) TEST_DEPTH(reader, 1); - hr = IXmlReader_MoveToElement(reader); - ok(hr == S_OK, "got %08x\n", hr); + move_to_element(reader); TEST_READER_POSITION2(reader, 1, 3, ~0u, 55); type = XmlNodeType_None; @@ -1302,8 +1309,7 @@ static void test_read_public_dtd(void) reader_name(reader, "SYSTEM"); reader_value(reader, "externalid uri"); - hr = IXmlReader_MoveToElement(reader); - ok(hr == S_OK, "got 0x%08x\n", hr); + move_to_element(reader); len = 0; str = NULL; @@ -1367,8 +1373,7 @@ static void test_read_system_dtd(void) reader_name(reader, "SYSTEM"); reader_value(reader, "externalid uri"); - hr = IXmlReader_MoveToElement(reader); - ok(hr == S_OK, "got 0x%08x\n", hr); + move_to_element(reader); len = 0; str = NULL; @@ -1539,9 +1544,7 @@ static void test_read_element(void) ok(hr == S_OK, "got %08x\n", hr); ok(depth == depths[i] + 1, "%u: got depth %u, expected %u\n", i, depth, depths[i] + 1); - hr = IXmlReader_MoveToElement(reader); - ok(hr == S_OK, "got %08x\n", hr); - + move_to_element(reader); reader_value(reader, ""); depth = 123; @@ -2045,9 +2048,7 @@ static void test_prefix(void) reader_prefix(reader, prefix_tests[i].prefix3); /* back to the element, check prefix */ - hr = IXmlReader_MoveToElement(reader); - ok(hr == S_OK, "MoveToElement() failed, %#x.\n", hr); - + move_to_element(reader); reader_prefix(reader, prefix_tests[i].prefix1); IStream_Release(stream); @@ -2473,8 +2474,7 @@ static void test_reader_position(void) next_attribute(reader); TEST_READER_POSITION2(reader, 1, 24, ~0u, 34); - hr = IXmlReader_MoveToElement(reader); - ok(hr == S_OK, "got %08x\n", hr); + move_to_element(reader); TEST_READER_POSITION2(reader, 1, 2, ~0u, 34); hr = IXmlReader_Read(reader, &type);

1 0

Alexandre Julliard : Release 2.5.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: 64e4a03a92498abea428dc567372f3996fa9dc3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e4a03a92498abea428dc567… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 21:24:16 2017 +0200 Release 2.5. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 801 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 437 insertions(+), 387 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64e4a03a92498abea428d…

1 0

Jacek Caban : xmllite: Allow reading from allocated strings in ReadValueChunk.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: daf0504570c74f54641bb6c0afd87d979d82fca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=daf0504570c74f54641bb6c0a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 31 15:58:06 2017 +0200 xmllite: Allow reading from allocated strings in ReadValueChunk. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 118 ++++++++++++++++++++++++++------------------ dlls/xmllite/tests/reader.c | 2 - 2 files changed, 70 insertions(+), 50 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 660d2cd..a11ec7a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -22,6 +22,7 @@ #include <stdio.h> #include <stdarg.h> +#include <assert.h> #include "windef.h" #include "winbase.h" #include "initguid.h" @@ -286,6 +287,7 @@ typedef struct struct list nsdef; struct list ns; struct list elements; + int chunk_read_off; strval strvalues[StringValue_Last]; UINT depth; UINT max_depth; @@ -2536,7 +2538,10 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) HRESULT hr; if (!is_reader_pending(reader)) + { + reader->chunk_read_off = 0; reader_clear_attrs(reader); + } /* When moving from EndElement or empty element, pop its own namespace definitions */ switch (nodetype) @@ -2934,6 +2939,7 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader) reader_inc_depth(reader); reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); + reader->chunk_read_off = 0; reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); reader_set_strvalue(reader, StringValue_QualifiedName, &reader->attr->qname); reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); @@ -2966,6 +2972,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) if (next) { This->attr = LIST_ENTRY(next, struct attribute, entry); + This->chunk_read_off = 0; reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); reader_set_strvalue(This, StringValue_Value, &This->attr->value); @@ -3007,6 +3014,7 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } } + This->chunk_read_off = 0; reader_set_strvalue(This, StringValue_Value, &strval_empty); return S_OK; @@ -3274,17 +3282,54 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, return S_OK; } +static const strval *reader_get_value(xmlreader *reader, BOOL ensure_allocated) +{ + strval *val; + + switch (reader_get_nodetype(reader)) + { + case XmlNodeType_XmlDeclaration: + case XmlNodeType_EndElement: + case XmlNodeType_None: + return &strval_empty; + case XmlNodeType_Attribute: + /* For namespace definition attributes return values from namespace list */ + if (reader->attr->flags & (ATTRIBUTE_NS_DEFINITION | ATTRIBUTE_DEFAULT_NS_DEFINITION)) + { + struct ns *ns; + + if (!(ns = reader_lookup_ns(reader, &reader->attr->localname))) + ns = reader_lookup_nsdef(reader); + + return &ns->uri; + } + break; + default: + break; + } + + val = &reader->strvalues[StringValue_Value]; + if (!val->str && ensure_allocated) + { + WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); + if (!ptr) return NULL; + memcpy(ptr, reader_get_strptr(reader, val), val->len*sizeof(WCHAR)); + ptr[val->len] = 0; + val->str = ptr; + } + + return val; +} + static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); - strval *val = &reader->strvalues[StringValue_Value]; - UINT length; + const strval *val = &reader->strvalues[StringValue_Value]; + UINT off; TRACE("(%p)->(%p %p)\n", reader, value, len); *value = NULL; - if (!len) - len = &length; if ((reader->nodetype == XmlNodeType_Comment && !val->str && !val->len) || is_reader_pending(reader)) { @@ -3298,64 +3343,40 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, if (is_reader_pending(reader)) return E_PENDING; } - switch (reader_get_nodetype(reader)) - { - case XmlNodeType_XmlDeclaration: - case XmlNodeType_EndElement: - case XmlNodeType_None: - *value = emptyW; - *len = 0; - break; - case XmlNodeType_Attribute: - { - /* For namespace definition attributes return values from namespace list */ - if (reader->attr->flags & (ATTRIBUTE_NS_DEFINITION | ATTRIBUTE_DEFAULT_NS_DEFINITION)) - { - struct ns *ns; - - if (!(ns = reader_lookup_ns(reader, &reader->attr->localname))) - ns = reader_lookup_nsdef(reader); - - *value = ns->uri.str; - *len = ns->uri.len; - break; - } - } - /* fallthrough */ - default: - if (!val->str) - { - WCHAR *ptr = reader_alloc(reader, (val->len+1)*sizeof(WCHAR)); - if (!ptr) return E_OUTOFMEMORY; - memcpy(ptr, reader_get_strptr(reader, val), val->len*sizeof(WCHAR)); - ptr[val->len] = 0; - val->str = ptr; - } - *value = val->str; - *len = val->len; - break; - } + val = reader_get_value(reader, TRUE); + if (!val) + return E_OUTOFMEMORY; + off = abs(reader->chunk_read_off); + assert(off <= val->len); + *value = val->str + off; + if (len) *len = val->len - off; + reader->chunk_read_off = -off; return S_OK; } static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, WCHAR *buffer, UINT chunk_size, UINT *read) { xmlreader *reader = impl_from_IXmlReader(iface); - strval *val = &reader->strvalues[StringValue_Value]; - UINT len; + const strval *val; + UINT len = 0; TRACE("(%p)->(%p %u %p)\n", reader, buffer, chunk_size, read); - /* Value is already allocated, chunked reads are not possible. */ - len = !val->str && val->len ? min(chunk_size, val->len) : 0; + val = reader_get_value(reader, FALSE); + + /* If value is already read by GetValue, chunk_read_off is negative and chunked reads are not possible. */ + if (reader->chunk_read_off >= 0) + { + assert(reader->chunk_read_off <= val->len); + len = min(val->len - reader->chunk_read_off, chunk_size); + } if (read) *read = len; if (len) { - memcpy(buffer, reader_get_ptr2(reader, val->start), len*sizeof(WCHAR)); - val->start += len; - val->len -= len; + memcpy(buffer, reader_get_strptr(reader, val) + reader->chunk_read_off, len*sizeof(WCHAR)); + reader->chunk_read_off += len; } return len || !chunk_size ? S_OK : S_FALSE; @@ -3601,6 +3622,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->elements); reader->max_depth = 256; + reader->chunk_read_off = 0; for (i = 0; i < StringValue_Last; i++) reader->strvalues[i] = strval_empty; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 20d8240..fd83569 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2581,12 +2581,10 @@ static void test_string_pointers(void) next_attribute(reader); read_value_char(reader, 'm'); IXmlReader_GetValue(reader, &p, NULL); - todo_wine ok(!strcmp_wa(p, "yns"), "value = %s\n", wine_dbgstr_w(p)); read_node(reader, XmlNodeType_Element); ns = reader_namespace(reader, "myns"); - todo_wine ok(ns+1 == p, "ns+1 != p\n"); set_input_string(reader, "<elem attr=\"value\"></elem>");

1 0

Jacek Caban : xmllite: Store allocated copy of local name in attribute struct and use that instead of StringValue_LocalName.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: f86222268fd716b5836c975fc199a0d9d052b07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86222268fd716b5836c975fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 31 15:57:51 2017 +0200 xmllite: Store allocated copy of local name in attribute struct and use that instead of StringValue_LocalName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 47 ++++++++++++++++++++++++--------------------- dlls/xmllite/tests/reader.c | 28 ++++++++++++--------------- 2 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 405e5cc..660d2cd 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -391,11 +391,22 @@ static inline WCHAR *readerinput_strdupW(xmlreaderinput *input, const WCHAR *str return ret; } +/* This one frees stored string value if needed */ +static void reader_free_strvalued(xmlreader *reader, strval *v) +{ + if (v->str != strval_empty.str) + { + reader_free(reader, v->str); + *v = strval_empty; + } +} + static void reader_clear_attrs(xmlreader *reader) { struct attribute *attr, *attr2; LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry) { + reader_free_strvalued(reader, &attr->localname); reader_free(reader, attr); } list_init(&reader->attrs); @@ -409,15 +420,22 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn strval *value, const struct reader_position *position, unsigned int flags) { struct attribute *attr; + HRESULT hr; attr = reader_alloc(reader, sizeof(*attr)); if (!attr) return E_OUTOFMEMORY; + hr = reader_strvaldup(reader, localname, &attr->localname); + if (hr != S_OK) + { + reader_free(reader, attr); + return hr; + } + if (prefix) attr->prefix = *prefix; else memset(&attr->prefix, 0, sizeof(attr->prefix)); - attr->localname = *localname; attr->qname = qname ? *qname : *localname; attr->value = *value; attr->position = *position; @@ -437,16 +455,6 @@ static struct element *reader_get_element(xmlreader *reader) return LIST_ENTRY(list_head(&reader->elements), struct element, entry); } -/* This one frees stored string value if needed */ -static void reader_free_strvalued(xmlreader *reader, strval *v) -{ - if (v->str != strval_empty.str) - { - reader_free(reader, v->str); - *v = strval_empty; - } -} - static inline void reader_init_strvalue(UINT start, UINT len, strval *v) { v->start = start; @@ -2927,7 +2935,6 @@ static HRESULT reader_move_to_first_attribute(xmlreader *reader) reader->attr = LIST_ENTRY(list_head(&reader->attrs), struct attribute, entry); reader_set_strvalue(reader, StringValue_Prefix, &reader->attr->prefix); - reader_set_strvalue(reader, StringValue_LocalName, &reader->attr->localname); reader_set_strvalue(reader, StringValue_QualifiedName, &reader->attr->qname); reader_set_strvalue(reader, StringValue_Value, &reader->attr->value); @@ -2960,7 +2967,6 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) { This->attr = LIST_ENTRY(next, struct attribute, entry); reader_set_strvalue(This, StringValue_Prefix, &This->attr->prefix); - reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); reader_set_strvalue(This, StringValue_QualifiedName, &This->attr->qname); reader_set_strvalue(This, StringValue_Value, &This->attr->value); } @@ -3053,8 +3059,8 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam } else { - *name = This->strvalues[StringValue_LocalName].str; - *len = This->strvalues[StringValue_LocalName].len; + *name = attribute->localname.str; + *len = attribute->localname.len; } break; default: @@ -3111,10 +3117,9 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * '2','0','0','0','/','x','m','l','n','s','/',0}; static const WCHAR xml_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', 'X','M','L','/','1','9','9','8','/','n','a','m','e','s','p','a','c','e',0}; - const strval *local = &This->strvalues[StringValue_LocalName]; /* check for reserved prefixes first */ - if ((strval_eq(This, prefix, &strval_empty) && strval_eq(This, local, &strval_xmlns)) || + if ((strval_eq(This, prefix, &strval_empty) && strval_eq(This, &This->attr->localname, &strval_xmlns)) || strval_eq(This, prefix, &strval_xmlns)) { *uri = xmlns_uriW; @@ -3208,8 +3213,8 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U } else { - *name = This->strvalues[StringValue_LocalName].str; - *len = This->strvalues[StringValue_LocalName].len; + *name = This->attr->localname.str; + *len = This->attr->localname.len; } break; default: @@ -3303,14 +3308,12 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, break; case XmlNodeType_Attribute: { - const strval *local = &reader->strvalues[StringValue_LocalName]; - /* For namespace definition attributes return values from namespace list */ if (reader->attr->flags & (ATTRIBUTE_NS_DEFINITION | ATTRIBUTE_DEFAULT_NS_DEFINITION)) { struct ns *ns; - if (!(ns = reader_lookup_ns(reader, local))) + if (!(ns = reader_lookup_ns(reader, &reader->attr->localname))) ns = reader_lookup_nsdef(reader); *value = ns->uri.str; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 731c7b8..20d8240 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1310,17 +1310,10 @@ static void test_read_public_dtd(void) reader_value(reader, "externalid uri"); move_to_element(reader); + reader_name(reader, "testdtd"); len = 0; str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { - ok(len == lstrlenW(dtdnameW), "got %u\n", len); - ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); -} - len = 0; - str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine { @@ -1374,17 +1367,10 @@ static void test_read_system_dtd(void) reader_value(reader, "externalid uri"); move_to_element(reader); + reader_name(reader, "testdtd"); len = 0; str = NULL; - hr = IXmlReader_GetLocalName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { - ok(len == lstrlenW(dtdnameW), "got %u\n", len); - ok(!lstrcmpW(str, dtdnameW), "got %s\n", wine_dbgstr_w(str)); -} - len = 0; - str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine { @@ -2603,6 +2589,16 @@ static void test_string_pointers(void) todo_wine ok(ns+1 == p, "ns+1 != p\n"); + set_input_string(reader, "<elem attr=\"value\"></elem>"); + + read_node(reader, XmlNodeType_Element); + next_attribute(reader); + name = reader_name(reader, "attr"); + + move_to_element(reader); + next_attribute(reader); + ok(name == reader_name(reader, "attr"), "attr pointer changed\n"); + IXmlReader_Release(reader); }

1 0

Tag wine-2.5 : Alexandre Julliard : Release 2.5
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: refs/tags/wine-2.5 Tag: 994a07e20c9a4aeba1ceabb4d4266a138ffaaba2 URL: http://source.winehq.org/git/wine.git/?a=tag;h=994a07e20c9a4aeba1ceabb4d426… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 31 21:24:16 2017 +0200 Release 2.5

1 0

Jacek Caban : xmllite: Allocate value in reader_add_attr.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: 1b9b791c4118bdebf08990d94b196ce7877acf95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b9b791c4118bdebf08990d94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 31 15:58:21 2017 +0200 xmllite: Allocate value in reader_add_attr. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 10 ++++++++-- dlls/xmllite/tests/reader.c | 4 +++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a11ec7a..e7b8364 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -409,6 +409,7 @@ static void reader_clear_attrs(xmlreader *reader) LIST_FOR_EACH_ENTRY_SAFE(attr, attr2, &reader->attrs, struct attribute, entry) { reader_free_strvalued(reader, &attr->localname); + reader_free_strvalued(reader, &attr->value); reader_free(reader, attr); } list_init(&reader->attrs); @@ -428,6 +429,12 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn if (!attr) return E_OUTOFMEMORY; hr = reader_strvaldup(reader, localname, &attr->localname); + if (hr == S_OK) + { + hr = reader_strvaldup(reader, value, &attr->value); + if (hr != S_OK) + reader_free_strvalued(reader, &attr->value); + } if (hr != S_OK) { reader_free(reader, attr); @@ -439,7 +446,6 @@ static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localn else memset(&attr->prefix, 0, sizeof(attr->prefix)); attr->qname = qname ? *qname : *localname; - attr->value = *value; attr->position = *position; attr->flags = flags; list_add_tail(&reader->attrs, &attr->entry); @@ -3303,7 +3309,7 @@ static const strval *reader_get_value(xmlreader *reader, BOOL ensure_allocated) return &ns->uri; } - break; + return &reader->attr->value; default: break; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fd83569..ea163de 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2483,7 +2483,7 @@ static void test_reader_position(void) static void test_string_pointers(void) { - const WCHAR *ns, *nsq, *empty, *xmlns_ns, *xmlns_name, *name, *p, *q, *xml, *ptr; + const WCHAR *ns, *nsq, *empty, *xmlns_ns, *xmlns_name, *name, *p, *q, *xml, *ptr, *value; IXmlReader *reader; HRESULT hr; @@ -2592,10 +2592,12 @@ static void test_string_pointers(void) read_node(reader, XmlNodeType_Element); next_attribute(reader); name = reader_name(reader, "attr"); + value = reader_value(reader, "value"); move_to_element(reader); next_attribute(reader); ok(name == reader_name(reader, "attr"), "attr pointer changed\n"); + ok(value == reader_value(reader, "value"), "value pointer changed\n"); IXmlReader_Release(reader); }

1 0

Jacek Caban : xmllite: Don't use StringValue_LocalName for element nodes.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: 004d615f832996f4a205194a52cf4446606d2370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=004d615f832996f4a205194a5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 31 15:57:19 2017 +0200 xmllite: Don't use StringValue_LocalName for element nodes. It's not used anyway. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index eb23f3a..405e5cc 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2313,7 +2313,6 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; reader_set_strvalue(reader, StringValue_Prefix, &prefix); - reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); reader_set_strvalue(reader, StringValue_Value, &strval_empty); break; @@ -2993,14 +2992,12 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) /* FIXME: support other node types with 'attributes' like DTD */ if (This->is_empty_element) { reader_set_strvalue(This, StringValue_Prefix, &This->empty_element.prefix); - reader_set_strvalue(This, StringValue_LocalName, &This->empty_element.localname); reader_set_strvalue(This, StringValue_QualifiedName, &This->empty_element.qname); } else { struct element *element = LIST_ENTRY(list_head(&This->elements), struct element, entry); if (element) { reader_set_strvalue(This, StringValue_Prefix, &element->prefix); - reader_set_strvalue(This, StringValue_LocalName, &element->localname); reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); } }

1 0

Jacek Caban : usp10: Check if corresponding headers are present before accessing their feature lists in _initialize_feature_cache.
by Alexandre Julliard March 31, 2017

March 31, 2017

Module: wine Branch: master Commit: 45538716142d80c68983d065149c1a4404edaafc URL: http://source.winehq.org/git/wine.git/?a=commit;h=45538716142d80c68983d0651… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 31 16:50:54 2017 +0200 usp10: Check if corresponding headers are present before accessing their feature lists in _initialize_feature_cache. Based on feedback from Henri, fixes regression from commit 63bcfa3354edd910ee52b8134af191f7a774b701. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a8b3975..889aa8a 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2832,13 +2832,17 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language if (language->features_initialized) return; - feature_list = (const OT_FeatureList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->FeatureList)); if ((lang = language->gsub_table)) + { + feature_list = (const OT_FeatureList *)((const BYTE *)gsub_header + GET_BE_WORD(gsub_header->FeatureList)); usp10_language_add_feature_list(language, FEATURE_GSUB_TABLE, lang, feature_list); + } - feature_list = (const OT_FeatureList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->FeatureList)); if ((lang = language->gpos_table)) + { + feature_list = (const OT_FeatureList *)((const BYTE *)gpos_header + GET_BE_WORD(gpos_header->FeatureList)); usp10_language_add_feature_list(language, FEATURE_GPOS_TABLE, lang, feature_list); + } language->features_initialized = TRUE; }

1 0