December 2016 - Wine-commits

Nikolay Sivov : xmllite: Improve writer methods tracing.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: a39251b09634db16d48c1da079e51dfb2d5dc644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a39251b09634db16d48c1da07… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:21 2016 +0300 xmllite: Improve writer methods tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/writer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/writer.c b/dlls/xmllite/writer.c index bcc0e85..f7f2604 100644 --- a/dlls/xmllite/writer.c +++ b/dlls/xmllite/writer.c @@ -447,7 +447,7 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IXmlWriter)) @@ -463,23 +463,23 @@ static HRESULT WINAPI xmlwriter_QueryInterface(IXmlWriter *iface, REFIID riid, v static ULONG WINAPI xmlwriter_AddRef(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - TRACE("%p\n", This); - return InterlockedIncrement(&This->ref); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; } static ULONG WINAPI xmlwriter_Release(IXmlWriter *iface) { xmlwriter *This = impl_from_IXmlWriter(iface); - LONG ref; + ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p\n", This); + TRACE("(%p)->>(%u)\n", This, ref); - ref = InterlockedDecrement(&This->ref); if (ref == 0) { struct element *element, *element2; IMalloc *imalloc = This->imalloc; - IXmlWriter_Flush(iface); + writeroutput_flush_stream(This->output); if (This->output) IUnknown_Release(&This->output->IXmlWriterOutput_iface); /* element stack */

1 0

Nikolay Sivov : xmllite: Store empty element fields separately.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: f185dd51fdb4c1afeb2771445e3db304790f1eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f185dd51fdb4c1afeb2771445… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:22 2016 +0300 xmllite: Store empty element fields separately. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9484173..c3b68d2 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -253,7 +253,8 @@ typedef struct strval strvalues[StringValue_Last]; UINT depth; UINT max_depth; - BOOL empty_element; + BOOL is_empty_element; + struct element empty_element; UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -433,7 +434,7 @@ static void reader_clear_elements(xmlreader *reader) reader_free(reader, elem); } list_init(&reader->elements); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; } static HRESULT reader_inc_depth(xmlreader *reader) @@ -479,7 +480,7 @@ static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *loc } list_add_head(&reader->elements, &elem->entry); - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; return hr; } @@ -2075,7 +2076,9 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '/>' */ reader_skipn(reader, 2); - reader->empty_element = TRUE; + reader->is_empty_element = TRUE; + reader->empty_element.localname = *local; + reader->empty_element.qname = *qname; return S_OK; } @@ -2707,7 +2710,6 @@ static HRESULT WINAPI xmlreader_MoveToAttributeByName(IXmlReader* iface, static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); - struct element *elem; TRACE("(%p)\n", This); @@ -2715,11 +2717,16 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) This->attr = NULL; /* FIXME: support other node types with 'attributes' like DTD */ - elem = LIST_ENTRY(list_head(&This->elements), struct element, entry); - if (elem) - { - reader_set_strvalue(This, StringValue_QualifiedName, &elem->qname); - reader_set_strvalue(This, StringValue_LocalName, &elem->localname); + if (This->is_empty_element) { + 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_LocalName, &element->localname); + reader_set_strvalue(This, StringValue_QualifiedName, &element->qname); + } } return S_OK; @@ -2841,7 +2848,7 @@ static BOOL WINAPI xmlreader_IsEmptyElement(IXmlReader* iface) TRACE("(%p)\n", This); /* Empty elements are not placed in stack, it's stored as a global reader flag that makes sense when current node is start tag of an element */ - return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->empty_element : FALSE; + return (reader_get_nodetype(This) == XmlNodeType_Element) ? This->is_empty_element : FALSE; } static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *lineNumber) @@ -3024,7 +3031,7 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256; - reader->empty_element = FALSE; + reader->is_empty_element = FALSE; memset(reader->resume, 0, sizeof(reader->resume)); for (i = 0; i < StringValue_Last; i++)

1 0

