Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in domcdata.
Alexandre Julliard
julliard at winehq.org
Fri Dec 17 11:30:42 CST 2010
Module: wine
Branch: master
Commit: 6a319a33280563db7052e60be37aa54f377cc55c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a319a33280563db7052e60be37aa54f377cc55c
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Dec 16 01:04:06 2010 +0100
msxml3: Use an iface instead of a vtbl pointer in domcdata.
---
dlls/msxml3/cdata.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c
index e4f24c5..227563f 100644
--- a/dlls/msxml3/cdata.c
+++ b/dlls/msxml3/cdata.c
@@ -40,13 +40,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml);
typedef struct _domcdata
{
xmlnode node;
- const struct IXMLDOMCDATASectionVtbl *lpVtbl;
+ IXMLDOMCDATASection IXMLDOMCDATASection_iface;
LONG ref;
} domcdata;
static inline domcdata *impl_from_IXMLDOMCDATASection( IXMLDOMCDATASection *iface )
{
- return (domcdata *)((char*)iface - FIELD_OFFSET(domcdata, lpVtbl));
+ return CONTAINING_RECORD(iface, domcdata, IXMLDOMCDATASection_iface);
}
static HRESULT WINAPI domcdata_QueryInterface(
@@ -177,8 +177,8 @@ static HRESULT WINAPI domcdata_Invoke(
hr = get_typeinfo(IXMLDOMCDATASection_tid, &typeinfo);
if(SUCCEEDED(hr))
{
- hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams,
- pVarResult, pExcepInfo, puArgErr);
+ hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMCDATASection_iface, dispIdMember, wFlags,
+ pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo);
}
@@ -892,12 +892,12 @@ IUnknown* create_cdata( xmlNodePtr text )
if ( !This )
return NULL;
- This->lpVtbl = &domcdata_vtbl;
+ This->IXMLDOMCDATASection_iface.lpVtbl = &domcdata_vtbl;
This->ref = 1;
- init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->lpVtbl, NULL);
+ init_xmlnode(&This->node, text, (IXMLDOMNode*)&This->IXMLDOMCDATASection_iface, NULL);
- return (IUnknown*) &This->lpVtbl;
+ return (IUnknown*)&This->IXMLDOMCDATASection_iface;
}
#endif
More information about the wine-cvs
mailing list