December 2010 - Wine-commits

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

07 Dec '10

Module: wine Branch: master Commit: ca129550fe583c012f9eff091038a4dc21f7913c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca129550fe583c012f9eff091… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:24 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLFrameElement. --- dlls/mshtml/htmlframe.c | 43 +++++++++++++++++++++---------------------- 1 files changed, 21 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlframe.c b/dlls/mshtml/htmlframe.c index 708831b..e2cb0a6 100644 --- a/dlls/mshtml/htmlframe.c +++ b/dlls/mshtml/htmlframe.c @@ -33,52 +33,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLFrameBase framebase; - const IHTMLFrameElement3Vtbl *lpIHTMLFrameElement3Vtbl; + IHTMLFrameElement3 IHTMLFrameElement3_iface; } HTMLFrameElement; -#define HTMLFRAMEELEM3(x) ((IHTMLFrameElement3*) &(x)->lpIHTMLFrameElement3Vtbl) - -#define HTMLFRAME3_THIS(iface) DEFINE_THIS(HTMLFrameElement, IHTMLFrameElement3, iface) +static inline HTMLFrameElement *impl_from_IHTMLFrameElement3(IHTMLFrameElement3 *iface) +{ + return CONTAINING_RECORD(iface, HTMLFrameElement, IHTMLFrameElement3_iface); +} static HRESULT WINAPI HTMLFrameElement3_QueryInterface(IHTMLFrameElement3 *iface, 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); } 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)); } 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)); } 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); } static HRESULT WINAPI HTMLFrameElement3_GetTypeInfo(IHTMLFrameElement3 *iface, UINT iTInfo, 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); } static HRESULT WINAPI HTMLFrameElement3_GetIDsOfNames(IHTMLFrameElement3 *iface, REFIID riid, 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); } @@ -86,14 +87,14 @@ static HRESULT WINAPI HTMLFrameElement3_Invoke(IHTMLFrameElement3 *iface, DISPID REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, 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, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLFrameElement3_get_contentDocument(IHTMLFrameElement3 *iface, IDispatch **p) { - HTMLFrameElement *This = HTMLFRAME3_THIS(iface); + HTMLFrameElement *This = impl_from_IHTMLFrameElement3(iface); IHTMLDocument2 *doc; HRESULT hres; @@ -114,48 +115,46 @@ static HRESULT WINAPI HTMLFrameElement3_get_contentDocument(IHTMLFrameElement3 * 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)); return E_NOTIMPL; } 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); return E_NOTIMPL; } 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)); return E_NOTIMPL; } 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); return E_NOTIMPL; } 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)); return E_NOTIMPL; } 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); return E_NOTIMPL; } -#undef HTMLFRAME3_THIS - static const IHTMLFrameElement3Vtbl HTMLFrameElement3Vtbl = { HTMLFrameElement3_QueryInterface, HTMLFrameElement3_AddRef, @@ -181,7 +180,7 @@ static HRESULT HTMLFrameElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IHTMLFrameElement3, riid)) { TRACE("(%p)->(IID_IHTMLFrameElement3 %p)\n", This, ppv); - *ppv = HTMLFRAMEELEM3(This); + *ppv = &This->IHTMLFrameElement3_iface; }else { return HTMLFrameBase_QI(&This->framebase, riid, ppv); } @@ -301,7 +300,7 @@ HRESULT HTMLFrameElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem return E_OUTOFMEMORY; ret->framebase.element.node.vtbl = &HTMLFrameElementImplVtbl; - ret->lpIHTMLFrameElement3Vtbl = &HTMLFrameElement3Vtbl; + ret->IHTMLFrameElement3_iface.lpVtbl = &HTMLFrameElement3Vtbl; HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLFrameElement_dispex);

1 0

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

07 Dec '10

