ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xmllite: Fix node type for whitespace text nodes in Content.

This commit is contained in:
Nikolay Sivov 2013-09-29 18:55:20 +04:00 committed by Alexandre Julliard
parent 249b45786f
commit ece36f17d0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/xmllite/reader.c
View File

@ -2205,7 +2205,7 @@ static HRESULT reader_parse_chardata(xmlreader *reader)
ptr = start = reader_get_cur(reader);
/* There's no text */
if (!*ptr || *ptr == '<') return S_OK;
reader->nodetype = XmlNodeType_Text;
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);
@ -2232,6 +2232,9 @@ static HRESULT reader_parse_chardata(xmlreader *reader)
}
reader_skipn(reader, 1);
/* this covers a case when text has leading whitespace chars */
if (!is_wchar_space(*ptr)) reader->nodetype = XmlNodeType_Text;
ptr++;
}

4
dlls/xmllite/tests/reader.c
View File

@ -943,11 +943,13 @@ static const char misc_test_xml[] =
" \t \r \n"
"<!-- comment4 -->"
"<a>"
"\r\n\t"
"<b/>"
"text"
"<!-- comment -->"
"text2"
"<?pi pibody ?>"
"\r\n"
"</a>"
;
@ -961,11 +963,13 @@ static struct nodes_test misc_test = {
XmlNodeType_Whitespace,
XmlNodeType_Comment,
XmlNodeType_Element,
XmlNodeType_Whitespace,
XmlNodeType_Element,
XmlNodeType_Text,
XmlNodeType_Comment,
XmlNodeType_Text,
XmlNodeType_ProcessingInstruction,
XmlNodeType_Whitespace,
XmlNodeType_EndElement,
XmlNodeType_None
}