Module: wine Branch: master Commit: b282572ee31eca8d076139bfda3f44a663f70de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b282572ee31eca8d076139bfda...
Author: Michael Karcher wine@mkarcher.dialup.fu-berlin.de Date: Sat Nov 29 10:51:58 2008 +0100
msxml3: Move attach_xmlnode.c to domdoc.c.
---
dlls/msxml3/domdoc.c | 14 ++++++++++++++ dlls/msxml3/msxml_private.h | 2 -- dlls/msxml3/node.c | 14 -------------- 3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index c685889..f5b7aff 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -209,6 +209,20 @@ HRESULT xmldoc_remove_orphan(xmlDocPtr doc, xmlNodePtr node) return S_FALSE; }
+static void attach_xmlnode( IXMLDOMNode *node, xmlNodePtr xml ) +{ + xmlnode *This = impl_from_IXMLDOMNode( node ); + + if(This->node) + xmldoc_release(This->node->doc); + + This->node = xml; + if(This->node) + xmldoc_add_ref(This->node->doc); + + return; +} + static inline domdoc *impl_from_IXMLDOMDocument2( IXMLDOMDocument2 *iface ) { return (domdoc *)((char*)iface - FIELD_OFFSET(domdoc, lpVtbl)); diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index aa14b9b..e33b994 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -54,8 +54,6 @@ extern IUnknown *create_doc_entity_ref( xmlNodePtr entity );
extern HRESULT queryresult_create( xmlNodePtr, LPWSTR, IXMLDOMNodeList ** );
-extern void attach_xmlnode( IXMLDOMNode *node, xmlNodePtr xmlnode ); - /* data accessors */ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type );
diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 3d6f2f3..aa3b748 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -85,20 +85,6 @@ xmlNodePtr xmlNodePtr_from_domnode( IXMLDOMNode *iface, xmlElementType type ) return This->node; }
-void attach_xmlnode( IXMLDOMNode *node, xmlNodePtr xml ) -{ - xmlnode *This = impl_from_IXMLDOMNode( node ); - - if(This->node) - xmldoc_release(This->node->doc); - - This->node = xml; - if(This->node) - xmldoc_add_ref(This->node->doc); - - return; -} - static HRESULT WINAPI xmlnode_QueryInterface( IXMLDOMNode *iface, REFIID riid,