Michael Stefaniuc : windowscodecs: Use an iface instead of a vtbl pointer in ClassFactoryImpl.
Alexandre Julliard
julliard at winehq.org
Mon Nov 29 13:38:38 CST 2010
Module: wine
Branch: master
Commit: 1881db6ab511a8c76d21c10d8de756ace7f73006
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1881db6ab511a8c76d21c10d8de756ace7f73006
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Nov 29 00:57:27 2010 +0100
windowscodecs: Use an iface instead of a vtbl pointer in ClassFactoryImpl.
---
dlls/windowscodecs/clsfactory.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c
index 3c718cb..473a6a9 100644
--- a/dlls/windowscodecs/clsfactory.c
+++ b/dlls/windowscodecs/clsfactory.c
@@ -59,15 +59,20 @@ static classinfo wic_classes[] = {
{0}};
typedef struct {
- const IClassFactoryVtbl *lpIClassFactoryVtbl;
+ IClassFactory IClassFactory_iface;
LONG ref;
classinfo *info;
} ClassFactoryImpl;
+static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
+{
+ return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface);
+}
+
static HRESULT WINAPI ClassFactoryImpl_QueryInterface(IClassFactory *iface,
REFIID iid, void **ppv)
{
- ClassFactoryImpl *This = (ClassFactoryImpl*)iface;
+ ClassFactoryImpl *This = impl_from_IClassFactory(iface);
TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv);
if (!ppv) return E_INVALIDARG;
@@ -88,7 +93,7 @@ static HRESULT WINAPI ClassFactoryImpl_QueryInterface(IClassFactory *iface,
static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface)
{
- ClassFactoryImpl *This = (ClassFactoryImpl*)iface;
+ ClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref);
@@ -98,7 +103,7 @@ static ULONG WINAPI ClassFactoryImpl_AddRef(IClassFactory *iface)
static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface)
{
- ClassFactoryImpl *This = (ClassFactoryImpl*)iface;
+ ClassFactoryImpl *This = impl_from_IClassFactory(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) refcount=%u\n", iface, ref);
@@ -112,7 +117,7 @@ static ULONG WINAPI ClassFactoryImpl_Release(IClassFactory *iface)
static HRESULT WINAPI ClassFactoryImpl_CreateInstance(IClassFactory *iface,
IUnknown *pUnkOuter, REFIID riid, void **ppv)
{
- ClassFactoryImpl *This = (ClassFactoryImpl*)iface;
+ ClassFactoryImpl *This = impl_from_IClassFactory(iface);
return This->info->constructor(pUnkOuter, riid, ppv);
}
@@ -141,7 +146,7 @@ static HRESULT ClassFactoryImpl_Constructor(classinfo *info, REFIID riid, LPVOID
This = HeapAlloc(GetProcessHeap(), 0, sizeof(ClassFactoryImpl));
if (!This) return E_OUTOFMEMORY;
- This->lpIClassFactoryVtbl = &ClassFactoryImpl_Vtbl;
+ This->IClassFactory_iface.lpVtbl = &ClassFactoryImpl_Vtbl;
This->ref = 1;
This->info = info;
More information about the wine-cvs
mailing list