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

Sebastian Lackner : webservices: Unlock critical section before returning.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 3c6c6a3cae7621294276f95fd035a7d4f699d399 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c6c6a3cae7621294276f95fd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 01:06:38 2017 +0100 webservices: Unlock critical section before returning. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 0951af7..26a5fe9 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1182,6 +1182,8 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR } } + LeaveCriticalSection( &reader->cs ); + if (!found) { if (required) return WS_E_INVALID_FORMAT; @@ -1189,7 +1191,6 @@ HRESULT WINAPI WsGetNamespaceFromPrefix( WS_XML_READER *handle, const WS_XML_STR return S_FALSE; } - LeaveCriticalSection( &reader->cs ); return S_OK; }

1 0

Sebastian Lackner : webservices: Fix uninitialized variable in WsWriteArray.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 348fcb18af3f6521bef539b22fc4c4879a51de1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=348fcb18af3f6521bef539b22… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 01:07:11 2017 +0100 webservices: Fix uninitialized variable in WsWriteArray. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f47baa6..4736c07 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -2599,7 +2599,7 @@ HRESULT WINAPI WsWriteArray( WS_XML_WRITER *handle, const WS_XML_STRING *localna struct writer *writer = (struct writer *)handle; WS_TYPE type; ULONG type_size, i; - HRESULT hr; + HRESULT hr = S_OK; TRACE( "%p %s %s %u %p %u %u %u %p\n", handle, debugstr_xmlstr(localname), debugstr_xmlstr(ns), value_type, array, size, offset, count, error );

1 0

Sebastian Lackner : webservices: Return the correct HRESULT on error.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: b665b051660d00dfe6ede9b7a7a335d9b9dd6c99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b665b051660d00dfe6ede9b7a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 01:07:00 2017 +0100 webservices: Return the correct HRESULT on error. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 20cbace..f47baa6 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -945,7 +945,7 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) done: LeaveCriticalSection( &writer->cs ); - return S_OK; + return hr; } static HRESULT write_add_attribute( struct writer *writer, const WS_XML_STRING *prefix, @@ -1018,7 +1018,7 @@ HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING writer->state = WRITER_STATE_STARTATTRIBUTE; LeaveCriticalSection( &writer->cs ); - return S_OK; + return hr; } /* flush current start element if necessary */ @@ -2676,7 +2676,7 @@ HRESULT WINAPI WsWriteXmlBuffer( WS_XML_WRITER *handle, WS_XML_BUFFER *buffer, W done: LeaveCriticalSection( &writer->cs ); - return S_OK; + return hr; } /**************************************************************************

1 0

Nikolay Sivov : xmllite/reader: Return prefixes from namespace stack.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: d3319f60ad7fc418f6ad505ff69b3b337e36dd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3319f60ad7fc418f6ad505ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 9 07:14:06 2017 +0300 xmllite/reader: Return prefixes from namespace stack. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 46 +++++++++++++++++++++++++++++++++++++++++---- dlls/xmllite/tests/reader.c | 1 + 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ba7a56e..2e828f3 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3087,13 +3087,51 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U return S_OK; } -static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, LPCWSTR *prefix, UINT *len) +static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); + XmlNodeType nodetype; + UINT length; + + TRACE("(%p)->(%p %p)\n", This, ret, len); + + if (!len) + len = &length; + + *ret = emptyW; + *len = 0; + + switch ((nodetype = reader_get_nodetype(This))) + { + case XmlNodeType_Element: + case XmlNodeType_EndElement: + case XmlNodeType_Attribute: + { + const strval *prefix = &This->strvalues[StringValue_Prefix]; + struct ns *ns; + + if (strval_eq(This, prefix, &strval_xml)) + { + *ret = xmlW; + *len = 3; + } + else if (strval_eq(This, prefix, &strval_xmlns)) + { + *ret = xmlnsW; + *len = 5; + } + else if ((ns = reader_lookup_ns(This, prefix))) + { + *ret = ns->prefix.str; + *len = ns->prefix.len; + } + + break; + } + default: + ; + } - TRACE("(%p)->(%p %p)\n", This, prefix, len); - *prefix = This->strvalues[StringValue_Prefix].str; - if (len) *len = This->strvalues[StringValue_Prefix].len; return S_OK; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 1d32678..1defecf 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2024,6 +2024,7 @@ static void test_prefix(void) } prefix_tests[] = { { "<b xmlns=\"defns\" xml:a=\"a ns\"/>", "", "", "xml" }, + { "<c:b xmlns:c=\"c ns\" xml:a=\"a ns\"/>", "c", "xmlns", "xml" }, }; IXmlReader *reader; unsigned int i;

1 0

Nikolay Sivov : xmllite/tests: Some tests for reader position.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 162353ac8e94c5bc3e846ac90536d7f6baa15f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=162353ac8e94c5bc3e846ac90… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 9 07:14:07 2017 +0300 xmllite/tests: Some tests for reader position. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 128 +++++++++++++++++++++++++++++++++----------- 1 file changed, 96 insertions(+), 32 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 1defecf..b0713a6 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -70,29 +70,28 @@ static IStream *create_stream_on_data(const void *data, unsigned int size) return stream; } -static void ok_pos_(IXmlReader *reader, int line, int pos, int line_broken, - int pos_broken, BOOL todo, int _line_) +static void test_reader_pos(IXmlReader *reader, UINT line, UINT pos, UINT line_broken, + UINT pos_broken, int _line_) { - UINT l, p; - HRESULT hr; + UINT l = ~0u, p = ~0u; BOOL broken_state; - hr = IXmlReader_GetLineNumber(reader, &l); - ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IXmlReader_GetLinePosition(reader, &p); - ok_(__FILE__, _line_)(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IXmlReader_GetLineNumber(reader, &l); + IXmlReader_GetLinePosition(reader, &p); - if (line_broken == -1 && pos_broken == -1) + if (line_broken == ~0u && pos_broken == ~0u) broken_state = FALSE; else - broken_state = broken((line_broken == -1 ? line : line_broken) == l && - (pos_broken == -1 ? pos : pos_broken) == p); + broken_state = broken((line_broken == ~0u ? line : line_broken) == l && + (pos_broken == ~0u ? pos : pos_broken) == p); - todo_wine_if (todo) - ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, - "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); + ok_(__FILE__, _line_)((l == line && pos == p) || broken_state, + "Expected (%d,%d), got (%d,%d)\n", line, pos, l, p); } -#define ok_pos(reader, l, p, l_brk, p_brk, todo) ok_pos_(reader, l, p, l_brk, p_brk, todo, __LINE__) +#define TEST_READER_POSITION(reader, line, pos) \ + test_reader_pos(reader, line, pos, ~0u, ~0u, __LINE__) +#define TEST_READER_POSITION2(reader, line, pos, line_broken, pos_broken) \ + test_reader_pos(reader, line, pos, line_broken, pos_broken, __LINE__) typedef struct input_iids_t { IID iids[10]; @@ -734,13 +733,6 @@ static void test_read_xmldeclaration(void) hr = CreateXmlReader(&IID_IXmlReader, (LPVOID*)&reader, NULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - /* position methods with Null args */ - hr = IXmlReader_GetLineNumber(reader, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - - hr = IXmlReader_GetLinePosition(reader, NULL); - ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); - stream = create_stream_on_data(xmldecl_full, sizeof(xmldecl_full)); hr = IXmlReader_SetInput(reader, (IUnknown*)stream); @@ -760,7 +752,7 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_FALSE, "got %08x\n", hr); - ok_pos(reader, 0, 0, -1, -1, FALSE); + TEST_READER_POSITION(reader, 0, 0); type = -1; hr = IXmlReader_Read(reader, &type); @@ -768,7 +760,8 @@ static void test_read_xmldeclaration(void) ok(type == XmlNodeType_XmlDeclaration, "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ - ok_pos(reader, 1, 3, -1, 55, TRUE); +todo_wine + TEST_READER_POSITION2(reader, 1, 3, ~0u, 55); TEST_DEPTH(reader, 0); TEST_READER_STATE(reader, XmlReadState_Interactive); @@ -788,7 +781,8 @@ static void test_read_xmldeclaration(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - ok_pos(reader, 1, 7, -1, 55, TRUE); +todo_wine + TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); /* try to move from last attribute */ hr = IXmlReader_MoveToNextAttribute(reader); @@ -805,7 +799,8 @@ static void test_read_xmldeclaration(void) hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "got %08x\n", hr); - ok_pos(reader, 1, 7, -1, 55, TRUE); +todo_wine + TEST_READER_POSITION2(reader, 1, 7, ~0u, 55); hr = IXmlReader_GetAttributeCount(reader, NULL); ok(hr == E_INVALIDARG, "got %08x\n", hr); @@ -862,7 +857,8 @@ todo_wine { hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); - ok_pos(reader, 1, 3, 1, 21, TRUE); +todo_wine + TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_GetAttributeCount(reader, &count); @@ -894,7 +890,8 @@ todo_wine { hr = IXmlReader_GetNodeType(reader, &type); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(type == XmlNodeType_Attribute, "got %d\n", type); - ok_pos(reader, 1, 7, 1, 21, TRUE); +todo_wine + TEST_READER_POSITION2(reader, 1, 7, ~0u, 21); /* try to move from last attribute */ hr = IXmlReader_MoveToNextAttribute(reader); @@ -904,7 +901,8 @@ todo_wine { hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(type == XmlNodeType_Element, "expected Element, got %s\n", type_to_str(type)); - ok_pos(reader, 1, 23, 1, 40, TRUE); +todo_wine + TEST_READER_POSITION2(reader, 1, 23, ~0u, 40); TEST_READER_STATE(reader, XmlReadState_Interactive); hr = IXmlReader_GetAttributeCount(reader, &count); @@ -927,10 +925,10 @@ todo_wine { todo_wine ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); - ok_pos(reader, 1, 41, -1, -1, TRUE); -todo_wine +todo_wine { + TEST_READER_POSITION(reader, 1, 41); TEST_READER_STATE(reader, XmlReadState_Error); - +} IStream_Release(stream); IXmlReader_Release(reader); } @@ -2473,6 +2471,71 @@ todo_wine { IXmlReader_Release(reader); } +static void test_reader_position(void) +{ + static const char *xml = "<c:a xmlns:c=\"nsdef c\" b=\"attr b\" />"; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + UINT position; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + /* position methods with Null args */ + hr = IXmlReader_GetLineNumber(reader, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IXmlReader_GetLinePosition(reader, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + position = 123; + hr = IXmlReader_GetLinePosition(reader, &position); +todo_wine + ok(hr == S_FALSE, "got %#x\n", hr); + ok(position == 0, "got %u\n", position); + + position = 123; + hr = IXmlReader_GetLineNumber(reader, &position); +todo_wine + ok(hr == S_FALSE, "got %#x\n", hr); + ok(position == 0, "got %u\n", position); + + stream = create_stream_on_data(xml, strlen(xml)); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + TEST_READER_POSITION(reader, 0, 0); + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Element, "got type %d\n", type); +todo_wine + TEST_READER_POSITION2(reader, 1, 2, ~0u, 36); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + TEST_READER_POSITION2(reader, 1, 6, ~0u, 36); + + hr = IXmlReader_MoveToNextAttribute(reader); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + TEST_READER_POSITION2(reader, 1, 24, ~0u, 36); + + hr = IXmlReader_MoveToElement(reader); + ok(hr == S_OK, "got %08x\n", hr); +todo_wine + TEST_READER_POSITION2(reader, 1, 2, ~0u, 36); + + IXmlReader_SetInput(reader, NULL); + TEST_READER_POSITION(reader, 0, 0); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -2498,4 +2561,5 @@ START_TEST(reader) test_encoding_detection(); test_endoffile(); test_max_element_depth(); + test_reader_position(); }

1 0

Nikolay Sivov : xmllite/reader: Remove redundant parameter.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: e1c31e13a88e780fb7ecb9835691f0806901f454 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c31e13a88e780fb7ecb9835… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 9 07:14:08 2017 +0300 xmllite/reader: Remove redundant parameter. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 2e828f3..6a22cc5 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2167,7 +2167,7 @@ static HRESULT reader_parse_attribute(xmlreader *reader) /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ -static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) +static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname) { HRESULT hr; @@ -2181,11 +2181,10 @@ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *loca reader_skipspaces(reader); /* empty element */ - if ((*empty = !reader_cmp(reader, endW))) + if ((reader->is_empty_element = !reader_cmp(reader, endW))) { /* 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; @@ -2227,16 +2226,15 @@ static HRESULT reader_parse_element(xmlreader *reader) case XmlReadResumeState_STag: { strval qname, prefix, local; - int empty = 0; /* this handles empty elements too */ - hr = reader_parse_stag(reader, &prefix, &local, &qname, &empty); + hr = reader_parse_stag(reader, &prefix, &local, &qname); if (FAILED(hr)) return hr; /* FIXME: need to check for defined namespace to reject invalid prefix */ /* if we got empty element and stack is empty go straight to Misc */ - if (empty && list_empty(&reader->elements)) + if (reader->is_empty_element && list_empty(&reader->elements)) reader->instate = XmlReadInState_MiscEnd; else reader->instate = XmlReadInState_Content;

1 0

Nikolay Sivov : xmllite/reader: Improve returned reader position for elements and attributes.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 6cf9524f07f5abdf1ffafab4b1c33877fc706ea0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf9524f07f5abdf1ffafab4b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 9 07:14:09 2017 +0300 xmllite/reader: Improve returned reader position for elements and attributes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 124 ++++++++++++++++++++++++++++++++++---------- dlls/xmllite/tests/reader.c | 29 +++++------ 2 files changed, 109 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6cf9524f07f5abdf1ffaf…

1 0

Nikolay Sivov : xmllite/reader: Fix reader position returned for xml declaration node.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 65e62c33087a51c8e285c0ab0039999013b2de88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e62c33087a51c8e285c0ab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 9 07:14:10 2017 +0300 xmllite/reader: Fix reader position returned for xml declaration node. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 23 +++++++++++++++++++---- dlls/xmllite/tests/reader.c | 3 +-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 07330f5..28da5e1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -281,7 +281,8 @@ typedef struct UINT depth; UINT max_depth; BOOL is_empty_element; - struct element empty_element; + struct element empty_element; /* used for empty elements without end tag <a />, + and to keep <?xml reader position */ UINT resume[XmlReadResume_Last]; /* offsets used to resume reader */ } xmlreader; @@ -1294,12 +1295,16 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) { static const WCHAR xmldeclW[] = {'<','?','x','m','l',' ',0}; static const WCHAR declcloseW[] = {'?','>',0}; + struct reader_position position; HRESULT hr; /* check if we have "<?xml " */ - if (reader_cmp(reader, xmldeclW)) return S_FALSE; + if (reader_cmp(reader, xmldeclW)) + return S_FALSE; - reader_skipn(reader, 5); + reader_skipn(reader, 2); + position = reader->position; + reader_skipn(reader, 3); hr = reader_parse_versioninfo(reader); if (FAILED(hr)) return hr; @@ -1313,10 +1318,14 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) return hr; reader_skipspaces(reader); - if (reader_cmp(reader, declcloseW)) return WC_E_XMLDECL; + if (reader_cmp(reader, declcloseW)) + return WC_E_XMLDECL; + + /* skip '?>' */ reader_skipn(reader, 2); reader->nodetype = XmlNodeType_XmlDeclaration; + reader->empty_element.position = position; reader_set_strvalue(reader, StringValue_LocalName, &strval_xml); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_xml); reader_set_strvalue(reader, StringValue_Value, &strval_empty); @@ -3291,6 +3300,9 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb case XmlNodeType_Attribute: *line_number = This->attr->position.line_number; break; + case XmlNodeType_XmlDeclaration: + *line_number = This->empty_element.position.line_number; + break; default: *line_number = This->position.line_number; break; @@ -3323,6 +3335,9 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po case XmlNodeType_Attribute: *line_position = This->attr->position.line_position; break; + case XmlNodeType_XmlDeclaration: + *line_position = This->empty_element.position.line_position; + break; default: *line_position = This->position.line_position; break; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index d09316a..208e4be 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -760,7 +760,6 @@ static void test_read_xmldeclaration(void) ok(type == XmlNodeType_XmlDeclaration, "Expected XmlNodeType_XmlDeclaration, got %s\n", type_to_str(type)); /* new version 1.2.x and 1.3.x properly update position for <?xml ?> */ -todo_wine TEST_READER_POSITION2(reader, 1, 3, ~0u, 55); TEST_DEPTH(reader, 0); @@ -829,6 +828,7 @@ todo_wine hr = IXmlReader_MoveToElement(reader); ok(hr == S_OK, "got %08x\n", hr); + TEST_READER_POSITION2(reader, 1, 3, ~0u, 55); type = XmlNodeType_None; hr = IXmlReader_GetNodeType(reader, &type); @@ -855,7 +855,6 @@ todo_wine { hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "expected S_OK, got %08x\n", hr); ok(type == XmlNodeType_XmlDeclaration, "expected XmlDeclaration, got %s\n", type_to_str(type)); -todo_wine TEST_READER_POSITION2(reader, 1, 3, ~0u, 21); TEST_READER_STATE(reader, XmlReadState_Interactive);

