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

mshtml: Use an iface instead of a vtbl pointer in HTMLFrameElement.

Browse Source
This commit is contained in:
Michael Stefaniuc 2010-12-06 23:31:24 +01:00 committed by Alexandre Julliard
parent 2bef3ad2ef
commit ca129550fe
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
dlls/mshtml/htmlframe.c
View File

@ -33,52 +33,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct { typedef struct {
HTMLFrameBase framebase; HTMLFrameBase framebase;
const IHTMLFrameElement3Vtbl *lpIHTMLFrameElement3Vtbl; IHTMLFrameElement3 IHTMLFrameElement3_iface;
} HTMLFrameElement; } HTMLFrameElement;
#define HTMLFRAMEELEM3(x) ((IHTMLFrameElement3*) &(x)->lpIHTMLFrameElement3Vtbl) static inline HTMLFrameElement *impl_from_IHTMLFrameElement3(IHTMLFrameElement3 *iface)
{
#define HTMLFRAME3_THIS(iface) DEFINE_THIS(HTMLFrameElement, IHTMLFrameElement3, iface) return CONTAINING_RECORD(iface, HTMLFrameElement, IHTMLFrameElement3_iface);
}
static HRESULT WINAPI HTMLFrameElement3_QueryInterface(IHTMLFrameElement3 *iface, static HRESULT WINAPI HTMLFrameElement3_QueryInterface(IHTMLFrameElement3 *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->framebase.element.node), riid, ppv); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->framebase.element.node), riid, ppv);
} }
static ULONG WINAPI HTMLFrameElement3_AddRef(IHTMLFrameElement3 *iface) static ULONG WINAPI HTMLFrameElement3_AddRef(IHTMLFrameElement3 *iface)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->framebase.element.node)); return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->framebase.element.node));
} }
static ULONG WINAPI HTMLFrameElement3_Release(IHTMLFrameElement3 *iface) static ULONG WINAPI HTMLFrameElement3_Release(IHTMLFrameElement3 *iface)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
return IHTMLDOMNode_Release(HTMLDOMNODE(&This->framebase.element.node)); return IHTMLDOMNode_Release(HTMLDOMNODE(&This->framebase.element.node));
} }
static HRESULT WINAPI HTMLFrameElement3_GetTypeInfoCount(IHTMLFrameElement3 *iface, UINT *pctinfo) static HRESULT WINAPI HTMLFrameElement3_GetTypeInfoCount(IHTMLFrameElement3 *iface, UINT *pctinfo)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->framebase.element.node.dispex), pctinfo); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->framebase.element.node.dispex), pctinfo);
} }
static HRESULT WINAPI HTMLFrameElement3_GetTypeInfo(IHTMLFrameElement3 *iface, UINT iTInfo, static HRESULT WINAPI HTMLFrameElement3_GetTypeInfo(IHTMLFrameElement3 *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->framebase.element.node.dispex), iTInfo, lcid, ppTInfo); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->framebase.element.node.dispex), iTInfo, lcid, ppTInfo);
} }
static HRESULT WINAPI HTMLFrameElement3_GetIDsOfNames(IHTMLFrameElement3 *iface, REFIID riid, static HRESULT WINAPI HTMLFrameElement3_GetIDsOfNames(IHTMLFrameElement3 *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->framebase.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->framebase.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId);
} }
@ -86,14 +87,14 @@ static HRESULT WINAPI HTMLFrameElement3_Invoke(IHTMLFrameElement3 *iface, DISPID
REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
return IDispatchEx_Invoke(DISPATCHEX(&This->framebase.element.node.dispex), dispIdMember, riid, return IDispatchEx_Invoke(DISPATCHEX(&This->framebase.element.node.dispex), dispIdMember, riid,
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
} }
static HRESULT WINAPI HTMLFrameElement3_get_contentDocument(IHTMLFrameElement3 *iface, IDispatch **p) static HRESULT WINAPI HTMLFrameElement3_get_contentDocument(IHTMLFrameElement3 *iface, IDispatch **p)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
IHTMLDocument2 *doc; IHTMLDocument2 *doc;
HRESULT hres; HRESULT hres;
@ -114,48 +115,46 @@ static HRESULT WINAPI HTMLFrameElement3_get_contentDocument(IHTMLFrameElement3 *
static HRESULT WINAPI HTMLFrameElement3_put_src(IHTMLFrameElement3 *iface, BSTR v) static HRESULT WINAPI HTMLFrameElement3_put_src(IHTMLFrameElement3 *iface, BSTR v)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); FIXME("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLFrameElement3_get_src(IHTMLFrameElement3 *iface, BSTR *p) static HRESULT WINAPI HTMLFrameElement3_get_src(IHTMLFrameElement3 *iface, BSTR *p)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLFrameElement3_put_longDesc(IHTMLFrameElement3 *iface, BSTR v) static HRESULT WINAPI HTMLFrameElement3_put_longDesc(IHTMLFrameElement3 *iface, BSTR v)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); FIXME("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLFrameElement3_get_longDesc(IHTMLFrameElement3 *iface, BSTR *p) static HRESULT WINAPI HTMLFrameElement3_get_longDesc(IHTMLFrameElement3 *iface, BSTR *p)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLFrameElement3_put_frameBorder(IHTMLFrameElement3 *iface, BSTR v) static HRESULT WINAPI HTMLFrameElement3_put_frameBorder(IHTMLFrameElement3 *iface, BSTR v)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); FIXME("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLFrameElement3_get_frameBorder(IHTMLFrameElement3 *iface, BSTR *p) static HRESULT WINAPI HTMLFrameElement3_get_frameBorder(IHTMLFrameElement3 *iface, BSTR *p)
{ {
HTMLFrameElement *This = HTMLFRAME3_THIS(iface); HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface);
FIXME("(%p)->(%p)\n", This, p); FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return E_NOTIMPL;
} }
#undef HTMLFRAME3_THIS
static const IHTMLFrameElement3Vtbl HTMLFrameElement3Vtbl = { static const IHTMLFrameElement3Vtbl HTMLFrameElement3Vtbl = {
HTMLFrameElement3_QueryInterface, HTMLFrameElement3_QueryInterface,
HTMLFrameElement3_AddRef, HTMLFrameElement3_AddRef,
@ -181,7 +180,7 @@ static HRESULT HTMLFrameElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
if(IsEqualGUID(&IID_IHTMLFrameElement3, riid)) { if(IsEqualGUID(&IID_IHTMLFrameElement3, riid)) {
TRACE("(%p)->(IID_IHTMLFrameElement3 %p)\n", This, ppv); TRACE("(%p)->(IID_IHTMLFrameElement3 %p)\n", This, ppv);
*ppv = HTMLFRAMEELEM3(This); *ppv = &This->IHTMLFrameElement3_iface;
}else { }else {
return HTMLFrameBase_QI(&This->framebase, riid, ppv); return HTMLFrameBase_QI(&This->framebase, riid, ppv);
} }
@ -301,7 +300,7 @@ HRESULT HTMLFrameElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
ret->framebase.element.node.vtbl = &HTMLFrameElementImplVtbl; ret->framebase.element.node.vtbl = &HTMLFrameElementImplVtbl;
ret->lpIHTMLFrameElement3Vtbl = &HTMLFrameElement3Vtbl; ret->IHTMLFrameElement3_iface.lpVtbl = &HTMLFrameElement3Vtbl;
HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLFrameElement_dispex); HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLFrameElement_dispex);