wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

Nikolay Sivov : xmllite/reader: Improve line number updating when switching to the next line.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 9685fec1746a6ef348be118bfd026bcb770747ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=9685fec1746a6ef348be118bf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:43 2017 +0300 xmllite/reader: Improve line number updating when switching to the next line. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 32 +++++++++++++++++--------------- dlls/xmllite/tests/reader.c | 11 +++++++++-- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c5aa99b..b223994 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1050,16 +1050,29 @@ static int reader_cmp(xmlreader *reader, const WCHAR *str) return 0; } +static void reader_update_position(xmlreader *reader, WCHAR ch) +{ + if (ch == '\r') + reader->position.line_position = 1; + else if (ch == '\n') + { + reader->position.line_number++; + reader->position.line_position = 1; + } + else + reader->position.line_position++; +} + /* moves cursor n WCHARs forward */ static void reader_skipn(xmlreader *reader, int n) { encoded_buffer *buffer = &reader->input->buffer->utf16; - const WCHAR *ptr = reader_get_ptr(reader); + const WCHAR *ptr; - while (*ptr++ && n--) + while (*(ptr = reader_get_ptr(reader)) && n--) { + reader_update_position(reader, *ptr); buffer->cur++; - reader->position.line_position++; } } @@ -1071,23 +1084,12 @@ static inline BOOL is_wchar_space(WCHAR ch) /* [3] S ::= (#x20 | #x9 | #xD | #xA)+ */ static int reader_skipspaces(xmlreader *reader) { - encoded_buffer *buffer = &reader->input->buffer->utf16; const WCHAR *ptr = reader_get_ptr(reader); UINT start = reader_get_cur(reader); while (is_wchar_space(*ptr)) { - if (*ptr == '\r') - reader->position.line_position = 0; - else if (*ptr == '\n') - { - reader->position.line_number++; - reader->position.line_position = 0; - } - else - reader->position.line_position++; - - buffer->cur++; + reader_skipn(reader, 1); ptr = reader_get_ptr(reader); } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f7987c7..fdd2750 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1590,6 +1590,7 @@ static void test_read_pending(void) ok(hr == S_OK || broken(hr == E_PENDING), "got 0x%08x\n", hr); /* newer versions are happy when it's enough data to detect node type, older versions keep reading until it fails to read more */ +todo_wine ok(stream_readcall == 1 || broken(stream_readcall > 1), "got %d\n", stream_readcall); ok(type == XmlNodeType_Comment || broken(type == XmlNodeType_None), "got %d\n", type); @@ -2474,7 +2475,7 @@ todo_wine { static void test_reader_position(void) { - static const char *xml = "<c:a xmlns:c=\"nsdef c\" b=\"attr b\"></c:a>"; + static const char *xml = "<c:a xmlns:c=\"nsdef c\" b=\"attr b\">\n</c:a>"; IXmlReader *reader; XmlNodeType type; IStream *stream; @@ -2529,8 +2530,14 @@ static void test_reader_position(void) hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); + ok(type == XmlNodeType_Whitespace, "got type %d\n", type); +todo_wine + TEST_READER_POSITION2(reader, 1, 35, 2, 6); + + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); ok(type == XmlNodeType_EndElement, "got type %d\n", type); - TEST_READER_POSITION2(reader, 1, 37, ~0u, 40); + TEST_READER_POSITION2(reader, 2, 3, 2, 6); IXmlReader_SetInput(reader, NULL); TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed);

1 0

