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

Jacek Caban : xmllite/tests: Added reader_prefix helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: b581c8f68b9f9bb3cd6f0f66e4c0e502bb2b60a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b581c8f68b9f9bb3cd6f0f66e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:19 2017 +0200 xmllite/tests: Added reader_prefix 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 | 44 ++++++++++++++++++-------------------------- 1 file changed, 18 insertions(+), 26 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 46e839e..9e27e9c 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -305,6 +305,20 @@ static const WCHAR *_reader_name(unsigned line, IXmlReader *reader, const char * return str; } +#define reader_prefix(a,b) _reader_prefix(__LINE__,a,b) +static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetPrefix(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetPrefix returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "prefix = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -1982,9 +1996,7 @@ static void test_prefix(void) ok(hr == S_OK, "S_OK, got %08x\n", hr); for (i = 0; i < sizeof(prefix_tests)/sizeof(prefix_tests[0]); i++) { - const WCHAR *prefix; XmlNodeType type; - WCHAR *expected; IStream *stream; stream = create_stream_on_data(prefix_tests[i].xml, strlen(prefix_tests[i].xml) + 1); @@ -1995,12 +2007,7 @@ static void test_prefix(void) ok(hr == S_OK, "Read() failed, %#x\n", hr); ok(type == XmlNodeType_Element, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix1); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix1); hr = IXmlReader_MoveToFirstAttribute(reader); ok(hr == S_OK, "MoveToFirstAttribute() failed, %#x.\n", hr); @@ -2009,12 +2016,7 @@ static void test_prefix(void) ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix2); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix2); next_attribute(reader); @@ -2022,23 +2024,13 @@ static void test_prefix(void) ok(hr == S_OK, "GetNodeType() failed, %#x.\n", hr); ok(type == XmlNodeType_Attribute, "Unexpected node type %d.\n", type); - expected = a2w(prefix_tests[i].prefix3); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + 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); - expected = a2w(prefix_tests[i].prefix1); - hr = IXmlReader_GetPrefix(reader, &prefix, NULL); - ok(hr == S_OK, "GetPrefix() failed, %#x.\n", hr); - ok(!lstrcmpW(prefix, expected), "Unexpected prefix %s, expected %s.\n", wine_dbgstr_w(prefix), - wine_dbgstr_w(expected)); - free_str(expected); + reader_prefix(reader, prefix_tests[i].prefix1); IStream_Release(stream); }

1 0

Jacek Caban : xmllite/tests: Added reader_namespace helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: a69aa5fc38a4a0d6788d337137aaacaec2346ce7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a69aa5fc38a4a0d6788d33713… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:28 2017 +0200 xmllite/tests: Added reader_namespace 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 | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 9e27e9c..2da5d00 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -319,6 +319,20 @@ static const WCHAR *_reader_prefix(unsigned line, IXmlReader *reader, const char return str; } +#define reader_namespace(a,b) _reader_namespace(__LINE__,a,b) +static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const char *expect) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetNamespaceUri(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetNamespaceUri returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "namespace = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -2086,9 +2100,8 @@ static void test_namespaceuri(void) type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { - const WCHAR *uri, *local, *qname; + const WCHAR *local, *qname; UINT length, length2; - WCHAR *uriW; ok(type == XmlNodeType_Element || type == XmlNodeType_Text || @@ -2123,14 +2136,7 @@ static void test_namespaceuri(void) ok(length2 > 0, "Unexpected qualified name length\n"); } - uri = NULL; - hr = IXmlReader_GetNamespaceUri(reader, &uri, NULL); - ok(hr == S_OK, "S_OK, got %08x\n", hr); - ok(uri != NULL, "Unexpected NULL uri pointer\n"); - - uriW = a2w(uri_tests[i].uri[j]); - ok(!lstrcmpW(uriW, uri), "%s: uri %s\n", wine_dbgstr_w(local), wine_dbgstr_w(uri)); - free_str(uriW); + reader_namespace(reader, uri_tests[i].uri[j]); j++; }

1 0

