Michael Stefaniuc : browseui: Use an iface instead of a vtbl pointer in ClassFactory.
Alexandre Julliard
julliard at winehq.org
Thu Dec 9 12:26:26 CST 2010
Module: wine
Branch: master
Commit: 0d61c7ba161dfbd658c60207102e1c974dae0ca6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d61c7ba161dfbd658c60207102e1c974dae0ca6
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Dec 8 22:59:27 2010 +0100
browseui: Use an iface instead of a vtbl pointer in ClassFactory.
---
dlls/browseui/browseui_main.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c
index 52226e4..18af461 100644
--- a/dlls/browseui/browseui_main.c
+++ b/dlls/browseui/browseui_main.c
@@ -60,11 +60,16 @@ static const struct {
typedef struct tagClassFactory
{
- const IClassFactoryVtbl *vtbl;
+ IClassFactory IClassFactory_iface;
LONG ref;
LPFNCONSTRUCTOR ctor;
} ClassFactory;
+static inline ClassFactory *impl_from_IClassFactory(IClassFactory *iface)
+{
+ return CONTAINING_RECORD(iface, ClassFactory, IClassFactory_iface);
+}
+
static void ClassFactory_Destructor(ClassFactory *This)
{
TRACE("Destroying class factory %p\n", This);
@@ -87,13 +92,13 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r
static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
{
- ClassFactory *This = (ClassFactory *)iface;
+ ClassFactory *This = impl_from_IClassFactory(iface);
return InterlockedIncrement(&This->ref);
}
static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
{
- ClassFactory *This = (ClassFactory *)iface;
+ ClassFactory *This = impl_from_IClassFactory(iface);
ULONG ret = InterlockedDecrement(&This->ref);
if (ret == 0)
@@ -103,7 +108,7 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID iid, LPVOID *ppvOut)
{
- ClassFactory *This = (ClassFactory *)iface;
+ ClassFactory *This = impl_from_IClassFactory(iface);
HRESULT ret;
IUnknown *obj;
@@ -118,7 +123,7 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown
static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock)
{
- ClassFactory *This = (ClassFactory *)iface;
+ ClassFactory *This = impl_from_IClassFactory(iface);
TRACE("(%p)->(%x)\n", This, fLock);
@@ -144,7 +149,7 @@ static const IClassFactoryVtbl ClassFactoryVtbl = {
static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut)
{
ClassFactory *This = heap_alloc(sizeof(ClassFactory));
- This->vtbl = &ClassFactoryVtbl;
+ This->IClassFactory_iface.lpVtbl = &ClassFactoryVtbl;
This->ref = 1;
This->ctor = ctor;
*ppvOut = This;
More information about the wine-cvs
mailing list