[PATCH 4/9] Remove get_ownerDocument() forward
Nikolay Sivov
nsivov at codeweavers.com
Wed Feb 23 05:38:32 CST 2011
---
dlls/msxml3/attribute.c | 5 +++--
dlls/msxml3/cdata.c | 5 +++--
dlls/msxml3/comment.c | 7 ++++---
dlls/msxml3/docfrag.c | 5 +++--
dlls/msxml3/domdoc.c | 11 ++++++-----
dlls/msxml3/element.c | 7 ++++---
dlls/msxml3/entityref.c | 5 +++--
dlls/msxml3/msxml_private.h | 4 +++-
dlls/msxml3/node.c | 14 ++++----------
dlls/msxml3/pi.c | 5 +++--
dlls/msxml3/schema.c | 2 +-
dlls/msxml3/text.c | 5 +++--
12 files changed, 40 insertions(+), 35 deletions(-)
diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c
index 88eead1..8fa24f1 100644
--- a/dlls/msxml3/attribute.c
+++ b/dlls/msxml3/attribute.c
@@ -353,10 +353,11 @@ static HRESULT WINAPI domattr_hasChildNodes(
static HRESULT WINAPI domattr_get_ownerDocument(
IXMLDOMAttribute *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMDocument **doc)
{
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(
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index 977778d..64185ca 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -364,10 +364,11 @@ static HRESULT WINAPI domcdata_hasChildNodes(
static HRESULT WINAPI domcdata_get_ownerDocument(
IXMLDOMCDATASection *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMDocument **doc)
{
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(
diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c
index 8fabca5..bb0c488 100644
--- a/dlls/msxml3/comment.c
+++ b/dlls/msxml3/comment.c
@@ -356,11 +356,12 @@ static HRESULT WINAPI domcomment_hasChildNodes(
}
static HRESULT WINAPI domcomment_get_ownerDocument(
- IXMLDOMComment *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMComment *iface,
+ IXMLDOMDocument **doc)
{
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(
diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index 3e3a6f2..8c7c8bf 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -361,10 +361,11 @@ static HRESULT WINAPI domfrag_hasChildNodes(
static HRESULT WINAPI domfrag_get_ownerDocument(
IXMLDOMDocumentFragment *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMDocument **doc)
{
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(
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c
index cc8cc86..f0938e4 100644
--- a/dlls/msxml3/domdoc.c
+++ b/dlls/msxml3/domdoc.c
@@ -1249,10 +1249,11 @@ static HRESULT WINAPI domdoc_hasChildNodes(
static HRESULT WINAPI domdoc_get_ownerDocument(
IXMLDOMDocument3 *iface,
- IXMLDOMDocument** DOMDocument)
+ IXMLDOMDocument **doc)
{
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
};
-HRESULT DOMDocument_create_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document)
+HRESULT get_domdoc_from_xmldoc(xmlDocPtr xmldoc, IXMLDOMDocument3 **document)
{
domdoc *doc;
@@ -3477,7 +3478,7 @@ HRESULT DOMDocument_create(const GUID *clsid, IUnknown *pUnkOuter, void **ppObj)
xmldoc->_private = create_priv();
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))
{
free_properties(properties_from_xmlDocPtr(xmldoc));
@@ -3496,7 +3497,7 @@ IUnknown* create_domdoc( xmlNodePtr 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))
return NULL;
diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c
index 4954a71..7cf3afc 100644
--- a/dlls/msxml3/element.c
+++ b/dlls/msxml3/element.c
@@ -371,11 +371,12 @@ static HRESULT WINAPI domelem_hasChildNodes(
}
static HRESULT WINAPI domelem_get_ownerDocument(
- IXMLDOMElement *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMElement *iface,
+ IXMLDOMDocument **doc)
{
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(
diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c
index 4f4ab25..d8d1f21 100644
--- a/dlls/msxml3/entityref.c
+++ b/dlls/msxml3/entityref.c
@@ -355,10 +355,11 @@ static HRESULT WINAPI entityref_hasChildNodes(
static HRESULT WINAPI entityref_get_ownerDocument(
IXMLDOMEntityReference *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMDocument **doc)
{
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(
diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h
index 45a3902..499aecb 100644
--- a/dlls/msxml3/msxml_private.h
+++ b/dlls/msxml3/msxml_private.h
@@ -274,8 +274,10 @@ extern HRESULT node_get_base_name(xmlnode*,BSTR*);
extern HRESULT node_get_namespaceURI(xmlnode*,BSTR*);
extern HRESULT node_remove_child(xmlnode*,IXMLDOMNode*,IXMLDOMNode**);
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 XDR_DT SchemaCache_get_node_dt(IXMLDOMSchemaCollection2* iface, xmlNodePtr node);
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c
index 214f1e6..dc393f8 100644
--- a/dlls/msxml3/node.c
+++ b/dlls/msxml3/node.c
@@ -463,15 +463,9 @@ HRESULT node_has_childnodes(const xmlnode *This, VARIANT_BOOL *ret)
return S_OK;
}
-static HRESULT WINAPI xmlnode_get_ownerDocument(
- IXMLDOMNode *iface,
- IXMLDOMDocument** DOMDocument)
+HRESULT node_get_owner_doc(const xmlnode *This, IXMLDOMDocument **doc)
{
- xmlnode *This = impl_from_IXMLDOMNode( iface );
-
- TRACE("(%p)->(%p)\n", This, DOMDocument);
-
- return DOMDocument_create_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)DOMDocument);
+ return get_domdoc_from_xmldoc(This->node->doc, (IXMLDOMDocument3**)doc);
}
HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode)
@@ -1137,7 +1131,7 @@ static const struct IXMLDOMNodeVtbl xmlnode_vtbl =
NULL,
NULL,
NULL,
- xmlnode_get_ownerDocument,
+ NULL,
NULL,
NULL,
xmlnode_get_text,
@@ -1500,7 +1494,7 @@ static HRESULT WINAPI unknode_get_ownerDocument(
IXMLDOMDocument** domDocument)
{
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(
diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c
index b0e0638..6b812a5 100644
--- a/dlls/msxml3/pi.c
+++ b/dlls/msxml3/pi.c
@@ -371,10 +371,11 @@ static HRESULT WINAPI dom_pi_hasChildNodes(
static HRESULT WINAPI dom_pi_get_ownerDocument(
IXMLDOMProcessingInstruction *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMDocument **doc)
{
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(
diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c
index 2c20061..f782254 100644
--- a/dlls/msxml3/schema.c
+++ b/dlls/msxml3/schema.c
@@ -1163,7 +1163,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri
/* TODO: this should be read-only */
if (entry)
- return DOMDocument_create_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node);
+ return get_domdoc_from_xmldoc(entry->doc, (IXMLDOMDocument3**)node);
*node = NULL;
return S_OK;
diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index e8db21b..c57428f 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -370,10 +370,11 @@ static HRESULT WINAPI domtext_hasChildNodes(
static HRESULT WINAPI domtext_get_ownerDocument(
IXMLDOMText *iface,
- IXMLDOMDocument** domDocument)
+ IXMLDOMDocument **doc)
{
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(
--
1.5.6.5
--------------010408090504040203030502--
More information about the wine-patches
mailing list