Module: wine Branch: master Commit: 00324ea8bec139963c8260014c164b439faa0f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00324ea8bec139963c8260014… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:02 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLTableRow. --- dlls/mshtml/htmltablerow.c | 69 +++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/dlls/mshtml/htmltablerow.c b/dlls/mshtml/htmltablerow.c index 91f4e6b..f2b6269 100644 --- a/dlls/mshtml/htmltablerow.c +++ b/dlls/mshtml/htmltablerow.c @@ -34,47 +34,48 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLTableRowVtbl *lpHTMLTableRowVtbl; + IHTMLTableRow IHTMLTableRow_iface; nsIDOMHTMLTableRowElement *nsrow; } HTMLTableRow; -#define HTMLTABLEROW(x) (&(x)->lpHTMLTableRowVtbl) - -#define HTMLTABLEROW_THIS(iface) DEFINE_THIS(HTMLTableRow, HTMLTableRow, iface) +static inline HTMLTableRow *impl_from_IHTMLTableRow(IHTMLTableRow *iface) +{ + return CONTAINING_RECORD(iface, HTMLTableRow, IHTMLTableRow_iface); +} static HRESULT WINAPI HTMLTableRow_QueryInterface(IHTMLTableRow *iface, REFIID riid, void **ppv) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); } static ULONG WINAPI HTMLTableRow_AddRef(IHTMLTableRow *iface) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLTableRow_Release(IHTMLTableRow *iface) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLTableRow_GetTypeInfoCount(IHTMLTableRow *iface, UINT *pctinfo) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLTableRow_GetTypeInfo(IHTMLTableRow *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } @@ -82,7 +83,7 @@ static HRESULT WINAPI HTMLTableRow_GetIDsOfNames(IHTMLTableRow *iface, REFIID ri LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -90,112 +91,112 @@ static HRESULT WINAPI HTMLTableRow_Invoke(IHTMLTableRow *iface, DISPID dispIdMem REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLTableRow_put_align(IHTMLTableRow *iface, BSTR v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_align(IHTMLTableRow *iface, BSTR *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_vAlign(IHTMLTableRow *iface, BSTR v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_vAlign(IHTMLTableRow *iface, BSTR *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_bgColor(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_bgColor(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_borderColor(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_borderColor(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_borderColorLight(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_borderColorLight(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_put_borderColorDark(IHTMLTableRow *iface, VARIANT v) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_borderColorDark(IHTMLTableRow *iface, VARIANT *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_rowIndex(IHTMLTableRow *iface, LONG *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_selectionRowIndex(IHTMLTableRow *iface, LONG *p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementCollection **p) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); nsIDOMHTMLCollection *nscol; nsresult nsres; @@ -207,7 +208,7 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC return E_FAIL; } - *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)HTMLTABLEROW(This), nscol); + *p = create_collection_from_htmlcol(This->element.node.doc, (IUnknown*)&This->IHTMLTableRow_iface, nscol); nsIDOMHTMLCollection_Release(nscol); return S_OK; @@ -215,20 +216,18 @@ static HRESULT WINAPI HTMLTableRow_get_cells(IHTMLTableRow *iface, IHTMLElementC static HRESULT WINAPI HTMLTableRow_insertCell(IHTMLTableRow *iface, LONG index, IDispatch **row) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%d %p)\n", This, index, row); return E_NOTIMPL; } static HRESULT WINAPI HTMLTableRow_deleteCell(IHTMLTableRow *iface, LONG index) { - HTMLTableRow *This = HTMLTABLEROW_THIS(iface); + HTMLTableRow *This = impl_from_IHTMLTableRow(iface); FIXME("(%p)->(%d)\n", This, index); return E_NOTIMPL; } -#undef HTMLTABLEROW_THIS - static const IHTMLTableRowVtbl HTMLTableRowVtbl = { HTMLTableRow_QueryInterface, HTMLTableRow_AddRef, @@ -266,13 +265,13 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) if(IsEqualGUID(&IID_IUnknown, riid)) { TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); - *ppv = HTMLTABLEROW(This); + *ppv = &This->IHTMLTableRow_iface; }else if(IsEqualGUID(&IID_IDispatch, riid)) { TRACE("(%p)->(IID_IDispatch %p)\n", This, ppv); - *ppv = HTMLTABLEROW(This); + *ppv = &This->IHTMLTableRow_iface; }else if(IsEqualGUID(&IID_IHTMLTableRow, riid)) { TRACE("(%p)->(IID_IHTMLTableRow %p)\n", This, ppv); - *ppv = HTMLTABLEROW(This); + *ppv = &This->IHTMLTableRow_iface; } if(*ppv) { @@ -323,7 +322,7 @@ HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HT if(!ret) return E_OUTOFMEMORY; - ret->lpHTMLTableRowVtbl = &HTMLTableRowVtbl; + ret->IHTMLTableRow_iface.lpVtbl = &HTMLTableRowVtbl; ret->element.node.vtbl = &HTMLTableRowImplVtbl; nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow);

1 0

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

07 Dec '10

Module: wine Branch: master Commit: 6d158cf1d5440533981de317952c29a181a88ef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d158cf1d5440533981de3179… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:55 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLSelectElement. --- dlls/mshtml/htmlselect.c | 87 ++++++++++++++++++++++----------------------- 1 files changed, 43 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d158cf1d5440533981de…

1 0

Michael Stefaniuc : mshtml: Change the first vtbl in HTMLInputElement to an iface.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: bc4fed3a61cfcab45d8c34e90769482a63db702c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc4fed3a61cfcab45d8c34e90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:25 2010 +0100 mshtml: Change the first vtbl in HTMLInputElement to an iface. --- dlls/mshtml/htmlinput.c | 213 +++++++++++++++++++++++------------------------ 1 files changed, 105 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bc4fed3a61cfcab45d8c3…

1 0

Michael Stefaniuc : mshtml: Change the second vtbl in HTMLInputElement to an iface.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 407a02d7eba249c7b108df3ba4637215436ea5d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407a02d7eba249c7b108df3ba… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:30 2010 +0100 mshtml: Change the second vtbl in HTMLInputElement to an iface. --- dlls/mshtml/htmlinput.c | 76 ++++++++++++++++++++++++----------------------- 1 files changed, 39 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=407a02d7eba249c7b108d…

1 0

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

07 Dec '10

Module: wine Branch: master Commit: 5a506d707ade983cb1c0b974ed6d70a91021032c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a506d707ade983cb1c0b974e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:29 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLGenericElement. --- dlls/mshtml/htmlgeneric.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/htmlgeneric.c b/dlls/mshtml/htmlgeneric.c index 119f366..2bdb3cf 100644 --- a/dlls/mshtml/htmlgeneric.c +++ b/dlls/mshtml/htmlgeneric.c @@ -35,51 +35,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLElement element; - const IHTMLGenericElementVtbl *lpHTMLGenericElementVtbl; + IHTMLGenericElement IHTMLGenericElement_iface; } HTMLGenericElement; -#define HTMLGENERIC(x) (&(x)->lpHTMLGenericElementVtbl) - -#define HTMLGENERIC_THIS(iface) DEFINE_THIS(HTMLGenericElement, HTMLGenericElement, iface) +static inline HTMLGenericElement *impl_from_IHTMLGenericElement(IHTMLGenericElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLGenericElement, IHTMLGenericElement_iface); +} static HRESULT WINAPI HTMLGenericElement_QueryInterface(IHTMLGenericElement *iface, REFIID riid, void **ppv) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->element.node), riid, ppv); } static ULONG WINAPI HTMLGenericElement_AddRef(IHTMLGenericElement *iface) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->element.node)); } static ULONG WINAPI HTMLGenericElement_Release(IHTMLGenericElement *iface) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IHTMLDOMNode_Release(HTMLDOMNODE(&This->element.node)); } static HRESULT WINAPI HTMLGenericElement_GetTypeInfoCount(IHTMLGenericElement *iface, UINT *pctinfo) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->element.node.dispex), pctinfo); } static HRESULT WINAPI HTMLGenericElement_GetTypeInfo(IHTMLGenericElement *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->element.node.dispex), iTInfo, lcid, ppTInfo); } static HRESULT WINAPI HTMLGenericElement_GetIDsOfNames(IHTMLGenericElement *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); } @@ -87,14 +88,14 @@ static HRESULT WINAPI HTMLGenericElement_Invoke(IHTMLGenericElement *iface, DISP REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); return IDispatchEx_Invoke(DISPATCHEX(&This->element.node.dispex), dispIdMember, riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); } static HRESULT WINAPI HTMLGenericElement_get_recordset(IHTMLGenericElement *iface, IDispatch **p) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); FIXME("(%p)->(%p)\n", This, p); return E_NOTIMPL; } @@ -102,7 +103,7 @@ static HRESULT WINAPI HTMLGenericElement_get_recordset(IHTMLGenericElement *ifac static HRESULT WINAPI HTMLGenericElement_namedRecordset(IHTMLGenericElement *iface, BSTR dataMember, VARIANT *hierarchy, IDispatch **ppRecordset) { - HTMLGenericElement *This = HTMLGENERIC_THIS(iface); + HTMLGenericElement *This = impl_from_IHTMLGenericElement(iface); FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(dataMember), hierarchy, ppRecordset); return E_NOTIMPL; } @@ -129,7 +130,7 @@ static HRESULT HTMLGenericElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv if(IsEqualGUID(&IID_IHTMLGenericElement, riid)) { TRACE("(%p)->(IID_IHTMLGenericElement %p)\n", This, ppv); - *ppv = HTMLGENERIC(This); + *ppv = &This->IHTMLGenericElement_iface; }else { return HTMLElement_QI(&This->element.node, riid, ppv); } @@ -174,7 +175,7 @@ HRESULT HTMLGenericElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nsel if(!ret) return E_OUTOFMEMORY; - ret->lpHTMLGenericElementVtbl = &HTMLGenericElementVtbl; + ret->IHTMLGenericElement_iface.lpVtbl = &HTMLGenericElementVtbl; ret->element.node.vtbl = &HTMLGenericElementImplVtbl; HTMLElement_Init(&ret->element, doc, nselem, &HTMLGenericElement_dispex);

