Michael Stefaniuc : dispex/tests: Use an iface instead of a vtbl pointer in dispex.
Alexandre Julliard
julliard at winehq.org
Mon Nov 29 13:38:38 CST 2010
Module: wine
Branch: master
Commit: 87f42eb853777492d7f1205e0d38bd05132034b0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f42eb853777492d7f1205e0d38bd05132034b0
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Nov 29 00:56:38 2010 +0100
dispex/tests: Use an iface instead of a vtbl pointer in dispex.
---
dlls/dispex/tests/marshal.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c
index 4380621..7fa9121 100644
--- a/dlls/dispex/tests/marshal.c
+++ b/dlls/dispex/tests/marshal.c
@@ -140,10 +140,15 @@ static void end_host_object(DWORD tid, HANDLE thread)
typedef struct
{
- const IDispatchExVtbl *lpVtbl;
+ IDispatchEx IDispatchEx_iface;
LONG refs;
} dispex;
+static inline dispex *impl_from_IDispatchEx(IDispatchEx *iface)
+{
+ return CONTAINING_RECORD(iface, dispex, IDispatchEx_iface);
+}
+
static HRESULT WINAPI dispex_QueryInterface(IDispatchEx* iface,
REFIID iid, void **obj)
{
@@ -164,7 +169,7 @@ static HRESULT WINAPI dispex_QueryInterface(IDispatchEx* iface,
static ULONG WINAPI dispex_AddRef(IDispatchEx* iface)
{
- dispex *This = (dispex *)iface;
+ dispex *This = impl_from_IDispatchEx(iface);
trace("AddRef\n");
return InterlockedIncrement(&This->refs);
@@ -172,7 +177,7 @@ static ULONG WINAPI dispex_AddRef(IDispatchEx* iface)
static ULONG WINAPI dispex_Release(IDispatchEx* iface)
{
- dispex *This = (dispex *)iface;
+ dispex *This = impl_from_IDispatchEx(iface);
ULONG refs = InterlockedDecrement(&This->refs);
trace("Release\n");
if(!refs)
@@ -349,7 +354,7 @@ static IDispatchEx *dispex_create(void)
This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This));
if (!This) return NULL;
- This->lpVtbl = &dispex_vtable;
+ This->IDispatchEx_iface.lpVtbl = &dispex_vtable;
This->refs = 1;
return (IDispatchEx *)This;
}
More information about the wine-cvs
mailing list