ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Stefaniuc 2010-12-16 01:04:12 +01:00 committed by Alexandre Julliard
parent 73b08ed2f0
commit 25df7aac27
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/msxml3/element.c
View File

@ -44,13 +44,13 @@ static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes";
typedef struct _domelem typedef struct _domelem
{ {
xmlnode node; xmlnode node;
const struct IXMLDOMElementVtbl *lpVtbl; IXMLDOMElement IXMLDOMElement_iface;
LONG ref; LONG ref;
} domelem; } domelem;
static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface )
{ {
return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl)); return CONTAINING_RECORD(iface, domelem, IXMLDOMElement_iface);
} }
static inline xmlNodePtr get_element( const domelem *This ) static inline xmlNodePtr get_element( const domelem *This )
@ -72,7 +72,7 @@ static HRESULT WINAPI domelem_QueryInterface(
IsEqualGUID( riid, &IID_IDispatch ) || IsEqualGUID( riid, &IID_IDispatch ) ||
IsEqualGUID( riid, &IID_IUnknown ) ) IsEqualGUID( riid, &IID_IUnknown ) )
{ {
*ppvObject = &This->lpVtbl; *ppvObject = &This->IXMLDOMElement_iface;
} }
else if(node_query_interface(&This->node, riid, ppvObject)) else if(node_query_interface(&This->node, riid, ppvObject))
{ {
@ -184,8 +184,8 @@ static HRESULT WINAPI domelem_Invoke(
hr = get_typeinfo(IXMLDOMElement_tid, &typeinfo); hr = get_typeinfo(IXMLDOMElement_tid, &typeinfo);
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMElement_iface, dispIdMember, wFlags,
pVarResult, pExcepInfo, puArgErr); pDispParams, pVarResult, pExcepInfo, puArgErr);
ITypeInfo_Release(typeinfo); ITypeInfo_Release(typeinfo);
} }
@ -314,7 +314,7 @@ static HRESULT WINAPI domelem_get_attributes(
TRACE("(%p)->(%p)\n", This, attributeMap); TRACE("(%p)->(%p)\n", This, attributeMap);
*attributeMap = create_nodemap((IXMLDOMNode*)&This->lpVtbl); *attributeMap = create_nodemap((IXMLDOMNode*)&This->IXMLDOMElement_iface);
return S_OK; return S_OK;
} }
@ -1333,12 +1333,12 @@ IUnknown* create_element( xmlNodePtr element )
if ( !This ) if ( !This )
return NULL; return NULL;
This->lpVtbl = &domelem_vtbl; This->IXMLDOMElement_iface.lpVtbl = &domelem_vtbl;
This->ref = 1; This->ref = 1;
init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->lpVtbl, &domelem_dispex); init_xmlnode(&This->node, element, (IXMLDOMNode*)&This->IXMLDOMElement_iface, &domelem_dispex);
return (IUnknown*) &This->lpVtbl; return (IUnknown*)&This->IXMLDOMElement_iface;
} }
#endif #endif