Nikolay Sivov : xmllite: Store prefix for elements.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 635c40912601589224e2c60be714c5b5a27597f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=635c40912601589224e2c60be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:23 2016 +0300 xmllite: Store prefix for elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 68 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c3b68d2..8978d97 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -228,8 +228,9 @@ struct attribute struct element { struct list entry; - strval qname; + strval prefix; strval localname; + strval qname; }; typedef struct @@ -282,6 +283,14 @@ static inline void *reader_alloc(xmlreader *reader, size_t len) return m_alloc(reader->imalloc, len); } +static inline void *reader_alloc_zero(xmlreader *reader, size_t len) +{ + void *ret = reader_alloc(reader, len); + if (ret) + memset(ret, 0, len); + return ret; +} + static inline void reader_free(xmlreader *reader, void *mem) { m_free(reader->imalloc, mem); @@ -448,39 +457,44 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } -static HRESULT reader_push_element(xmlreader *reader, strval *qname, strval *localname) +static void reader_free_element(xmlreader *reader, struct element *element) { - struct element *elem; - HRESULT hr; - - elem = reader_alloc(reader, sizeof(*elem)); - if (!elem) return E_OUTOFMEMORY; - - hr = reader_strvaldup(reader, qname, &elem->qname); - if (FAILED(hr)) { - reader_free(reader, elem); - return hr; - } + reader_free_strvalued(reader, &element->prefix); + reader_free_strvalued(reader, &element->localname); + reader_free_strvalued(reader, &element->qname); + reader_free(reader, element); +} - hr = reader_strvaldup(reader, localname, &elem->localname); - if (FAILED(hr)) - { - reader_free_strvalued(reader, &elem->qname); - reader_free(reader, elem); - return hr; - } +static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *localname, + strval *qname) +{ + struct element *element; + HRESULT hr; if (!list_empty(&reader->elements)) { hr = reader_inc_depth(reader); - if (FAILED(hr)) { - reader_free(reader, elem); + if (FAILED(hr)) return hr; - } } - list_add_head(&reader->elements, &elem->entry); + element = reader_alloc_zero(reader, sizeof(*element)); + if (!element) + goto failed; + + if ((hr = reader_strvaldup(reader, prefix, &element->prefix)) != S_OK || + (hr = reader_strvaldup(reader, localname, &element->localname)) != S_OK || + (hr = reader_strvaldup(reader, qname, &element->qname)) != S_OK) + { + reader_free_element(reader, element); + goto failed; + } + + list_add_head(&reader->elements, &element->entry); reader->is_empty_element = FALSE; + +failed: + reader_dec_depth(reader); return hr; } @@ -2077,6 +2091,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca /* skip '/>' */ reader_skipn(reader, 2); reader->is_empty_element = TRUE; + reader->empty_element.prefix = *prefix; reader->empty_element.localname = *local; reader->empty_element.qname = *qname; return S_OK; @@ -2087,7 +2102,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca { /* skip '>' */ reader_skipn(reader, 1); - return reader_push_element(reader, qname, local); + return reader_push_element(reader, prefix, local, qname); } hr = reader_parse_attribute(reader); @@ -2134,8 +2149,8 @@ static HRESULT reader_parse_element(xmlreader *reader) reader->nodetype = XmlNodeType_Element; reader->resumestate = XmlReadResumeState_Initial; - reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_Prefix, &prefix); + reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname); break; } @@ -2178,6 +2193,7 @@ static HRESULT reader_parse_endtag(xmlreader *reader) reader->instate = XmlReadInState_MiscEnd; reader->nodetype = XmlNodeType_EndElement; + reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); reader_set_strvalue(reader, StringValue_QualifiedName, &qname);

1 0