1 0

Sebastian Lackner : server: Explicitly mark memory as undefined in mem_alloc wrapper.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 332d59215846e773375b9bd02411c0de63055953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=332d59215846e773375b9bd02… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Mar 8 04:40:47 2017 +0100 server: Explicitly mark memory as undefined in mem_alloc wrapper. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/object.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/server/object.c b/server/object.c index ad22ec1..e43fe3f 100644 --- a/server/object.c +++ b/server/object.c @@ -28,6 +28,9 @@ #include <string.h> #include <unistd.h> #include <stdarg.h> +#ifdef HAVE_VALGRIND_MEMCHECK_H +#include <valgrind/memcheck.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -92,11 +95,22 @@ void close_objects(void) /*****************************************************************/ +/* mark a block of memory as uninitialized for debugging purposes */ +static inline void mark_block_uninitialized( void *ptr, size_t size ) +{ + memset( ptr, 0x55, size ); +#if defined(VALGRIND_MAKE_MEM_UNDEFINED) + VALGRIND_DISCARD( VALGRIND_MAKE_MEM_UNDEFINED( ptr, size )); +#elif defined(VALGRIND_MAKE_WRITABLE) + VALGRIND_DISCARD( VALGRIND_MAKE_WRITABLE( ptr, size )); +#endif +} + /* malloc replacement */ void *mem_alloc( size_t size ) { void *ptr = malloc( size ); - if (ptr) memset( ptr, 0x55, size ); + if (ptr) mark_block_uninitialized( ptr, size ); else set_error( STATUS_NO_MEMORY ); return ptr; }

1 0

Michael Müller : bcrypt: Add builtin HMAC implementation.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 9c123204f396e8428368143dfc08777650767d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c123204f396e8428368143df… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Mar 7 23:13:51 2017 +0100 bcrypt: Add builtin HMAC implementation. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 264 +++++++++++++++------------------------------- 1 file changed, 84 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9c123204f396e84283681…

1 0