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

msxml3: Add support to get_nodeTypedValue on Element Nodes.

This commit is contained in:
Alistair Leslie-Hughes 2008-10-28 19:47:15 +11:00 committed by Alexandre Julliard
parent 9e4d6e6110
commit 13606ed49d
2 changed files with 89 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dlls/msxml3/node.c
View File

@ -977,8 +977,32 @@ static HRESULT WINAPI xmlnode_get_nodeTypedValue(
IXMLDOMNode *iface,
VARIANT* typedValue)
{
FIXME("ignoring data type\n");
return xmlnode_get_nodeValue(iface, typedValue);
xmlnode *This = impl_from_IXMLDOMNode( iface );
HRESULT r = S_FALSE;
FIXME("ignoring data type %p %p\n", This, typedValue);
if(!typedValue)
return E_INVALIDARG;
V_VT(typedValue) = VT_NULL;
switch ( This->node->type )
{
case XML_ELEMENT_NODE:
{
xmlChar *content = xmlNodeGetContent(This->node);
V_VT(typedValue) = VT_BSTR;
V_BSTR(typedValue) = bstr_from_xmlChar( content );
xmlFree(content);
r = S_OK;
break;
}
default:
r = xmlnode_get_nodeValue(iface, typedValue);
}
return r;
}
static HRESULT WINAPI xmlnode_put_nodeTypedValue(

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

@ -146,6 +146,10 @@ static const CHAR szTransformOutput[] =
"Hello World"
"</h1></body></html>";
static const CHAR szTypeValueXML[] =
"<?xml version=\"1.0\" encoding=\"utf-8\"?>"
"<string>Wine</string>";
static const WCHAR szNonExistentFile[] = {
'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', '.', 'x', 'm', 'l', 0
};
@ -3782,6 +3786,64 @@ static void test_FormattingXML(void)
free_bstrs();
}
static void test_NodeTypeValue(void)
{
IXMLDOMDocument2 *doc = NULL;
IXMLDOMNode *pNode;
VARIANT_BOOL bSucc;
HRESULT hr;
VARIANT v;
hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc );
if( hr != S_OK )
return;
hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szTypeValueXML), &bSucc);
ok(hr == S_OK, "ret %08x\n", hr );
ok(bSucc == VARIANT_TRUE, "Expected VARIANT_TRUE got VARIANT_FALSE\n");
if(bSucc == VARIANT_TRUE)
{
hr = IXMLDOMDocument2_get_nodeValue(doc, NULL);
ok(hr == E_INVALIDARG, "ret %08x\n", hr );
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = NULL;
hr = IXMLDOMDocument2_get_nodeValue(doc, &v);
ok(hr == S_FALSE, "ret %08x\n", hr );
ok(V_VT(&v) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&v));
hr = IXMLDOMDocument2_get_nodeTypedValue(doc, NULL);
ok(hr == E_INVALIDARG, "ret %08x\n", hr );
hr = IXMLDOMDocument2_get_nodeTypedValue(doc, &v);
ok(hr == S_FALSE, "ret %08x\n", hr );
hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("string"), &pNode);
ok(hr == S_OK, "ret %08x\n", hr );
if(hr == S_OK)
{
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = NULL;
hr = IXMLDOMNode_get_nodeValue(pNode, &v);
ok(hr == S_FALSE, "ret %08x\n", hr );
ok(V_VT(&v) == VT_NULL, "expect VT_NULL got %d\n", V_VT(&v));
hr = IXMLDOMNode_get_nodeTypedValue(pNode, NULL);
ok(hr == E_INVALIDARG, "ret %08x\n", hr );
hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v);
ok(hr == S_OK, "ret %08x\n", hr );
ok(!lstrcmpW( V_BSTR(&v), _bstr_("Wine") ), "incorrect value\n");
IXMLDOMNode_Release(pNode);
}
}
IXMLDOMDocument2_Release(doc);
free_bstrs();
}
START_TEST(domdoc)
{
HRESULT r;
@ -3810,6 +3872,7 @@ START_TEST(domdoc)
test_testTransforms();
test_Namespaces();
test_FormattingXML();
test_NodeTypeValue();
CoUninitialize();
}