December 2010 - Wine-commits

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLLoadOptions.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 99a0da2410bcea676c1727fff7fc353cffa52734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99a0da2410bcea676c1727fff… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:10 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLLoadOptions. --- dlls/mshtml/loadopts.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/loadopts.c b/dlls/mshtml/loadopts.c index 8648f16..bc5e31f 100644 --- a/dlls/mshtml/loadopts.c +++ b/dlls/mshtml/loadopts.c @@ -44,37 +44,38 @@ typedef struct load_opt { } load_opt; typedef struct { - const IHtmlLoadOptionsVtbl *lpHtmlLoadOptionsVtbl; + IHtmlLoadOptions IHtmlLoadOptions_iface; LONG ref; load_opt *opts; } HTMLLoadOptions; -#define LOADOPTS(x) ((IHtmlLoadOptions*) &(x)->lpHtmlLoadOptionsVtbl) - -#define LOADOPTS_THIS(iface) DEFINE_THIS(HTMLLoadOptions, HtmlLoadOptions, iface) +static inline HTMLLoadOptions *impl_from_IHtmlLoadOptions(IHtmlLoadOptions *iface) +{ + return CONTAINING_RECORD(iface, HTMLLoadOptions, IHtmlLoadOptions_iface); +} static HRESULT WINAPI HtmlLoadOptions_QueryInterface(IHtmlLoadOptions *iface, REFIID riid, void **ppv) { - HTMLLoadOptions *This = LOADOPTS_THIS(iface); + HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = LOADOPTS(This); + *ppv = &This->IHtmlLoadOptions_iface; }else if(IsEqualGUID(&IID_IOptionArray, riid)) { TRACE("(%p)->(IID_IOptionArray %p)\n", This, ppv); - *ppv = LOADOPTS(This); + *ppv = &This->IHtmlLoadOptions_iface; }else if(IsEqualGUID(&IID_IHtmlLoadOptions, riid)) { TRACE("(%p)->(IID_IHtmlLoadOptions %p)\n", This, ppv); - *ppv = LOADOPTS(This); + *ppv = &This->IHtmlLoadOptions_iface; } if(*ppv) { - IHtmlLoadOptions_AddRef(LOADOPTS(This)); + IHtmlLoadOptions_AddRef(&This->IHtmlLoadOptions_iface); return S_OK; } @@ -84,7 +85,7 @@ static HRESULT WINAPI HtmlLoadOptions_QueryInterface(IHtmlLoadOptions *iface, static ULONG WINAPI HtmlLoadOptions_AddRef(IHtmlLoadOptions *iface) { - HTMLLoadOptions *This = LOADOPTS_THIS(iface); + HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -94,7 +95,7 @@ static ULONG WINAPI HtmlLoadOptions_AddRef(IHtmlLoadOptions *iface) static ULONG WINAPI HtmlLoadOptions_Release(IHtmlLoadOptions *iface) { - HTMLLoadOptions *This = LOADOPTS_THIS(iface); + HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -119,7 +120,7 @@ static ULONG WINAPI HtmlLoadOptions_Release(IHtmlLoadOptions *iface) static HRESULT WINAPI HtmlLoadOptions_QueryOption(IHtmlLoadOptions *iface, DWORD dwOption, LPVOID pBuffer, ULONG *pcbBuf) { - HTMLLoadOptions *This = LOADOPTS_THIS(iface); + HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); load_opt *iter; TRACE("(%p)->(%d %p %p)\n", This, dwOption, pBuffer, pcbBuf); @@ -148,7 +149,7 @@ static HRESULT WINAPI HtmlLoadOptions_QueryOption(IHtmlLoadOptions *iface, DWORD static HRESULT WINAPI HtmlLoadOptions_SetOption(IHtmlLoadOptions *iface, DWORD dwOption, LPVOID pBuffer, ULONG cbBuf) { - HTMLLoadOptions *This = LOADOPTS_THIS(iface); + HTMLLoadOptions *This = impl_from_IHtmlLoadOptions(iface); load_opt *iter = NULL; TRACE("(%p)->(%d %p %d)\n", This, dwOption, pBuffer, cbBuf); @@ -182,8 +183,6 @@ static HRESULT WINAPI HtmlLoadOptions_SetOption(IHtmlLoadOptions *iface, DWORD d return S_OK; } -#undef LOADOPTS_THIS - static const IHtmlLoadOptionsVtbl HtmlLoadOptionsVtbl = { HtmlLoadOptions_QueryInterface, HtmlLoadOptions_AddRef, @@ -201,12 +200,12 @@ HRESULT HTMLLoadOptions_Create(IUnknown *pUnkOuter, REFIID riid, void** ppv) ret = heap_alloc(sizeof(HTMLLoadOptions)); - ret->lpHtmlLoadOptionsVtbl = &HtmlLoadOptionsVtbl; + ret->IHtmlLoadOptions_iface.lpVtbl = &HtmlLoadOptionsVtbl; ret->ref = 1; ret->opts = NULL; - hres = IHtmlLoadOptions_QueryInterface(LOADOPTS(ret), riid, ppv); - IHtmlLoadOptions_Release(LOADOPTS(ret)); + hres = IHtmlLoadOptions_QueryInterface(&ret->IHtmlLoadOptions_iface, riid, ppv); + IHtmlLoadOptions_Release(&ret->IHtmlLoadOptions_iface); return hres; }

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLSelectionObject.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: d4b05232883eb0696cd7b6f601288f0baeb11b4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4b05232883eb0696cd7b6f60… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:17 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLSelectionObject. --- dlls/mshtml/selection.c | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 4c670a6..1ffc567 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - const IHTMLSelectionObjectVtbl *lpHTMLSelectionObjectVtbl; + IHTMLSelectionObject IHTMLSelectionObject_iface; LONG ref; @@ -43,26 +43,27 @@ typedef struct { struct list entry; } HTMLSelectionObject; -#define HTMLSELOBJ(x) ((IHTMLSelectionObject*) &(x)->lpHTMLSelectionObjectVtbl) - -#define HTMLSELOBJ_THIS(iface) DEFINE_THIS(HTMLSelectionObject, HTMLSelectionObject, iface) +static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject(IHTMLSelectionObject *iface) +{ + return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject_iface); +} static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *iface, REFIID riid, void **ppv) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLSELOBJ(This); + *ppv = &This->IHTMLSelectionObject_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLSELOBJ(This); + *ppv = &This->IHTMLSelectionObject_iface; }else if(IsEqualGUID(&IID_IHTMLSelectionObject, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLSELOBJ(This); + *ppv = &This->IHTMLSelectionObject_iface; } if(*ppv) { @@ -76,7 +77,7 @@ static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *i static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); LONG ref = InterlockedIncrement(&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) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); LONG ref = InterlockedDecrement(&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) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); FIXME("(%p)->(%p)\n", This, pctinfo); return E_NOTIMPL; } @@ -112,7 +113,7 @@ static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *iface, UINT iTInfo, 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); return E_NOTIMPL; } @@ -121,7 +122,7 @@ static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *if LPOLESTR *rgszNames, UINT cNames, 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, lcid, rgDispId); return E_NOTIMPL; @@ -131,7 +132,7 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, 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), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; @@ -139,7 +140,7 @@ static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DI static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); IHTMLTxtRange *range_obj = NULL; nsIDOMRange *nsrange = NULL; HRESULT hres; @@ -189,21 +190,21 @@ static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *ifac static HRESULT WINAPI HTMLSelectionObject_empty(IHTMLSelectionObject *iface) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLSelectionObject_clear(IHTMLSelectionObject *iface) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, BSTR *p) { - HTMLSelectionObject *This = HTMLSELOBJ_THIS(iface); + HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); PRBool collapsed = TRUE; static const WCHAR wszNone[] = {'N','o','n','e',0}; @@ -219,8 +220,6 @@ static HRESULT WINAPI HTMLSelectionObject_get_type(IHTMLSelectionObject *iface, return S_OK; } -#undef HTMLSELOBJ_THIS - static const IHTMLSelectionObjectVtbl HTMLSelectionObjectVtbl = { HTMLSelectionObject_QueryInterface, HTMLSelectionObject_AddRef, @@ -243,14 +242,14 @@ HRESULT HTMLSelectionObject_Create(HTMLDocumentNode *doc, nsISelection *nsselect if(!selection) return E_OUTOFMEMORY; - selection->lpHTMLSelectionObjectVtbl = &HTMLSelectionObjectVtbl; + selection->IHTMLSelectionObject_iface.lpVtbl = &HTMLSelectionObjectVtbl; selection->ref = 1; selection->nsselection = nsselection; /* We shouldn't call AddRef here */ selection->doc = doc; list_add_head(&doc->selection_list, &selection->entry); - *ret = HTMLSELOBJ(selection); + *ret = &selection->IHTMLSelectionObject_iface; return S_OK; }

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLScreen.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: bec5ea78ada3496e7e690ee772d533084eda53d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec5ea78ada3496e7e690ee77… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:47 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLScreen. --- dlls/mshtml/htmlscreen.c | 55 ++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index cc3f4b2..6661fbc 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -33,27 +33,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { DispatchEx dispex; - const IHTMLScreenVtbl *lpIHTMLScreenVtbl; + IHTMLScreen IHTMLScreen_iface; LONG ref; } HTMLScreen; -#define HTMLSCREEN(x) ((IHTMLScreen*) &(x)->lpIHTMLScreenVtbl) - -#define HTMLSCREEN_THIS(iface) DEFINE_THIS(HTMLScreen, IHTMLScreen, iface) +static inline HTMLScreen *impl_from_IHTMLScreen(IHTMLScreen *iface) +{ + return CONTAINING_RECORD(iface, HTMLScreen, IHTMLScreen_iface); +} static HRESULT WINAPI HTMLScreen_QueryInterface(IHTMLScreen *iface, REFIID riid, void **ppv) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); *ppv = NULL; if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLSCREEN(This); + *ppv = &This->IHTMLScreen_iface; }else if(IsEqualGUID(&IID_IHTMLScreen, riid)) { TRACE("(%p)->(IID_IHTMLScreen %p)\n", This, ppv); - *ppv = HTMLSCREEN(This); + *ppv = &This->IHTMLScreen_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -69,7 +70,7 @@ static HRESULT WINAPI HTMLScreen_QueryInterface(IHTMLScreen *iface, REFIID riid, static ULONG WINAPI HTMLScreen_AddRef(IHTMLScreen *iface) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -79,7 +80,7 @@ static ULONG WINAPI HTMLScreen_AddRef(IHTMLScreen *iface) static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -94,7 +95,7 @@ static ULONG WINAPI HTMLScreen_Release(IHTMLScreen *iface) static HRESULT WINAPI HTMLScreen_GetTypeInfoCount(IHTMLScreen *iface, UINT *pctinfo) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -102,7 +103,7 @@ static HRESULT WINAPI HTMLScreen_GetTypeInfoCount(IHTMLScreen *iface, UINT *pcti static HRESULT WINAPI HTMLScreen_GetTypeInfo(IHTMLScreen *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -110,7 +111,7 @@ static HRESULT WINAPI HTMLScreen_GetTypeInfo(IHTMLScreen *iface, UINT iTInfo, static HRESULT WINAPI HTMLScreen_GetIDsOfNames(IHTMLScreen *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } @@ -119,14 +120,14 @@ static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)\n", This); return E_NOTIMPL; } static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); TRACE("(%p)->(%p)\n", This, p); @@ -136,21 +137,21 @@ static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p) static HRESULT WINAPI HTMLScreen_put_bufferDepth(IHTMLScreen *iface, LONG v) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLScreen_get_bufferDepth(IHTMLScreen *iface, LONG *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScreen_get_width(IHTMLScreen *iface, LONG *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); TRACE("(%p)->(%p)\n", This, p); @@ -160,7 +161,7 @@ static HRESULT WINAPI HTMLScreen_get_width(IHTMLScreen *iface, LONG *p) static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); TRACE("(%p)->(%p)\n", This, p); @@ -170,41 +171,39 @@ static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p) static HRESULT WINAPI HTMLScreen_put_updateInterval(IHTMLScreen *iface, LONG v) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLScreen_get_updateInterval(IHTMLScreen *iface, LONG *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScreen_get_availHeight(IHTMLScreen *iface, LONG *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScreen_get_availWidth(IHTMLScreen *iface, LONG *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScreen_get_fontSmoothingEnabled(IHTMLScreen *iface, VARIANT_BOOL *p) { - HTMLScreen *This = HTMLSCREEN_THIS(iface); + HTMLScreen *This = impl_from_IHTMLScreen(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLSCREEN_THIS - static const IHTMLScreenVtbl HTMLSreenVtbl = { HTMLScreen_QueryInterface, HTMLScreen_AddRef, @@ -244,11 +243,11 @@ HRESULT HTMLScreen_Create(IHTMLScreen **ret) if(!screen) return E_OUTOFMEMORY; - screen->lpIHTMLScreenVtbl = &HTMLSreenVtbl; + screen->IHTMLScreen_iface.lpVtbl = &HTMLSreenVtbl; screen->ref = 1; - init_dispex(&screen->dispex, (IUnknown*)HTMLSCREEN(screen), &HTMLScreen_dispex); + init_dispex(&screen->dispex, (IUnknown*)&screen->IHTMLScreen_iface, &HTMLScreen_dispex); - *ret = HTMLSCREEN(screen); + *ret = &screen->IHTMLScreen_iface; return S_OK; }

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLIFrame.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 850e991fd0733aa8d5aeb1e4c8df11357e4dd9c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=850e991fd0733aa8d5aeb1e4c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:33 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLIFrame. --- dlls/mshtml/htmliframe.c | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index 2394ee2..c31985f 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -33,52 +33,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLFrameBase framebase; - const IHTMLIFrameElementVtbl *lpIHTMLIFrameElementVtbl; + IHTMLIFrameElement IHTMLIFrameElement_iface; } HTMLIFrame; -#define HTMLIFRAMEELEM(x) ((IHTMLIFrameElement*) &(x)->lpIHTMLIFrameElementVtbl) - -#define HTMLIFRAME_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLIFrameElement, iface) +static inline HTMLIFrame *impl_from_IHTMLIFrameElement(IHTMLIFrameElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLIFrame, IHTMLIFrameElement_iface); +} static HRESULT WINAPI HTMLIFrameElement_QueryInterface(IHTMLIFrameElement *iface, REFIID riid, void **ppv) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->framebase.element.node), riid, ppv); } static ULONG WINAPI HTMLIFrameElement_AddRef(IHTMLIFrameElement *iface) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->framebase.element.node)); } static ULONG WINAPI HTMLIFrameElement_Release(IHTMLIFrameElement *iface) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); return IHTMLDOMNode_Release(HTMLDOMNODE(&This->framebase.element.node)); } static HRESULT WINAPI HTMLIFrameElement_GetTypeInfoCount(IHTMLIFrameElement *iface, UINT *pctinfo) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->framebase.element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLIFrameElement_GetTypeInfo(IHTMLIFrameElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->framebase.element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLIFrameElement_GetIDsOfNames(IHTMLIFrameElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->framebase.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -86,55 +87,53 @@ static HRESULT WINAPI HTMLIFrameElement_Invoke(IHTMLIFrameElement *iface, DISPID REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->framebase.element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLIFrameElement_put_vspace(IHTMLIFrameElement *iface, LONG v) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLIFrameElement_get_vspace(IHTMLIFrameElement *iface, LONG *p) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLIFrameElement_put_hspace(IHTMLIFrameElement *iface, LONG v) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); FIXME("(%p)->(%d)\n", This, v); return E_NOTIMPL; } static HRESULT WINAPI HTMLIFrameElement_get_hspace(IHTMLIFrameElement *iface, LONG *p) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLIFrameElement_put_align(IHTMLIFrameElement *iface, BSTR v) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLIFrameElement_get_align(IHTMLIFrameElement *iface, BSTR *p) { - HTMLIFrame *This = HTMLIFRAME_THIS(iface); + HTMLIFrame *This = impl_from_IHTMLIFrameElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } -#undef HTMLIFRAME_THIS - static const IHTMLIFrameElementVtbl HTMLIFrameElementVtbl = { HTMLIFrameElement_QueryInterface, HTMLIFrameElement_AddRef, @@ -159,7 +158,7 @@ static HRESULT HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHTMLIFrameElement, riid)) { TRACE("(%p)->(IID_IHTMLIFrameElement %p)\n", This, ppv); - *ppv = HTMLIFRAMEELEM(This); + *ppv = &This->IHTMLIFrameElement_iface; }else { return HTMLFrameBase_QI(&This->framebase, riid, ppv); } @@ -278,7 +277,7 @@ HRESULT HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTML if(!ret) return E_OUTOFMEMORY; - ret->lpIHTMLIFrameElementVtbl = &HTMLIFrameElementVtbl; + ret->IHTMLIFrameElement_iface.lpVtbl = &HTMLIFrameElementVtbl; ret->framebase.element.node.vtbl = &HTMLIFrameImplVtbl; HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLIFrame_dispex);

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in OmNavigator.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 6c6536cbefc283545ac9bb699f1210163e7cdc97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6536cbefc283545ac9bb699… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:14 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in OmNavigator. --- dlls/mshtml/omnavigator.c | 76 ++++++++++++++++++++++----------------------- 1 files changed, 37 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c6536cbefc283545ac9b…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLImgElement.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 6f401f9811ea233b5605b80d9fa1c2dcddc5cdfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f401f9811ea233b5605b80d9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:37 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLImgElement. --- dlls/mshtml/htmlimg.c | 127 ++++++++++++++++++++++++------------------------- 1 files changed, 63 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6f401f9811ea233b5605b…

