static IEnumFORMATETC *EnumFORMATETC_Create(UINT cfmtetc, const FORMATETC *rgfmtetc, UINT it);
-#define ENUMF_THIS(iface) ICOM_THIS_MULTI(EnumFORMATETC, lpEnumFORMATETCVtbl, iface)
+#define ENUMF_THIS(iface) DEFINE_THIS(EnumFORMATETC, EnumFORMATETC, iface)
static HRESULT WINAPI EnumFORMATETC_QueryInterface(IEnumFORMATETC *iface, REFIID riid, void **ppv)
{
- TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv);
+ EnumFORMATETC *This = ENUMF_THIS(iface);
+
+ TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv);
*ppv = NULL;
static ULONG WINAPI EnumFORMATETC_AddRef(IEnumFORMATETC *iface)
{
- ENUMF_THIS(iface);
+ EnumFORMATETC *This = ENUMF_THIS(iface);
LONG ref = InterlockedIncrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
return ref;
static ULONG WINAPI EnumFORMATETC_Release(IEnumFORMATETC *iface)
{
- ENUMF_THIS(iface);
+ EnumFORMATETC *This = ENUMF_THIS(iface);
LONG ref = InterlockedDecrement(&This->ref);
TRACE("(%p) ref=%d\n", This, ref);
static HRESULT WINAPI EnumFORMATETC_Next(IEnumFORMATETC *iface, ULONG celt,
FORMATETC *rgelt, ULONG *pceltFetched)
{
- ENUMF_THIS(iface);
+ EnumFORMATETC *This = ENUMF_THIS(iface);
ULONG cnt;
TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched);
static HRESULT WINAPI EnumFORMATETC_Skip(IEnumFORMATETC *iface, ULONG celt)
{
- ENUMF_THIS(iface);
+ EnumFORMATETC *This = ENUMF_THIS(iface);
TRACE("(%p)->(%d)\n", This, celt);
static HRESULT WINAPI EnumFORMATETC_Reset(IEnumFORMATETC *iface)
{
- ENUMF_THIS(iface);
+ EnumFORMATETC *This = ENUMF_THIS(iface);
TRACE("(%p)\n", This);
static HRESULT WINAPI EnumFORMATETC_Clone(IEnumFORMATETC *iface, IEnumFORMATETC **ppenum)
{
- ENUMF_THIS(iface);
+ EnumFORMATETC *This = ENUMF_THIS(iface);
TRACE("(%p)->(%p)\n", This, ppenum);