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 : xmllite/tests: Use an iface instead of a vtbl pointer in testinput.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: a36f51f35718239a2f6ab4bc5d81e1573ef0b14b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a36f51f35718239a2f6ab4bc5…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:57 2010 +0100 xmllite/tests: Use an iface instead of a vtbl pointer in testinput. --- dlls/xmllite/tests/reader.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 316f8f7..bd6ac1a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -19,6 +19,7 @@ */ #define COBJMACROS +#define CONST_VTABLE #include <stdarg.h> #include <stdio.h> @@ -258,13 +259,13 @@ static void test_read_state_(IXmlReader *reader, XmlReadState expected, typedef struct _testinput { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; LONG ref; } testinput; static inline testinput *impl_from_IUnknown(IUnknown *iface) { - return (testinput *)((char*)iface - FIELD_OFFSET(testinput, lpVtbl)); + return CONTAINING_RECORD(iface, testinput, IUnknown_iface); } static HRESULT WINAPI testinput_QueryInterface(IUnknown *iface, REFIID riid, void** ppvObj) @@ -317,10 +318,10 @@ static HRESULT testinput_createinstance(void **ppObj) input = HeapAlloc(GetProcessHeap(), 0, sizeof (*input)); if(!input) return E_OUTOFMEMORY; - input->lpVtbl = &testinput_vtbl; + input->IUnknown_iface.lpVtbl = &testinput_vtbl; input->ref = 1; - *ppObj = &input->lpVtbl; + *ppObj = &input->IUnknown_iface; return S_OK; } @@ -372,13 +373,14 @@ static void test_reader_create(void) hr = testinput_createinstance((void**)&input); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - input_iids.count = 0; - hr = IXmlReader_SetInput(reader, input); - ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); - ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE); - - IUnknown_Release(input); - + if (hr == S_OK) + { + input_iids.count = 0; + hr = IXmlReader_SetInput(reader, input); + ok(hr == E_NOINTERFACE, "Expected E_NOINTERFACE, got %08x\n", hr); + ok_iids(&input_iids, setinput_full, setinput_full_old, FALSE); + IUnknown_Release(input); + } IXmlReader_Release(reader); }
1
0
0
0
Michael Stefaniuc : explorerframe/tests: COM cleanup for INameSpaceTreeControlEventsImpl.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: d15f5722cbca155b02dd35834d9343b3055cb87b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=d15f5722cbca155b02dd35834…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:01 2010 +0100 explorerframe/tests: COM cleanup for INameSpaceTreeControlEventsImpl. --- dlls/explorerframe/tests/nstc.c | 103 +++++++++++++++++++++++++++----------- 1 files changed, 73 insertions(+), 30 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=d15f5722cbca155b02dd3…
1
0
0
0
Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in parse_error_t.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: e53582fdc11226b74c96c796ee1b18ebf9f9ff34 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e53582fdc11226b74c96c796e…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:52:22 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in parse_error_t. --- dlls/msxml3/parseerror.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index d5e4cde..2869907 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct { - const struct IXMLDOMParseErrorVtbl *lpVtbl; + IXMLDOMParseError IXMLDOMParseError_iface; LONG ref; LONG code, line, linepos, filepos; BSTR url, reason, srcText; @@ -47,7 +47,7 @@ typedef struct static inline parse_error_t *impl_from_IXMLDOMParseError( IXMLDOMParseError *iface ) { - return (parse_error_t *)((char*)iface - FIELD_OFFSET(parse_error_t, lpVtbl)); + return CONTAINING_RECORD(iface, parse_error_t, IXMLDOMParseError_iface); } static HRESULT WINAPI parseError_QueryInterface( @@ -180,8 +180,8 @@ static HRESULT WINAPI parseError_Invoke( hr = get_typeinfo(IXMLDOMParseError_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLDOMParseError_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -291,7 +291,7 @@ IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR src if ( !This ) return NULL; - This->lpVtbl = &parseError_vtbl; + This->IXMLDOMParseError_iface.lpVtbl = &parseError_vtbl; This->ref = 1; This->code = code; @@ -302,5 +302,5 @@ IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR src This->linepos = linepos; This->filepos = filepos; - return (IXMLDOMParseError*) &This->lpVtbl; + return &This->IXMLDOMParseError_iface; }
1
0
0
0
Michael Stefaniuc : wbemprox: Use an iface instead of a vtbl pointer in wbemprox_cf.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: 17b4de2bba7ed2cb2ffa9ea6a3da9b1b2d696c27 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=17b4de2bba7ed2cb2ffa9ea6a…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:40 2010 +0100 wbemprox: Use an iface instead of a vtbl pointer in wbemprox_cf. --- dlls/wbemprox/main.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/main.c b/dlls/wbemprox/main.c index 5f32bd2..c6bb240 100644 --- a/dlls/wbemprox/main.c +++ b/dlls/wbemprox/main.c @@ -40,13 +40,13 @@ typedef HRESULT (*fnCreateInstance)( IUnknown *pUnkOuter, LPVOID *ppObj ); typedef struct { - const struct IClassFactoryVtbl *vtbl; + IClassFactory IClassFactory_iface; fnCreateInstance pfnCreateInstance; } wbemprox_cf; static inline wbemprox_cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (wbemprox_cf *)((char *)iface - FIELD_OFFSET( wbemprox_cf, vtbl )); + return CONTAINING_RECORD(iface, wbemprox_cf, IClassFactory_iface); } static HRESULT WINAPI wbemprox_cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -113,7 +113,7 @@ static const struct IClassFactoryVtbl wbemprox_cf_vtbl = wbemprox_cf_LockServer }; -static wbemprox_cf wbem_locator_cf = { &wbemprox_cf_vtbl, WbemLocator_create }; +static wbemprox_cf wbem_locator_cf = { { &wbemprox_cf_vtbl }, WbemLocator_create }; BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -141,7 +141,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) if (IsEqualGUID( rclsid, &CLSID_WbemLocator )) { - cf = (IClassFactory *)&wbem_locator_cf.vtbl; + cf = &wbem_locator_cf.IClassFactory_iface; } if (!cf) return CLASS_E_CLASSNOTAVAILABLE; return IClassFactory_QueryInterface( cf, iid, ppv );
1
0
0
0
Michael Stefaniuc : inetcomm: Use an iface instead of a vtbl pointer in cf.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: 65ff66a111e57c3fc1101ac2ef4e8b5ba242b3d1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=65ff66a111e57c3fc1101ac2e…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:53:15 2010 +0100 inetcomm: Use an iface instead of a vtbl pointer in cf. --- dlls/inetcomm/inetcomm_main.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/inetcomm/inetcomm_main.c b/dlls/inetcomm/inetcomm_main.c index 885b79d..1e45c22 100644 --- a/dlls/inetcomm/inetcomm_main.c +++ b/dlls/inetcomm/inetcomm_main.c @@ -72,13 +72,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) */ typedef struct { - const struct IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; HRESULT (*create_object)(IUnknown *, void **); } cf; static inline cf *impl_from_IClassFactory( IClassFactory *iface ) { - return (cf *)((char*)iface - FIELD_OFFSET(cf, lpVtbl)); + return CONTAINING_RECORD(iface, cf, IClassFactory_iface); } static HRESULT WINAPI cf_QueryInterface( IClassFactory *iface, REFIID riid, LPVOID *ppobj ) @@ -141,11 +141,11 @@ static const struct IClassFactoryVtbl cf_vtbl = cf_LockServer }; -static cf mime_body_cf = { &cf_vtbl, MimeBody_create }; -static cf mime_allocator_cf = { &cf_vtbl, MimeAllocator_create }; -static cf mime_message_cf = { &cf_vtbl, MimeMessage_create }; -static cf mime_security_cf = { &cf_vtbl, MimeSecurity_create }; -static cf virtual_stream_cf = { &cf_vtbl, VirtualStream_create }; +static cf mime_body_cf = { { &cf_vtbl }, MimeBody_create }; +static cf mime_allocator_cf = { { &cf_vtbl }, MimeAllocator_create }; +static cf mime_message_cf = { { &cf_vtbl }, MimeMessage_create }; +static cf mime_security_cf = { { &cf_vtbl }, MimeSecurity_create }; +static cf virtual_stream_cf = { { &cf_vtbl }, VirtualStream_create }; /*********************************************************************** * DllGetClassObject (INETCOMM.@) @@ -170,23 +170,23 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) if ( IsEqualCLSID( rclsid, &CLSID_IMimeSecurity )) { - cf = (IClassFactory*) &mime_security_cf.lpVtbl; + cf = &mime_security_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IMimeMessage )) { - cf = (IClassFactory*) &mime_message_cf.lpVtbl; + cf = &mime_message_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IMimeBody )) { - cf = (IClassFactory*) &mime_body_cf.lpVtbl; + cf = &mime_body_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IMimeAllocator )) { - cf = (IClassFactory*) &mime_allocator_cf.lpVtbl; + cf = &mime_allocator_cf.IClassFactory_iface; } else if( IsEqualCLSID( rclsid, &CLSID_IVirtualStream )) { - cf = (IClassFactory*) &virtual_stream_cf.lpVtbl; + cf = &virtual_stream_cf.IClassFactory_iface; } if ( !cf )
1
0
0
0
Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in nsProtocolHandler.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: 33883536799230b0e6d18cbd859f40fbdd6a59ae URL:
http://source.winehq.org/git/wine.git/?a=commit;h=33883536799230b0e6d18cbd8…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:52:32 2010 +0100 mshtml: Use an iface instead of a vtbl pointer in nsProtocolHandler. --- dlls/mshtml/nsio.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 3d0be0f..48ddb10 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2464,30 +2464,31 @@ HRESULT create_doc_uri(HTMLWindow *window, WCHAR *url, nsWineURI **ret) } typedef struct { - const nsIProtocolHandlerVtbl *lpProtocolHandlerVtbl; + nsIProtocolHandler nsIProtocolHandler_iface; LONG ref; nsIProtocolHandler *nshandler; } nsProtocolHandler; -#define NSPROTHANDLER(x) ((nsIProtocolHandler*) &(x)->lpProtocolHandlerVtbl) - -#define NSPROTHANDLER_THIS(iface) DEFINE_THIS(nsProtocolHandler, ProtocolHandler, iface) +static inline nsProtocolHandler *impl_from_nsIProtocolHandler(nsIProtocolHandler *iface) +{ + return CONTAINING_RECORD(iface, nsProtocolHandler, nsIProtocolHandler_iface); +} static nsresult NSAPI nsProtocolHandler_QueryInterface(nsIProtocolHandler *iface, nsIIDRef riid, void **result) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); *result = NULL; if(IsEqualGUID(&IID_nsISupports, riid)) { TRACE("(%p)->(IID_nsISupports %p)\n", This, result); - *result = NSPROTHANDLER(This); + *result = &This->nsIProtocolHandler_iface; }else if(IsEqualGUID(&IID_nsIProtocolHandler, riid)) { TRACE("(%p)->(IID_nsIProtocolHandler %p)\n", This, result); - *result = NSPROTHANDLER(This); + *result = &This->nsIProtocolHandler_iface; }else if(IsEqualGUID(&IID_nsIExternalProtocolHandler, riid)) { TRACE("(%p)->(IID_nsIExternalProtocolHandler %p), returning NULL\n", This, result); return NS_NOINTERFACE; @@ -2504,7 +2505,7 @@ static nsresult NSAPI nsProtocolHandler_QueryInterface(nsIProtocolHandler *iface static nsrefcnt NSAPI nsProtocolHandler_AddRef(nsIProtocolHandler *iface) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2514,7 +2515,7 @@ static nsrefcnt NSAPI nsProtocolHandler_AddRef(nsIProtocolHandler *iface) static nsrefcnt NSAPI nsProtocolHandler_Release(nsIProtocolHandler *iface) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -2530,7 +2531,7 @@ static nsrefcnt NSAPI nsProtocolHandler_Release(nsIProtocolHandler *iface) static nsresult NSAPI nsProtocolHandler_GetScheme(nsIProtocolHandler *iface, nsACString *aScheme) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p)\n", This, aScheme); @@ -2542,7 +2543,7 @@ static nsresult NSAPI nsProtocolHandler_GetScheme(nsIProtocolHandler *iface, nsA static nsresult NSAPI nsProtocolHandler_GetDefaultPort(nsIProtocolHandler *iface, PRInt32 *aDefaultPort) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p)\n", This, aDefaultPort); @@ -2554,7 +2555,7 @@ static nsresult NSAPI nsProtocolHandler_GetDefaultPort(nsIProtocolHandler *iface static nsresult NSAPI nsProtocolHandler_GetProtocolFlags(nsIProtocolHandler *iface, PRUint32 *aProtocolFlags) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p)\n", This, aProtocolFlags); @@ -2566,7 +2567,7 @@ static nsresult NSAPI nsProtocolHandler_GetProtocolFlags(nsIProtocolHandler *ifa static nsresult NSAPI nsProtocolHandler_NewURI(nsIProtocolHandler *iface, const nsACString *aSpec, const char *aOriginCharset, nsIURI *aBaseURI, nsIURI **_retval) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("((%p)->%s %s %p %p)\n", This, debugstr_nsacstr(aSpec), debugstr_a(aOriginCharset), aBaseURI, _retval); @@ -2579,7 +2580,7 @@ static nsresult NSAPI nsProtocolHandler_NewURI(nsIProtocolHandler *iface, static nsresult NSAPI nsProtocolHandler_NewChannel(nsIProtocolHandler *iface, nsIURI *aURI, nsIChannel **_retval) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%p %p)\n", This, aURI, _retval); @@ -2591,7 +2592,7 @@ static nsresult NSAPI nsProtocolHandler_NewChannel(nsIProtocolHandler *iface, static nsresult NSAPI nsProtocolHandler_AllowPort(nsIProtocolHandler *iface, PRInt32 port, const char *scheme, PRBool *_retval) { - nsProtocolHandler *This = NSPROTHANDLER_THIS(iface); + nsProtocolHandler *This = impl_from_nsIProtocolHandler(iface); TRACE("(%p)->(%d %s %p)\n", This, port, debugstr_a(scheme), _retval); @@ -2600,8 +2601,6 @@ static nsresult NSAPI nsProtocolHandler_AllowPort(nsIProtocolHandler *iface, return NS_ERROR_NOT_IMPLEMENTED; } -#undef NSPROTHANDLER_THIS - static const nsIProtocolHandlerVtbl nsProtocolHandlerVtbl = { nsProtocolHandler_QueryInterface, nsProtocolHandler_AddRef, @@ -2618,11 +2617,11 @@ static nsIProtocolHandler *create_protocol_handler(nsIProtocolHandler *nshandler { nsProtocolHandler *ret = heap_alloc(sizeof(nsProtocolHandler)); - ret->lpProtocolHandlerVtbl = &nsProtocolHandlerVtbl; + ret->nsIProtocolHandler_iface.lpVtbl = &nsProtocolHandlerVtbl; ret->ref = 1; ret->nshandler = nshandler; - return NSPROTHANDLER(ret); + return &ret->nsIProtocolHandler_iface; } static nsresult NSAPI nsIOService_QueryInterface(nsIIOService*,nsIIDRef,void**);
1
0
0
0
Michael Stefaniuc : mshtml: COM cleanup for the IHTMLTxtRange iface.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: 4b37d5c72b2cec22bc6ed4f45440dde34d1327c3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4b37d5c72b2cec22bc6ed4f45…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:52:48 2010 +0100 mshtml: COM cleanup for the IHTMLTxtRange iface. --- dlls/mshtml/txtrange.c | 121 +++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 62 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b37d5c72b2cec22bc6ed…
1
0
0
0
Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in httprequest.
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: 2a2bc6a98d6d5c5faaa2a55e1405f8ca9123bd0b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2a2bc6a98d6d5c5faaa2a55e1…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:52:14 2010 +0100 msxml3: Use an iface instead of a vtbl pointer in httprequest. --- dlls/msxml3/httprequest.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 9e8cf69..23bc227 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -60,7 +60,7 @@ struct reqheader typedef struct { - const struct IXMLHTTPRequestVtbl *lpVtbl; + IXMLHTTPRequest IXMLHTTPRequest_iface; LONG ref; READYSTATE state; @@ -85,7 +85,7 @@ typedef struct static inline httprequest *impl_from_IXMLHTTPRequest( IXMLHTTPRequest *iface ) { - return (httprequest *)((char*)iface - FIELD_OFFSET(httprequest, lpVtbl)); + return CONTAINING_RECORD(iface, httprequest, IXMLHTTPRequest_iface); } static void httprequest_setreadystate(httprequest *This, READYSTATE state) @@ -617,8 +617,8 @@ static HRESULT WINAPI httprequest_Invoke(IXMLHTTPRequest *iface, DISPID dispIdMe hr = get_typeinfo(IXMLHTTPRequest_tid, &typeinfo); if(SUCCEEDED(hr)) { - hr = ITypeInfo_Invoke(typeinfo, &(This->lpVtbl), dispIdMember, wFlags, pDispParams, - pVarResult, pExcepInfo, puArgErr); + hr = ITypeInfo_Invoke(typeinfo, &This->IXMLHTTPRequest_iface, dispIdMember, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); ITypeInfo_Release(typeinfo); } @@ -1001,7 +1001,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) if( !req ) return E_OUTOFMEMORY; - req->lpVtbl = &dimimpl_vtbl; + req->IXMLHTTPRequest_iface.lpVtbl = &dimimpl_vtbl; req->ref = 1; req->async = FALSE; @@ -1016,7 +1016,7 @@ HRESULT XMLHTTPRequest_create(IUnknown *pUnkOuter, void **ppObj) req->reqheader_size = 0; list_init(&req->reqheaders); - *ppObj = &req->lpVtbl; + *ppObj = &req->IXMLHTTPRequest_iface; TRACE("returning iface %p\n", *ppObj);
1
0
0
0
Michael Stefaniuc : oledb32: Use ifaces instead of vtbl pointers in convert .
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: 7af2899aeb6b4f8b4bdd8317a73cda6a69f9318e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=7af2899aeb6b4f8b4bdd8317a…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:49:43 2010 +0100 oledb32: Use ifaces instead of vtbl pointers in convert. --- dlls/oledb32/convert.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index c98d0b2..203061b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -38,8 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oledb); typedef struct { - const struct IDataConvertVtbl *lpVtbl; - const struct IDCInfoVtbl *lpDCInfoVtbl; + IDataConvert IDataConvert_iface; + IDCInfo IDCInfo_iface; LONG ref; @@ -48,12 +48,12 @@ typedef struct static inline convert *impl_from_IDataConvert(IDataConvert *iface) { - return (convert *)((char*)iface - FIELD_OFFSET(convert, lpVtbl)); + return CONTAINING_RECORD(iface, convert, IDataConvert_iface); } static inline convert *impl_from_IDCInfo(IDCInfo *iface) { - return (convert *)((char*)iface - FIELD_OFFSET(convert, lpDCInfoVtbl)); + return CONTAINING_RECORD(iface, convert, IDCInfo_iface); } static HRESULT WINAPI convert_QueryInterface(IDataConvert* iface, @@ -72,7 +72,7 @@ static HRESULT WINAPI convert_QueryInterface(IDataConvert* iface, } else if(IsEqualIID(riid, &IID_IDCInfo)) { - *obj = &This->lpDCInfoVtbl; + *obj = &This->IDCInfo_iface; } else { @@ -985,21 +985,21 @@ static HRESULT WINAPI dcinfo_QueryInterface(IDCInfo* iface, REFIID riid, void ** { convert *This = impl_from_IDCInfo(iface); - return IDataConvert_QueryInterface((IDataConvert *)This, riid, obj); + return IDataConvert_QueryInterface(&This->IDataConvert_iface, riid, obj); } static ULONG WINAPI dcinfo_AddRef(IDCInfo* iface) { convert *This = impl_from_IDCInfo(iface); - return IDataConvert_AddRef((IDataConvert *)This); + return IDataConvert_AddRef(&This->IDataConvert_iface); } static ULONG WINAPI dcinfo_Release(IDCInfo* iface) { convert *This = impl_from_IDCInfo(iface); - return IDataConvert_Release((IDataConvert *)This); + return IDataConvert_Release(&This->IDataConvert_iface); } static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types[], DCINFO **info_ptr) @@ -1081,12 +1081,12 @@ HRESULT create_oledb_convert(IUnknown *outer, void **obj) This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if(!This) return E_OUTOFMEMORY; - This->lpVtbl = &convert_vtbl; - This->lpDCInfoVtbl = &dcinfo_vtbl; + This->IDataConvert_iface.lpVtbl = &convert_vtbl; + This->IDCInfo_iface.lpVtbl = &dcinfo_vtbl; This->ref = 1; This->version = 0x110; - *obj = &This->lpVtbl; + *obj = &This->IDataConvert_iface; return S_OK; }
1
0
0
0
Michael Stefaniuc : hlink: Use ifaces instead of vtbl pointers in HlinkImpl .
by Alexandre Julliard
29 Dec '10
29 Dec '10
Module: wine Branch: master Commit: 5101f249c8c39dbb18d467ddd6d6f2767fa0a9e5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5101f249c8c39dbb18d467ddd…
Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:48:17 2010 +0100 hlink: Use ifaces instead of vtbl pointers in HlinkImpl. --- dlls/hlink/link.c | 89 ++++++++++++++++++++++++++++------------------------- 1 files changed, 47 insertions(+), 42 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=5101f249c8c39dbb18d46…
1
0
0
0
← Newer
1
...
7
8
9
10
11
12
13
...
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