Jacek Caban : xmllite/tests: Added reader_qname helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: e9913db3885045785a78418198a4801999d333c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9913db3885045785a7841819… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:38 2017 +0200 xmllite/tests: Added reader_qname 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, 16 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 2da5d00..497b31d 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -333,6 +333,20 @@ static const WCHAR *_reader_namespace(unsigned line, IXmlReader *reader, const c return str; } +#define reader_qname(a,b) _reader_qname(a,b,__LINE__) +static const WCHAR *_reader_qname(IXmlReader *reader, const char *expect, unsigned line) +{ + const WCHAR *str = (void*)0xdeadbeef; + ULONG len = 0xdeadbeef; + HRESULT hr; + + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok_(__FILE__,line)(hr == S_OK, "GetQualifiedName returned %08x\n", hr); + ok_(__FILE__,line)(len == lstrlenW(str), "len = %u\n", len); + ok_(__FILE__,line)(!strcmp_wa(str, expect), "name = %s\n", wine_dbgstr_w(str)); + return str; +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -810,7 +824,6 @@ static void test_reader_depth(IXmlReader *reader, UINT depth, UINT brk, int line static void test_read_xmldeclaration(void) { - static const WCHAR xmlW[] = {'x','m','l',0}; static const struct { WCHAR name[12]; @@ -956,10 +969,7 @@ todo_wine { reader_value(reader, ""); reader_name(reader, "xml"); - val = NULL; - hr = IXmlReader_GetQualifiedName(reader, &val, NULL); - ok(hr == S_OK, "expected S_OK, got %08x\n", hr); - ok(!lstrcmpW(val, xmlW), "got %s\n", wine_dbgstr_w(val)); + reader_qname(reader, "xml"); /* check attributes */ next_attribute(reader); @@ -1067,7 +1077,6 @@ static void test_read_comment(void) if (hr == S_OK) { const WCHAR *str; - UINT len; ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); @@ -1078,12 +1087,7 @@ static void test_read_comment(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); - len = 1; - str = NULL; - hr = IXmlReader_GetQualifiedName(reader, &str, &len); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == 0, "got %u\n", len); - ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + reader_qname(reader, ""); str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, NULL);

1 0

Jacek Caban : xmllite/tests: Added read_value_char helper.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 82f95833495a23f9ac331e86a8502ad1b7fd9f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82f95833495a23f9ac331e86a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:46:48 2017 +0200 xmllite/tests: Added read_value_char 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 | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 497b31d..0e8a0f5 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -347,6 +347,19 @@ static const WCHAR *_reader_qname(IXmlReader *reader, const char *expect, unsign return str; } +#define read_value_char(a,b) _read_value_char(a,b,__LINE__) +static void _read_value_char(IXmlReader *reader, WCHAR expected_char, unsigned line) +{ + WCHAR c = 0xffff; + UINT count = 0; + HRESULT hr; + + hr = IXmlReader_ReadValueChunk(reader, &c, 1, &count); + ok_(__FILE__,line)(hr == S_OK, "got %08x\n", hr); + ok_(__FILE__,line)(count == 1, "got %u\n", c); + ok_(__FILE__,line)(c == expected_char, "got %x\n", c); +} + typedef struct _testinput { IUnknown IUnknown_iface; @@ -1611,19 +1624,8 @@ static void test_readvaluechunk(void) ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_Comment, "type = %u\n", type); - c = 0; - b = 0; - hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_OK, "got %08x\n", hr); - ok(c == 1, "got %u\n", c); - ok(b == ' ', "got %x\n", b); - - c = 0; - b = 0xffff; - hr = IXmlReader_ReadValueChunk(reader, &b, 1, &c); - ok(hr == S_OK, "got %08x\n", hr); - ok(c == 1, "got %u\n", c); - ok(b == 'c', "got %x\n", b); + read_value_char(reader, ' '); + read_value_char(reader, 'c'); /* portion read as chunk is skipped from resulting node value */ reader_value(reader, "omment1 "); @@ -1644,9 +1646,7 @@ static void test_readvaluechunk(void) reader_value(reader, "omment1 "); /* read comment2 */ - hr = IXmlReader_Read(reader, &type); - ok(hr == S_OK, "got %08x\n", hr); - ok(type == XmlNodeType_Comment, "type = %u\n", type); + read_node(reader, XmlNodeType_Comment); c = 0xdeadbeef; hr = IXmlReader_ReadValueChunk(reader, buf, 0, &c);

