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

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

This commit is contained in:
Nikolay Sivov 2010-02-12 23:06:42 +03:00 committed by Alexandre Julliard
parent f414d3cf60
commit 20a240fe41
2 changed files with 42 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/msxml3/domdoc.c
View File

@ -1189,35 +1189,36 @@ static HRESULT WINAPI domdoc_createProcessingInstruction(
BSTR data, BSTR data,
IXMLDOMProcessingInstruction** pi ) IXMLDOMProcessingInstruction** pi )
{ {
#ifdef HAVE_XMLNEWDOCPI
xmlNodePtr xmlnode;
domdoc *This = impl_from_IXMLDOMDocument2( iface ); 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) if (!pi) return E_INVALIDARG;
return E_INVALIDARG;
if(!target || lstrlenW(target) == 0) *pi = NULL;
return E_FAIL;
xml_target = xmlChar_from_wchar(target); V_VT(&type) = VT_I1;
xml_content = xmlChar_from_wchar(data); V_I1(&type) = NODE_PROCESSING_INSTRUCTION;
xmlnode = xmlNewDocPI(get_doc(This), xml_target, xml_content); hr = IXMLDOMDocument2_createNode(iface, type, target, NULL, &node);
xmldoc_add_orphan(xmlnode->doc, xmlnode); if (hr == S_OK)
TRACE("created xmlptr %p\n", xmlnode); {
*pi = (IXMLDOMProcessingInstruction*)create_pi(xmlnode); VARIANT v_data;
heap_free(xml_content); /* this is to bypass check in ::put_data() that blocks "<?xml" PIs */
heap_free(xml_target); V_VT(&v_data) = VT_BSTR;
V_BSTR(&v_data) = data;
return S_OK; hr = IXMLDOMNode_put_nodeValue( node, v_data );
#else
FIXME("Libxml 2.6.15 or greater required.\n"); IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMProcessingInstruction, (void**)pi);
return E_NOTIMPL; IXMLDOMNode_Release(node);
#endif }
return hr;
} }

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

@ -1887,6 +1887,26 @@ static void test_create(void)
ok( r == S_OK, "returns %08x\n", r ); ok( r == S_OK, "returns %08x\n", r );
if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); 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 */ /* NODE_ELEMENT */
V_VT(&var) = VT_I1; V_VT(&var) = VT_I1;
V_I1(&var) = NODE_ELEMENT; V_I1(&var) = NODE_ELEMENT;