Nikolay Sivov : xmllite: Keep a list of namespace definitions.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 18d6deff6d844d841844d2d7c63405742d74b7fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=18d6deff6d844d841844d2d7c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:24 2016 +0300 xmllite: Keep a list of namespace definitions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 102 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 83 insertions(+), 19 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 8978d97..500db62 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -216,11 +216,14 @@ typedef struct } strval; static WCHAR emptyW[] = {0}; +static WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const strval strval_empty = { emptyW }; +static const strval strval_xmlns = { xmlnsW, 5 }; struct attribute { struct list entry; + strval prefix; strval localname; strval value; }; @@ -233,6 +236,14 @@ struct element strval qname; }; +struct ns +{ + struct list entry; + strval prefix; + strval uri; + struct element *element; +}; + typedef struct { IXmlReader IXmlReader_iface; @@ -250,6 +261,8 @@ typedef struct struct list attrs; /* attributes list for current node */ struct attribute *attr; /* current attribute */ UINT attr_count; + struct list nsdef; + struct list ns; struct list elements; strval strvalues[StringValue_Last]; UINT depth; @@ -369,13 +382,17 @@ static void reader_clear_attrs(xmlreader *reader) /* attribute data holds pointers to buffer data, so buffer shrink is not possible while we are on a node with attributes */ -static HRESULT reader_add_attr(xmlreader *reader, strval *localname, strval *value) +static HRESULT reader_add_attr(xmlreader *reader, strval *prefix, strval *localname, strval *value) { struct attribute *attr; attr = reader_alloc(reader, sizeof(*attr)); if (!attr) return E_OUTOFMEMORY; + if (prefix) + attr->prefix = *prefix; + else + memset(&attr->prefix, 0, sizeof(attr->prefix)); attr->localname = *localname; attr->value = *value; list_add_tail(&reader->attrs, &attr->entry); @@ -457,6 +474,36 @@ static void reader_dec_depth(xmlreader *reader) if (reader->depth > 1) reader->depth--; } +static HRESULT reader_push_ns(xmlreader *reader, const strval *prefix, const strval *uri, BOOL def) +{ + struct ns *ns; + HRESULT hr; + + ns = reader_alloc(reader, sizeof(*ns)); + if (!ns) return E_OUTOFMEMORY; + + if (def) + memset(&ns->prefix, 0, sizeof(ns->prefix)); + else { + hr = reader_strvaldup(reader, prefix, &ns->prefix); + if (FAILED(hr)) { + reader_free(reader, ns); + return hr; + } + } + + hr = reader_strvaldup(reader, uri, &ns->uri); + if (FAILED(hr)) { + reader_free_strvalued(reader, &ns->prefix); + reader_free(reader, ns); + return hr; + } + + ns->element = NULL; + list_add_head(def ? &reader->nsdef : &reader->ns, &ns->entry); + return hr; +} + static void reader_free_element(xmlreader *reader, struct element *element) { reader_free_strvalued(reader, &element->prefix); @@ -1056,7 +1103,7 @@ static HRESULT reader_parse_versioninfo(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* ([A-Za-z0-9._] | '-') */ @@ -1132,7 +1179,7 @@ static HRESULT reader_parse_encdecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [32] SDDecl ::= S 'standalone' Eq (("'" ('yes' | 'no') "'") | ('"' ('yes' | 'no') '"')) */ @@ -1174,7 +1221,7 @@ static HRESULT reader_parse_sddecl(xmlreader *reader) /* skip "'"|'"' */ reader_skipn(reader, 1); - return reader_add_attr(reader, &name, &val); + return reader_add_attr(reader, NULL, &name, &val); } /* [23] XMLDecl ::= '<?xml' VersionInfo EncodingDecl? SDDecl? S? '?>' */ @@ -1644,7 +1691,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(publicW, strlenW(publicW), &name); - hr = reader_add_attr(reader, &name, &pub); + hr = reader_add_attr(reader, NULL, &name, &pub); if (FAILED(hr)) return hr; cnt = reader_skipspaces(reader); @@ -1655,7 +1702,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return S_OK; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - hr = reader_add_attr(reader, &name, &sys); + hr = reader_add_attr(reader, NULL, &name, &sys); if (FAILED(hr)) return hr; return S_OK; @@ -1669,7 +1716,7 @@ static HRESULT reader_parse_externalid(xmlreader *reader) if (FAILED(hr)) return hr; reader_init_cstrvalue(systemW, strlenW(systemW), &name); - return reader_add_attr(reader, &name, &sys); + return reader_add_attr(reader, NULL, &name, &sys); } return S_FALSE; @@ -2042,23 +2089,18 @@ static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) [15 NS] Attribute ::= NSAttName Eq AttValue | QName Eq AttValue */ static HRESULT reader_parse_attribute(xmlreader *reader) { - static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; - strval prefix, local, qname, xmlns, value; + strval prefix, local, qname, value; + BOOL ns = FALSE, nsdef = FALSE; HRESULT hr; hr = reader_parse_qname(reader, &prefix, &local, &qname); if (FAILED(hr)) return hr; - reader_init_cstrvalue((WCHAR*)xmlnsW, 5, &xmlns); - - if (strval_eq(reader, &prefix, &xmlns)) - { - FIXME("namespace definitions not supported\n"); - return E_NOTIMPL; - } + if (strval_eq(reader, &prefix, &strval_xmlns)) + ns = TRUE; - if (strval_eq(reader, &qname, &xmlns)) - FIXME("default namespace definitions not supported\n"); + if (strval_eq(reader, &qname, &strval_xmlns)) + ns = nsdef = TRUE; hr = reader_parse_eq(reader); if (FAILED(hr)) return hr; @@ -2066,8 +2108,11 @@ static HRESULT reader_parse_attribute(xmlreader *reader) hr = reader_parse_attvalue(reader, &value); if (FAILED(hr)) return hr; + if (ns) + reader_push_ns(reader, nsdef ? &strval_xmlns : &local, &value, nsdef); + TRACE("%s=%s\n", debug_strval(reader, &local), debug_strval(reader, &value)); - return reader_add_attr(reader, &local, &value); + return reader_add_attr(reader, &prefix, &local, &value); } /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' @@ -2487,6 +2532,22 @@ static ULONG WINAPI xmlreader_AddRef(IXmlReader *iface) return ref; } +static void reader_clear_ns(xmlreader *reader) +{ + struct ns *ns, *ns2; + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->ns, struct ns, entry) { + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } + + LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->nsdef, struct ns, entry) { + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } +} + static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); @@ -2501,6 +2562,7 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) if (This->resolver) IXmlResolver_Release(This->resolver); if (This->mlang) IUnknown_Release(This->mlang); reader_clear_attrs(This); + reader_clear_ns(This); reader_clear_elements(This); reader_free_strvalues(This); reader_free(This, This); @@ -3044,6 +3106,8 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) list_init(&reader->attrs); reader->attr_count = 0; reader->attr = NULL; + list_init(&reader->nsdef); + list_init(&reader->ns); list_init(&reader->elements); reader->depth = 0; reader->max_depth = 256;