1 0

Michael Stefaniuc : urlmon: Use an iface instead of a vtbl pointer in EnumFORMATETC.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: c5935e152ee46723e4ffa443cb8b4361f2c805c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5935e152ee46723e4ffa443c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:01 2010 +0100 urlmon: Use an iface instead of a vtbl pointer in EnumFORMATETC. --- dlls/urlmon/format.c | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/urlmon/format.c b/dlls/urlmon/format.c index bf9dda0..6967c3b 100644 --- a/dlls/urlmon/format.c +++ b/dlls/urlmon/format.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); static WCHAR wszEnumFORMATETC[] = {'_','E','n','u','m','F','O','R','M','A','T','E','T','C','_',0}; typedef struct { - const IEnumFORMATETCVtbl *lpEnumFORMATETCVtbl; + IEnumFORMATETC IEnumFORMATETC_iface; FORMATETC *fetc; UINT fetc_cnt; @@ -33,13 +33,16 @@ typedef struct { LONG ref; } EnumFORMATETC; -static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it); +static inline EnumFORMATETC *impl_from_IEnumFORMATETC(IEnumFORMATETC *iface) +{ + return CONTAINING_RECORD(iface, EnumFORMATETC, IEnumFORMATETC_iface); +} -#define ENUMF_THIS(iface) DEFINE_THIS(EnumFORMATETC, EnumFORMATETC, iface) +static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it); static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID riid, void **ppv) { - EnumFORMATETC *This = ENUMF_THIS(iface); + EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); @@ -57,7 +60,7 @@ static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) { - EnumFORMATETC *This = ENUMF_THIS(iface); + EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); return ref; @@ -65,7 +68,7 @@ static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface) static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) { - EnumFORMATETC *This = ENUMF_THIS(iface); + EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -83,7 +86,7 @@ static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFetched) { - EnumFORMATETC *This = ENUMF_THIS(iface); + EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); ULONG cnt; TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); @@ -110,7 +113,7 @@ static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt, static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) { - EnumFORMATETC *This = ENUMF_THIS(iface); + EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(%d)\n", This, celt); @@ -120,7 +123,7 @@ static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt) static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) { - EnumFORMATETC *This = ENUMF_THIS(iface); + EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)\n", This); @@ -130,7 +133,7 @@ static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface) static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum) { - EnumFORMATETC *This = ENUMF_THIS(iface); + EnumFORMATETC *This = impl_from_IEnumFORMATETC(iface); TRACE("(%p)->(%p)\n", This, ppenum); @@ -157,7 +160,7 @@ static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmt URLMON_LockModule(); - ret->lpEnumFORMATETCVtbl = &EnumFORMATETCVtbl; + ret->IEnumFORMATETC_iface.lpVtbl = &EnumFORMATETCVtbl; ret->ref = 1; ret->it = it; ret->fetc_cnt = cfmtetc; @@ -165,7 +168,7 @@ static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmt ret->fetc = heap_alloc(cfmtetc*sizeof(FORMATETC)); memcpy(ret->fetc, rgfmtetc, cfmtetc*sizeof(FORMATETC)); - return (IEnumFORMATETC*)ret; + return &ret->IEnumFORMATETC_iface; } /**********************************************************

