Reimplement IXMLDOMDocument::createTextNode() on top of ::createNode().
Nikolay Sivov
bunglehead at gmail.com
Fri Feb 12 12:44:27 CST 2010
---
dlls/msxml3/domdoc.c | 31 ++++++++++++-------------
dlls/msxml3/tests/domdoc.c | 54 +++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 68 insertions(+), 17 deletions(-)
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index cb734b6..cc27932 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1087,29 +1087,28 @@ static HRESULT WINAPI domdoc_createTextNode(
IXMLDOMText** text )
{
domdoc *This = impl_from_IXMLDOMDocument2( iface );
- xmlNodePtr xmlnode;
- xmlChar *xml_content;
+ IXMLDOMNode *node;
+ 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)
- return E_INVALIDARG;
+ if (!text) return E_INVALIDARG;
*text = NULL;
- xml_content = xmlChar_from_wchar(data);
- xmlnode = xmlNewText(xml_content);
- heap_free(xml_content);
-
- if(!xmlnode)
- return E_FAIL;
-
- xmlnode->doc = get_doc( This );
- xmldoc_add_orphan(xmlnode->doc, xmlnode);
+ V_VT(&type) = VT_I1;
+ V_I1(&type) = NODE_TEXT;
- *text = (IXMLDOMText*)create_text(xmlnode);
+ hr = IXMLDOMDocument2_createNode(iface, type, NULL, NULL, &node);
+ if (hr == S_OK)
+ {
+ IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)text);
+ IXMLDOMNode_Release(node);
+ hr = IXMLDOMText_put_data(*text, data);
+ }
- return S_OK;
+ return hr;
}
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 031f701..1664443 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -692,7 +692,11 @@ static void test_domdoc( void )
ok( code == 0, "code %d\n", code );
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 );
r = IXMLDOMDocument_createTextNode(doc, str, NULL);
ok( r == E_INVALIDARG, "returns %08x\n", r );
@@ -1677,6 +1681,7 @@ static void test_create(void)
IXMLDOMDocument *doc;
IXMLDOMElement *element;
IXMLDOMComment *comment;
+ IXMLDOMText *text;
IXMLDOMNode *root, *node, *child;
IXMLDOMNamedNodeMap *attr_map;
IUnknown *unk;
@@ -1764,6 +1769,53 @@ static void test_create(void)
ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str);
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 */
V_VT(&var) = VT_I1;
V_I1(&var) = NODE_ELEMENT;
--
1.5.6.5
--=-ZT0FAP7YTKYDnbIfKMu4--
More information about the wine-patches
mailing list