- Get rid of the ICOM crap.
svn path=/trunk/; revision=11069
const IOleDocumentVtbl* lpVtbl;
};
struct IOleDocumentVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IOleDocument* This,
#endif
#define IOleDocument_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IOleDocumentSiteVtbl* lpVtbl;
};
struct IOleDocumentSiteVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IOleDocumentSite* This,
#endif
#define IOleDocumentSite_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IOleDocumentViewVtbl* lpVtbl;
};
struct IOleDocumentViewVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IOleDocumentView* This,
#endif
#define IOleDocumentView_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IEnumOleDocumentViewsVtbl* lpVtbl;
};
struct IEnumOleDocumentViewsVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IEnumOleDocumentViews* This,
#endif
#define IEnumOleDocumentViews_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IOleCommandTargetVtbl* lpVtbl;
};
struct IOleCommandTargetVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IOleCommandTarget* This,
#endif
#define IOleCommandTarget_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IContinueCallbackVtbl* lpVtbl;
};
struct IContinueCallbackVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IContinueCallback* This,
#endif
#define IContinueCallback_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IPrintVtbl* lpVtbl;
};
struct IPrintVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IPrint* This,
#endif
#define IPrint_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IWebBrowserVtbl* lpVtbl;
};
struct IWebBrowserVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IWebBrowser* This,
#endif
#define IWebBrowser_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IWebBrowserAppVtbl* lpVtbl;
};
struct IWebBrowserAppVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IWebBrowserApp* This,
#endif
#define IWebBrowserApp_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
+++ /dev/null
-#ifndef __WINE_ICOM_H
-#define __WINE_ICOM_H
-
-//#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))
-//#define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;
-//#define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,
-//#else
-# define ICOM_MSVTABLE_COMPAT_FIELDS
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-//#endif
-
-#define ICOM_DEFINE(iface,ibase) DECLARE_INTERFACE_(iface,ibase) { iface##_METHODS };
-#define ICOM_VTABLE(iface) iface##Vtbl
-#define ICOM_VFIELD(iface) ICOM_VTABLE(iface)* lpVtbl
-#define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface)
-#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
-
-#define IUnknown_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
- /*** IUnknown methods ***/ \
- STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
- STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
- STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-#endif /* __WINE_ICOM_H */
#define interface struct
-#undef CONST_VTBL
-#define CONST_VTBL
-#define WINE_DECLARE_INTERFACE(iface) \
- /*typedef*/ interface iface { struct iface##Vtbl *lpVtbl; } /*iface*/; \
- typedef struct iface##Vtbl iface##Vtbl; \
- struct iface##Vtbl
-#define WINE_DECLARE_INTERFACE_(iface,ibase) WINE_DECLARE_INTERFACE(iface)
-
-#define ICOM_DEFINE(iface,ibase) WINE_DECLARE_INTERFACE_(iface,ibase) { iface##_METHODS };
-#define ICOM_VTABLE(iface) iface##Vtbl
-#define ICOM_VFIELD(iface) ICOM_VTABLE(iface)* lpVtbl
-#define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface)
-#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
-
/*****************************************************************************
* Storage API
*/
DEFINE_GUID(IID_ISequentialStream, 0x0c733a30, 0x2a1c, 0x11ce, 0xad,0xe5, 0x00,0xaa,0x00,0x44,0x77,0x3d);
#define ISequentialStream_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IGlobalInterfaceTableVtbl* lpVtbl;
};
struct IGlobalInterfaceTableVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IGlobalInterfaceTable* This,
#endif
#define IGlobalInterfaceTable_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IAutoCompleteVtbl* lpVtbl;
};
struct IAutoCompleteVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IAutoComplete* This,
#endif
#define IAutoComplete_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
const IAutoComplete2Vtbl* lpVtbl;
};
struct IAutoComplete2Vtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
-
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IAutoComplete2* This,
#endif
#define IAutoComplete2_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
STDMETHOD(GetKey)(THIS_ ASSOCF flags, ASSOCKEY key, LPCWSTR pszExtra, HKEY * phkeyOut) PURE; \
STDMETHOD(GetData)(THIS_ ASSOCF flags, ASSOCDATA data, LPCWSTR pszExtra, LPVOID pvOut, DWORD * pcbOut) PURE; \
STDMETHOD(GetEnum)(THIS_ ASSOCF flags, ASSOCENUM assocenum, LPCWSTR pszExtra, REFIID riid, LPVOID * ppvOut) PURE;
-ICOM_DEFINE(IQueryAssociations,IUnknown)
+DECLARE_INTERFACE_(IQueryAssociations,IUnknown) { IQueryAssociations_METHODS };
#undef INTERFACE
#ifdef COBJMACROS
#define IClassFactory_CreateInstance(p,a,b,c) (p)->lpVtbl->CreateInstance(p,a,b,c)
#define IClassFactory_LockServer(p,a) (p)->lpVtbl->LockServer(p,a)
-#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))
-# define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,
-#else
-# define ICOM_MSVTABLE_COMPAT_FIELDS
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-#endif
-
#define IUnknown_METHODS \
- ICOM_MSVTABLE_COMPAT_FIELDS \
/*** IUnknown methods ***/ \
STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
*/
typedef struct ConnectionPointImpl {
- ICOM_VTABLE(IConnectionPoint) *lpvtbl;
+ IConnectionPointVtbl *lpvtbl;
/* IUnknown of our main object*/
IUnknown *Obj;
DWORD nSinks;
} ConnectionPointImpl;
-static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable;
+static IConnectionPointVtbl ConnectionPointImpl_VTable;
/************************************************************************
*/
typedef struct EnumConnectionsImpl {
- ICOM_VTABLE(IEnumConnections) *lpvtbl;
+ IEnumConnectionsVtbl *lpvtbl;
DWORD ref;
REFIID riid,
void** ppvObject)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
/*
*/
static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
TRACE("(%p)->(ref=%ld)\n", This, This->ref);
This->ref++;
static ULONG WINAPI ConnectionPointImpl_Release(
IConnectionPoint* iface)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
TRACE("(%p)->(ref=%ld)\n", This, This->ref);
/*
IConnectionPoint *iface,
IID *piid)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
TRACE("(%p)->(%p) returning %s\n", This, piid, debugstr_guid(&(This->iid)));
*piid = This->iid;
return S_OK;
IConnectionPoint *iface,
IConnectionPointContainer **ppCPC)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
TRACE("(%p)->(%p)\n", This, ppCPC);
return IUnknown_QueryInterface(This->Obj,
DWORD *pdwCookie)
{
DWORD i;
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
IUnknown *lpSink;
TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie);
static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface,
DWORD dwCookie)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
TRACE("(%p)->(%ld)\n", This, dwCookie);
if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG;
IConnectionPoint *iface,
LPENUMCONNECTIONS *ppEnum)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
CONNECTDATA *pCD;
DWORD i, nextslot;
EnumConnectionsImpl *EnumObj;
return hr;
}
-static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable =
+static IConnectionPointVtbl ConnectionPointImpl_VTable =
{
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ConnectionPointImpl_QueryInterface,
ConnectionPointImpl_AddRef,
ConnectionPointImpl_Release,
};
-static ICOM_VTABLE(IEnumConnections) EnumConnectionsImpl_VTable;
+static IEnumConnectionsVtbl EnumConnectionsImpl_VTable;
static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface);
/************************************************************************
REFIID riid,
void** ppvObject)
{
- ICOM_THIS(ConnectionPointImpl, iface);
+ ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
/*
*/
static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface)
{
- ICOM_THIS(EnumConnectionsImpl, iface);
+ EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
TRACE("(%p)->(ref=%ld)\n", This, This->ref);
This->ref++;
IUnknown_AddRef(This->pUnk);
*/
static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface)
{
- ICOM_THIS(EnumConnectionsImpl, iface);
+ EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
TRACE("(%p)->(ref=%ld)\n", This, This->ref);
IUnknown_Release(This->pUnk);
ULONG cConn, LPCONNECTDATA pCD,
ULONG *pEnum)
{
- ICOM_THIS(EnumConnectionsImpl, iface);
+ EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
DWORD nRet = 0;
TRACE("(%p)->(%ld, %p, %p)\n", This, cConn, pCD, pEnum);
static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
ULONG cSkip)
{
- ICOM_THIS(EnumConnectionsImpl, iface);
+ EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
TRACE("(%p)->(%ld)\n", This, cSkip);
if(This->nCur + cSkip >= This->nConns)
*/
static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface)
{
- ICOM_THIS(EnumConnectionsImpl, iface);
+ EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
TRACE("(%p)\n", This);
This->nCur = 0;
static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface,
LPENUMCONNECTIONS *ppEnum)
{
- ICOM_THIS(EnumConnectionsImpl, iface);
+ EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
EnumConnectionsImpl *newObj;
TRACE("(%p)->(%p)\n", This, ppEnum);
return S_OK;
}
-static ICOM_VTABLE(IEnumConnections) EnumConnectionsImpl_VTable =
+static IEnumConnectionsVtbl EnumConnectionsImpl_VTable =
{
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
EnumConnectionsImpl_QueryInterface,
EnumConnectionsImpl_AddRef,
EnumConnectionsImpl_Release,
typedef struct
{
- ICOM_VFIELD(IDispatch);
+ IDispatchVtbl *lpVtbl;
void * pvThis;
ITypeInfo * pTypeInfo;
ULONG ref;
REFIID riid,
void** ppvObject)
{
- ICOM_THIS(StdDispatch, iface);
+ StdDispatch *This = (StdDispatch *)iface;
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObject);
if (IsEqualIID(riid, &IID_IDispatch) ||
*/
static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface)
{
- ICOM_THIS(StdDispatch, iface);
+ StdDispatch *This = (StdDispatch *)iface;
TRACE("()\n");
return ++This->ref;
*/
static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface)
{
- ICOM_THIS(StdDispatch, iface);
+ StdDispatch *This = (StdDispatch *)iface;
ULONG ret;
TRACE("(%p)->()\n", This);
*/
static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo)
{
- ICOM_THIS(StdDispatch, iface);
+ StdDispatch *This = (StdDispatch *)iface;
TRACE("(%p)\n", pctinfo);
*pctinfo = This->pTypeInfo ? 1 : 0;
*/
static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo)
{
- ICOM_THIS(StdDispatch, iface);
+ StdDispatch *This = (StdDispatch *)iface;
TRACE("(%d, %lx, %p)\n", iTInfo, lcid, ppTInfo);
*ppTInfo = NULL;
*/
static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId)
{
- ICOM_THIS(StdDispatch, iface);
+ StdDispatch *This = (StdDispatch *)iface;
TRACE("(%s, %p, %d, 0x%lx, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
if (!IsEqualGUID(riid, &IID_NULL))
WORD wFlags, DISPPARAMS * pDispParams, VARIANT * pVarResult,
EXCEPINFO * pExcepInfo, UINT * puArgErr)
{
- ICOM_THIS(StdDispatch, iface);
+ StdDispatch *This = (StdDispatch *)iface;
TRACE("(%ld, %s, 0x%lx, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
if (!IsEqualGUID(riid, &IID_NULL))
return DispInvoke(This->pvThis, This->pTypeInfo, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
}
-static ICOM_VTABLE(IDispatch) StdDispatch_VTable =
+static IDispatchVtbl StdDispatch_VTable =
{
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
StdDispatch_QueryInterface,
StdDispatch_AddRef,
StdDispatch_Release,
* IPicture handles IUnknown
*/
- ICOM_VTABLE(IPicture) *lpvtbl1;
- ICOM_VTABLE(IDispatch) *lpvtbl2;
- ICOM_VTABLE(IPersistStream) *lpvtbl3;
- ICOM_VTABLE(IConnectionPointContainer) *lpvtbl4;
+ IPictureVtbl *lpvtbl1;
+ IDispatchVtbl *lpvtbl2;
+ IPersistStreamVtbl *lpvtbl3;
+ IConnectionPointContainerVtbl *lpvtbl4;
/* Object referenece count */
DWORD ref;
/*
* Predeclare VTables. They get initialized at the end.
*/
-static ICOM_VTABLE(IPicture) OLEPictureImpl_VTable;
-static ICOM_VTABLE(IDispatch) OLEPictureImpl_IDispatch_VTable;
-static ICOM_VTABLE(IPersistStream) OLEPictureImpl_IPersistStream_VTable;
-static ICOM_VTABLE(IConnectionPointContainer) OLEPictureImpl_IConnectionPointContainer_VTable;
+static IPictureVtbl OLEPictureImpl_VTable;
+static IDispatchVtbl OLEPictureImpl_IDispatch_VTable;
+static IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable;
+static IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable;
/***********************************************************************
* Implementation of the OLEPictureImpl class.
REFIID riid,
void** ppvObject)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
/*
static ULONG WINAPI OLEPictureImpl_AddRef(
IPicture* iface)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(ref=%ld)\n", This, This->ref);
This->ref++;
static ULONG WINAPI OLEPictureImpl_Release(
IPicture* iface)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(ref=%ld)\n", This, This->ref);
/*
static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
OLE_HANDLE *phandle)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p)\n", This, phandle);
switch(This->desc.picType) {
case PICTYPE_BITMAP:
static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface,
OLE_HANDLE *phandle)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
FIXME("(%p)->(%p): stub\n", This, phandle);
return E_NOTIMPL;
}
static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface,
short *ptype)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p): type is %d\n", This, ptype, This->desc.picType);
*ptype = This->desc.picType;
return S_OK;
static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface,
OLE_XSIZE_HIMETRIC *pwidth)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p): width is %ld\n", This, pwidth, This->himetricWidth);
*pwidth = This->himetricWidth;
return S_OK;
static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
OLE_YSIZE_HIMETRIC *pheight)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p): height is %ld\n", This, pheight, This->himetricHeight);
*pheight = This->himetricHeight;
return S_OK;
OLE_YSIZE_HIMETRIC cySrc,
LPCRECT prcWBounds)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n",
This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
if(prcWBounds)
static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface,
OLE_HANDLE hpal)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
FIXME("(%p)->(%08x): stub\n", This, hpal);
OLEPicture_SendNotify(This,DISPID_PICT_HPAL);
return E_NOTIMPL;
static HRESULT WINAPI OLEPictureImpl_get_CurDC(IPicture *iface,
HDC *phdc)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p), returning %p\n", This, This->hDCCur);
if (phdc) *phdc = This->hDCCur;
return S_OK;
HDC *phdcOut,
OLE_HANDLE *phbmpOut)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p, %p, %p)\n", This, hdcIn, phdcOut, phbmpOut);
if (This->desc.picType == PICTYPE_BITMAP) {
SelectObject(hdcIn,This->desc.u.bmp.hbitmap);
static HRESULT WINAPI OLEPictureImpl_get_KeepOriginalFormat(IPicture *iface,
BOOL *pfKeep)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p)\n", This, pfKeep);
if (!pfKeep)
return E_POINTER;
static HRESULT WINAPI OLEPictureImpl_put_KeepOriginalFormat(IPicture *iface,
BOOL keep)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%d)\n", This, keep);
This->keepOrigFormat = keep;
/* FIXME: what DISPID notification here? */
*/
static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->()\n", This);
OLEPicture_SendNotify(This,DISPID_PICT_HANDLE);
return S_OK;
BOOL SaveMemCopy,
LONG *pcbSize)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize);
return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize);
}
static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface,
DWORD *pdwAttr)
{
- ICOM_THIS(OLEPictureImpl, iface);
+ OLEPictureImpl *This = (OLEPictureImpl *)iface;
TRACE("(%p)->(%p).\n", This, pdwAttr);
*pdwAttr = 0;
switch (This->desc.picType) {
}
-static ICOM_VTABLE(IPicture) OLEPictureImpl_VTable =
+static IPictureVtbl OLEPictureImpl_VTable =
{
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
OLEPictureImpl_QueryInterface,
OLEPictureImpl_AddRef,
OLEPictureImpl_Release,
OLEPictureImpl_get_Attributes
};
-static ICOM_VTABLE(IDispatch) OLEPictureImpl_IDispatch_VTable =
+static IDispatchVtbl OLEPictureImpl_IDispatch_VTable =
{
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
OLEPictureImpl_IDispatch_QueryInterface,
OLEPictureImpl_IDispatch_AddRef,
OLEPictureImpl_IDispatch_Release,
OLEPictureImpl_Invoke
};
-static ICOM_VTABLE(IPersistStream) OLEPictureImpl_IPersistStream_VTable =
+static IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable =
{
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
OLEPictureImpl_IPersistStream_QueryInterface,
OLEPictureImpl_IPersistStream_AddRef,
OLEPictureImpl_IPersistStream_Release,
OLEPictureImpl_GetSizeMax
};
-static ICOM_VTABLE(IConnectionPointContainer) OLEPictureImpl_IConnectionPointContainer_VTable =
+static IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable =
{
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
OLEPictureImpl_IConnectionPointContainer_QueryInterface,
OLEPictureImpl_IConnectionPointContainer_AddRef,
OLEPictureImpl_IConnectionPointContainer_Release,
typedef struct
{
/* IUnknown fields */
- ICOM_VFIELD(IClassFactory);
+ IClassFactoryVtbl *lpVtbl;
DWORD ref;
} IClassFactoryImpl;
static HRESULT WINAPI
SPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
- ICOM_THIS(IClassFactoryImpl,iface);
+ IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
return E_NOINTERFACE;
static ULONG WINAPI
SPCF_AddRef(LPCLASSFACTORY iface) {
- ICOM_THIS(IClassFactoryImpl,iface);
+ IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
return ++(This->ref);
}
static ULONG WINAPI SPCF_Release(LPCLASSFACTORY iface) {
- ICOM_THIS(IClassFactoryImpl,iface);
+ IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
/* static class, won't be freed */
return --(This->ref);
}
}
static HRESULT WINAPI SPCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
- ICOM_THIS(IClassFactoryImpl,iface);
+ IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
FIXME("(%p)->(%d),stub!\n",This,dolock);
return S_OK;
}
-static ICOM_VTABLE(IClassFactory) SPCF_Vtbl = {
- ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+static IClassFactoryVtbl SPCF_Vtbl = {
SPCF_QueryInterface,
SPCF_AddRef,
SPCF_Release,
typedef struct _TMProxyImpl {
DWORD *lpvtbl;
- ICOM_VTABLE(IRpcProxyBuffer) *lpvtbl2;
+ IRpcProxyBufferVtbl *lpvtbl2;
DWORD ref;
TMAsmProxy *asmstubs;
* Predeclare the interfaces
*/
DEFINE_GUID(IID_ISFHelper, 0x1fe68efbL, 0x1874, 0x9812, 0x56, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-typedef struct ISFHelper ISFHelper, *LPISFHELPER;
+typedef struct ISFHelper *LPISFHELPER;
/*****************************************************************************
* ISFHelper interface
STDMETHOD(AddFolder)(THIS_ HWND hwnd, LPCSTR lpName, LPITEMIDLIST * ppidlOut) PURE; \
STDMETHOD(DeleteItems)(THIS_ UINT cidl, LPCITEMIDLIST * apidl) PURE; \
STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT cidl, LPCITEMIDLIST * apidl) PURE;
-ICOM_DEFINE(ISFHelper, IUnknown)
+DECLARE_INTERFACE_(ISFHelper, IUnknown) { ISFHelper_METHODS };
#undef INTERFACE
#ifdef COBJMACROS