Michael Stefaniuc : avifil32: Use an iface instead of an vtbl pointer in IClassFactoryImpl.
Alexandre Julliard
julliard at winehq.org
Sun Dec 5 12:10:06 CST 2010
Module: wine
Branch: master
Commit: b8ef455d4918b9e680639556d1a618231d9e9516
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ef455d4918b9e680639556d1a618231d9e9516
Author: Michael Stefaniuc <mstefani at 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);
More information about the wine-cvs
mailing list