wine-commits December 2010

wine-commits@winehq.org

2 participants
1099 discussions

Michael Stefaniuc : qmgr: Use an iface instead of a vtbl pointer in DLBindStatusCallback.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 21c1cbf3088c22ed919dae73e4e7e157bfac57e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c1cbf3088c22ed919dae73e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:16:22 2010 +0100 qmgr: Use an iface instead of a vtbl pointer in DLBindStatusCallback. --- dlls/qmgr/file.c | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 91cabb6..40a9c28 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -213,20 +213,25 @@ static DWORD CALLBACK copyProgressCallback(LARGE_INTEGER totalSize, typedef struct { - const IBindStatusCallbackVtbl *lpVtbl; + IBindStatusCallback IBindStatusCallback_iface; BackgroundCopyFileImpl *file; LONG ref; } DLBindStatusCallback; +static inline DLBindStatusCallback *impl_from_IBindStatusCallback(IBindStatusCallback *iface) +{ + return CONTAINING_RECORD(iface, DLBindStatusCallback, IBindStatusCallback_iface); +} + static ULONG WINAPI DLBindStatusCallback_AddRef(IBindStatusCallback *iface) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); return InterlockedIncrement(&This->ref); } static ULONG WINAPI DLBindStatusCallback_Release(IBindStatusCallback *iface) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -243,12 +248,12 @@ static HRESULT WINAPI DLBindStatusCallback_QueryInterface( REFIID riid, void **ppvObject) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IBindStatusCallback)) { - *ppvObject = &This->lpVtbl; + *ppvObject = &This->IBindStatusCallback_iface; DLBindStatusCallback_AddRef(iface); return S_OK; } @@ -304,7 +309,7 @@ static HRESULT WINAPI DLBindStatusCallback_OnProgress( ULONG statusCode, LPCWSTR statusText) { - DLBindStatusCallback *This = (DLBindStatusCallback *) iface; + DLBindStatusCallback *This = impl_from_IBindStatusCallback(iface); BackgroundCopyFileImpl *file = This->file; BackgroundCopyJobImpl *job = file->owner; ULONG64 diff; @@ -359,7 +364,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( if (!This) return NULL; - This->lpVtbl = &DLBindStatusCallback_Vtbl; + This->IBindStatusCallback_iface.lpVtbl = &DLBindStatusCallback_Vtbl; IBackgroundCopyFile_AddRef((IBackgroundCopyFile *) file); This->file = file; This->ref = 1; @@ -369,7 +374,7 @@ static DLBindStatusCallback *DLBindStatusCallbackConstructor( BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) { static const WCHAR prefix[] = {'B','I','T', 0}; - IBindStatusCallback *callbackObj; + DLBindStatusCallback *callbackObj; WCHAR tmpDir[MAX_PATH]; WCHAR tmpName[MAX_PATH]; HRESULT hr; @@ -390,7 +395,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) return FALSE; } - callbackObj = (IBindStatusCallback *) DLBindStatusCallbackConstructor(file); + callbackObj = DLBindStatusCallbackConstructor(file); if (!callbackObj) { ERR("Out of memory\n"); @@ -412,8 +417,9 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSFERRING); DeleteUrlCacheEntryW(file->info.RemoteName); - hr = URLDownloadToFileW(NULL, file->info.RemoteName, tmpName, 0, callbackObj); - IBindStatusCallback_Release(callbackObj); + hr = URLDownloadToFileW(NULL, file->info.RemoteName, tmpName, 0, + &callbackObj->IBindStatusCallback_iface); + IBindStatusCallback_Release(&callbackObj->IBindStatusCallback_iface); if (hr == INET_E_DOWNLOAD_FAILURE) { TRACE("URLDownload failed, trying local file copy\n");

1 0

Michael Stefaniuc : ole32: Use an iface instead of a vtbl pointer in EnumOLEVERB.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: be5bb18502cfb0dbd936a126b4b87807b1608372 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5bb18502cfb0dbd936a126b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:14:24 2010 +0100 ole32: Use an iface instead of a vtbl pointer in EnumOLEVERB. --- dlls/ole32/ole2.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index ca4cd4c..d5fd2c2 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -812,13 +812,18 @@ static HRESULT EnumOLEVERB_Construct(HKEY hkeyVerb, ULONG index, IEnumOLEVERB ** typedef struct { - const IEnumOLEVERBVtbl *lpvtbl; + IEnumOLEVERB IEnumOLEVERB_iface; LONG ref; HKEY hkeyVerb; ULONG index; } EnumOLEVERB; +static inline EnumOLEVERB *impl_from_IEnumOLEVERB(IEnumOLEVERB *iface) +{ + return CONTAINING_RECORD(iface, EnumOLEVERB, IEnumOLEVERB_iface); +} + static HRESULT WINAPI EnumOLEVERB_QueryInterface( IEnumOLEVERB *iface, REFIID riid, void **ppv) { @@ -836,7 +841,7 @@ static HRESULT WINAPI EnumOLEVERB_QueryInterface( static ULONG WINAPI EnumOLEVERB_AddRef( IEnumOLEVERB *iface) { - EnumOLEVERB *This = (EnumOLEVERB *)iface; + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); TRACE("()\n"); return InterlockedIncrement(&This->ref); } @@ -844,7 +849,7 @@ static ULONG WINAPI EnumOLEVERB_AddRef( static ULONG WINAPI EnumOLEVERB_Release( IEnumOLEVERB *iface) { - EnumOLEVERB *This = (EnumOLEVERB *)iface; + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); LONG refs = InterlockedDecrement(&This->ref); TRACE("()\n"); if (!refs) @@ -859,7 +864,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( IEnumOLEVERB *iface, ULONG celt, LPOLEVERB rgelt, ULONG *pceltFetched) { - EnumOLEVERB *This = (EnumOLEVERB *)iface; + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); HRESULT hr = S_OK; TRACE("(%d, %p, %p)\n", celt, rgelt, pceltFetched); @@ -946,7 +951,7 @@ static HRESULT WINAPI EnumOLEVERB_Next( static HRESULT WINAPI EnumOLEVERB_Skip( IEnumOLEVERB *iface, ULONG celt) { - EnumOLEVERB *This = (EnumOLEVERB *)iface; + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); TRACE("(%d)\n", celt); @@ -957,7 +962,7 @@ static HRESULT WINAPI EnumOLEVERB_Skip( static HRESULT WINAPI EnumOLEVERB_Reset( IEnumOLEVERB *iface) { - EnumOLEVERB *This = (EnumOLEVERB *)iface; + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); TRACE("()\n"); @@ -969,7 +974,7 @@ static HRESULT WINAPI EnumOLEVERB_Clone( IEnumOLEVERB *iface, IEnumOLEVERB **ppenum) { - EnumOLEVERB *This = (EnumOLEVERB *)iface; + EnumOLEVERB *This = impl_from_IEnumOLEVERB(iface); HKEY hkeyVerb; TRACE("(%p)\n", ppenum); if (!DuplicateHandle(GetCurrentProcess(), This->hkeyVerb, GetCurrentProcess(), (HANDLE *)&hkeyVerb, 0, FALSE, DUPLICATE_SAME_ACCESS)) @@ -996,12 +1001,12 @@ static HRESULT EnumOLEVERB_Construct(HKEY hkeyVerb, ULONG index, IEnumOLEVERB ** RegCloseKey(hkeyVerb); return E_OUTOFMEMORY; } - This->lpvtbl = &EnumOLEVERB_VTable; + This->IEnumOLEVERB_iface.lpVtbl = &EnumOLEVERB_VTable; This->ref = 1; This->index = index; This->hkeyVerb = hkeyVerb; - *ppenum = (IEnumOLEVERB *)&This->lpvtbl; - return S_OK; + *ppenum = &This->IEnumOLEVERB_iface; + return S_OK; } /***********************************************************************

1 0

Michael Stefaniuc : fusion: Use an iface instead of a vtbl pointer in IAssemblyEnumImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: b194b778b4a1dcab9ecda053ebe35fa7b153dfb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b194b778b4a1dcab9ecda053e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:13:29 2010 +0100 fusion: Use an iface instead of a vtbl pointer in IAssemblyEnumImpl. --- dlls/fusion/asmenum.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/fusion/asmenum.c b/dlls/fusion/asmenum.c index d4ea905..99462ed 100644 --- a/dlls/fusion/asmenum.c +++ b/dlls/fusion/asmenum.c @@ -45,17 +45,22 @@ typedef struct _tagASMNAME typedef struct { - const IAssemblyEnumVtbl *lpIAssemblyEnumVtbl; + IAssemblyEnum IAssemblyEnum_iface; struct list assemblies; struct list *iter; LONG ref; } IAssemblyEnumImpl; +static inline IAssemblyEnumImpl *impl_from_IAssemblyEnum(IAssemblyEnum *iface) +{ + return CONTAINING_RECORD(iface, IAssemblyEnumImpl, IAssemblyEnum_iface); +} + static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, REFIID riid, LPVOID *ppobj) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -75,7 +80,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_QueryInterface(IAssemblyEnum *iface, static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before = %u)\n", This, refCount - 1); @@ -85,7 +90,7 @@ static ULONG WINAPI IAssemblyEnumImpl_AddRef(IAssemblyEnum *iface) static ULONG WINAPI IAssemblyEnumImpl_Release(IAssemblyEnum *iface) { - IAssemblyEnumImpl *This = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *This = impl_from_IAssemblyEnum(iface); ULONG refCount = InterlockedDecrement(&This->ref); struct list *item, *cursor; @@ -113,7 +118,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, IAssemblyName **ppName, DWORD dwFlags) { - IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); ASMNAME *asmname; TRACE("(%p, %p, %p, %d)\n", iface, pvReserved, ppName, dwFlags); @@ -135,7 +140,7 @@ static HRESULT WINAPI IAssemblyEnumImpl_GetNextAssembly(IAssemblyEnum *iface, static HRESULT WINAPI IAssemblyEnumImpl_Reset(IAssemblyEnum *iface) { - IAssemblyEnumImpl *asmenum = (IAssemblyEnumImpl *)iface; + IAssemblyEnumImpl *asmenum = impl_from_IAssemblyEnum(iface); TRACE("(%p)\n", iface); @@ -431,7 +436,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, if (!asmenum) return E_OUTOFMEMORY; - asmenum->lpIAssemblyEnumVtbl = &AssemblyEnumVtbl; + asmenum->IAssemblyEnum_iface.lpVtbl = &AssemblyEnumVtbl; asmenum->ref = 1; list_init(&asmenum->assemblies); @@ -446,7 +451,7 @@ HRESULT WINAPI CreateAssemblyEnum(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, } asmenum->iter = list_head(&asmenum->assemblies); - *pEnum = (IAssemblyEnum *)asmenum; + *pEnum = &asmenum->IAssemblyEnum_iface; return S_OK; }

1 0

Michael Stefaniuc : ole32/tests: Use an iface instead of a vtbl pointer in HeapUnknown.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: 46ebaa9be219a38677ba59fb2bf661bbe2a76415 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46ebaa9be219a38677ba59fb2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:14:56 2010 +0100 ole32/tests: Use an iface instead of a vtbl pointer in HeapUnknown. --- dlls/ole32/tests/marshal.c | 17 +++++++++++------ dlls/ole32/tests/moniker.c | 27 ++++++++++++++++----------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 3d0ab16..5563085 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1697,10 +1697,15 @@ static void test_proxy_interfaces(void) typedef struct { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; ULONG refs; } HeapUnknown; +static inline HeapUnknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, HeapUnknown, IUnknown_iface); +} + static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -1715,13 +1720,13 @@ static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, v static ULONG WINAPI HeapUnknown_AddRef(IUnknown *iface) { - HeapUnknown *This = (HeapUnknown *)iface; + HeapUnknown *This = impl_from_IUnknown(iface); return InterlockedIncrement((LONG*)&This->refs); } static ULONG WINAPI HeapUnknown_Release(IUnknown *iface) { - HeapUnknown *This = (HeapUnknown *)iface; + HeapUnknown *This = impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement((LONG*)&This->refs); if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; @@ -1744,7 +1749,7 @@ static void test_proxybuffer(REFIID riid) CLSID clsid; HeapUnknown *pUnkOuter = HeapAlloc(GetProcessHeap(), 0, sizeof(*pUnkOuter)); - pUnkOuter->lpVtbl = &HeapUnknown_Vtbl; + pUnkOuter->IUnknown_iface.lpVtbl = &HeapUnknown_Vtbl; pUnkOuter->refs = 1; hr = CoGetPSClsid(riid, &clsid); @@ -1753,13 +1758,13 @@ static void test_proxybuffer(REFIID riid) hr = CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IPSFactoryBuffer, (LPVOID*)&psfb); ok_ole_success(hr, CoGetClassObject); - hr = IPSFactoryBuffer_CreateProxy(psfb, (IUnknown*)pUnkOuter, riid, &proxy, &lpvtbl); + hr = IPSFactoryBuffer_CreateProxy(psfb, &pUnkOuter->IUnknown_iface, riid, &proxy, &lpvtbl); ok_ole_success(hr, IPSFactoryBuffer_CreateProxy); ok(lpvtbl != NULL, "IPSFactoryBuffer_CreateProxy succeeded, but returned a NULL vtable!\n"); /* release our reference to the outer unknown object - the PS factory * buffer will have AddRef's it in the CreateProxy call */ - refs = IUnknown_Release((IUnknown *)pUnkOuter); + refs = IUnknown_Release(&pUnkOuter->IUnknown_iface); ok(refs == 1, "Ref count of outer unknown should have been 1 instead of %d\n", refs); refs = IPSFactoryBuffer_Release(psfb); diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 33edde1..eb7973e 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -156,10 +156,15 @@ static IClassFactory Test_ClassFactory = { &TestClassFactory_Vtbl }; typedef struct { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; ULONG refs; } HeapUnknown; +static inline HeapUnknown *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, HeapUnknown, IUnknown_iface); +} + static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { if (IsEqualIID(riid, &IID_IUnknown)) @@ -174,13 +179,13 @@ static HRESULT WINAPI HeapUnknown_QueryInterface(IUnknown *iface, REFIID riid, v static ULONG WINAPI HeapUnknown_AddRef(IUnknown *iface) { - HeapUnknown *This = (HeapUnknown *)iface; + HeapUnknown *This = impl_from_IUnknown(iface); return InterlockedIncrement((LONG*)&This->refs); } static ULONG WINAPI HeapUnknown_Release(IUnknown *iface) { - HeapUnknown *This = (HeapUnknown *)iface; + HeapUnknown *This = impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement((LONG*)&This->refs); if (!refs) HeapFree(GetProcessHeap(), 0, This); return refs; @@ -1880,9 +1885,9 @@ static void test_bind_context(void) ok(hr == E_INVALIDARG, "IBindCtx_RegisterObjectParam should have returned E_INVALIDARG instead of 0x%08x\n", hr); unknown = HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); - unknown->lpVtbl = &HeapUnknown_Vtbl; + unknown->IUnknown_iface.lpVtbl = &HeapUnknown_Vtbl; unknown->refs = 1; - hr = IBindCtx_RegisterObjectParam(pBindCtx, (WCHAR *)wszParamName, (IUnknown *)&unknown->lpVtbl); + hr = IBindCtx_RegisterObjectParam(pBindCtx, (WCHAR *)wszParamName, &unknown->IUnknown_iface); ok_ole_success(hr, "IBindCtx_RegisterObjectParam"); hr = IBindCtx_GetObjectParam(pBindCtx, (WCHAR *)wszParamName, &param_obj); @@ -1907,23 +1912,23 @@ static void test_bind_context(void) ok(hr == E_INVALIDARG, "IBindCtx_RevokeObjectBound(NULL) should have return E_INVALIDARG instead of 0x%08x\n", hr); unknown2 = HeapAlloc(GetProcessHeap(), 0, sizeof(*unknown)); - unknown2->lpVtbl = &HeapUnknown_Vtbl; + unknown2->IUnknown_iface.lpVtbl = &HeapUnknown_Vtbl; unknown2->refs = 1; - hr = IBindCtx_RegisterObjectBound(pBindCtx, (IUnknown *)&unknown2->lpVtbl); + hr = IBindCtx_RegisterObjectBound(pBindCtx, &unknown2->IUnknown_iface); ok_ole_success(hr, "IBindCtx_RegisterObjectBound"); - hr = IBindCtx_RevokeObjectBound(pBindCtx, (IUnknown *)&unknown2->lpVtbl); + hr = IBindCtx_RevokeObjectBound(pBindCtx, &unknown2->IUnknown_iface); ok_ole_success(hr, "IBindCtx_RevokeObjectBound"); - hr = IBindCtx_RevokeObjectBound(pBindCtx, (IUnknown *)&unknown2->lpVtbl); + hr = IBindCtx_RevokeObjectBound(pBindCtx, &unknown2->IUnknown_iface); ok(hr == MK_E_NOTBOUND, "IBindCtx_RevokeObjectBound with not bound object should have returned MK_E_NOTBOUND instead of 0x%08x\n", hr); IBindCtx_Release(pBindCtx); - refs = IUnknown_Release((IUnknown *)&unknown->lpVtbl); + refs = IUnknown_Release(&unknown->IUnknown_iface); ok(!refs, "object param should have been destroyed, instead of having %d refs\n", refs); - refs = IUnknown_Release((IUnknown *)&unknown2->lpVtbl); + refs = IUnknown_Release(&unknown2->IUnknown_iface); ok(!refs, "bound object should have been destroyed, instead of having %d refs\n", refs); }

1 0

Michael Stefaniuc : avifil32: Use an iface instead of an vtbl pointer in IClassFactoryImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: b8ef455d4918b9e680639556d1a618231d9e9516 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ef455d4918b9e680639556d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:12:18 2010 +0100 avifil32: Use an iface instead of an vtbl pointer in IClassFactoryImpl. --- dlls/avifil32/factory.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index d1246e8..2c7a965 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -57,12 +57,17 @@ static const IClassFactoryVtbl iclassfact = { typedef struct { /* IUnknown fields */ - const IClassFactoryVtbl *lpVtbl; + IClassFactory IClassFactory_iface; DWORD dwRef; CLSID clsid; } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid, LPVOID *ppv) { @@ -75,11 +80,11 @@ static HRESULT AVIFILE_CreateClassFactory(const CLSID *pclsid, const IID *riid, if (pClassFactory == NULL) return E_OUTOFMEMORY; - pClassFactory->lpVtbl = &iclassfact; + pClassFactory->IClassFactory_iface.lpVtbl = &iclassfact; pClassFactory->dwRef = 0; pClassFactory->clsid = *pclsid; - hr = IClassFactory_QueryInterface((IClassFactory*)pClassFactory, riid, ppv); + hr = IClassFactory_QueryInterface(&pClassFactory->IClassFactory_iface, riid, ppv); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, pClassFactory); *ppv = NULL; @@ -105,7 +110,7 @@ static HRESULT WINAPI IClassFactory_fnQueryInterface(LPCLASSFACTORY iface, static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)\n", iface); @@ -114,7 +119,7 @@ static ULONG WINAPI IClassFactory_fnAddRef(LPCLASSFACTORY iface) static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)\n", iface); if ((--(This->dwRef)) > 0) @@ -129,7 +134,7 @@ static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid,LPVOID *ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p,%p,%s,%p)\n", iface, pOuter, debugstr_guid(riid), ppobj);

1 0

Michael Stefaniuc : shell32: Use ifaces instead of vtbl pointers in IDesktopFolderImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: a92531487bb80ac297b8fca006d7a5bfe7f1ab19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a92531487bb80ac297b8fca00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:21:57 2010 +0100 shell32: Use ifaces instead of vtbl pointers in IDesktopFolderImpl. --- dlls/shell32/shfldr_desktop.c | 61 ++++++++++++++++++++++------------------- 1 files changed, 33 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a92531487bb80ac297b8f…

1 0

Michael Stefaniuc : shell32: Use an iface instead of a vtbl pointer in IShellItemArrayImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: c8ba8b6d6a54aed48178dd901062849b5dcb3713 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ba8b6d6a54aed48178dd901… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:16:52 2010 +0100 shell32: Use an iface instead of a vtbl pointer in IShellItemArrayImpl. --- dlls/shell32/shellitem.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shellitem.c b/dlls/shell32/shellitem.c index d9e7e7b..805731f 100644 --- a/dlls/shell32/shellitem.c +++ b/dlls/shell32/shellitem.c @@ -656,18 +656,23 @@ HRESULT WINAPI SHGetItemFromObject(IUnknown *punk, REFIID riid, void **ppv) * IShellItemArray implementation */ typedef struct { - const IShellItemArrayVtbl *lpVtbl; + IShellItemArray IShellItemArray_iface; LONG ref; IShellItem **array; DWORD item_count; } IShellItemArrayImpl; +static inline IShellItemArrayImpl *impl_from_IShellItemArray(IShellItemArray *iface) +{ + return CONTAINING_RECORD(iface, IShellItemArrayImpl, IShellItemArray_iface); +} + static HRESULT WINAPI IShellItemArray_fnQueryInterface(IShellItemArray *iface, REFIID riid, void **ppvObject) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); TRACE("%p (%s, %p)\n", This, shdebugstr_guid(riid), ppvObject); *ppvObject = NULL; @@ -688,7 +693,7 @@ static HRESULT WINAPI IShellItemArray_fnQueryInterface(IShellItemArray *iface, static ULONG WINAPI IShellItemArray_fnAddRef(IShellItemArray *iface) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); LONG ref = InterlockedIncrement(&This->ref); TRACE("%p - ref %d\n", This, ref); @@ -697,7 +702,7 @@ static ULONG WINAPI IShellItemArray_fnAddRef(IShellItemArray *iface) static ULONG WINAPI IShellItemArray_fnRelease(IShellItemArray *iface) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); LONG ref = InterlockedDecrement(&This->ref); TRACE("%p - ref %d\n", This, ref); @@ -723,7 +728,7 @@ static HRESULT WINAPI IShellItemArray_fnBindToHandler(IShellItemArray *iface, REFIID riid, void **ppvOut) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); FIXME("Stub: %p (%p, %s, %s, %p)\n", This, pbc, shdebugstr_guid(bhid), shdebugstr_guid(riid), ppvOut); @@ -735,7 +740,7 @@ static HRESULT WINAPI IShellItemArray_fnGetPropertyStore(IShellItemArray *iface, REFIID riid, void **ppv) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); FIXME("Stub: %p (%x, %s, %p)\n", This, flags, shdebugstr_guid(riid), ppv); return E_NOTIMPL; @@ -746,7 +751,7 @@ static HRESULT WINAPI IShellItemArray_fnGetPropertyDescriptionList(IShellItemArr REFIID riid, void **ppv) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); FIXME("Stub: %p (%p, %s, %p)\n", This, keyType, shdebugstr_guid(riid), ppv); @@ -758,7 +763,7 @@ static HRESULT WINAPI IShellItemArray_fnGetAttributes(IShellItemArray *iface, SFGAOF sfgaoMask, SFGAOF *psfgaoAttribs) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); FIXME("Stub: %p (%x, %x, %p)\n", This, AttribFlags, sfgaoMask, psfgaoAttribs); return E_NOTIMPL; @@ -767,7 +772,7 @@ static HRESULT WINAPI IShellItemArray_fnGetAttributes(IShellItemArray *iface, static HRESULT WINAPI IShellItemArray_fnGetCount(IShellItemArray *iface, DWORD *pdwNumItems) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); TRACE("%p (%p)\n", This, pdwNumItems); *pdwNumItems = This->item_count; @@ -779,7 +784,7 @@ static HRESULT WINAPI IShellItemArray_fnGetItemAt(IShellItemArray *iface, DWORD dwIndex, IShellItem **ppsi) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); TRACE("%p (%x, %p)\n", This, dwIndex, ppsi); /* zero indexed */ @@ -795,7 +800,7 @@ static HRESULT WINAPI IShellItemArray_fnGetItemAt(IShellItemArray *iface, static HRESULT WINAPI IShellItemArray_fnEnumItems(IShellItemArray *iface, IEnumShellItems **ppenumShellItems) { - IShellItemArrayImpl *This = (IShellItemArrayImpl *)iface; + IShellItemArrayImpl *This = impl_from_IShellItemArray(iface); FIXME("Stub: %p (%p)\n", This, ppenumShellItems); return E_NOTIMPL; @@ -829,12 +834,12 @@ static HRESULT IShellItemArray_Constructor(IUnknown *pUnkOuter, REFIID riid, voi return E_OUTOFMEMORY; This->ref = 1; - This->lpVtbl = &vt_IShellItemArray; + This->IShellItemArray_iface.lpVtbl = &vt_IShellItemArray; This->array = NULL; This->item_count = 0; - ret = IShellItemArray_QueryInterface((IShellItemArray*)This, riid, ppv); - IShellItemArray_Release((IShellItemArray*)This); + ret = IShellItemArray_QueryInterface(&This->IShellItemArray_iface, riid, ppv); + IShellItemArray_Release(&This->IShellItemArray_iface); return ret; } @@ -875,7 +880,7 @@ HRESULT WINAPI SHCreateShellItemArray(PCIDLIST_ABSOLUTE pidlParent, { This->array = array; This->item_count = cidl; - *ppsiItemArray = (IShellItemArray*)This; + *ppsiItemArray = &This->IShellItemArray_iface; return ret; }

1 0

Michael Stefaniuc : oleaut32: Use an iface instead of a vtbl pointer in StdDispatch.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: ec1f8b5335a153cdb65e76f1d2794fcb7d914b12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1f8b5335a153cdb65e76f1d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:16:07 2010 +0100 oleaut32: Use an iface instead of a vtbl pointer in StdDispatch. --- dlls/oleaut32/dispatch.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index ed3fad4..760f8aa 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -232,12 +232,17 @@ HRESULT WINAPI CreateStdDispatch( typedef struct { - const IDispatchVtbl *lpVtbl; + IDispatch IDispatch_iface; void * pvThis; ITypeInfo * pTypeInfo; LONG ref; } StdDispatch; +static inline StdDispatch *impl_from_IDispatch(IDispatch *iface) +{ + return CONTAINING_RECORD(iface, StdDispatch, IDispatch_iface); +} + /****************************************************************************** * IDispatch_QueryInterface {OLEAUT32} * @@ -248,7 +253,7 @@ static HRESULT WINAPI StdDispatch_QueryInterface( REFIID riid, void** ppvObject) { - StdDispatch *This = (StdDispatch *)iface; + StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObject); if (IsEqualIID(riid, &IID_IDispatch) || @@ -268,7 +273,7 @@ static HRESULT WINAPI StdDispatch_QueryInterface( */ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) { - StdDispatch *This = (StdDispatch *)iface; + StdDispatch *This = impl_from_IDispatch(iface); ULONG refCount = InterlockedIncrement(&This->ref); TRACE("(%p)->(ref before=%u)\n",This, refCount - 1); @@ -283,7 +288,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) */ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) { - StdDispatch *This = (StdDispatch *)iface; + StdDispatch *This = impl_from_IDispatch(iface); ULONG refCount = InterlockedDecrement(&This->ref); TRACE("(%p)->(ref before=%u)\n", This, refCount + 1); @@ -316,7 +321,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) */ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo) { - StdDispatch *This = (StdDispatch *)iface; + StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%p)\n", pctinfo); *pctinfo = This->pTypeInfo ? 1 : 0; @@ -343,7 +348,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti */ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo) { - StdDispatch *This = (StdDispatch *)iface; + StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%d, %x, %p)\n", iTInfo, lcid, ppTInfo); *ppTInfo = NULL; @@ -386,7 +391,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI */ static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId) { - StdDispatch *This = (StdDispatch *)iface; + StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%s, %p, %d, 0x%x, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); if (!IsEqualGUID(riid, &IID_NULL)) @@ -424,7 +429,7 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember, WORD wFlags, DISPPARAMS * pDispParams, VARIANT * pVarResult, EXCEPINFO * pExcepInfo, UINT * puArgErr) { - StdDispatch *This = (StdDispatch *)iface; + StdDispatch *This = impl_from_IDispatch(iface); TRACE("(%d, %s, 0x%x, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); if (!IsEqualGUID(riid, &IID_NULL)) @@ -455,9 +460,9 @@ static IDispatch * StdDispatch_Construct( pStdDispatch = CoTaskMemAlloc(sizeof(StdDispatch)); if (!pStdDispatch) - return (IDispatch *)pStdDispatch; + return &pStdDispatch->IDispatch_iface; - pStdDispatch->lpVtbl = &StdDispatch_VTable; + pStdDispatch->IDispatch_iface.lpVtbl = &StdDispatch_VTable; pStdDispatch->pvThis = pvThis; pStdDispatch->pTypeInfo = pTypeInfo; pStdDispatch->ref = 1; @@ -466,5 +471,5 @@ static IDispatch * StdDispatch_Construct( * being destroyed until we are done with it */ ITypeInfo_AddRef(pTypeInfo); - return (IDispatch *)pStdDispatch; + return &pStdDispatch->IDispatch_iface; }

1 0

Michael Stefaniuc : oleaut32: Use an iface instead of a vtbl pointer in IRecordInfoImpl.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: fd6ba85f4e269147e481e96be885f2f55a0c5b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6ba85f4e269147e481e96be… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:15:33 2010 +0100 oleaut32: Use an iface instead of a vtbl pointer in IRecordInfoImpl. --- dlls/oleaut32/recinfo.c | 51 +++++++++++++++++++++++++--------------------- 1 files changed, 28 insertions(+), 23 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index c23aad7..54413eb 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -41,7 +41,7 @@ typedef struct { } fieldstr; typedef struct { - const IRecordInfoVtbl *lpVtbl; + IRecordInfo IRecordInfo_iface; LONG ref; GUID guid; @@ -53,6 +53,11 @@ typedef struct { ITypeInfo *pTypeInfo; } IRecordInfoImpl; +static inline IRecordInfoImpl *impl_from_IRecordInfo(IRecordInfo *iface) +{ + return CONTAINING_RECORD(iface, IRecordInfoImpl, IRecordInfo_iface); +} + static HRESULT copy_to_variant(void *src, VARIANT *pvar, enum VARENUM vt) { TRACE("%p %p %d\n", src, pvar, vt); @@ -155,7 +160,7 @@ static HRESULT WINAPI IRecordInfoImpl_QueryInterface(IRecordInfo *iface, REFIID static ULONG WINAPI IRecordInfoImpl_AddRef(IRecordInfo *iface) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) -> %d\n", This, ref); return ref; @@ -163,7 +168,7 @@ static ULONG WINAPI IRecordInfoImpl_AddRef(IRecordInfo *iface) static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) -> %d\n", This, ref); @@ -182,7 +187,7 @@ static ULONG WINAPI IRecordInfoImpl_Release(IRecordInfo *iface) static HRESULT WINAPI IRecordInfoImpl_RecordInit(IRecordInfo *iface, PVOID pvNew) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); TRACE("(%p)->(%p)\n", This, pvNew); if(!pvNew) @@ -194,7 +199,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordInit(IRecordInfo *iface, PVOID pvNew static HRESULT WINAPI IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvExisting) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; PVOID var; @@ -251,7 +256,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordClear(IRecordInfo *iface, PVOID pvEx static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, PVOID pvExisting, PVOID pvNew) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); TRACE("(%p)->(%p %p)\n", This, pvExisting, pvNew); @@ -264,7 +269,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordCopy(IRecordInfo *iface, PVOID pvExi static HRESULT WINAPI IRecordInfoImpl_GetGuid(IRecordInfo *iface, GUID *pguid) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); TRACE("(%p)->(%p)\n", This, pguid); @@ -277,7 +282,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetGuid(IRecordInfo *iface, GUID *pguid) static HRESULT WINAPI IRecordInfoImpl_GetName(IRecordInfo *iface, BSTR *pbstrName) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); TRACE("(%p)->(%p)\n", This, pbstrName); @@ -290,8 +295,8 @@ static HRESULT WINAPI IRecordInfoImpl_GetName(IRecordInfo *iface, BSTR *pbstrNam static HRESULT WINAPI IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG *pcbSize) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; - + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); + TRACE("(%p)->(%p)\n", This, pcbSize); if(!pcbSize) @@ -303,7 +308,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetSize(IRecordInfo *iface, ULONG *pcbSize static HRESULT WINAPI IRecordInfoImpl_GetTypeInfo(IRecordInfo *iface, ITypeInfo **ppTypeInfo) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); TRACE("(%p)->(%p)\n", This, ppTypeInfo); @@ -319,7 +324,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetTypeInfo(IRecordInfo *iface, ITypeInfo static HRESULT WINAPI IRecordInfoImpl_GetField(IRecordInfo *iface, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; TRACE("(%p)->(%p %s %p)\n", This, pvData, debugstr_w(szFieldName), pvarField); @@ -341,7 +346,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetField(IRecordInfo *iface, PVOID pvData, static HRESULT WINAPI IRecordInfoImpl_GetFieldNoCopy(IRecordInfo *iface, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField, PVOID *ppvDataCArray) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; TRACE("(%p)->(%p %s %p %p)\n", This, pvData, debugstr_w(szFieldName), pvarField, ppvDataCArray); @@ -365,7 +370,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetFieldNoCopy(IRecordInfo *iface, PVOID p static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; TRACE("(%p)->(%08x %p %s %p)\n", This, wFlags, pvData, debugstr_w(szFieldName), @@ -393,7 +398,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutField(IRecordInfo *iface, ULONG wFlags, static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG wFlags, PVOID pvData, LPCOLESTR szFieldName, VARIANT *pvarField) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); int i; FIXME("(%p)->(%08x %p %s %p) stub\n", This, wFlags, pvData, debugstr_w(szFieldName), pvarField); @@ -414,7 +419,7 @@ static HRESULT WINAPI IRecordInfoImpl_PutFieldNoCopy(IRecordInfo *iface, ULONG w static HRESULT WINAPI IRecordInfoImpl_GetFieldNames(IRecordInfo *iface, ULONG *pcNames, BSTR *rgBstrNames) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); ULONG n = This->n_vars, i; TRACE("(%p)->(%p %p)\n", This, pcNames, rgBstrNames); @@ -436,7 +441,7 @@ static HRESULT WINAPI IRecordInfoImpl_GetFieldNames(IRecordInfo *iface, ULONG *p static BOOL WINAPI IRecordInfoImpl_IsMatchingType(IRecordInfo *iface, IRecordInfo *pRecordInfo) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); FIXME("(%p)->(%p) stub\n", This, pRecordInfo); @@ -445,7 +450,7 @@ static BOOL WINAPI IRecordInfoImpl_IsMatchingType(IRecordInfo *iface, IRecordInf static PVOID WINAPI IRecordInfoImpl_RecordCreate(IRecordInfo *iface) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); TRACE("(%p)\n", This); @@ -455,7 +460,7 @@ static PVOID WINAPI IRecordInfoImpl_RecordCreate(IRecordInfo *iface) static HRESULT WINAPI IRecordInfoImpl_RecordCreateCopy(IRecordInfo *iface, PVOID pvSource, PVOID *ppvDest) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); TRACE("(%p)->(%p %p)\n", This, pvSource, ppvDest); @@ -468,7 +473,7 @@ static HRESULT WINAPI IRecordInfoImpl_RecordCreateCopy(IRecordInfo *iface, PVOID static HRESULT WINAPI IRecordInfoImpl_RecordDestroy(IRecordInfo *iface, PVOID pvRecord) { - IRecordInfoImpl *This = (IRecordInfoImpl*)iface; + IRecordInfoImpl *This = impl_from_IRecordInfo(iface); HRESULT hres; TRACE("(%p)->(%p)\n", This, pvRecord); @@ -585,7 +590,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo } ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret)); - ret->lpVtbl = &IRecordInfoImplVtbl; + ret->IRecordInfo_iface.lpVtbl = &IRecordInfoImplVtbl; ret->ref = 1; ret->pTypeInfo = pTypeInfo; ret->n_vars = typeattr->cVars; @@ -621,8 +626,8 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo WARN("GetDocumentation failed: %08x\n", hres); ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc); } - - *ppRecInfo = (IRecordInfo*)ret; + + *ppRecInfo = &ret->IRecordInfo_iface; return S_OK; }

