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

xmllite: Report node value for comment nodes.

Browse Source
This commit is contained in:
Nikolay Sivov 2013-01-08 14:32:21 +04:00 committed by Alexandre Julliard
parent 1db9fb9036
commit 57148ae964
2 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/xmllite/reader.c
View File

@ -56,6 +56,7 @@ typedef enum
{ {
StringValue_LocalName, StringValue_LocalName,
StringValue_QualifiedName, StringValue_QualifiedName,
StringValue_Value,
StringValue_Last StringValue_Last
} XmlReaderStringValue; } XmlReaderStringValue;
@ -889,7 +890,7 @@ static HRESULT reader_parse_xmldecl(xmlreader *reader)
/* [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->' */ /* [15] Comment ::= '<!--' ((Char - '-') | ('-' (Char - '-')))* '-->' */
static HRESULT reader_parse_comment(xmlreader *reader) static HRESULT reader_parse_comment(xmlreader *reader)
{ {
const WCHAR *start, *ptr; WCHAR *start, *ptr;
/* skip '<!--' */ /* skip '<!--' */
reader_skipn(reader, 4); reader_skipn(reader, 4);
@ -904,11 +905,14 @@ static HRESULT reader_parse_comment(xmlreader *reader)
{ {
if (ptr[2] == '>') if (ptr[2] == '>')
{ {
strval value = { start, ptr-start };
TRACE("%s\n", debugstr_wn(start, ptr-start)); TRACE("%s\n", debugstr_wn(start, ptr-start));
/* skip '-->' */ /* skip '-->' */
reader_skipn(reader, 3); reader_skipn(reader, 3);
reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); reader_set_strvalue(reader, StringValue_LocalName, &strval_empty);
reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty);
reader_set_strvalue(reader, StringValue_Value, &value);
reader->nodetype = XmlNodeType_Comment; reader->nodetype = XmlNodeType_Comment;
return S_OK; return S_OK;
} }
@ -1421,12 +1425,14 @@ static HRESULT WINAPI xmlreader_GetPrefix(IXmlReader* iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, static HRESULT WINAPI xmlreader_GetValue(IXmlReader* iface, LPCWSTR *value, UINT *len)
LPCWSTR *value,
UINT *value_length)
{ {
FIXME("(%p %p %p): stub\n", iface, value, value_length); xmlreader *This = impl_from_IXmlReader(iface);
return E_NOTIMPL;
TRACE("(%p)->(%p %p)\n", This, value, len);
*value = This->strvalues[StringValue_Value].str;
if (len) *len = This->strvalues[StringValue_Value].len;
return S_OK;
} }
static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface, static HRESULT WINAPI xmlreader_ReadValueChunk(IXmlReader* iface,
@ -1600,6 +1606,7 @@ static const struct IUnknownVtbl xmlreaderinput_vtbl =
HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc) HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc)
{ {
xmlreader *reader; xmlreader *reader;
int i;
TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc); TRACE("(%s, %p, %p)\n", wine_dbgstr_guid(riid), obj, imalloc);
@ -1628,7 +1635,9 @@ HRESULT WINAPI CreateXmlReader(REFIID riid, void **obj, IMalloc *imalloc)
list_init(&reader->attrs); list_init(&reader->attrs);
reader->attr_count = 0; reader->attr_count = 0;
reader->attr = NULL; reader->attr = NULL;
memset(&reader->strvalues, 0, sizeof(reader->strvalues));
for (i = 0; i < StringValue_Last; i++)
reader->strvalues[i] = strval_empty;
*obj = &reader->IXmlReader_iface; *obj = &reader->IXmlReader_iface;

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

@ -648,9 +648,7 @@ static void test_read_xmldeclaration(void)
test_read_state(reader, XmlReadState_Interactive, -1, 0); test_read_state(reader, XmlReadState_Interactive, -1, 0);
hr = IXmlReader_GetValue(reader, &val, NULL); hr = IXmlReader_GetValue(reader, &val, NULL);
todo_wine
ok(hr == S_OK, "got %08x\n", hr); ok(hr == S_OK, "got %08x\n", hr);
if (hr == S_OK)
ok(*val == 0, "got %s\n", wine_dbgstr_w(val)); ok(*val == 0, "got %s\n", wine_dbgstr_w(val));
/* check attributes */ /* check attributes */
@ -717,14 +715,16 @@ todo_wine {
struct test_entry { struct test_entry {
const char *xml; const char *xml;
const char *name; const char *name;
const char *value;
HRESULT hr; HRESULT hr;
HRESULT hr_broken; /* this is set to older version results */ HRESULT hr_broken; /* this is set to older version results */
}; };
static struct test_entry comment_tests[] = { static struct test_entry comment_tests[] = {
{ "<!-- comment -->", "", S_OK }, { "<!-- comment -->", "", " comment ", S_OK },
{ "<!-- - comment-->", "", S_OK }, { "<!-- - comment-->", "", " - comment", S_OK },
{ "<!-- -- comment-->", NULL, WC_E_COMMENT, WC_E_GREATERTHAN }, { "<!-- -- comment-->", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN },
{ "<!-- -- comment--->", NULL, NULL, WC_E_COMMENT, WC_E_GREATERTHAN },
{ NULL } { NULL }
}; };
@ -754,29 +754,39 @@ static void test_read_comment(void)
ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); ok(hr == test->hr, "got %08x for %s\n", hr, test->xml);
if (hr == S_OK) if (hr == S_OK)
{ {
const WCHAR *name; const WCHAR *str;
WCHAR *name_exp; WCHAR *str_exp;
UINT len; UINT len;
ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml); ok(type == XmlNodeType_Comment, "got %d for %s\n", type, test->xml);
len = 1; len = 1;
name = NULL; str = NULL;
hr = IXmlReader_GetLocalName(reader, &name, &len); hr = IXmlReader_GetLocalName(reader, &str, &len);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok(len == strlen(test->name), "got %u\n", len); ok(len == strlen(test->name), "got %u\n", len);
name_exp = a2w(test->name); str_exp = a2w(test->name);
ok(!lstrcmpW(name, name_exp), "got %s\n", wine_dbgstr_w(name)); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));
free_str(name_exp); free_str(str_exp);
len = 1; len = 1;
name = NULL; str = NULL;
hr = IXmlReader_GetQualifiedName(reader, &name, &len); hr = IXmlReader_GetQualifiedName(reader, &str, &len);
ok(hr == S_OK, "got 0x%08x\n", hr); ok(hr == S_OK, "got 0x%08x\n", hr);
ok(len == strlen(test->name), "got %u\n", len); ok(len == strlen(test->name), "got %u\n", len);
name_exp = a2w(test->name); str_exp = a2w(test->name);
ok(!lstrcmpW(name, name_exp), "got %s\n", wine_dbgstr_w(name)); ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));
free_str(name_exp); free_str(str_exp);
/* value */
len = 1;
str = NULL;
hr = IXmlReader_GetValue(reader, &str, &len);
ok(hr == S_OK, "got 0x%08x\n", hr);
ok(len == strlen(test->value), "got %u\n", len);
str_exp = a2w(test->value);
ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str));
free_str(str_exp);
} }
IStream_Release(stream); IStream_Release(stream);
@ -787,12 +797,12 @@ static void test_read_comment(void)
} }
static struct test_entry pi_tests[] = { static struct test_entry pi_tests[] = {
{ "<?pi?>", "pi", S_OK }, { "<?pi?>", "pi", "", S_OK },
{ "<?pi ?>", "pi", S_OK }, { "<?pi ?>", "pi", "", S_OK },
{ "<?pi:pi?>", NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER }, { "<?pi:pi?>", NULL, NULL, NC_E_NAMECOLON, WC_E_NAMECHARACTER },
{ "<?:pi ?>", NULL, WC_E_PI, WC_E_NAMECHARACTER }, { "<?:pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER },
{ "<?-pi ?>", NULL, WC_E_PI, WC_E_NAMECHARACTER }, { "<?-pi ?>", NULL, NULL, WC_E_PI, WC_E_NAMECHARACTER },
{ "<?xml-stylesheet ?>", "xml-stylesheet", S_OK }, { "<?xml-stylesheet ?>", "xml-stylesheet", "", S_OK },
{ NULL } { NULL }
}; };