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

msxml3: Implemented xmlnode_get_nodeTypedValue 'number' data type handling.

This commit is contained in:
Piotr Caban 2009-11-18 00:51:11 +01:00 committed by Alexandre Julliard
parent b56031c3a6
commit 0a6d3a70ca
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/msxml3/node.c
View File

@ -948,7 +948,8 @@ static HRESULT WINAPI xmlnode_get_dataType(IXMLDOMNode*, VARIANT*);
inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type) inline HRESULT VARIANT_from_xmlChar(xmlChar *str, VARIANT *v, BSTR type)
{ {
if(!type || !lstrcmpiW(type, szString)) if(!type || !lstrcmpiW(type, szString) ||
!lstrcmpiW(type, szNumber))
{ {
V_VT(v) = VT_BSTR; V_VT(v) = VT_BSTR;
V_BSTR(v) = bstr_from_xmlChar(str); V_BSTR(v) = bstr_from_xmlChar(str);

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

@ -151,6 +151,8 @@ static const CHAR szTypeValueXML[] =
"<root xmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n" "<root xmlns:dt=\"urn:schemas-microsoft-com:datatypes\">\n"
" <string>Wine</string>\n" " <string>Wine</string>\n"
" <string2 dt:dt=\"string\">String</string2>\n" " <string2 dt:dt=\"string\">String</string2>\n"
" <number dt:dt=\"number\">12.44</number>\n"
" <number2 dt:dt=\"NUMbEr\">-3.71e3</number2>\n"
"</root>"; "</root>";
static const CHAR szBasicTransformSSXMLPart1[] = static const CHAR szBasicTransformSSXMLPart1[] =
@ -4009,6 +4011,32 @@ static void test_NodeTypeValue(void)
IXMLDOMNode_Release(pNode); IXMLDOMNode_Release(pNode);
} }
hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/number"), &pNode);
ok(hr == S_OK, "ret %08x\n", hr );
if(hr == S_OK)
{
hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
ok(hr == S_OK, "ret %08x\n", hr );
ok(V_VT(&v) == VT_BSTR, "incorrect type\n");
ok(!lstrcmpW( V_BSTR(&v), _bstr_("12.44") ), "incorrect value\n");
VariantClear( &v );
IXMLDOMNode_Release(pNode);
}
hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("root/number2"), &pNode);
ok(hr == S_OK, "ret %08x\n", hr );
if(hr == S_OK)
{
hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
ok(hr == S_OK, "ret %08x\n", hr );
ok(V_VT(&v) == VT_BSTR, "incorrect type\n");
ok(!lstrcmpW( V_BSTR(&v), _bstr_("-3.71e3") ), "incorrect value\n");
VariantClear( &v );
IXMLDOMNode_Release(pNode);
}
} }
IXMLDOMDocument2_Release(doc); IXMLDOMDocument2_Release(doc);