Skip to content

W
wine-cw
Commit 3b83a446 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

xmllite/reader: Explicitly return empty string as qualified name for some node types.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 52f91932
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 22 deletions
dlls/xmllite/reader.c
View file @ 3b83a446
......@@ -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 */
......
dlls/xmllite/tests/reader.c
View file @ 3b83a446
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment