December 2010 - Wine-Commits

Michael Stefaniuc : explorerframe/tests: COM cleanup for INameSpaceTreeControlEventsImpl.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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

Michael Stefaniuc : msxml3: Use an iface instead of a vtbl pointer in parse_error_t.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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

Michael Stefaniuc : xmllite/tests: Use an iface instead of a vtbl pointer in testinput.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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

Michael Stefaniuc : wbemprox: Use an iface instead of a vtbl pointer in wbemprox_cf.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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

Michael Stefaniuc : hlink: Use ifaces instead of vtbl pointers in HlinkImpl .
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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

Michael Stefaniuc : mshtml: COM cleanup for the IHTMLTxtRange iface.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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

Michael Stefaniuc : mapi32: Fully merge the IMAPIProp ifaces into IPropData .
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

Module: wine Branch: master Commit: e67e836ef9615c4afb75a5f9976887b65b9b0d45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67e836ef9615c4afb75a5f99… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:43:13 2010 +0100 mapi32: Fully merge the IMAPIProp ifaces into IPropData. --- dlls/mapi32/prop.c | 326 +++++++++------------------------------------------- 1 files changed, 54 insertions(+), 272 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e67e836ef9615c4afb75a…

1 0

Michael Stefaniuc : mshtml: Use an iface instead of a vtbl pointer in nsProtocolHandler.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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

Michael Stefaniuc : mapi32: COM cleanup for the IPropData iface.
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

Module: wine Branch: master Commit: abcd84aa0ed3130b3e0319477353d9cc55fb56c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abcd84aa0ed3130b3e0319477… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Dec 29 02:44:19 2010 +0100 mapi32: COM cleanup for the IPropData iface. --- dlls/mapi32/prop.c | 32 ++++++++++++++++++-------------- 1 files changed, 18 insertions(+), 14 deletions(-) diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index 7123eca..716c528 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -1401,7 +1401,7 @@ typedef struct /* The main property data collection structure */ typedef struct { - const IPropDataVtbl *lpVtbl; + IPropData IPropData_iface; LONG lRef; /* Reference count */ ALLOCATEBUFFER *lpAlloc; /* Memory allocation routine */ ALLOCATEMORE *lpMore; /* Linked memory allocation routine */ @@ -1412,6 +1412,11 @@ typedef struct CRITICAL_SECTION cs; /* Lock for thread safety */ } IPropDataImpl; +static inline IPropDataImpl *impl_from_IPropData(IPropData *iface) +{ + return CONTAINING_RECORD(iface, IPropDataImpl, IPropData_iface); +} + /* Internal - Get a property value, assumes lock is held */ static IPropDataItem *IMAPIPROP_GetValue(IPropDataImpl *This, ULONG ulPropTag) { @@ -1487,7 +1492,7 @@ static inline void IMAPIPROP_Unlock(IPropDataImpl *This) */ static WINAPI HRESULT IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, LPVOID *ppvObj) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); TRACE("(%p,%s,%p)\n", This, debugstr_guid(riid), ppvObj); @@ -1518,7 +1523,7 @@ static WINAPI HRESULT IPropData_fnQueryInterface(LPPROPDATA iface, REFIID riid, */ static ULONG WINAPI IPropData_fnAddRef(LPPROPDATA iface) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); TRACE("(%p)->(count before=%u)\n", This, This->lRef); @@ -1533,7 +1538,7 @@ static ULONG WINAPI IPropData_fnAddRef(LPPROPDATA iface) */ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); LONG lRef; TRACE("(%p)->(count before=%u)\n", This, This->lRef); @@ -1642,9 +1647,9 @@ static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) static HRESULT WINAPI IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpTags, ULONG ulFlags, ULONG *lpCount, LPSPropValue *lppProps) { + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i; HRESULT hRet = S_OK; - IPropDataImpl *This = (IPropDataImpl*)iface; TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags, lpCount, lppProps); @@ -1708,7 +1713,7 @@ static HRESULT WINAPI IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpT static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, LPSPropTagArray *lppTags) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i; HRESULT hRet; @@ -1779,7 +1784,7 @@ static HRESULT WINAPI IPropData_fnOpenProperty(LPPROPDATA iface, ULONG ulPropTag static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPSPropValue lpProps, LPSPropProblemArray *lppProbs) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); HRESULT hRet = S_OK; ULONG i; @@ -1865,7 +1870,7 @@ static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPS static HRESULT WINAPI IPropData_fnDeleteProps(LPPROPDATA iface, LPSPropTagArray lpTags, LPSPropProblemArray *lppProbs) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i, numProbs = 0; HRESULT hRet = S_OK; @@ -2055,7 +2060,7 @@ static HRESULT WINAPI IPropData_fnGetIDsFromNames(LPPROPDATA iface, ULONG ulName static HRESULT WINAPI IPropData_fnHrSetObjAccess(LPPROPDATA iface, ULONG ulAccess) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); TRACE("(%p,%x)\n", iface, ulAccess); @@ -2109,8 +2114,7 @@ static HRESULT WINAPI IPropData_fnHrSetPropAccess(LPPROPDATA iface, LPSPropTagArray lpTags, ULONG *lpAccess) { - IPropDataImpl *This = (IPropDataImpl*)iface; - + IPropDataImpl *This = impl_from_IPropData(iface); ULONG i; TRACE("(%p,%p,%p)\n", iface, lpTags, lpAccess); @@ -2161,7 +2165,7 @@ static HRESULT WINAPI IPropData_fnHrGetPropAccess(LPPROPDATA iface, LPSPropTagArray *lppTags, ULONG **lppAccess) { - IPropDataImpl *This = (IPropDataImpl*)iface; + IPropDataImpl *This = impl_from_IPropData(iface); LPVOID lpMem; HRESULT hRet; ULONG i; @@ -2316,7 +2320,7 @@ SCODE WINAPI CreateIProp(LPCIID iid, ALLOCATEBUFFER *lpAlloc, if (SUCCEEDED(scode)) { - lpPropData->lpVtbl = &IPropDataImpl_vtbl; + lpPropData->IPropData_iface.lpVtbl = &IPropDataImpl_vtbl; lpPropData->lRef = 1; lpPropData->lpAlloc = lpAlloc; lpPropData->lpMore = lpMore; @@ -2326,7 +2330,7 @@ SCODE WINAPI CreateIProp(LPCIID iid, ALLOCATEBUFFER *lpAlloc, list_init(&lpPropData->values); InitializeCriticalSection(&lpPropData->cs); lpPropData->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IPropDataImpl.cs"); - *lppPropData = (LPPROPDATA)lpPropData; + *lppPropData = &lpPropData->IPropData_iface; } return scode; }

1 0

Michael Stefaniuc : oledb32: Use ifaces instead of vtbl pointers in convert .
by Alexandre Julliard Dec. 29, 2010

Dec. 29, 2010

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