msxml3: Remove get_ownerDocument() forward.
This commit is contained in:
parent
3d63982f86
commit
2e5a0dd63f
|
@ -353,10 +353,11 @@ static HRESULT WINAPI domattr_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI domattr_get_ownerDocument(
|
static HRESULT WINAPI domattr_get_ownerDocument(
|
||||||
IXMLDOMAttribute *iface,
|
IXMLDOMAttribute *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
domattr *This = impl_from_IXMLDOMAttribute( iface );
|
domattr *This = impl_from_IXMLDOMAttribute( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI domattr_cloneNode(
|
static HRESULT WINAPI domattr_cloneNode(
|
||||||
|
|
|
@ -364,10 +364,11 @@ static HRESULT WINAPI domcdata_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI domcdata_get_ownerDocument(
|
static HRESULT WINAPI domcdata_get_ownerDocument(
|
||||||
IXMLDOMCDATASection *iface,
|
IXMLDOMCDATASection *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
|
domcdata *This = impl_from_IXMLDOMCDATASection( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI domcdata_cloneNode(
|
static HRESULT WINAPI domcdata_cloneNode(
|
||||||
|
|
|
@ -357,10 +357,11 @@ static HRESULT WINAPI domcomment_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI domcomment_get_ownerDocument(
|
static HRESULT WINAPI domcomment_get_ownerDocument(
|
||||||
IXMLDOMComment *iface,
|
IXMLDOMComment *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
domcomment *This = impl_from_IXMLDOMComment( iface );
|
domcomment *This = impl_from_IXMLDOMComment( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI domcomment_cloneNode(
|
static HRESULT WINAPI domcomment_cloneNode(
|
||||||
|
|
|
@ -361,10 +361,11 @@ static HRESULT WINAPI domfrag_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI domfrag_get_ownerDocument(
|
static HRESULT WINAPI domfrag_get_ownerDocument(
|
||||||
IXMLDOMDocumentFragment *iface,
|
IXMLDOMDocumentFragment *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
|
domfrag *This = impl_from_IXMLDOMDocumentFragment( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI domfrag_cloneNode(
|
static HRESULT WINAPI domfrag_cloneNode(
|
||||||
|
|
|
@ -1249,10 +1249,11 @@ static HRESULT WINAPI domdoc_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI domdoc_get_ownerDocument(
|
static HRESULT WINAPI domdoc_get_ownerDocument(
|
||||||
IXMLDOMDocument3 *iface,
|
IXMLDOMDocument3 *iface,
|
||||||
IXMLDOMDocument** DOMDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
domdoc *This = impl_from_IXMLDOMDocument3( iface );
|
domdoc *This = impl_from_IXMLDOMDocument3( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, DOMDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -3423,7 +3424,7 @@ static dispex_static_data_t domdoc_dispex = {
|
||||||
domdoc_iface_tids
|
domdoc_iface_tids
|
||||||
};
|
};
|
||||||
|
|
||||||
HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document)
|
HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document)
|
||||||
{
|
{
|
||||||
domdoc *doc;
|
domdoc *doc;
|
||||||
|
|
||||||
|
@ -3477,7 +3478,7 @@ HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj)
|
||||||
xmldoc->_private = create_priv();
|
xmldoc->_private = create_priv();
|
||||||
priv_from_xmlDocPtr(xmldoc)->properties = create_properties(clsid);
|
priv_from_xmlDocPtr(xmldoc)->properties = create_properties(clsid);
|
||||||
|
|
||||||
hr = DOMDocument_create_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj);
|
hr = get_domdoc_from_xmldoc(xmldoc, (IXMLDOMDocument3**)ppObj);
|
||||||
if(FAILED(hr))
|
if(FAILED(hr))
|
||||||
{
|
{
|
||||||
free_properties(properties_from_xmlDocPtr(xmldoc));
|
free_properties(properties_from_xmlDocPtr(xmldoc));
|
||||||
|
@ -3496,7 +3497,7 @@ IUnknown* create_domdoc( xmlNodePtr document )
|
||||||
|
|
||||||
TRACE("(%p)\n", document);
|
TRACE("(%p)\n", document);
|
||||||
|
|
||||||
hr = DOMDocument_create_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj);
|
hr = get_domdoc_from_xmldoc((xmlDocPtr)document, (IXMLDOMDocument3**)&pObj);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
|
|
@ -372,10 +372,11 @@ static HRESULT WINAPI domelem_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI domelem_get_ownerDocument(
|
static HRESULT WINAPI domelem_get_ownerDocument(
|
||||||
IXMLDOMElement *iface,
|
IXMLDOMElement *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
domelem *This = impl_from_IXMLDOMElement( iface );
|
domelem *This = impl_from_IXMLDOMElement( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI domelem_cloneNode(
|
static HRESULT WINAPI domelem_cloneNode(
|
||||||
|
|
|
@ -355,10 +355,11 @@ static HRESULT WINAPI entityref_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI entityref_get_ownerDocument(
|
static HRESULT WINAPI entityref_get_ownerDocument(
|
||||||
IXMLDOMEntityReference *iface,
|
IXMLDOMEntityReference *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
entityref *This = impl_from_IXMLDOMEntityReference( iface );
|
entityref *This = impl_from_IXMLDOMEntityReference( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI entityref_cloneNode(
|
static HRESULT WINAPI entityref_cloneNode(
|
||||||
|
|
|
@ -274,8 +274,10 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*);
|
||||||
extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*);
|
extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*);
|
||||||
extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**);
|
extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**);
|
||||||
extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*);
|
extern HRESULT node_has_childnodes(const xmlnode*,VARIANT_BOOL*);
|
||||||
|
extern HRESULT node_get_owner_doc(const xmlnode*,IXMLDOMDocument**);
|
||||||
|
|
||||||
|
extern HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document);
|
||||||
|
|
||||||
extern HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document);
|
|
||||||
extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree);
|
extern HRESULT SchemaCache_validate_tree(IXMLDOMSchemaCollection2* iface, xmlNodePtr tree);
|
||||||
extern XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node);
|
extern XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node);
|
||||||
|
|
||||||
|
|
|
@ -463,15 +463,9 @@ HRESULT node_has_childnodes(const xmlnode *This, VARIANT_BOOL *ret)
|
||||||
return S_OK;
|
return S_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI xmlnode_get_ownerDocument(
|
HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc)
|
||||||
IXMLDOMNode *iface,
|
|
||||||
IXMLDOMDocument** DOMDocument)
|
|
||||||
{
|
{
|
||||||
xmlnode *This = impl_from_IXMLDOMNode( iface );
|
return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc);
|
||||||
|
|
||||||
TRACE("(%p)->(%p)\n", This, DOMDocument);
|
|
||||||
|
|
||||||
return DOMDocument_create_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)DOMDocument);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode)
|
HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode)
|
||||||
|
@ -1137,7 +1131,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
xmlnode_get_ownerDocument,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
xmlnode_get_text,
|
xmlnode_get_text,
|
||||||
|
@ -1500,7 +1494,7 @@ static HRESULT WINAPI unknode_get_ownerDocument(
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument** domDocument)
|
||||||
{
|
{
|
||||||
unknode *This = unknode_from_IXMLDOMNode( iface );
|
unknode *This = unknode_from_IXMLDOMNode( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
return node_get_owner_doc(&This->node, domDocument);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI unknode_cloneNode(
|
static HRESULT WINAPI unknode_cloneNode(
|
||||||
|
|
|
@ -371,10 +371,11 @@ static HRESULT WINAPI dom_pi_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI dom_pi_get_ownerDocument(
|
static HRESULT WINAPI dom_pi_get_ownerDocument(
|
||||||
IXMLDOMProcessingInstruction *iface,
|
IXMLDOMProcessingInstruction *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
|
dom_pi *This = impl_from_IXMLDOMProcessingInstruction( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI dom_pi_cloneNode(
|
static HRESULT WINAPI dom_pi_cloneNode(
|
||||||
|
|
|
@ -1163,7 +1163,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri
|
||||||
|
|
||||||
/* TODO: this should be read-only */
|
/* TODO: this should be read-only */
|
||||||
if (entry)
|
if (entry)
|
||||||
return DOMDocument_create_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node);
|
return get_domdoc_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node);
|
||||||
|
|
||||||
*node = NULL;
|
*node = NULL;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
|
|
|
@ -370,10 +370,11 @@ static HRESULT WINAPI domtext_hasChildNodes(
|
||||||
|
|
||||||
static HRESULT WINAPI domtext_get_ownerDocument(
|
static HRESULT WINAPI domtext_get_ownerDocument(
|
||||||
IXMLDOMText *iface,
|
IXMLDOMText *iface,
|
||||||
IXMLDOMDocument** domDocument)
|
IXMLDOMDocument **doc)
|
||||||
{
|
{
|
||||||
domtext *This = impl_from_IXMLDOMText( iface );
|
domtext *This = impl_from_IXMLDOMText( iface );
|
||||||
return IXMLDOMNode_get_ownerDocument( &This->node.IXMLDOMNode_iface, domDocument );
|
TRACE("(%p)->(%p)\n", This, doc);
|
||||||
|
return node_get_owner_doc(&This->node, doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
static HRESULT WINAPI domtext_cloneNode(
|
static HRESULT WINAPI domtext_cloneNode(
|
||||||
|
|
Loading…
Reference in New Issue