hnetcfg: Use an iface instead of an vtbl pointer in fw_profile.

This commit is contained in:
Michael Stefaniuc 2010-12-20 11:34:31 +01:00 committed by Alexandre Julliard
parent 2bb60b239f
commit a38022ac29
1 changed files with 4 additions and 4 deletions

View File

@ -36,13 +36,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(hnetcfg);
typedef struct fw_profile typedef struct fw_profile
{ {
const INetFwProfileVtbl *vtbl; INetFwProfile INetFwProfile_iface;
LONG refs; LONG refs;
} fw_profile; } fw_profile;
static inline fw_profile *impl_from_INetFwProfile( INetFwProfile *iface ) static inline fw_profile *impl_from_INetFwProfile( INetFwProfile *iface )
{ {
return (fw_profile *)((char *)iface - FIELD_OFFSET( fw_profile, vtbl )); return CONTAINING_RECORD(iface, fw_profile, INetFwProfile_iface);
} }
static ULONG WINAPI fw_profile_AddRef( static ULONG WINAPI fw_profile_AddRef(
@ -319,10 +319,10 @@ HRESULT NetFwProfile_create( IUnknown *pUnkOuter, LPVOID *ppObj )
fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) ); fp = HeapAlloc( GetProcessHeap(), 0, sizeof(*fp) );
if (!fp) return E_OUTOFMEMORY; if (!fp) return E_OUTOFMEMORY;
fp->vtbl = &fw_profile_vtbl; fp->INetFwProfile_iface.lpVtbl = &fw_profile_vtbl;
fp->refs = 1; fp->refs = 1;
*ppObj = &fp->vtbl; *ppObj = &fp->INetFwProfile_iface;
TRACE("returning iface %p\n", *ppObj); TRACE("returning iface %p\n", *ppObj);
return S_OK; return S_OK;