Nikolay Sivov : xmllite/reader: Fix position methods return values in closed reader state.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 79a65678fc158a56e789946e3ce6ebbf6bda0d0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a65678fc158a56e789946e3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:42 2017 +0300 xmllite/reader: Fix position methods return values in closed reader state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 4 ++-- dlls/xmllite/tests/reader.c | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index c9ab4e1..c5aa99b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -3320,7 +3320,7 @@ static HRESULT WINAPI xmlreader_GetLineNumber(IXmlReader* iface, UINT *line_numb break; } - return S_OK; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_position) @@ -3355,7 +3355,7 @@ static HRESULT WINAPI xmlreader_GetLinePosition(IXmlReader* iface, UINT *line_po break; } - return S_OK; + return This->state == XmlReadState_Closed ? S_FALSE : S_OK; } static HRESULT WINAPI xmlreader_GetAttributeCount(IXmlReader* iface, UINT *count) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index a44af67..f7987c7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2484,6 +2484,8 @@ static void test_reader_position(void) hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); ok(hr == S_OK, "S_OK, got %08x\n", hr); + TEST_READER_STATE(reader, XmlReadState_Closed); + /* position methods with Null args */ hr = IXmlReader_GetLineNumber(reader, NULL); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); @@ -2493,13 +2495,11 @@ static void test_reader_position(void) 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); @@ -2508,6 +2508,7 @@ todo_wine hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "got %08x\n", hr); + TEST_READER_STATE(reader, XmlReadState_Initial); TEST_READER_POSITION(reader, 0, 0); hr = IXmlReader_Read(reader, &type); ok(hr == S_OK, "got %08x\n", hr); @@ -2532,6 +2533,7 @@ todo_wine TEST_READER_POSITION2(reader, 1, 37, ~0u, 40); IXmlReader_SetInput(reader, NULL); + TEST_READER_STATE2(reader, XmlReadState_Initial, XmlReadState_Closed); TEST_READER_POSITION(reader, 0, 0); IStream_Release(stream);

1 0

Nikolay Sivov : xmllite/reader: Return correct error for multiple colons in qualified name.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 62a41d035c0a61d5565ab0a17d96aa0195e24adf URL: http://source.winehq.org/git/wine.git/?a=commit;h=62a41d035c0a61d5565ab0a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:41 2017 +0300 xmllite/reader: Return correct error for multiple colons in qualified name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 9 ++++++--- dlls/xmllite/tests/reader.c | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 056721e..c9ab4e1 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1838,7 +1838,7 @@ static HRESULT reader_parse_dtd(xmlreader *reader) } /* [11 NS] LocalPart ::= NCName */ -static HRESULT reader_parse_local(xmlreader *reader, strval *local) +static HRESULT reader_parse_local(xmlreader *reader, strval *local, BOOL check_for_separator) { WCHAR *ptr; UINT start; @@ -1860,6 +1860,9 @@ static HRESULT reader_parse_local(xmlreader *reader, strval *local) ptr = reader_get_ptr(reader); } + if (check_for_separator && *ptr == ':') + return NC_E_QNAMECOLON; + if (is_reader_pending(reader)) { reader->resume[XmlReadResume_Local] = start; @@ -1898,7 +1901,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc if (reader->resume[XmlReadResume_Local]) { - hr = reader_parse_local(reader, local); + hr = reader_parse_local(reader, local, FALSE); if (FAILED(hr)) return hr; reader_init_strvalue(reader->resume[XmlReadResume_Name], @@ -1923,7 +1926,7 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc /* skip ':' */ reader_skipn(reader, 1); - hr = reader_parse_local(reader, local); + hr = reader_parse_local(reader, local, TRUE); if (FAILED(hr)) return hr; } else diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 4318a29..a44af67 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1415,6 +1415,8 @@ static struct test_entry element_tests[] = { { "<a >", "a", "", S_OK }, { "<a \r \t\n>", "a", "", S_OK }, { "</a>", NULL, NULL, NC_E_QNAMECHARACTER }, + { "<a:b:c />", NULL, NULL, NC_E_QNAMECOLON }, + { "<:b:c />", NULL, NULL, NC_E_QNAMECHARACTER }, { NULL } };

1 0