1 0

Nikolay Sivov : xmllite: Keep namespace list updated when going through document tree.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 65ee2b734a35f45688486e27a4329a1ea81e3f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65ee2b734a35f45688486e27a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:25 2016 +0300 xmllite: Keep namespace list updated when going through document tree. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 80 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 500db62..351f872 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -512,6 +512,23 @@ static void reader_free_element(xmlreader *reader, struct element *element) reader_free(reader, element); } +static void reader_mark_ns_nodes(xmlreader *reader, struct element *element) +{ + struct ns *ns; + + LIST_FOR_EACH_ENTRY(ns, &reader->ns, struct ns, entry) { + if (ns->element) + break; + ns->element = element; + } + + LIST_FOR_EACH_ENTRY(ns, &reader->nsdef, struct ns, entry) { + if (ns->element) + break; + ns->element = element; + } +} + static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *localname, strval *qname) { @@ -538,6 +555,7 @@ static HRESULT reader_push_element(xmlreader *reader, strval *prefix, strval *lo } list_add_head(&reader->elements, &element->entry); + reader_mark_ns_nodes(reader, element); reader->is_empty_element = FALSE; failed: @@ -545,18 +563,48 @@ failed: return hr; } -static void reader_pop_element(xmlreader *reader) +static void reader_pop_ns_nodes(xmlreader *reader, struct element *element) { - struct element *elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + struct ns *ns, *ns2; - if (elem) - { - list_remove(&elem->entry); - reader_free_strvalued(reader, &elem->qname); - reader_free_strvalued(reader, &elem->localname); - reader_free(reader, elem); - reader_dec_depth(reader); + LIST_FOR_EACH_ENTRY_SAFE_REV(ns, ns2, &reader->ns, struct ns, entry) { + if (ns->element != element) + break; + + list_remove(&ns->entry); + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); } + + if (!list_empty(&reader->nsdef)) { + ns = LIST_ENTRY(list_head(&reader->nsdef), struct ns, entry); + if (ns->element == element) { + list_remove(&ns->entry); + reader_free_strvalued(reader, &ns->prefix); + reader_free_strvalued(reader, &ns->uri); + reader_free(reader, ns); + } + } +} + +static void reader_pop_element(xmlreader *reader) +{ + struct element *element; + + if (list_empty(&reader->elements)) + return; + + element = LIST_ENTRY(list_head(&reader->elements), struct element, entry); + list_remove(&element->entry); + + reader_pop_ns_nodes(reader, element); + reader_free_element(reader, element); + reader_dec_depth(reader); + + /* It was a root element, the rest is expected as Misc */ + if (list_empty(&reader->elements)) + reader->instate = XmlReadInState_MiscEnd; } /* Always make a copy, cause strings are supposed to be null terminated. Null pointer for 'value' @@ -2139,6 +2187,7 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca reader->empty_element.prefix = *prefix; reader->empty_element.localname = *local; reader->empty_element.qname = *qname; + reader_mark_ns_nodes(reader, &reader->empty_element); return S_OK; } @@ -2231,12 +2280,6 @@ static HRESULT reader_parse_endtag(xmlreader *reader) elem = LIST_ENTRY(list_head(&reader->elements), struct element, entry); if (!strval_eq(reader, &elem->qname, &qname)) return WC_E_ELEMENTMATCH; - reader_pop_element(reader); - - /* It was a root element, the rest is expected as Misc */ - if (list_empty(&reader->elements)) - reader->instate = XmlReadInState_MiscEnd; - reader->nodetype = XmlNodeType_EndElement; reader_set_strvalue(reader, StringValue_Prefix, &prefix); reader_set_strvalue(reader, StringValue_LocalName, &local); @@ -2415,11 +2458,18 @@ static HRESULT reader_parse_content(xmlreader *reader) static HRESULT reader_parse_nextnode(xmlreader *reader) { + XmlNodeType nodetype = reader_get_nodetype(reader); HRESULT hr; if (!is_reader_pending(reader)) reader_clear_attrs(reader); + /* When moving from EndElement or empty element, pop its own namespace defitions */ + if (nodetype == XmlNodeType_Element && reader->is_empty_element) + reader_pop_ns_nodes(reader, &reader->empty_element); + else if (nodetype == XmlNodeType_EndElement) + reader_pop_element(reader); + while (1) { switch (reader->instate)

1 0

Nikolay Sivov : xmllite: Use a helper to move to first attribute to avoid extra traces.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 0575a4b2bb28318eb763088bddb159fc03775418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0575a4b2bb28318eb763088bd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:26 2016 +0300 xmllite: Use a helper to move to first attribute to avoid extra traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 351f872..874de75 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2790,18 +2790,26 @@ static HRESULT WINAPI xmlreader_GetNodeType(IXmlReader* iface, XmlNodeType *node return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } +static HRESULT reader_move_to_first_attribute(xmlreader *reader) +{ + if (!reader->attr_count) + return S_FALSE; + + 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_Value, &reader->attr->value); + + return S_OK; +} + static HRESULT WINAPI xmlreader_MoveToFirstAttribute(IXmlReader* iface) { xmlreader *This = impl_from_IXmlReader(iface); TRACE("(%p)\n", This); - if (!This->attr_count) return S_FALSE; - This->attr = LIST_ENTRY(list_head(&This->attrs), struct attribute, entry); - reader_set_strvalue(This, StringValue_LocalName, &This->attr->localname); - reader_set_strvalue(This, StringValue_Value, &This->attr->value); - - return S_OK; + return reader_move_to_first_attribute(This); } static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) @@ -2814,7 +2822,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) if (!This->attr_count) return S_FALSE; if (!This->attr) - return IXmlReader_MoveToFirstAttribute(iface); + return reader_move_to_first_attribute(This); next = list_next(&This->attrs, &This->attr->entry); if (next)

