Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domfrag.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1b11ffaa6b489d59ebc7677fc2b2fd20b69b7ecb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=1b11ffaa6b489d59ebc7677fc2...

Author: Michael Stefaniuc 
Date:   Thu Dec 16 01:04:10 2010 +0100

msxml3: Use an iface instead of a vtbl pointer in domfrag.

---

dlls/msxml3/docfrag.c |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c
index 2dcb894..5eb3a2c 100644
--- a/dlls/msxml3/docfrag.c
+++ b/dlls/msxml3/docfrag.c
@@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 typedef struct _domfrag
 {
     xmlnode node;
-    const struct IXMLDOMDocumentFragmentVtbl *lpVtbl;
+    IXMLDOMDocumentFragment IXMLDOMDocumentFragment_iface;
     LONG ref;
 } domfrag;

static inline domfrag *impl_from_IXMLDOMDocumentFragment( IXMLDOMDocumentFragment *iface )
 {
-    return (domfrag *)((char*)iface - FIELD_OFFSET(domfrag, lpVtbl));
+    return CONTAINING_RECORD(iface, domfrag, IXMLDOMDocumentFragment_iface);
 }

static HRESULT WINAPI domfrag_QueryInterface(
@@ -170,8 +170,8 @@ static HRESULT WINAPI domfrag_Invoke(
     hr = get_typeinfo(IXMLDOMDocumentFragment_tid, &typeinfo);
     if(SUCCEEDED(hr))
     {
-        hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams,
-                pVarResult, pExcepInfo, puArgErr);
+        hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMDocumentFragment_iface, dispIdMember,
+                wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
         ITypeInfo_Release(typeinfo);
     }

@@ -588,12 +588,12 @@ IUnknown* create_doc_fragment( xmlNodePtr fragment )
     if ( !This )
         return NULL;

-    This->lpVtbl = &domfrag_vtbl;
+    This->IXMLDOMDocumentFragment_iface.lpVtbl = &domfrag_vtbl;
     This->ref = 1;

-    init_xmlnode(&This->node, fragment, (IXMLDOMNode*)&This->lpVtbl, NULL);
+    init_xmlnode(&This->node, fragment, (IXMLDOMNode*)&This->IXMLDOMDocumentFragment_iface, NULL);

-    return (IUnknown*) &This->lpVtbl;
+    return (IUnknown*)&This->IXMLDOMDocumentFragment_iface;
 }

#endif