1 0

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

07 Dec '10

Module: wine Branch: master Commit: 8d78c7210f236da45f5b876b7b1c7a6a9bdd4267 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d78c7210f236da45f5b876b7… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:32:05 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLTextAreaElement. --- dlls/mshtml/htmltextarea.c | 89 ++++++++++++++++++++++---------------------- 1 files changed, 44 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d78c7210f236da45f5b8…

1 0

Henri Verbeet : d3d9/tests: Don't draw undefined data in stream_test().
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: ac2afd08aee6e744b7b9ec59aabadae1e71dfbef URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac2afd08aee6e744b7b9ec59a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:01 2010 +0100 d3d9/tests: Don't draw undefined data in stream_test(). --- dlls/d3d9/tests/visual.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d2c5df5..db67be3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9306,8 +9306,7 @@ static void stream_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetStreamSource(device, act.strInstance, vb3, 0, sizeof(instancepos[0])); ok(hr == D3D_OK, "IDirect3DIndexBuffer9_Unlock failed with %08x (case %i)\n", hr, i); - /* don't know if this is right (1*3 and 4*1)*/ - hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 1 * 3 , 0, 4*1); + hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLELIST, 0, 0, 4, 0, 2); ok(hr == D3D_OK, "IDirect3DDevice9_DrawIndexedPrimitive failed with %08x (case %i)\n", hr, i); hr = IDirect3DDevice9_EndScene(device); ok(hr == D3D_OK, "IDirect3DDevice9_EndScene failed with %08x (case %i)\n", hr, i);

1 0

Henri Verbeet : wined3d: Rename shader_reg_maps to wined3d_shader_reg_maps.
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: db164a990cb555a919b75a57c60ded034f8ffea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db164a990cb555a919b75a57c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:02 2010 +0100 wined3d: Rename shader_reg_maps to wined3d_shader_reg_maps. For consistency with other shader translation structures. --- dlls/wined3d/arb_program_shader.c | 27 ++++++++++++++------------- dlls/wined3d/glsl_shader.c | 19 +++++++++++-------- dlls/wined3d/shader.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 15 ++++++++------- 4 files changed, 40 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db164a990cb555a919b75…

1 0

Henri Verbeet : wined3d: Explicitly pass gl_info to shader_arb_generate_vshader().
by Alexandre Julliard 07 Dec '10

07 Dec '10

Module: wine Branch: master Commit: 202a60c489fff8c7b61081813ee4b64374de90a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202a60c489fff8c7b61081813… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Dec 6 20:33:03 2010 +0100 wined3d: Explicitly pass gl_info to shader_arb_generate_vshader(). --- dlls/wined3d/arb_program_shader.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bc710e5..3a8f758 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4067,14 +4067,13 @@ static void init_output_registers(IWineD3DVertexShaderImpl *shader, DWORD sig_nu } /* GL locking is done by the caller */ -static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct wined3d_shader_buffer *buffer, +static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, + const struct wined3d_gl_info *gl_info, struct wined3d_shader_buffer *buffer, const struct arb_vs_compile_args *args, struct arb_vs_compiled_shader *compiled) { const struct arb_vshader_private *shader_data = This->baseShader.backend_data; const struct wined3d_shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; - IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const local_constant *lconst; GLuint ret; DWORD next_local, *lconst_map = local_const_mapping((IWineD3DBaseShaderImpl *) This); @@ -4163,6 +4162,7 @@ static GLuint shader_arb_generate_vshader(IWineD3DVertexShaderImpl *This, struct */ if (!gl_info->supported[NV_VERTEX_PROGRAM]) { + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)This->baseShader.device; const char *color_init = arb_get_helper_value(WINED3D_SHADER_TYPE_VERTEX, ARB_0001); shader_addline(buffer, "MOV result.color.secondary, %s;\n", color_init); @@ -4401,7 +4401,7 @@ static struct arb_vs_compiled_shader *find_arb_vshader(IWineD3DVertexShaderImpl return 0; } - ret = shader_arb_generate_vshader(shader, &buffer, args, + ret = shader_arb_generate_vshader(shader, gl_info, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); shader_data->gl_shaders[shader_data->num_gl_shaders].prgId = ret;

1 0