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

msxml3: Support 'any attribute' selection [@*] in XSLPattern predicates.

Browse Source
This commit is contained in:
Nikolay Sivov 2014-05-13 00:20:21 +04:00 committed by Alexandre Julliard
parent 9e3d103dcb
commit 239d8077db
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/msxml3/tests/domdoc.c
View File

@ -494,7 +494,7 @@ static const char szExampleXML[] =
" </description>\n" " </description>\n"
" </elem>\n" " </elem>\n"
"\n" "\n"
" <elem>\n" " <elem a='a'>\n"
" <a>A2 field</a>\n" " <a>A2 field</a>\n"
" <b>B2 field</b>\n" " <b>B2 field</b>\n"
" <c type=\"old\">C2 field</c>\n" " <c type=\"old\">C2 field</c>\n"
@ -1074,14 +1074,16 @@ static char *list_to_string(IXMLDOMNodeList *list)
static char buf[4096]; static char buf[4096];
char *pos = buf; char *pos = buf;
LONG len = 0; LONG len = 0;
HRESULT hr;
int i; int i;
if (list == NULL) if (list == NULL)
{ {
lstrcpyA(buf, "(null)"); strcpy(buf, "(null)");
return buf; return buf;
} }
ole_check(IXMLDOMNodeList_get_length(list, &len)); hr = IXMLDOMNodeList_get_length(list, &len);
ok(hr == S_OK, "got 0x%08x\n", hr);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
IXMLDOMNode *node; IXMLDOMNode *node;
@ -4449,12 +4451,13 @@ static const xpath_test_t xpath_test[] = {
{ "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" }, { "child::node()", "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1" },
{ "child::text()", "" }, { "child::text()", "" },
{ "child::*/..", "E2.D1" }, { "child::*/..", "E2.D1" },
{ "child::*//@*/..", "E2.E5.E1.E2.D1 E3.E2.E2.D1" }, { "child::*//@*/..", "E2.E5.E1.E2.D1 E2.E2.D1 E3.E2.E2.D1" },
{ "self::node()", "E2.D1" }, { "self::node()", "E2.D1" },
{ "ancestor::node()", "D1" }, { "ancestor::node()", "D1" },
{ "elem[c][last()]/a", "E1.E2.E2.D1"}, { "elem[c][last()]/a", "E1.E2.E2.D1"},
{ "ancestor-or-self::node()[1]", "E2.D1" }, { "ancestor-or-self::node()[1]", "E2.D1" },
{ "((//a)[1])[last()]", "E1.E1.E2.D1" }, { "((//a)[1])[last()]", "E1.E1.E2.D1" },
{ "//elem[@*]", "E2.E2.D1" },
{ NULL } { NULL }
}; };
@ -4517,7 +4520,7 @@ static void test_XPath(void)
str = list_to_string(list); str = list_to_string(list);
ok(strcmp(str, xptest->list)==0, "query=%s, invalid node list: %s, expected %s\n", ok(!strcmp(str, xptest->list), "query=%s, invalid node list: \"%s\", expected \"%s\"\n",
xptest->query, str, xptest->list); xptest->query, str, xptest->list);
if (list) if (list)
@ -6838,6 +6841,7 @@ static void test_default_properties(void)
typedef struct { typedef struct {
const char *query; const char *query;
const char *list; const char *list;
BOOL todo;
} xslpattern_test_t; } xslpattern_test_t;
static const xslpattern_test_t xslpattern_test[] = { static const xslpattern_test_t xslpattern_test[] = {
@ -6900,6 +6904,7 @@ static const xslpattern_test_t xslpattern_test[] = {
{ "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[index()>0 $and$ $not$ end()]", "E2.E2.D1 E3.E2.D1" },
{ "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" }, { "root/elem[index()>0 && $not$ end()]", "E2.E2.D1 E3.E2.D1" },
{ "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" }, { "root/elem[d]", "E1.E2.D1 E2.E2.D1 E4.E2.D1" },
{ "root/elem[@*]", "E2.E2.D1 E3.E2.D1", TRUE },
{ NULL } { NULL }
}; };
@ -6977,8 +6982,16 @@ static void test_XSLPattern(void)
len = 0; len = 0;
hr = IXMLDOMNodeList_get_length(list, &len); hr = IXMLDOMNodeList_get_length(list, &len);
ok(len != 0, "query=%s, empty list\n", ptr->query); ok(len != 0, "query=%s, empty list\n", ptr->query);
if (len) if (len) {
expect_list_and_release(list, ptr->list); if (ptr->todo) {
char *str = list_to_string(list);
todo_wine
ok(!strcmp(str, ptr->list), "Invalid node list: %s, expected %s\n", str, ptr->list);
IXMLDOMNodeList_Release(list);
}
else
expect_list_and_release(list, ptr->list);
}
ptr++; ptr++;
} }

5
dlls/msxml3/xslpattern.y
View File

@ -186,6 +186,11 @@ static void xslpattern_error(parser_param* param, void const* scanner, char cons
$$=xmlStrcat($$,$2); $$=xmlStrcat($$,$2);
xmlFree($2); xmlFree($2);
} }
| '@' '*'
{
TRACE("Got All attributes pattern: \"@*\"\n");
$$=xmlStrdup(U("@*"));
}
; ;
/* [2.3] Node Tests */ /* [2.3] Node Tests */