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

msxml3: Reimplement IXMLDOMDocument::createTextNode() on top of ::createNode().

Browse Source
This commit is contained in:
Nikolay Sivov 2010-02-12 21:44:27 +03:00 committed by Alexandre Julliard
parent 035566802b
commit 24e198e2ff
2 changed files with 68 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/msxml3/domdoc.c
View File

@ -1087,29 +1087,28 @@ static HRESULT WINAPI domdoc_createTextNode(
IXMLDOMText** text ) IXMLDOMText** text )
{ {
domdoc *This = impl_from_IXMLDOMDocument2( iface ); domdoc *This = impl_from_IXMLDOMDocument2( iface );
xmlNodePtr xmlnode; IXMLDOMNode *node;
xmlChar *xml_content; VARIANT type;
HRESULT hr;
TRACE("%p->(%s %p)\n", iface, debugstr_w(data), text); TRACE("%p->(%s %p)\n", This, debugstr_w(data), text);
if(!text) if (!text) return E_INVALIDARG;
return E_INVALIDARG;
*text = NULL; *text = NULL;
xml_content = xmlChar_from_wchar(data); V_VT(&type) = VT_I1;
xmlnode = xmlNewText(xml_content); V_I1(&type) = NODE_TEXT;
heap_free(xml_content);
if(!xmlnode) hr = IXMLDOMDocument2_createNode(iface, type, NULL, NULL, &node);
return E_FAIL; if (hr == S_OK)
{
IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)text);
IXMLDOMNode_Release(node);
hr = IXMLDOMText_put_data(*text, data);
}
xmlnode->doc = get_doc( This ); return hr;
xmldoc_add_orphan(xmlnode->doc, xmlnode);
*text = (IXMLDOMText*)create_text(xmlnode);
return S_OK;
} }

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

@ -692,7 +692,11 @@ static void test_domdoc( void )
ok( code == 0, "code %d\n", code ); ok( code == 0, "code %d\n", code );
IXMLDOMParseError_Release( error ); IXMLDOMParseError_Release( error );
/* test createTextNode */ /* test createTextNode */
r = IXMLDOMDocument_createTextNode(doc, _bstr_(""), &nodetext);
ok( r == S_OK, "returns %08x\n", r );
IXMLDOMText_Release(nodetext);
str = SysAllocString( szOpen ); str = SysAllocString( szOpen );
r = IXMLDOMDocument_createTextNode(doc, str, NULL); r = IXMLDOMDocument_createTextNode(doc, str, NULL);
ok( r == E_INVALIDARG, "returns %08x\n", r ); ok( r == E_INVALIDARG, "returns %08x\n", r );
@ -1677,6 +1681,7 @@ static void test_create(void)
IXMLDOMDocument *doc; IXMLDOMDocument *doc;
IXMLDOMElement *element; IXMLDOMElement *element;
IXMLDOMComment *comment; IXMLDOMComment *comment;
IXMLDOMText *text;
IXMLDOMNode *root, *node, *child; IXMLDOMNode *root, *node, *child;
IXMLDOMNamedNodeMap *attr_map; IXMLDOMNamedNodeMap *attr_map;
IUnknown *unk; IUnknown *unk;
@ -1764,6 +1769,53 @@ static void test_create(void)
ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str);
IXMLDOMComment_Release(comment); IXMLDOMComment_Release(comment);
/* NODE_TEXT */
V_VT(&var) = VT_I1;
V_I1(&var) = NODE_TEXT;
node = NULL;
r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node );
ok( r == S_OK, "returns %08x\n", r );
ok( node != NULL, "\n");
r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text);
ok( r == S_OK, "returns %08x\n", r );
IXMLDOMNode_Release(node);
str = NULL;
r = IXMLDOMText_get_data(text, &str);
ok( r == S_OK, "returns %08x\n", r );
ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str);
IXMLDOMText_Release(comment);
SysFreeString(str);
node = (IXMLDOMNode*)0x1;
r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node );
ok( r == S_OK, "returns %08x\n", r );
r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text);
ok( r == S_OK, "returns %08x\n", r );
IXMLDOMNode_Release(node);
str = NULL;
r = IXMLDOMText_get_data(text, &str);
ok( r == S_OK, "returns %08x\n", r );
ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str);
IXMLDOMText_Release(text);
node = (IXMLDOMNode*)0x1;
r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node );
ok( r == S_OK, "returns %08x\n", r );
r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text);
ok( r == S_OK, "returns %08x\n", r );
IXMLDOMNode_Release(node);
str = NULL;
r = IXMLDOMText_get_data(text, &str);
ok( r == S_OK, "returns %08x\n", r );
ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str);
IXMLDOMText_Release(text);
/* NODE_ELEMENT */ /* NODE_ELEMENT */
V_VT(&var) = VT_I1; V_VT(&var) = VT_I1;
V_I1(&var) = NODE_ELEMENT; V_I1(&var) = NODE_ELEMENT;