1 0

Jacek Caban : xmllite: Clear all parser values in SetInput.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 6917e2aa3ca9ac78bdce9b11e3382bce8e06fe2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6917e2aa3ca9ac78bdce9b11e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 19:47:05 2017 +0200 xmllite: Clear all parser values in SetInput. Not clearing namespaces was problematic for tests, but clearing other values also looks like a good idea. 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 | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index e81f266..eb23f3a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2679,17 +2679,36 @@ static void reader_clear_ns(xmlreader *reader) struct ns *ns, *ns2; LIST_FOR_EACH_ENTRY_SAFE(ns, ns2, &reader->ns, struct ns, entry) { + list_remove(&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) { + list_remove(&ns->entry); reader_free_strvalued(reader, &ns->uri); reader_free(reader, ns); } } +static void reader_reset_parser(xmlreader *reader) +{ + reader->position.line_number = 0; + reader->position.line_position = 0; + + reader_clear_elements(reader); + reader_clear_attrs(reader); + reader_clear_ns(reader); + reader_free_strvalues(reader); + + reader->depth = 0; + reader->nodetype = XmlNodeType_None; + reader->resumestate = XmlReadResumeState_Initial; + memset(reader->resume, 0, sizeof(reader->resume)); + reader->is_empty_element = FALSE; +} + static ULONG WINAPI xmlreader_Release(IXmlReader *iface) { xmlreader *This = impl_from_IXmlReader(iface); @@ -2700,13 +2719,10 @@ static ULONG WINAPI xmlreader_Release(IXmlReader *iface) if (ref == 0) { IMalloc *imalloc = This->imalloc; + reader_reset_parser(This); if (This->input) IUnknown_Release(&This->input->IXmlReaderInput_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); if (imalloc) IMalloc_Release(imalloc); } @@ -2729,13 +2745,7 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->input = NULL; } - This->position.line_number = 0; - This->position.line_position = 0; - reader_clear_elements(This); - This->depth = 0; - This->nodetype = XmlNodeType_None; - This->resumestate = XmlReadResumeState_Initial; - memset(This->resume, 0, sizeof(This->resume)); + reader_reset_parser(This); /* just reset current input */ if (!input) @@ -2776,7 +2786,6 @@ static HRESULT WINAPI xmlreader_SetInput(IXmlReader* iface, IUnknown *input) This->state = XmlReadState_Initial; This->instate = XmlReadInState_Initial; } - return hr; }

1 0

