Michael Stefaniuc : mscoree: Use an iface instead of a vtbl pointer in MetaDataDispenser.
Alexandre Julliard
julliard at winehq.org
Fri Dec 10 11:56:59 CST 2010
Module: wine
Branch: master
Commit: bcf15c7b163f20b6a0598c090d08bca28e748205
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf15c7b163f20b6a0598c090d08bca28e748205
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Dec 10 09:31:42 2010 +0100
mscoree: Use an iface instead of a vtbl pointer in MetaDataDispenser.
---
dlls/mscoree/metadata.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/mscoree/metadata.c b/dlls/mscoree/metadata.c
index c9b8c72..7a5336d 100644
--- a/dlls/mscoree/metadata.c
+++ b/dlls/mscoree/metadata.c
@@ -41,10 +41,15 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
typedef struct MetaDataDispenser
{
- const struct IMetaDataDispenserExVtbl *lpVtbl;
+ IMetaDataDispenserEx IMetaDataDispenserEx_iface;
LONG ref;
} MetaDataDispenser;
+static inline MetaDataDispenser *impl_from_IMetaDataDispenserEx(IMetaDataDispenserEx *iface)
+{
+ return CONTAINING_RECORD(iface, MetaDataDispenser, IMetaDataDispenserEx_iface);
+}
+
static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* iface,
REFIID riid, void **ppvObject)
{
@@ -69,7 +74,7 @@ static HRESULT WINAPI MetaDataDispenser_QueryInterface(IMetaDataDispenserEx* ifa
static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface)
{
- MetaDataDispenser *This = (MetaDataDispenser*)iface;
+ MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface);
ULONG ref = InterlockedIncrement(&This->ref);
TRACE("%p ref=%u\n", This, ref);
@@ -81,7 +86,7 @@ static ULONG WINAPI MetaDataDispenser_AddRef(IMetaDataDispenserEx* iface)
static ULONG WINAPI MetaDataDispenser_Release(IMetaDataDispenserEx* iface)
{
- MetaDataDispenser *This = (MetaDataDispenser*)iface;
+ MetaDataDispenser *This = impl_from_IMetaDataDispenserEx(iface);
ULONG ref = InterlockedDecrement(&This->ref);
TRACE("%p ref=%u\n", This, ref);
@@ -193,7 +198,7 @@ HRESULT MetaDataDispenser_CreateInstance(IUnknown **ppUnk)
if (!This)
return E_OUTOFMEMORY;
- This->lpVtbl = &MetaDataDispenserVtbl;
+ This->IMetaDataDispenserEx_iface.lpVtbl = &MetaDataDispenserVtbl;
This->ref = 1;
*ppUnk = (IUnknown*)This;
More information about the wine-cvs
mailing list