1 0

Nikolay Sivov : xmllite: Update prefix when moving to first attribute.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 585735a0daf9f6b8b38b9b64fa88e85d96832883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=585735a0daf9f6b8b38b9b64f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:27 2016 +0300 xmllite: Update prefix when moving to first attribute. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 874de75..d8d031d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2828,6 +2828,7 @@ static HRESULT WINAPI xmlreader_MoveToNextAttribute(IXmlReader* iface) if (next) { 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_Value, &This->attr->value); }

1 0

Nikolay Sivov : xmllite: Free prefix and local name too when clearing element list.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 249b7a99a73fd43ae1642c93d34c0b10dae1779c URL: http://source.winehq.org/git/wine.git/?a=commit;h=249b7a99a73fd43ae1642c93d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:28 2016 +0300 xmllite: Free prefix and local name too when clearing element list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index d8d031d..09c8e30 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -456,6 +456,8 @@ static void reader_clear_elements(xmlreader *reader) struct element *elem, *elem2; LIST_FOR_EACH_ENTRY_SAFE(elem, elem2, &reader->elements, struct element, entry) { + reader_free_strvalued(reader, &elem->prefix); + reader_free_strvalued(reader, &elem->localname); reader_free_strvalued(reader, &elem->qname); reader_free(reader, elem); }

1 0

