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

msxml3: Partially implement ::setAttributeNode().

This commit is contained in:
Nikolay Sivov 2010-10-21 02:07:20 +04:00 committed by Alexandre Julliard
parent 27c0161797
commit 88adaa0617
2 changed files with 65 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dlls/msxml3/element.c
View File

@ -50,7 +50,7 @@ static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface )
return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl)); return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl));
} }
static inline xmlNodePtr get_element( domelem *This ) static inline xmlNodePtr get_element( const domelem *This )
{ {
return This->node.node; return This->node.node;
} }
@ -705,16 +705,61 @@ static HRESULT WINAPI domelem_getAttributeNode(
static HRESULT WINAPI domelem_setAttributeNode( static HRESULT WINAPI domelem_setAttributeNode(
IXMLDOMElement *iface, IXMLDOMElement *iface,
IXMLDOMAttribute* domAttribute, IXMLDOMAttribute* attribute,
IXMLDOMAttribute** attributeNode) IXMLDOMAttribute** old)
{ {
domelem *This = impl_from_IXMLDOMElement( iface ); domelem *This = impl_from_IXMLDOMElement( iface );
xmlChar *name, *value;
BSTR nameW, prefix;
xmlAttrPtr attr;
VARIANT valueW;
HRESULT hr;
FIXME("(%p)->(%p %p)\n", This, domAttribute, attributeNode); FIXME("(%p)->(%p %p): semi-stub\n", This, attribute, old);
if(!domAttribute) return E_INVALIDARG; if (!attribute) return E_INVALIDARG;
return E_NOTIMPL; if (old) *old = NULL;
hr = IXMLDOMAttribute_get_nodeName(attribute, &nameW);
if (hr != S_OK) return hr;
hr = IXMLDOMAttribute_get_nodeValue(attribute, &valueW);
if (hr != S_OK)
{
SysFreeString(nameW);
return hr;
}
TRACE("attribute: %s=%s\n", debugstr_w(nameW), debugstr_w(V_BSTR(&valueW)));
hr = IXMLDOMAttribute_get_prefix(attribute, &prefix);
if (hr == S_OK)
{
FIXME("namespaces not supported: %s\n", debugstr_w(prefix));
SysFreeString(prefix);
}
name = xmlChar_from_wchar(nameW);
value = xmlChar_from_wchar(V_BSTR(&valueW));
if (!name || !value)
{
SysFreeString(nameW);
VariantClear(&valueW);
heap_free(name);
heap_free(value);
return E_OUTOFMEMORY;
}
attr = xmlSetNsProp(get_element(This), NULL, name, value);
SysFreeString(nameW);
VariantClear(&valueW);
heap_free(name);
heap_free(value);
return attr ? S_OK : E_FAIL;
} }
static HRESULT WINAPI domelem_removeAttributeNode( static HRESULT WINAPI domelem_removeAttributeNode(

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

@ -6853,22 +6853,31 @@ static void test_setAttributeNode(void)
ret_attr = (void*)0xdeadbeef; ret_attr = (void*)0xdeadbeef;
hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr);
todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); ok( hr == S_OK, "got 0x%08x\n", hr);
todo_wine ok( ret_attr == NULL, "got %p\n", ret_attr); ok( ret_attr == NULL, "got %p\n", ret_attr);
attr2 = NULL; attr2 = NULL;
hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2); hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attr"), &attr2);
todo_wine ok( hr == S_OK, "got 0x%08x\n", hr); ok( hr == S_OK, "got 0x%08x\n", hr);
if (attr2) IXMLDOMAttribute_Release(attr2); IXMLDOMAttribute_Release(attr2);
/* try to add it another time */ /* try to add it another time */
ret_attr = (void*)0xdeadbeef; ret_attr = (void*)0xdeadbeef;
hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr); hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr);
todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr); todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr);
ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr); todo_wine ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr);
IXMLDOMElement_Release(elem); IXMLDOMElement_Release(elem);
/* initialy used element is released, attribute still 'has' a container */
hr = IXMLDOMDocument_get_documentElement(doc, &elem);
ok( hr == S_OK, "got 0x%08x\n", hr);
ret_attr = (void*)0xdeadbeef;
hr = IXMLDOMElement_setAttributeNode(elem, attr, &ret_attr);
todo_wine ok( hr == E_FAIL, "got 0x%08x\n", hr);
todo_wine ok( ret_attr == (void*)0xdeadbeef, "got %p\n", ret_attr);
IXMLDOMElement_Release(elem);
/* add attribute already attached to another document */ /* add attribute already attached to another document */
doc2 = create_document(&IID_IXMLDOMDocument); doc2 = create_document(&IID_IXMLDOMDocument);