1 0

Michael Stefaniuc : urlmon: Standardize the COM usage in sec_mgr.c.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: d98e21035105a826ce243c960dd93fbf64804467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98e21035105a826ce243c960… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:34:25 2010 +0100 urlmon: Standardize the COM usage in sec_mgr.c. --- dlls/urlmon/sec_mgr.c | 54 ++++++++++++++++++++++++++++-------------------- 1 files changed, 31 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index f984aa4..6b12a9a 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -295,7 +295,7 @@ static HRESULT get_action_policy(DWORD zone, DWORD action, BYTE *policy, DWORD s * */ typedef struct { - const IInternetSecurityManagerVtbl* lpInternetSecurityManagerVtbl; + IInternetSecurityManager IInternetSecurityManager_iface; LONG ref; @@ -303,11 +303,14 @@ typedef struct { IInternetSecurityManager *custom_manager; } SecManagerImpl; -#define SECMGR_THIS(iface) DEFINE_THIS(SecManagerImpl, InternetSecurityManager, iface) +static inline SecManagerImpl *impl_from_IInternetSecurityManager(IInternetSecurityManager *iface) +{ + return CONTAINING_RECORD(iface, SecManagerImpl, IInternetSecurityManager_iface); +} static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManager* iface,REFIID riid,void** ppvObject) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); @@ -337,7 +340,7 @@ static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManager* if static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManager* iface) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%u\n", This, refCount); @@ -347,7 +350,7 @@ static ULONG WINAPI SecManagerImpl_AddRef(IInternetSecurityManager* iface) static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManager* iface) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%u\n", This, refCount); @@ -370,7 +373,7 @@ static ULONG WINAPI SecManagerImpl_Release(IInternetSecurityManager* iface) static HRESULT WINAPI SecManagerImpl_SetSecuritySite(IInternetSecurityManager *iface, IInternetSecurityMgrSite *pSite) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); TRACE("(%p)->(%p)\n", This, pSite); @@ -405,7 +408,7 @@ static HRESULT WINAPI SecManagerImpl_SetSecuritySite(IInternetSecurityManager *i static HRESULT WINAPI SecManagerImpl_GetSecuritySite(IInternetSecurityManager *iface, IInternetSecurityMgrSite **ppSite) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); TRACE("(%p)->(%p)\n", This, ppSite); @@ -423,7 +426,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%s %p %08x)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); @@ -449,7 +452,7 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); LPWSTR url, ptr, ptr2; DWORD zone, len; HRESULT hres; @@ -529,7 +532,7 @@ static HRESULT WINAPI SecManagerImpl_ProcessUrlAction(IInternetSecurityManager * BYTE *pContext, DWORD cbContext, DWORD dwFlags, DWORD dwReserved) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); DWORD zone, policy; HRESULT hres; @@ -584,7 +587,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager BYTE *pContext, DWORD cbContext, DWORD dwReserved) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%s %s %p %p %p %08x %08x )\n", iface, debugstr_w(pwszUrl), debugstr_guid(guidKey), @@ -604,7 +607,7 @@ static HRESULT WINAPI SecManagerImpl_QueryCustomPolicy(IInternetSecurityManager static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *iface, DWORD dwZone, LPCWSTR pwszPattern, DWORD dwFlags) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%08x %s %08x)\n", iface, dwZone, debugstr_w(pwszPattern),dwFlags); @@ -623,7 +626,7 @@ static HRESULT WINAPI SecManagerImpl_SetZoneMapping(IInternetSecurityManager *if static HRESULT WINAPI SecManagerImpl_GetZoneMappings(IInternetSecurityManager *iface, DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags) { - SecManagerImpl *This = SECMGR_THIS(iface); + SecManagerImpl *This = impl_from_IInternetSecurityManager(iface); HRESULT hres; TRACE("(%p)->(%08x %p %08x)\n", iface, dwZone, ppenumString,dwFlags); @@ -662,7 +665,7 @@ HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) This = heap_alloc(sizeof(*This)); /* Initialize the virtual function table. */ - This->lpInternetSecurityManagerVtbl = &VT_SecManagerImpl; + This->IInternetSecurityManager_iface.lpVtbl = &VT_SecManagerImpl; This->ref = 1; This->mgrsite = NULL; @@ -680,12 +683,17 @@ HRESULT SecManagerImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) * */ typedef struct { - const IInternetZoneManagerEx2Vtbl* lpVtbl; + IInternetZoneManagerEx2 IInternetZoneManagerEx2_iface; LONG ref; LPDWORD *zonemaps; DWORD zonemap_count; } ZoneMgrImpl; +static inline ZoneMgrImpl *impl_from_IInternetZoneManagerEx2(IInternetZoneManagerEx2 *iface) +{ + return CONTAINING_RECORD(iface, ZoneMgrImpl, IInternetZoneManagerEx2_iface); +} + /*********************************************************************** * build_zonemap_from_reg [internal] @@ -750,7 +758,7 @@ cleanup: */ static HRESULT WINAPI ZoneMgrImpl_QueryInterface(IInternetZoneManagerEx2* iface, REFIID riid, void** ppvObject) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppvObject); @@ -783,7 +791,7 @@ static HRESULT WINAPI ZoneMgrImpl_QueryInterface(IInternetZoneManagerEx2* iface, */ static ULONG WINAPI ZoneMgrImpl_AddRef(IInternetZoneManagerEx2* iface) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -796,7 +804,7 @@ static ULONG WINAPI ZoneMgrImpl_AddRef(IInternetZoneManagerEx2* iface) */ static ULONG WINAPI ZoneMgrImpl_Release(IInternetZoneManagerEx2* iface) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount + 1); @@ -818,7 +826,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAttributes(IInternetZoneManagerEx2* ifa DWORD dwZone, ZONEATTRIBUTES* pZoneAttributes) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); HRESULT hr; HKEY hcu; HKEY hklm = NULL; @@ -957,7 +965,7 @@ static HRESULT WINAPI ZoneMgrImpl_CreateZoneEnumerator(IInternetZoneManagerEx2* DWORD* pdwCount, DWORD dwFlags) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD * new_maps; LPDWORD data; DWORD i; @@ -1012,7 +1020,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManagerEx2* iface, DWORD dwIndex, DWORD* pdwZone) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD data; TRACE("(%p)->(0x%08x, %d, %p)\n", This, dwEnum, dwIndex, pdwZone); @@ -1035,7 +1043,7 @@ static HRESULT WINAPI ZoneMgrImpl_GetZoneAt(IInternetZoneManagerEx2* iface, static HRESULT WINAPI ZoneMgrImpl_DestroyZoneEnumerator(IInternetZoneManagerEx2* iface, DWORD dwEnum) { - ZoneMgrImpl* This = (ZoneMgrImpl*)iface; + ZoneMgrImpl* This = impl_from_IInternetZoneManagerEx2(iface); LPDWORD data; TRACE("(%p)->(0x%08x)\n", This, dwEnum); @@ -1202,7 +1210,7 @@ HRESULT ZoneMgrImpl_Construct(IUnknown *pUnkOuter, LPVOID *ppobj) ZoneMgrImpl* ret = heap_alloc_zero(sizeof(ZoneMgrImpl)); TRACE("(%p %p)\n", pUnkOuter, ppobj); - ret->lpVtbl = &ZoneMgrImplVtbl; + ret->IInternetZoneManagerEx2_iface.lpVtbl = &ZoneMgrImplVtbl; ret->ref = 1; *ppobj = (IInternetZoneManagerEx*)ret;

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLScriptElement.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 2c04cfdb4eec996aab93c4293baae571d993b45e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c04cfdb4eec996aab93c4293… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:50 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLScriptElement. --- dlls/mshtml/htmlscript.c | 65 ++++++++++++++++++++++----------------------- 1 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 63453ee..91e1d22 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -34,47 +34,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLScriptElementVtbl *lpHTMLScriptElementVtbl; + IHTMLScriptElement IHTMLScriptElement_iface; nsIDOMHTMLScriptElement *nsscript; } HTMLScriptElement; -#define HTMLSCRIPT(x) ((IHTMLScriptElement*) &(x)->lpHTMLScriptElementVtbl) - -#define HTMLSCRIPT_THIS(iface) DEFINE_THIS(HTMLScriptElement, HTMLScriptElement, iface) +static inline HTMLScriptElement *impl_from_IHTMLScriptElement(IHTMLScriptElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLScriptElement, IHTMLScriptElement_iface); +} static HRESULT WINAPI HTMLScriptElement_QueryInterface(IHTMLScriptElement *iface, REFIID riid, void **ppv) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); } static ULONG WINAPI HTMLScriptElement_AddRef(IHTMLScriptElement *iface) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLScriptElement_Release(IHTMLScriptElement *iface) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLScriptElement_GetTypeInfoCount(IHTMLScriptElement *iface, UINT *pctinfo) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLScriptElement_GetTypeInfo(IHTMLScriptElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } @@ -82,7 +83,7 @@ static HRESULT WINAPI HTMLScriptElement_GetIDsOfNames(IHTMLScriptElement *iface, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -90,70 +91,70 @@ static HRESULT WINAPI HTMLScriptElement_Invoke(IHTMLScriptElement *iface, DISPID REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLScriptElement_put_src(IHTMLScriptElement *iface, BSTR v) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_get_src(IHTMLScriptElement *iface, BSTR *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_put_htmlFor(IHTMLScriptElement *iface, BSTR v) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_get_htmlFor(IHTMLScriptElement *iface, BSTR *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_put_event(IHTMLScriptElement *iface, BSTR v) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_get_event(IHTMLScriptElement *iface, BSTR *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_put_text(IHTMLScriptElement *iface, BSTR v) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_get_text(IHTMLScriptElement *iface, BSTR *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_put_defer(IHTMLScriptElement *iface, VARIANT_BOOL v) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); HRESULT hr = S_OK; nsresult nsres; @@ -170,7 +171,7 @@ static HRESULT WINAPI HTMLScriptElement_put_defer(IHTMLScriptElement *iface, VAR static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VARIANT_BOOL *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); PRBool defer = FALSE; nsresult nsres; @@ -192,28 +193,28 @@ static HRESULT WINAPI HTMLScriptElement_get_defer(IHTMLScriptElement *iface, VAR static HRESULT WINAPI HTMLScriptElement_get_readyState(IHTMLScriptElement *iface, BSTR *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_put_onerror(IHTMLScriptElement *iface, VARIANT v) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(v(%d))\n", This, V_VT(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_get_onerror(IHTMLScriptElement *iface, VARIANT *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR v) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); nsAString nstype_str; nsresult nsres; @@ -230,7 +231,7 @@ static HRESULT WINAPI HTMLScriptElement_put_type(IHTMLScriptElement *iface, BSTR static HRESULT WINAPI HTMLScriptElement_get_type(IHTMLScriptElement *iface, BSTR *p) { - HTMLScriptElement *This = HTMLSCRIPT_THIS(iface); + HTMLScriptElement *This = impl_from_IHTMLScriptElement(iface); const PRUnichar *nstype; nsAString nstype_str; nsresult nsres; @@ -274,8 +275,6 @@ static const IHTMLScriptElementVtbl HTMLScriptElementVtbl = { HTMLScriptElement_get_type }; -#undef HTMLSCRIPT_THIS - #define HTMLSCRIPT_NODE_THIS(iface) DEFINE_THIS2(HTMLScriptElement, element.node, iface) static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) @@ -286,13 +285,13 @@ static HRESULT HTMLScriptElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLSCRIPT(This); + *ppv = &This->IHTMLScriptElement_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLSCRIPT(This); + *ppv = &This->IHTMLScriptElement_iface; }else if(IsEqualGUID(&IID_IHTMLScriptElement, riid)) { TRACE("(%p)->(IID_IHTMLScriptElement %p)\n", This, ppv); - *ppv = HTMLSCRIPT(This); + *ppv = &This->IHTMLScriptElement_iface; } if(*ppv) { @@ -313,7 +312,7 @@ static HRESULT HTMLScriptElement_get_readystate(HTMLDOMNode *iface, BSTR *p) { HTMLScriptElement *This = HTMLSCRIPT_NODE_THIS(iface); - return IHTMLScriptElement_get_readyState(HTMLSCRIPT(This), p); + return IHTMLScriptElement_get_readyState(&This->IHTMLScriptElement_iface, p); } #undef HTMLSCRIPT_NODE_THIS @@ -352,7 +351,7 @@ HRESULT HTMLScriptElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsele if(!ret) return E_OUTOFMEMORY; - ret->lpHTMLScriptElementVtbl = &HTMLScriptElementVtbl; + ret->IHTMLScriptElement_iface.lpVtbl = &HTMLScriptElementVtbl; ret->element.node.vtbl = &HTMLScriptElementImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLScriptElement, (void**)&ret->nsscript);

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in UndoManager.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 2bef3ad2ef06e2a452dcd62820ad5eff5c9bdb3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bef3ad2ef06e2a452dcd6282… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:21 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in UndoManager. --- dlls/mshtml/service.c | 49 ++++++++++++++++++++++++------------------------- 1 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index ef5a9d1..ab3d6d6 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -35,27 +35,28 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { - const IOleUndoManagerVtbl *lpOleUndoManagerVtbl; + IOleUndoManager IOleUndoManager_iface; LONG ref; } UndoManager; -#define UNDOMGR(x) ((IOleUndoManager*) &(x)->lpOleUndoManagerVtbl) - -#define UNDOMGR_THIS(iface) DEFINE_THIS(UndoManager, OleUndoManager, iface) +static inline UndoManager *impl_from_IOleUndoManager(IOleUndoManager *iface) +{ + return CONTAINING_RECORD(iface, UndoManager, IOleUndoManager_iface); +} static HRESULT WINAPI OleUndoManager_QueryInterface(IOleUndoManager *iface, REFIID riid, void **ppv) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); *ppv = NULL; if(IsEqualGUID(riid, &IID_IUnknown)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = UNDOMGR(This); + *ppv = &This->IOleUndoManager_iface; }else if(IsEqualGUID(riid, &IID_IOleUndoManager)) { TRACE("(%p)->(IID_IOleUndoManager %p)\n", This, ppv); - *ppv = UNDOMGR(This); + *ppv = &This->IOleUndoManager_iface; } @@ -65,7 +66,7 @@ static HRESULT WINAPI OleUndoManager_QueryInterface(IOleUndoManager *iface, REFI static ULONG WINAPI OleUndoManager_AddRef(IOleUndoManager *iface) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -75,7 +76,7 @@ static ULONG WINAPI OleUndoManager_AddRef(IOleUndoManager *iface) static ULONG WINAPI OleUndoManager_Release(IOleUndoManager *iface) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -88,7 +89,7 @@ static ULONG WINAPI OleUndoManager_Release(IOleUndoManager *iface) static HRESULT WINAPI OleUndoManager_Open(IOleUndoManager *iface, IOleParentUndoUnit *pPUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pPUU); return E_NOTIMPL; } @@ -96,42 +97,42 @@ static HRESULT WINAPI OleUndoManager_Open(IOleUndoManager *iface, IOleParentUndo static HRESULT WINAPI OleUndoManager_Close(IOleUndoManager *iface, IOleParentUndoUnit *pPUU, BOOL fCommit) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p %x)\n", This, pPUU, fCommit); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_Add(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_GetOpenParentState(IOleUndoManager *iface, DWORD *pdwState) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pdwState); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_DiscardFrom(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return S_OK; } static HRESULT WINAPI OleUndoManager_UndoTo(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_RedoTo(IOleUndoManager *iface, IOleUndoUnit *pUU) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pUU); return E_NOTIMPL; } @@ -139,7 +140,7 @@ static HRESULT WINAPI OleUndoManager_RedoTo(IOleUndoManager *iface, IOleUndoUnit static HRESULT WINAPI OleUndoManager_EnumUndoable(IOleUndoManager *iface, IEnumOleUndoUnits **ppEnum) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, ppEnum); return E_NOTIMPL; } @@ -147,34 +148,32 @@ static HRESULT WINAPI OleUndoManager_EnumUndoable(IOleUndoManager *iface, static HRESULT WINAPI OleUndoManager_EnumRedoable(IOleUndoManager *iface, IEnumOleUndoUnits **ppEnum) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, ppEnum); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_GetLastUndoDescription(IOleUndoManager *iface, BSTR *pBstr) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pBstr); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_GetLastRedoDescription(IOleUndoManager *iface, BSTR *pBstr) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%p)\n", This, pBstr); return E_NOTIMPL; } static HRESULT WINAPI OleUndoManager_Enable(IOleUndoManager *iface, BOOL fEnable) { - UndoManager *This = UNDOMGR_THIS(iface); + UndoManager *This = impl_from_IOleUndoManager(iface); FIXME("(%p)->(%x)\n", This, fEnable); return E_NOTIMPL; } -#undef UNDOMGR_THIS - static const IOleUndoManagerVtbl OleUndoManagerVtbl = { OleUndoManager_QueryInterface, OleUndoManager_AddRef, @@ -197,10 +196,10 @@ static IOleUndoManager *create_undomgr(void) { UndoManager *ret = heap_alloc(sizeof(UndoManager)); - ret->lpOleUndoManagerVtbl = &OleUndoManagerVtbl; + ret->IOleUndoManager_iface.lpVtbl = &OleUndoManagerVtbl; ret->ref = 1; - return UNDOMGR(ret); + return &ret->IOleUndoManager_iface; } /**********************************************************

1 0