Nikolay Sivov : xmllite/reader: Explicitly return empty string as qualified name for some node types.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 3b83a44639788c6f9b6821d7186d543507a70397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b83a44639788c6f9b6821d71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:40 2017 +0300 xmllite/reader: Explicitly return empty string as qualified name for some node types. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 15 ++++++++------- dlls/xmllite/tests/reader.c | 42 +++++++++++++++++++++++++++--------------- 2 files changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1dba23c..056721e 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1353,7 +1353,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -1375,7 +1374,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; @@ -2341,7 +2339,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2357,7 +2354,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; reader->resumestate = XmlReadResumeState_Initial; @@ -2400,7 +2396,6 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2942,7 +2937,6 @@ static HRESULT WINAPI xmlreader_MoveToElement(IXmlReader* iface) static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - XmlNodeType nodetype; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -2950,8 +2944,15 @@ static HRESULT WINAPI xmlreader_GetQualifiedName(IXmlReader* iface, LPCWSTR *nam if (!len) len = &length; - switch ((nodetype = reader_get_nodetype(This))) + switch (reader_get_nodetype(This)) { + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + *name = emptyW; + *len = 0; + break; case XmlNodeType_Element: case XmlNodeType_EndElement: /* empty elements are not added to the stack */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 31b5ce8..4318a29 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1013,6 +1013,11 @@ static void test_read_comment(void) ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, NULL); + 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); @@ -1020,6 +1025,11 @@ static void test_read_comment(void) ok(len == 0, "got %u\n", len); ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + /* value */ len = 1; str = NULL; @@ -1708,10 +1718,13 @@ static void test_read_cdata(void) str = NULL; hr = IXmlReader_GetQualifiedName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1; @@ -1779,30 +1792,29 @@ static void test_read_text(void) ok(type == XmlNodeType_Text, "got %d for %s\n", type, test->xml); - str_exp = a2w(test->name); - len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - - free_str(str_exp); + 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 == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); + + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1;

1 0

Nikolay Sivov : xmllite/reader: Explicitly return empty static string as local name for nodes without names.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 52f91932acd26ababbb6fad9434107cafccc2ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f91932acd26ababbb6fad94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:39 2017 +0300 xmllite/reader: Explicitly return empty static string as local name for nodes without names. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 15 ++++++++------- dlls/xmllite/tests/reader.c | 22 +++++++--------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 1805758..1dba23c 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1353,7 +1353,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) reader->nodetype = XmlNodeType_Comment; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_Comment; - reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -1376,7 +1375,6 @@ static HRESULT reader_parse_comment(xmlreader *reader) /* skip rest of markup '->' */ reader_skipn(reader, 3); - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -2343,7 +2341,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader->nodetype = XmlNodeType_CDATA; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CDATA; - reader_set_strvalue(reader, StringValue_LocalName, NULL); reader_set_strvalue(reader, StringValue_QualifiedName, NULL); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -2360,7 +2357,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) reader_skipn(reader, 3); TRACE("%s\n", debug_strval(reader, &value)); - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, &value); reader->resume[XmlReadResume_Body] = 0; @@ -2404,7 +2400,6 @@ static HRESULT reader_parse_chardata(xmlreader *reader) reader->nodetype = is_wchar_space(*ptr) ? XmlNodeType_Whitespace : XmlNodeType_Text; reader->resume[XmlReadResume_Body] = start; reader->resumestate = XmlReadResumeState_CharData; - reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_Value, NULL); } @@ -3090,7 +3085,6 @@ static HRESULT WINAPI xmlreader_GetNamespaceUri(IXmlReader* iface, const WCHAR * static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, UINT *len) { xmlreader *This = impl_from_IXmlReader(iface); - XmlNodeType nodetype; UINT length; TRACE("(%p)->(%p %p)\n", This, name, len); @@ -3098,8 +3092,15 @@ static HRESULT WINAPI xmlreader_GetLocalName(IXmlReader* iface, LPCWSTR *name, U if (!len) len = &length; - switch ((nodetype = reader_get_nodetype(This))) + switch (reader_get_nodetype(This)) { + case XmlNodeType_Text: + case XmlNodeType_CDATA: + case XmlNodeType_Comment: + case XmlNodeType_Whitespace: + *name = emptyW; + *len = 0; + break; case XmlNodeType_Element: case XmlNodeType_EndElement: /* empty elements are not added to the stack */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 208e4be..31b5ce8 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1010,19 +1010,15 @@ static void test_read_comment(void) str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + 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 == strlen(test->name), "got %u\n", len); - str_exp = a2w(test->name); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - free_str(str_exp); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); /* value */ len = 1; @@ -1696,21 +1692,17 @@ static void test_read_cdata(void) ok(type == XmlNodeType_CDATA, "got %d for %s\n", type, test->xml); - str_exp = a2w(test->name); - len = 1; str = NULL; hr = IXmlReader_GetLocalName(reader, &str, &len); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(len == strlen(test->name), "got %u\n", len); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + ok(len == 0, "got %u\n", len); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); str = NULL; hr = IXmlReader_GetLocalName(reader, &str, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); - - free_str(str_exp); + ok(*str == 0, "got %s\n", wine_dbgstr_w(str)); len = 1; str = NULL;

