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

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

This commit is contained in:
Michael Stefaniuc 2010-12-06 23:32:17 +01:00 committed by Alexandre Julliard
parent 99a0da2410
commit d4b0523288
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/selection.c
View File

@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(mshtml); WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
typedef struct { typedef struct {
const IHTMLSelectionObjectVtbl *lpHTMLSelectionObjectVtbl; IHTMLSelectionObject IHTMLSelectionObject_iface;
LONG ref; LONG ref;
@ -43,26 +43,27 @@ typedef struct {
struct list entry; struct list entry;
} HTMLSelectionObject; } HTMLSelectionObject;
#define HTMLSELOBJ(x) ((IHTMLSelectionObject*) &(x)->lpHTMLSelectionObjectVtbl) static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject(IHTMLSelectionObject *iface)
{
#define HTMLSELOBJ_THIS(iface) DEFINE_THIS(HTMLSelectionObject, HTMLSelectionObject, iface) return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject_iface);
}
static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *iface, static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *iface,
REFIID riid, void **ppv) REFIID riid, void **ppv)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
*ppv = NULL; *ppv = NULL;
if(IsEqualGUID(&IID_IUnknown, riid)) { if(IsEqualGUID(&IID_IUnknown, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
*ppv = HTMLSELOBJ(This); *ppv = &This->IHTMLSelectionObject_iface;
}else if(IsEqualGUID(&IID_IDispatch, riid)) { }else if(IsEqualGUID(&IID_IDispatch, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
*ppv = HTMLSELOBJ(This); *ppv = &This->IHTMLSelectionObject_iface;
}else if(IsEqualGUID(&IID_IHTMLSelectionObject, riid)) { }else if(IsEqualGUID(&IID_IHTMLSelectionObject, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
*ppv = HTMLSELOBJ(This); *ppv = &This->IHTMLSelectionObject_iface;
} }
if(*ppv) { if(*ppv) {
@ -76,7 +77,7 @@ static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *i
static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
@ -86,7 +87,7 @@ static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface)
static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref); TRACE("(%p) ref=%d\n", This, ref);
@ -104,7 +105,7 @@ static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface)
static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject *iface, UINT *pctinfo) static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject *iface, UINT *pctinfo)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
FIXME("(%p)->(%p)\n", This, pctinfo); FIXME("(%p)->(%p)\n", This, pctinfo);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -112,7 +113,7 @@ static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject
static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *iface, UINT iTInfo, static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *iface, UINT iTInfo,
LCID lcid, ITypeInfo **ppTInfo) LCID lcid, ITypeInfo **ppTInfo)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo);
return E_NOTIMPL; return E_NOTIMPL;
} }
@ -121,7 +122,7 @@ static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *if
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames,
lcid, rgDispId); lcid, rgDispId);
return E_NOTIMPL; return E_NOTIMPL;
@ -131,7 +132,7 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI
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)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
return E_NOTIMPL; return E_NOTIMPL;
@ -139,7 +140,7 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI
static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
IHTMLTxtRange *range_obj = NULL; IHTMLTxtRange *range_obj = NULL;
nsIDOMRange *nsrange = NULL; nsIDOMRange *nsrange = NULL;
HRESULT hres; HRESULT hres;
@ -189,21 +190,21 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac
static HRESULT WINAPI HTMLSelectionObject_empty(IHTMLSelectionObject *iface) static HRESULT WINAPI HTMLSelectionObject_empty(IHTMLSelectionObject *iface)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLSelectionObject_clear(IHTMLSelectionObject *iface) static HRESULT WINAPI HTMLSelectionObject_clear(IHTMLSelectionObject *iface)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
FIXME("(%p)\n", This); FIXME("(%p)\n", This);
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, BSTR *p) static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, BSTR *p)
{ {
HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface);
PRBool collapsed = TRUE; PRBool collapsed = TRUE;
static const WCHAR wszNone[] = {'N','o','n','e',0}; static const WCHAR wszNone[] = {'N','o','n','e',0};
@ -219,8 +220,6 @@ static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface,
return S_OK; return S_OK;
} }
#undef HTMLSELOBJ_THIS
static const IHTMLSelectionObjectVtbl HTMLSelectionObjectVtbl = { static const IHTMLSelectionObjectVtbl HTMLSelectionObjectVtbl = {
HTMLSelectionObject_QueryInterface, HTMLSelectionObject_QueryInterface,
HTMLSelectionObject_AddRef, HTMLSelectionObject_AddRef,
@ -243,14 +242,14 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect
if(!selection) if(!selection)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
selection->lpHTMLSelectionObjectVtbl = &HTMLSelectionObjectVtbl; selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl;
selection->ref = 1; selection->ref = 1;
selection->nsselection = nsselection; /* We shouldn't call AddRef here */ selection->nsselection = nsselection; /* We shouldn't call AddRef here */
selection->doc = doc; selection->doc = doc;
list_add_head(&doc->selection_list, &selection->entry); list_add_head(&doc->selection_list, &selection->entry);
*ret = HTMLSELOBJ(selection); *ret = &selection->IHTMLSelectionObject_iface;
return S_OK; return S_OK;
} }