winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
December 2010
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
2 participants
1099 discussions
Start a n
N
ew thread
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
0
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
0
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
0
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
0
0
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
0
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
0
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
0
0
Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in HTMLEventObj.
by Alexandre Julliard
07 Dec '10
07 Dec '10
Module: wine Branch: master Commit: 0d2f29a0105d3decd47ee97f63927e95f895e6c1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=0d2f29a0105d3decd47ee97f6…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Dec 6 23:31:16 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in HTMLEventObj. --- dlls/mshtml/htmlevent.c | 87 +++++++++++++++++++++++------------------------ 1 files changed, 43 insertions(+), 44 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d2f29a0105d3decd47ee…
1
0
0
0
Thomas Mullaly : urlmon: Implemented IUriBuilderFactory interface.
by Alexandre Julliard
07 Dec '10
07 Dec '10
Module: wine Branch: master Commit: 875f1e939c84f565fc22ef8665f9e61dc001f3c7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=875f1e939c84f565fc22ef866…
Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Mon Dec 6 17:50:37 2010 -0500 urlmon: Implemented IUriBuilderFactory interface. --- dlls/urlmon/tests/uri.c | 93 ++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 119 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 206 insertions(+), 6 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=875f1e939c84f565fc22e…
1
0
0
0
Thomas Mullaly : include: Added IUriBuilderFactory interface definition.
by Alexandre Julliard
07 Dec '10
07 Dec '10
Module: wine Branch: master Commit: 2182d7733342c204b04b53ab7d6b51a1f0ad20b5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2182d7733342c204b04b53ab7…
Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Dec 5 20:51:23 2010 -0500 include: Added IUriBuilderFactory interface definition. --- include/urlmon.idl | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index d1eee68..ec0354f 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1829,6 +1829,28 @@ interface IUriBuilder: IUnknown cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**);") /***************************************************************************** + * IUriBuilderFactory interface + */ +[ + local, + object, + uuid(e982ce48-0b96-440c-bc37-0c869b27a29e), + pointer_default(unique) +] +interface IUriBuilderFactory : IUnknown +{ + HRESULT CreateInitializedIUriBuilder( + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] IUriBuilder **ppIUriBuilder); + + HRESULT CreateIUriBuilder( + [in] DWORD dwFlags, + [in] DWORD_PTR dwReserved, + [out] IUriBuilder **ppIUriBuilder); +}; + +/***************************************************************************** * IInternetProtocolEx interface */ [
1
0
0
0
← Newer
1
...
69
70
71
72
73
74
75
...
110
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
Results per page:
10
25
50
100
200