1 0

Michael Stefaniuc : ole32: Use an iface instead of a vtbl pointer in EnumOleSTATDATA.
by Alexandre Julliard 05 Dec '10

05 Dec '10

Module: wine Branch: master Commit: f3810015e1533bcdf51adbaab02f07bd098669d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3810015e1533bcdf51adbaab… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Sat Dec 4 22:14:37 2010 +0100 ole32: Use an iface instead of a vtbl pointer in EnumOleSTATDATA. --- dlls/ole32/oleobj.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 7e131ae..4b2b5d7 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -56,13 +56,18 @@ static HRESULT EnumOleSTATDATA_Construct(OleAdviseHolderImpl *pOleAdviseHolder, typedef struct { - const IEnumSTATDATAVtbl *lpvtbl; + IEnumSTATDATA IEnumSTATDATA_iface; LONG ref; ULONG index; OleAdviseHolderImpl *pOleAdviseHolder; } EnumOleSTATDATA; +static inline EnumOleSTATDATA *impl_from_IEnumSTATDATA(IEnumSTATDATA *iface) +{ + return CONTAINING_RECORD(iface, EnumOleSTATDATA, IEnumSTATDATA_iface); +} + static HRESULT WINAPI EnumOleSTATDATA_QueryInterface( IEnumSTATDATA *iface, REFIID riid, void **ppv) { @@ -80,7 +85,7 @@ static HRESULT WINAPI EnumOleSTATDATA_QueryInterface( static ULONG WINAPI EnumOleSTATDATA_AddRef( IEnumSTATDATA *iface) { - EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); TRACE("()\n"); return InterlockedIncrement(&This->ref); } @@ -88,7 +93,7 @@ static ULONG WINAPI EnumOleSTATDATA_AddRef( static ULONG WINAPI EnumOleSTATDATA_Release( IEnumSTATDATA *iface) { - EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); LONG refs = InterlockedDecrement(&This->ref); TRACE("()\n"); if (!refs) @@ -103,7 +108,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Next( IEnumSTATDATA *iface, ULONG celt, LPSTATDATA rgelt, ULONG *pceltFetched) { - EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); HRESULT hr = S_OK; TRACE("(%d, %p, %p)\n", celt, rgelt, pceltFetched); @@ -140,7 +145,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Next( static HRESULT WINAPI EnumOleSTATDATA_Skip( IEnumSTATDATA *iface, ULONG celt) { - EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); TRACE("(%d)\n", celt); @@ -161,7 +166,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Skip( static HRESULT WINAPI EnumOleSTATDATA_Reset( IEnumSTATDATA *iface) { - EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); TRACE("()\n"); @@ -173,7 +178,7 @@ static HRESULT WINAPI EnumOleSTATDATA_Clone( IEnumSTATDATA *iface, IEnumSTATDATA **ppenum) { - EnumOleSTATDATA *This = (EnumOleSTATDATA *)iface; + EnumOleSTATDATA *This = impl_from_IEnumSTATDATA(iface); return EnumOleSTATDATA_Construct(This->pOleAdviseHolder, This->index, ppenum); } @@ -193,13 +198,13 @@ static HRESULT EnumOleSTATDATA_Construct(OleAdviseHolderImpl *pOleAdviseHolder, EnumOleSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); if (!This) return E_OUTOFMEMORY; - This->lpvtbl = &EnumOleSTATDATA_VTable; + This->IEnumSTATDATA_iface.lpVtbl = &EnumOleSTATDATA_VTable; This->ref = 1; This->index = index; This->pOleAdviseHolder = pOleAdviseHolder; IOleAdviseHolder_AddRef((IOleAdviseHolder *)pOleAdviseHolder); - *ppenum = (IEnumSTATDATA *)&This->lpvtbl; - return S_OK; + *ppenum = &This->IEnumSTATDATA_iface; + return S_OK; } /**************************************************************************

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2010