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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 73b08ed2f05bf510ed649f0e188f96d47b190914
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=73b08ed2f05bf510ed649f0e18...

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

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

---

dlls/msxml3/text.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c
index 76d81c2..4a2bd21 100644
--- a/dlls/msxml3/text.c
+++ b/dlls/msxml3/text.c
@@ -41,13 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
 typedef struct _domtext
 {
     xmlnode node;
-    const struct IXMLDOMTextVtbl *lpVtbl;
+    IXMLDOMText IXMLDOMText_iface;
     LONG ref;
 } domtext;

static inline domtext *impl_from_IXMLDOMText( IXMLDOMText *iface )
 {
-    return (domtext *)((char*)iface - FIELD_OFFSET(domtext, lpVtbl));
+    return CONTAINING_RECORD(iface, domtext, IXMLDOMText_iface);
 }

static HRESULT WINAPI domtext_QueryInterface(
@@ -179,7 +179,7 @@ static HRESULT WINAPI domtext_Invoke(
     hr = get_typeinfo(IXMLDOMText_tid, &typeinfo);
     if(SUCCEEDED(hr))
     {
-        hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams,
+        hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMText_iface, dispIdMember, wFlags, pDispParams,
                 pVarResult, pExcepInfo, puArgErr);
         ITypeInfo_Release(typeinfo);
     }
@@ -945,12 +945,12 @@ IUnknown* create_text( xmlNodePtr text )
     if ( !This )
         return NULL;

-    This->lpVtbl = &domtext_vtbl;
+    This->IXMLDOMText_iface.lpVtbl = &domtext_vtbl;
     This->ref = 1;

-    init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL);
+    init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->IXMLDOMText_iface, NULL);

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

#endif