Jacek Caban : xmllite/tests: Added tests for returned string pointers.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 261aa667d4e71eae52953d76f635fa4941d17afd URL: http://source.winehq.org/git/wine.git/?a=commit;h=261aa667d4e71eae52953d76f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 29 20:51:47 2017 +0200 xmllite/tests: Added tests for returned string pointers. 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 | 112 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 0e8a0f5..666432e 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2495,6 +2495,117 @@ static void test_reader_position(void) IXmlReader_Release(reader); } +static void test_string_pointers(void) +{ + const WCHAR *ns, *nsq, *empty, *xmlns_ns, *xmlns_name, *name, *p, *q, *xml, *ptr; + IXmlReader *reader; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + set_input_string(reader, "<elem xmlns=\"myns\">myns<elem2 /></elem>"); + + read_node(reader, XmlNodeType_Element); + empty = reader_value(reader, ""); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + name = reader_name(reader, "elem"); + ok(name == reader_qname(reader, "elem"), "name != qname\n"); + ns = reader_namespace(reader, "myns"); + + next_attribute(reader); + ptr = reader_value(reader, "myns"); + if (ns != ptr) + { + win_skip("attr value is different than namespace pointer, assuming old xmllite\n"); + IXmlReader_Release(reader); + return; + } + ok(ns == ptr, "ns != value\n"); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + xmlns_ns = reader_namespace(reader, "http://www.w3.org/2000/xmlns/"); + xmlns_name = reader_name(reader, "xmlns"); + ok(xmlns_name == reader_qname(reader, "xmlns"), "xmlns_name != qname\n"); + + read_node(reader, XmlNodeType_Text); + ok(ns != reader_value(reader, "myns"), "ns == value\n"); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + ok(empty == reader_name(reader, ""), "empty != name\n"); + ok(empty == reader_qname(reader, ""), "empty != qname\n"); + + read_node(reader, XmlNodeType_Element); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(ns == reader_namespace(reader, "myns"), "empty != namespace\n"); + + read_node(reader, XmlNodeType_EndElement); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(name == reader_name(reader, "elem"), "empty != name\n"); + ok(name == reader_qname(reader, "elem"), "empty != qname\n"); + ok(ns == reader_namespace(reader, "myns"), "empty != namespace\n"); + + set_input_string(reader, "<elem xmlns:p=\"myns\" xmlns:q=\"mynsq\"><p:elem2 q:attr=\"\"></p:elem2></elem>"); + + read_node(reader, XmlNodeType_Element); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + name = reader_name(reader, "elem"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + + next_attribute(reader); + ns = reader_value(reader, "myns"); + ok(xmlns_name == reader_prefix(reader, "xmlns"), "xmlns_name != prefix\n"); + p = reader_name(reader, "p"); + ok(xmlns_ns == reader_namespace(reader, "http://www.w3.org/2000/xmlns/"), "xmlns_ns != namespace\n"); + + next_attribute(reader); + nsq = reader_value(reader, "mynsq"); + ok(xmlns_name == reader_prefix(reader, "xmlns"), "xmlns_name != prefix\n"); + q = reader_name(reader, "q"); + 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(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(nsq == reader_namespace(reader, "mynsq"), "nsq != namespace\n"); + + read_node(reader, XmlNodeType_EndElement); + ptr = reader_qname(reader, "p:elem2"); todo_wine ok(name != ptr, "q == qname\n"); + + set_input_string(reader, "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"); + + read_node(reader, XmlNodeType_XmlDeclaration); + ok(empty == reader_value(reader, ""), "empty != value\n"); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + xml = reader_name(reader, "xml"); + ptr = reader_qname(reader, "xml"); todo_wine ok(xml == ptr, "xml != qname\n"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + + next_attribute(reader); + ok(empty == reader_prefix(reader, ""), "empty != prefix\n"); + ok(empty == reader_namespace(reader, ""), "empty != namespace\n"); + + set_input_string(reader, "<elem xmlns:p=\"myns\"><p:elem2 attr=\"\" /></elem>"); + + read_node(reader, XmlNodeType_Element); + 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"); + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -2521,4 +2632,5 @@ START_TEST(reader) test_endoffile(); test_max_element_depth(); test_reader_position(); + test_string_pointers(); }

1 0