Nikolay Sivov : xmllite: Implement GetNamespaceUri().
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 13afa65fb11845a72905c43012ed54e4814244e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13afa65fb11845a72905c4301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:29 2016 +0300 xmllite: Implement GetNamespaceUri(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 103 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 98 insertions(+), 5 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 09c8e30..24a061c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -216,8 +216,10 @@ typedef struct } strval; static WCHAR emptyW[] = {0}; +static WCHAR xmlW[] = {'x','m','l',0}; static WCHAR xmlnsW[] = {'x','m','l','n','s',0}; static const strval strval_empty = { emptyW }; +static const strval strval_xml = { xmlW, 3 }; static const strval strval_xmlns = { xmlnsW, 5 }; struct attribute @@ -2881,12 +2883,103 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam return S_OK; } -static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, - LPCWSTR *namespaceUri, - UINT *namespaceUri_length) +static struct ns *reader_lookup_ns(xmlreader *reader, const strval *prefix) { - FIXME("(%p %p %p): stub\n", iface, namespaceUri, namespaceUri_length); - return E_NOTIMPL; + struct list *nslist = prefix ? &reader->ns : &reader->nsdef; + struct ns *ns; + + LIST_FOR_EACH_ENTRY_REV(ns, nslist, struct ns, entry) { + if (strval_eq(reader, prefix, &ns->prefix)) + return ns; + } + + return NULL; +} + +static struct ns *reader_lookup_nsdef(xmlreader *reader) +{ + if (list_empty(&reader->nsdef)) + return NULL; + + return LIST_ENTRY(list_head(&reader->nsdef), struct ns, entry); +} + +static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR **uri, UINT *len) +{ + xmlreader *This = impl_from_IXmlReader(iface); + const strval *prefix = &This->strvalues[StringValue_Prefix]; + XmlNodeType nodetype; + struct ns *ns; + UINT length; + + TRACE("(%p %p %p)\n", iface, uri, len); + + if (!len) + len = &length; + + *uri = NULL; + *len = 0; + + switch ((nodetype = reader_get_nodetype(This))) + { + case XmlNodeType_Attribute: + { + static const WCHAR xmlns_uriW[] = {'h','t','t','p',':','/','/','w','w','w','.','w','3','.','o','r','g','/', + '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)) || + strval_eq(This, prefix, &strval_xmlns)) + { + *uri = xmlns_uriW; + *len = sizeof(xmlns_uriW)/sizeof(xmlns_uriW[0]) - 1; + } + else if (strval_eq(This, prefix, &strval_xml)) { + *uri = xml_uriW; + *len = sizeof(xml_uriW)/sizeof(xml_uriW[0]) - 1; + } + + if (!*uri) { + ns = reader_lookup_ns(This, prefix); + if (ns) { + *uri = ns->uri.str; + *len = ns->uri.len; + } + else { + *uri = emptyW; + *len = 0; + } + } + } + break; + case XmlNodeType_Element: + case XmlNodeType_EndElement: + { + ns = reader_lookup_ns(This, prefix); + + /* pick top default ns if any */ + if (!ns) + ns = reader_lookup_nsdef(This); + + if (ns) { + *uri = ns->uri.str; + *len = ns->uri.len; + } + else { + *uri = emptyW; + *len = 0; + } + } + break; + default: + FIXME("Unhandled node type %d\n", nodetype); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len)

1 0

Nikolay Sivov : xmllite: Improve GetValue() for namespace definition nodes.
by Alexandre Julliard 09 Dec '16

09 Dec '16

Module: wine Branch: master Commit: 20c575e81fdf2038a37eae2ac9bdb809a2542de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c575e81fdf2038a37eae2ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 16:38:30 2016 +0300 xmllite: Improve GetValue() for namespace definition nodes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 24a061c..47649f5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3002,6 +3002,18 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UI return S_OK; } +static BOOL is_namespace_definition(xmlreader *reader) +{ + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; + + if (reader_get_nodetype(reader) != XmlNodeType_Attribute) + return FALSE; + + return ((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns)); +} + static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, UINT *len) { xmlreader *reader = impl_from_IXmlReader(iface); @@ -3032,6 +3044,18 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, val->str = ptr; } + /* For namespace definition attributes return values from namespace list */ + if (is_namespace_definition(reader)) { + const strval *local = &reader->strvalues[StringValue_LocalName]; + struct ns *ns; + + ns = reader_lookup_ns(reader, local); + if (!ns) + ns = reader_lookup_nsdef(reader); + + val = &ns->uri; + } + *value = val->str; if (len) *len = val->len; return S_OK;

1 0