1 0

Nikolay Sivov : xmllite/reader: Return static empty string as xml declaration node value.
by Alexandre Julliard 10 Mar '17

10 Mar '17

Module: wine Branch: master Commit: 1ccc1f2f26eddba37438a88e18cd41fa931e6b4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ccc1f2f26eddba37438a88e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Mar 10 11:06:38 2017 +0300 xmllite/reader: Return static empty string as xml declaration node value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 67 ++++++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 28da5e1..1805758 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1328,7 +1328,6 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader) 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); return S_OK; } @@ -3171,26 +3170,17 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface, const WCHAR **ret, 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); strval *val = &reader->strvalues[StringValue_Value]; + UINT length; 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)) { @@ -3204,29 +3194,46 @@ static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, const WCHAR **value, if (is_reader_pending(reader)) return E_PENDING; } - if (!val->str) + switch (reader_get_nodetype(reader)) { - 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; - } + case XmlNodeType_XmlDeclaration: + *value = emptyW; + *len = 0; + break; + case XmlNodeType_Attribute: + { + const strval *local = &reader->strvalues[StringValue_LocalName]; + const strval *prefix = &reader->strvalues[StringValue_Prefix]; - /* For namespace definition attributes return values from namespace list */ - if (is_namespace_definition(reader)) { - const strval *local = &reader->strvalues[StringValue_LocalName]; - struct ns *ns; + /* For namespace definition attributes return values from namespace list */ + if (((strval_eq(reader, prefix, &strval_empty) && strval_eq(reader, local, &strval_xmlns)) || + strval_eq(reader, prefix, &strval_xmlns))) + { + struct ns *ns; - ns = reader_lookup_ns(reader, local); - if (!ns) - ns = reader_lookup_nsdef(reader); + if (!(ns = reader_lookup_ns(reader, local))) + ns = reader_lookup_nsdef(reader); - val = &ns->uri; + *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; } - *value = val->str; - if (len) *len = val->len; return S_OK; }

1 0

Sebastian Lackner : schedsvc: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: be0e05604a5560e26757d161708c2c3dae717834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0e05604a5560e26757d1617… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 9 16:12:10 2017 +0100 schedsvc: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc_private.h | 18 ++++++++---------- dlls/schedsvc/svc_main.c | 6 ++++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 3abce07..b426078 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -23,26 +23,24 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return MIDL_user_allocate(size); + return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - void *ptr = MIDL_user_allocate(size); - if (ptr) memset(ptr, 0, size); - return ptr; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *ptr, SIZE_T size) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc(GetProcessHeap(), 0, ptr, size); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline void heap_free(void *ptr) +static inline BOOL heap_free(void *mem) { - MIDL_user_free(ptr); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *heap_strdupW(const WCHAR *src) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 45496c9..bd8a29d 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -27,6 +27,8 @@ #include "schrpc.h" #include "wine/debug.h" +#include "schedsvc_private.h" + WINE_DEFAULT_DEBUG_CHANNEL(schedsvc); static const WCHAR scheduleW[] = {'S','c','h','e','d','u','l','e',0}; @@ -200,10 +202,10 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) void __RPC_FAR * __RPC_USER MIDL_user_allocate(SIZE_T len) { - return HeapAlloc(GetProcessHeap(), 0, len); + return heap_alloc(len); } void __RPC_USER MIDL_user_free(void __RPC_FAR * ptr) { - HeapFree(GetProcessHeap(), 0, ptr); + heap_free(ptr); }

1 0

Józef Kucia : d3d11/tests: Add test for unbinding shader resource view.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 1c8cb5974370629d7fb70f502f866a50a5581cdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8cb5974370629d7fb70f502… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 9 10:03:03 2017 +0100 d3d11/tests: Add test for unbinding shader resource view. 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 | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2060ab6..94a5a8f 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12248,6 +12248,95 @@ static void test_shader_input_registers_limits(void) release_test_context(&test_context); } +static void test_unbind_shader_resource_view(void) +{ + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + ID3D11ShaderResourceView *srv, *srv2; + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11DeviceContext *context; + ID3D11Texture2D *texture; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + static const DWORD ps_code[] = + { +#if 0 + Texture2D t0; + Texture2D t1; + SamplerState s; + + float4 main() : SV_Target + { + return min(t0.Sample(s, float2(0, 0)) + t1.Sample(s, float2(0, 0)), 1.0f); + } +#endif + 0x43425844, 0x698dc0cb, 0x0bf322b8, 0xee127418, 0xfe9214ce, 0x00000001, 0x00000168, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000f0, 0x00000040, 0x0000003c, + 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, 0x04001858, + 0x00107000, 0x00000001, 0x00005555, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, + 0x0c000045, 0x001000f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0c000045, 0x001000f2, 0x00000001, 0x00004002, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, 0x00000000, + 0x07000000, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00100e46, 0x00000001, 0x0a000033, + 0x001020f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, + 0x3f800000, 0x0100003e, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD texture_data[] = {0xff00ff00}; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + texture_desc.Width = 1; + texture_desc.Height = 1; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + resource_data.pSysMem = texture_data; + resource_data.SysMemPitch = sizeof(texture_data); + resource_data.SysMemSlicePitch = 0; + + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, &resource_data, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, NULL, &srv); + ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_code, sizeof(ps_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + srv2 = NULL; + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv2); + ID3D11DeviceContext_PSSetShaderResources(context, 1, 1, &srv2); + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); + draw_quad(&test_context); + todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 1); + + ID3D11PixelShader_Release(ps); + ID3D11ShaderResourceView_Release(srv); + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); +} + static void test_stencil_separate(void) { struct d3d11_test_context test_context; @@ -15734,6 +15823,7 @@ START_TEST(d3d11) run_for_each_9_x_feature_level(test_fl9_draw); test_ddy(); test_shader_input_registers_limits(); + test_unbind_shader_resource_view(); test_stencil_separate(); test_uav_load(); test_cs_uav_store();

1 0

Matteo Bruni : d3d9/tests: Fix pixel shader version check in test_pointsize().
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 7b34f460d8164f622b0de3b5eb36226726a156c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b34f460d8164f622b0de3b5e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 20:45:48 2017 +0100 d3d9/tests: Fix pixel shader version check in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e012d1b..41a883d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10588,7 +10588,7 @@ static void test_pointsize(void) ps2 = {D3DPS_VERSION(2, 0), pshader2_code}, ps2_zw = {D3DPS_VERSION(2, 0), pshader2_zw_code}, ps3 = {D3DPS_VERSION(3, 0), pshader3_code}, - ps3_zw = {D3DVS_VERSION(3, 0), pshader3_zw_code}; + ps3_zw = {D3DPS_VERSION(3, 0), pshader3_zw_code}; static const struct { const struct test_shader *vs;

1 0

Matteo Bruni : d3d9/tests: Skip test_vshader_input() if PS 3.0 isn' t supported.
by Alexandre Julliard 09 Mar '17

09 Mar '17

Module: wine Branch: master Commit: 101159309f1a0b1dcdabd9ce1ae09068269e2265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101159309f1a0b1dcdabd9ce1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 8 20:45:47 2017 +0100 d3d9/tests: Skip test_vshader_input() if PS 3.0 isn't supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c8cab8c..e012d1b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7828,6 +7828,12 @@ static void test_vshader_input(void) IDirect3DDevice9_Release(device); goto done; } + if (caps.PixelShaderVersion < D3DPS_VERSION(3, 0)) + { + skip("No ps_3_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr);

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017