Józef Kucia : d3d11: Validate stream output descriptions for feature level < 11_0.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: f1896d492acf35e330276cc171a3ba1734869615 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1896d492acf35e330276cc17… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:18 2017 +0200 d3d11: Validate stream output descriptions for feature level < 11_0. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 53 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 84d6b9f..22b8bbf 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -1191,7 +1191,7 @@ static const struct wined3d_parent_ops d3d_geometry_shader_wined3d_parent_ops = static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_output_element *elements, const D3D11_SO_DECLARATION_ENTRY *entries, unsigned int entry_count, const unsigned int *buffer_strides, unsigned int buffer_stride_count, - const struct wined3d_shader_signature *os) + const struct wined3d_shader_signature *os, D3D_FEATURE_LEVEL feature_level) { unsigned int i, j, mask; @@ -1211,6 +1211,11 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o WARN("Invalid stream %u.\n", f->Stream); return E_INVALIDARG; } + if (f->Stream && feature_level < D3D_FEATURE_LEVEL_11_0) + { + WARN("Invalid stream %u for feature level %#x.\n", f->Stream, feature_level); + return E_INVALIDARG; + } if (f->Stream) { FIXME("Streams not implemented yet.\n"); @@ -1299,8 +1304,8 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o for (i = 0; i < D3D11_SO_STREAM_COUNT; ++i) { unsigned int current_stride[D3D11_SO_BUFFER_SLOT_COUNT] = {0}; - BOOL has_element[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; - BOOL is_used[D3D11_SO_BUFFER_SLOT_COUNT] = {FALSE}; + unsigned int element_count[D3D11_SO_BUFFER_SLOT_COUNT] = {0}; + unsigned int gap_count[D3D11_SO_BUFFER_SLOT_COUNT] = {0}; for (j = 0; j < entry_count; ++j) { @@ -1309,19 +1314,21 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o if (e->stream_idx != i) continue; current_stride[e->output_slot] += 4 * e->component_count; - is_used[e->output_slot] = TRUE; - if (e->register_idx != WINED3D_STREAM_OUTPUT_GAP) - has_element[e->output_slot] = TRUE; + ++element_count[e->output_slot]; + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + ++gap_count[e->output_slot]; } for (j = 0; j < D3D11_SO_BUFFER_SLOT_COUNT; ++j) { - if (is_used[j] && !has_element[j]) + if (!element_count[j]) + continue; + if (element_count[j] == gap_count[j]) { WARN("Stream %u, output slot %u contains only gaps.\n", i, j); return E_INVALIDARG; } - if (buffer_stride_count && is_used[j]) + if (buffer_stride_count) { if (buffer_stride_count <= j) { @@ -1335,6 +1342,18 @@ static HRESULT wined3d_so_elements_from_d3d11_so_entries(struct wined3d_stream_o } } } + + if (!i && feature_level < D3D_FEATURE_LEVEL_11_0 && element_count[0] != entry_count) + { + for (j = 0; j < ARRAY_SIZE(element_count); ++j) + { + if (element_count[j] > 1) + { + WARN("Only one element per output slot is allowed.\n"); + return E_INVALIDARG; + } + } + } } return S_OK; @@ -1367,6 +1386,21 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, WARN("Invalid rasterizer stream %u.\n", rasterizer_stream); return E_INVALIDARG; } + if (device->feature_level < D3D_FEATURE_LEVEL_11_0) + { + if (rasterizer_stream) + { + WARN("Invalid rasterizer stream %u for feature level %#x.\n", + rasterizer_stream, device->feature_level); + return E_INVALIDARG; + } + if (buffer_stride_count && buffer_stride_count != 1) + { + WARN("Invalid buffer stride count %u for feature level %#x.\n", + buffer_stride_count, device->feature_level); + return E_INVALIDARG; + } + } if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { @@ -1392,7 +1426,8 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, return E_OUTOFMEMORY; } if (FAILED(hr = wined3d_so_elements_from_d3d11_so_entries(so_desc.elements, - so_entries, so_entry_count, buffer_strides, buffer_stride_count, &desc.output_signature))) + so_entries, so_entry_count, buffer_strides, buffer_stride_count, + &desc.output_signature, device->feature_level))) { HeapFree(GetProcessHeap(), 0, so_desc.elements); shader_free_signature(&desc.input_signature);

1 0

Józef Kucia : d3d11/tests: Add test for stream output descriptions.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 90bfc6779ac839cee6881f9d2b859d9624d36f6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90bfc6779ac839cee6881f9d2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:19 2017 +0200 d3d11/tests: Add test for stream output descriptions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 473 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 473 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=90bfc6779ac839cee6881…

1 0

Józef Kucia : d3d11/tests: Add test for feature level 10 stream output descriptions.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: c8dc913c47b51de037a0b52d407f2473731621be URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8dc913c47b51de037a0b52d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:20 2017 +0200 d3d11/tests: Add test for feature level 10 stream output descriptions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 258 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 258 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8dc913c47b51de037a0b…

1 0

Józef Kucia : wined3d: Enable transform feedback if geometry shader with stream output is active.
by Alexandre Julliard 30 Mar '17

30 Mar '17

Module: wine Branch: master Commit: 2e3300fa59d9792a5578e64929777277ee9a685d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e3300fa59d9792a5578e6492… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 30 14:09:21 2017 +0200 wined3d: Enable transform feedback if geometry shader with stream output is active. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 - dlls/wined3d/buffer.c | 22 +++++++++++++++++----- dlls/wined3d/drawprim.c | 25 +++++++++++++++++++++++++ dlls/wined3d/state.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 51 insertions(+), 7 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 07a9f25..c44afb4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11489,7 +11489,6 @@ static void test_index_buffer_offset(void) for (i = 0; i < ARRAY_SIZE(expected_data); ++i) { data = get_readback_vec4(&rb, i, 0); - todo_wine ok(compare_vec4(data, &expected_data[i], 0) || broken(is_nvidia_device(device) && !(i % 2) && compare_vec4(data, &broken_result, 0)), "Got unexpected result {%.8e, %.8e, %.8e, %.8e} at %u.\n", diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cb3cbbd..ba8b004 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -144,7 +144,7 @@ static void buffer_bind(struct wined3d_buffer *buffer, struct wined3d_context *c } /* Context activation is done by the caller. */ -static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const struct wined3d_context *context) +static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, struct wined3d_context *context) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_resource *resource = &buffer->resource; @@ -152,10 +152,6 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const st if (!buffer->buffer_object) return; - GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); - checkGLcall("glDeleteBuffers"); - buffer->buffer_object = 0; - /* The stream source state handler might have read the memory of the * vertex buffer already and got the memory in the vbo which is not * valid any longer. Dirtify the stream source to force a reload. This @@ -177,9 +173,25 @@ static void buffer_destroy_buffer_object(struct wined3d_buffer *buffer, const st device_invalidate_state(resource->device, STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_COMPUTE)); } if (buffer->bind_flags & WINED3D_BIND_STREAM_OUTPUT) + { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); + if (context->transform_feedback_active) + { + /* We have to make sure that transform feedback is not active + * when deleting a potentially bound transform feedback buffer. + * This may happen when the device is being destroyed. */ + WARN("Deleting buffer object for buffer %p, disabling transform feedback.\n", buffer); + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + } + } } + GL_EXTCALL(glDeleteBuffers(1, &buffer->buffer_object)); + checkGLcall("glDeleteBuffers"); + buffer->buffer_object = 0; + if (buffer->query) { wined3d_event_query_destroy(buffer->query); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 05a6380..e055361 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -406,6 +406,14 @@ static void remove_vbos(struct wined3d_context *context, } } +static BOOL use_transform_feedback(const struct wined3d_state *state) +{ + const struct wined3d_shader *shader; + if (!(shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) + return FALSE; + return shader->u.gs.so_desc.element_count; +} + /* Routine common to the draw primitive and draw indexed primitive routines */ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *state, int base_vertex_idx, unsigned int start_idx, unsigned int index_count, @@ -439,6 +447,13 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } gl_info = context->gl_info; + if (context->transform_feedback_active && !use_transform_feedback(state)) + { + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + } + for (i = 0; i < gl_info->limits.buffers; ++i) { struct wined3d_texture *rt; @@ -549,6 +564,16 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s } } + if (use_transform_feedback(state) && !context->transform_feedback_active) + { + const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; + GLenum primitive_mode = gl_primitive_type_from_d3d(shader->u.gs.output_type); + + GL_EXTCALL(glBeginTransformFeedback(primitive_mode)); + checkGLcall("glBeginTransformFeedback"); + context->transform_feedback_active = 1; + } + if (context->use_immediate_mode_draw || emulation) draw_primitive_immediate_mode(context, state, stream_info, idx_data, idx_size, base_vertex_idx, start_idx, index_count, instance_count); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b846ae..dedde1e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4982,6 +4982,13 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + if (context->transform_feedback_active) + { + GL_EXTCALL(glEndTransformFeedback()); + checkGLcall("glEndTransformFeedback"); + context->transform_feedback_active = 0; + } + for (i = 0; i < ARRAY_SIZE(state->stream_output); ++i) { if (!(buffer = state->stream_output[i].buffer)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4bd38f6..2f90efd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1689,7 +1689,8 @@ struct wined3d_context DWORD update_compute_unordered_access_view_bindings : 1; DWORD uses_uavs : 1; DWORD destroy_delayed : 1; - DWORD padding : 9; + DWORD transform_feedback_active : 1; + DWORD padding : 8; DWORD last_swizzle_map; /* MAX_ATTRIBS, 16 */ DWORD shader_update_mask; DWORD constant_update_mask;

1 0