system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 20:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

windowscodecs: Use an iface instead of a vtbl pointer in ClassFactoryImpl.

Browse source
This commit is contained in:
Michael Stefaniuc 2010-11-29 00:57:27 +01:00 committed by Alexandre Julliard
parent 624ca877f1
commit 1881db6ab5
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
dlls/windowscodecs/clsfactory.c
View file

@ -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;