Reimplement IXMLDOMDocument::createProcessingInstruction() on top of ::createNode()
Nikolay Sivov
bunglehead at gmail.com
Fri Feb 12 14:06:42 CST 2010
---
dlls/msxml3/domdoc.c | 43 ++++++++++++++++++++++---------------------
dlls/msxml3/tests/domdoc.c | 20 ++++++++++++++++++++
2 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index 4e9deb9..479c98c 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1189,35 +1189,36 @@ static HRESULT WINAPI domdoc_createProcessingInstruction(
BSTR data,
IXMLDOMProcessingInstruction** pi )
{
-#ifdef HAVE_XMLNEWDOCPI
- xmlNodePtr xmlnode;
domdoc *This = impl_from_IXMLDOMDocument2( iface );
- xmlChar *xml_target, *xml_content;
+ IXMLDOMNode *node;
+ VARIANT type;
+ HRESULT hr;
- TRACE("%p->(%s %s %p)\n", iface, debugstr_w(target), debugstr_w(data), pi);
+ TRACE("%p->(%s %s %p)\n", This, debugstr_w(target), debugstr_w(data), pi);
- if(!pi)
- return E_INVALIDARG;
+ if (!pi) return E_INVALIDARG;
- if(!target || lstrlenW(target) == 0)
- return E_FAIL;
+ *pi = NULL;
- xml_target = xmlChar_from_wchar(target);
- xml_content = xmlChar_from_wchar(data);
+ V_VT(&type) = VT_I1;
+ V_I1(&type) = NODE_PROCESSING_INSTRUCTION;
- xmlnode = xmlNewDocPI(get_doc(This), xml_target, xml_content);
- xmldoc_add_orphan(xmlnode->doc, xmlnode);
- TRACE("created xmlptr %p\n", xmlnode);
- *pi = (IXMLDOMProcessingInstruction*)create_pi(xmlnode);
+ hr = IXMLDOMDocument2_createNode(iface, type, target, NULL, &node);
+ if (hr == S_OK)
+ {
+ VARIANT v_data;
- heap_free(xml_content);
- heap_free(xml_target);
+ /* this is to bypass check in ::put_data() that blocks "<?xml" PIs */
+ V_VT(&v_data) = VT_BSTR;
+ V_BSTR(&v_data) = data;
- return S_OK;
-#else
- FIXME("Libxml 2.6.15 or greater required.\n");
- return E_NOTIMPL;
-#endif
+ hr = IXMLDOMNode_put_nodeValue( node, v_data );
+
+ IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)pi);
+ IXMLDOMNode_Release(node);
+ }
+
+ return hr;
}
diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c
index 63c3e15..88acb2c 100644
--- a/dlls/msxml3/tests/domdoc.c
+++ b/dlls/msxml3/tests/domdoc.c
@@ -1887,6 +1887,26 @@ static void test_create(void)
ok( r == S_OK, "returns %08x\n", r );
if( SUCCEEDED(r) ) IXMLDOMNode_Release( node );
+ /* NODE_PROCESSING_INSTRUCTION */
+ V_VT(&var) = VT_I1;
+ V_I1(&var) = NODE_PROCESSING_INSTRUCTION;
+ node = (IXMLDOMNode*)0x1;
+ r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node );
+ ok( r == E_FAIL, "returns %08x\n", r );
+ ok( node == (void*)0x1, "expected same ptr, got %p\n", node);
+
+ V_VT(&var) = VT_I1;
+ V_I1(&var) = NODE_PROCESSING_INSTRUCTION;
+ node = (IXMLDOMNode*)0x1;
+ r = IXMLDOMDocument_createNode( doc, var, _bstr_(""), NULL, &node );
+ ok( r == E_FAIL, "returns %08x\n", r );
+ ok( node == (void*)0x1, "expected same ptr, got %p\n", node);
+
+ V_VT(&var) = VT_I1;
+ V_I1(&var) = NODE_PROCESSING_INSTRUCTION;
+ r = IXMLDOMDocument_createNode( doc, var, _bstr_("pi"), NULL, NULL );
+ ok( r == E_INVALIDARG, "returns %08x\n", r );
+
/* NODE_ELEMENT */
V_VT(&var) = VT_I1;
V_I1(&var) = NODE_ELEMENT;
--
1.5.6.5
--=-sJ2JWCEYOrmt5zTzpK/y--
More information about the wine-patches
mailing list