From 241a4c34b1675341ca6aba5032b65c251e2dc7a1 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 9 Sep 2004 21:03:58 +0000 Subject: [PATCH] Get rid of the non-standard ICOM_THIS macro. --- dlls/ole32/antimoniker.c | 6 +-- dlls/ole32/bindctx.c | 24 +++++----- dlls/ole32/clipboard.c | 26 +++++----- dlls/ole32/compositemoniker.c | 24 +++++----- dlls/ole32/filemoniker.c | 22 ++++----- dlls/ole32/itemmoniker.c | 24 +++++----- dlls/ole32/marshal.c | 4 +- dlls/ole32/moniker.c | 20 ++++---- dlls/ole32/ole16.c | 18 +++---- dlls/ole32/oleobj.c | 32 ++++++------- dlls/ole32/oleproxy.c | 10 ++-- dlls/ole32/rpc.c | 8 ++-- dlls/ole32/storage.c | 38 +++++++-------- dlls/ole32/storage32.c | 20 ++++---- dlls/oleaut32/connpt.c | 30 ++++++------ dlls/oleaut32/dispatch.c | 14 +++--- dlls/oleaut32/olefont.c | 8 ++-- dlls/oleaut32/olepicture.c | 42 ++++++++-------- dlls/oleaut32/tmarshal.c | 12 ++--- dlls/oleaut32/typelib.c | 108 +++++++++++++++++++++--------------------- dlls/oleaut32/typelib2.c | 62 ++++++++++++------------ include/objbase.h | 16 +++---- 22 files changed, 282 insertions(+), 286 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index 278bef55aaf..89f767e0de6 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -146,7 +146,7 @@ static IROTDataVtbl VT_ROTDataImpl = *******************************************************************************/ HRESULT WINAPI AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { - ICOM_THIS(AntiMonikerImpl,iface); + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -182,7 +182,7 @@ HRESULT WINAPI AntiMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ******************************************************************************/ ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker* iface) { - ICOM_THIS(AntiMonikerImpl,iface); + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; TRACE("(%p)\n",This); @@ -194,7 +194,7 @@ ULONG WINAPI AntiMonikerImpl_AddRef(IMoniker* iface) ******************************************************************************/ ULONG WINAPI AntiMonikerImpl_Release(IMoniker* iface) { - ICOM_THIS(AntiMonikerImpl,iface); + AntiMonikerImpl *This = (AntiMonikerImpl *)iface; TRACE("(%p)\n",This); diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index ba737c73103..fcf98bccd19 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -105,7 +105,7 @@ static IBindCtxVtbl VT_BindCtxImpl = *******************************************************************************/ HRESULT WINAPI BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppvObject) { - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -138,7 +138,7 @@ HRESULT WINAPI BindCtxImpl_QueryInterface(IBindCtx* iface,REFIID riid,void** ppv ******************************************************************************/ ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface) { - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p)\n",This); @@ -150,7 +150,7 @@ ULONG WINAPI BindCtxImpl_AddRef(IBindCtx* iface) ******************************************************************************/ ULONG WINAPI BindCtxImpl_Release(IBindCtx* iface) { - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p)\n",This); @@ -224,7 +224,7 @@ HRESULT WINAPI BindCtxImpl_Destroy(BindCtxImpl* This) ******************************************************************************/ HRESULT WINAPI BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) { - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; DWORD lastIndex=This->bindCtxTableLastIndex; TRACE("(%p,%p)\n",This,punk); @@ -264,7 +264,7 @@ HRESULT WINAPI BindCtxImpl_RevokeObjectBound(IBindCtx* iface, IUnknown* punk) { DWORD index,j; - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%p)\n",This,punk); @@ -293,7 +293,7 @@ HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface) { DWORD i; - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p)\n",This); @@ -315,7 +315,7 @@ HRESULT WINAPI BindCtxImpl_ReleaseBoundObjects(IBindCtx* iface) ******************************************************************************/ HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%p)\n",This,pbindopts); @@ -336,7 +336,7 @@ HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) ******************************************************************************/ HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) { - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%p)\n",This,pbindopts); @@ -359,7 +359,7 @@ HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectT { HRESULT res; - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%p)\n",This,pprot); @@ -377,7 +377,7 @@ HRESULT WINAPI BindCtxImpl_GetRunningObjectTable(IBindCtx* iface,IRunningObjectT HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk) { DWORD index=0; - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_w(pszkey),punk); @@ -435,7 +435,7 @@ HRESULT WINAPI BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, HRESULT WINAPI BindCtxImpl_GetObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown** punk) { DWORD index; - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_w(pszkey),punk); @@ -461,7 +461,7 @@ HRESULT WINAPI BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR ppenum) { DWORD index,j; - ICOM_THIS(BindCtxImpl,iface); + BindCtxImpl *This = (BindCtxImpl *)iface; TRACE("(%p,%s)\n",This,debugstr_w(ppenum)); diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 2a7b756a8c1..48c92e0fce9 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1107,7 +1107,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_QueryInterface( /* * Declare "This" pointer */ - ICOM_THIS(OLEClipbrd, iface); + OLEClipbrd *This = (OLEClipbrd *)iface; TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* @@ -1158,7 +1158,7 @@ static ULONG WINAPI OLEClipbrd_IDataObject_AddRef( /* * Declare "This" pointer */ - ICOM_THIS(OLEClipbrd, iface); + OLEClipbrd *This = (OLEClipbrd *)iface; TRACE("(%p)->(count=%lu)\n",This, This->ref); @@ -1178,7 +1178,7 @@ static ULONG WINAPI OLEClipbrd_IDataObject_Release( /* * Declare "This" pointer */ - ICOM_THIS(OLEClipbrd, iface); + OLEClipbrd *This = (OLEClipbrd *)iface; TRACE("(%p)->(count=%lu)\n",This, This->ref); @@ -1220,7 +1220,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_GetData( /* * Declare "This" pointer */ - ICOM_THIS(OLEClipbrd, iface); + OLEClipbrd *This = (OLEClipbrd *)iface; TRACE("(%p,%p,%p)\n", iface, pformatetcIn, pmedium); @@ -1320,7 +1320,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_QueryGetData( /* * Declare "This" pointer */ - ICOM_THIS(OLEClipbrd, iface); + OLEClipbrd *This = (OLEClipbrd *)iface; TRACE("(%p, %p)\n", iface, pformatetc); @@ -1410,7 +1410,7 @@ static HRESULT WINAPI OLEClipbrd_IDataObject_EnumFormatEtc( /* * Declare "This" pointer */ - ICOM_THIS(OLEClipbrd, iface); + OLEClipbrd *This = (OLEClipbrd *)iface; TRACE("(%p, %lx, %p)\n", iface, dwDirection, ppenumFormatEtc); @@ -1603,7 +1603,7 @@ LPENUMFORMATETC OLEClipbrd_IEnumFORMATETC_Construct(UINT cfmt, const FORMATETC a static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface (LPENUMFORMATETC iface, REFIID riid, LPVOID* ppvObj) { - ICOM_THIS(IEnumFORMATETCImpl,iface); + IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; TRACE("(%p)->(\n\tIID:\t%s,%p)\n",This,debugstr_guid(riid),ppvObj); @@ -1645,7 +1645,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_QueryInterface */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) { - ICOM_THIS(IEnumFORMATETCImpl,iface); + IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; TRACE("(%p)->(count=%lu)\n",This, This->ref); if (This->pUnkDataObj) @@ -1661,7 +1661,7 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_AddRef(LPENUMFORMATETC iface) */ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) { - ICOM_THIS(IEnumFORMATETCImpl,iface); + IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; LPMALLOC pIMalloc; TRACE("(%p)->(count=%lu)\n",This, This->ref); @@ -1693,7 +1693,7 @@ static ULONG WINAPI OLEClipbrd_IEnumFORMATETC_Release(LPENUMFORMATETC iface) static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next (LPENUMFORMATETC iface, ULONG celt, FORMATETC *rgelt, ULONG *pceltFethed) { - ICOM_THIS(IEnumFORMATETCImpl,iface); + IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; UINT cfetch; HRESULT hres = S_FALSE; @@ -1731,7 +1731,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Next */ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULONG celt) { - ICOM_THIS(IEnumFORMATETCImpl,iface); + IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; TRACE("(%p)->(num=%lu)\n", This, celt); This->posFmt += celt; @@ -1750,7 +1750,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Skip(LPENUMFORMATETC iface, ULON */ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) { - ICOM_THIS(IEnumFORMATETCImpl,iface); + IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; TRACE("(%p)->()\n", This); This->posFmt = 0; @@ -1765,7 +1765,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Reset(LPENUMFORMATETC iface) static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone (LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum) { - ICOM_THIS(IEnumFORMATETCImpl,iface); + IEnumFORMATETCImpl *This = (IEnumFORMATETCImpl *)iface; HRESULT hr = S_OK; TRACE("(%p)->(ppenum=%p)\n", This, ppenum); diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 08cffcda700..19ea33009b2 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -203,7 +203,7 @@ static IEnumMonikerVtbl VT_EnumMonikerImpl = *******************************************************************************/ HRESULT WINAPI CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { - ICOM_THIS(CompositeMonikerImpl,iface); + CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -239,7 +239,7 @@ HRESULT WINAPI CompositeMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,v ******************************************************************************/ ULONG WINAPI CompositeMonikerImpl_AddRef(IMoniker* iface) { - ICOM_THIS(CompositeMonikerImpl,iface); + CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; TRACE("(%p)\n",This); @@ -251,7 +251,7 @@ ULONG WINAPI CompositeMonikerImpl_AddRef(IMoniker* iface) ******************************************************************************/ ULONG WINAPI CompositeMonikerImpl_Release(IMoniker* iface) { - ICOM_THIS(CompositeMonikerImpl,iface); + CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; ULONG i; TRACE("(%p)\n",This); @@ -311,7 +311,7 @@ HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker* iface,IStream* pStm) CLSID clsid; WCHAR string[1]={0}; - ICOM_THIS(CompositeMonikerImpl,iface); + CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; TRACE("(%p,%p)\n",iface,pStm); @@ -812,7 +812,7 @@ HRESULT WINAPI CompositeMonikerImpl_ComposeWith(IMoniker* iface, ******************************************************************************/ HRESULT WINAPI CompositeMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker** ppenumMoniker) { - ICOM_THIS(CompositeMonikerImpl,iface); + CompositeMonikerImpl *This = (CompositeMonikerImpl *)iface; TRACE("(%p,%d,%p)\n",iface,fForward,ppenumMoniker); @@ -1493,7 +1493,7 @@ HRESULT WINAPI CompositeMonikerROTDataImpl_GetComparaisonData(IROTData* iface, ******************************************************************************/ HRESULT WINAPI EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,void** ppvObject) { - ICOM_THIS(EnumMonikerImpl,iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -1523,7 +1523,7 @@ HRESULT WINAPI EnumMonikerImpl_QueryInterface(IEnumMoniker* iface,REFIID riid,vo ******************************************************************************/ ULONG WINAPI EnumMonikerImpl_AddRef(IEnumMoniker* iface) { - ICOM_THIS(EnumMonikerImpl,iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("(%p)\n",This); @@ -1536,7 +1536,7 @@ ULONG WINAPI EnumMonikerImpl_AddRef(IEnumMoniker* iface) ******************************************************************************/ ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) { - ICOM_THIS(EnumMonikerImpl,iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; ULONG i ; TRACE("(%p)\n",This); @@ -1562,7 +1562,7 @@ ULONG WINAPI EnumMonikerImpl_Release(IEnumMoniker* iface) ******************************************************************************/ HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface,ULONG celt, IMoniker** rgelt, ULONG* pceltFethed){ - ICOM_THIS(EnumMonikerImpl,iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; ULONG i; /* retrieve the requested number of moniker from the current position */ @@ -1584,7 +1584,7 @@ HRESULT WINAPI EnumMonikerImpl_Next(IEnumMoniker* iface,ULONG celt, IMoniker** r ******************************************************************************/ HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface,ULONG celt){ - ICOM_THIS(EnumMonikerImpl,iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; if ((This->currentPos+celt) >= This->tabSize) return S_FALSE; @@ -1599,7 +1599,7 @@ HRESULT WINAPI EnumMonikerImpl_Skip(IEnumMoniker* iface,ULONG celt){ ******************************************************************************/ HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface){ - ICOM_THIS(EnumMonikerImpl,iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; This->currentPos=0; @@ -1611,7 +1611,7 @@ HRESULT WINAPI EnumMonikerImpl_Reset(IEnumMoniker* iface){ ******************************************************************************/ HRESULT WINAPI EnumMonikerImpl_Clone(IEnumMoniker* iface,IEnumMoniker** ppenum){ - ICOM_THIS(EnumMonikerImpl,iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; return EnumMonikerImpl_CreateEnumMoniker(This->tabMoniker,This->tabSize,This->currentPos,TRUE,ppenum); } diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 0476fd441d2..c465507ec7f 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -153,7 +153,7 @@ static IROTDataVtbl VT_ROTDataImpl = *******************************************************************************/ HRESULT WINAPI FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -190,7 +190,7 @@ HRESULT WINAPI FileMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ******************************************************************************/ ULONG WINAPI FileMonikerImpl_AddRef(IMoniker* iface) { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; TRACE("(%p)\n",iface); @@ -202,7 +202,7 @@ ULONG WINAPI FileMonikerImpl_AddRef(IMoniker* iface) ******************************************************************************/ ULONG WINAPI FileMonikerImpl_Release(IMoniker* iface) { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; TRACE("(%p)\n",iface); @@ -260,7 +260,7 @@ HRESULT WINAPI FileMonikerImpl_Load(IMoniker* iface,IStream* pStm) WORD wbuffer; DWORD dwbuffer,length,i,doubleLenHex,doubleLenDec; - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; TRACE("(%p,%p)\n",iface,pStm); @@ -360,7 +360,7 @@ HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface, * if the length(filePath) > 8 or length(filePath) == 8 stop at step 5) */ - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; HRESULT res; LPOLESTR filePathW=This->filePathName; @@ -432,7 +432,7 @@ HRESULT WINAPI FileMonikerImpl_Save(IMoniker* iface, HRESULT WINAPI FileMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; DWORD len=lstrlenW(This->filePathName); DWORD sizeMAx; @@ -566,7 +566,7 @@ HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface, IClassFactory *pcf=0; IClassActivator *pca=0; - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; *ppvResult=0; @@ -860,7 +860,7 @@ HRESULT WINAPI FileMonikerImpl_Enum(IMoniker* iface,BOOL fForward, IEnumMoniker* ******************************************************************************/ HRESULT WINAPI FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker) { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; CLSID clsid; LPOLESTR filePath; IBindCtx* bind; @@ -893,7 +893,7 @@ HRESULT WINAPI FileMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker ******************************************************************************/ HRESULT WINAPI FileMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; int h = 0,i,skip,len; int off = 0; @@ -961,7 +961,7 @@ HRESULT WINAPI FileMonikerImpl_GetTimeOfLastChange(IMoniker* iface, IMoniker* pmkToLeft, FILETIME* pFileTime) { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; IRunningObjectTable* rot; HRESULT res; WIN32_FILE_ATTRIBUTE_DATA info; @@ -1229,7 +1229,7 @@ HRESULT WINAPI FileMonikerImpl_GetDisplayName(IMoniker* iface, IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) { - ICOM_THIS(FileMonikerImpl,iface); + FileMonikerImpl *This = (FileMonikerImpl *)iface; int len=lstrlenW(This->filePathName); diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index b2c3d08fff3..fef617d8cb1 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -152,7 +152,7 @@ static IROTDataVtbl VT_ROTDataImpl = *******************************************************************************/ HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -189,7 +189,7 @@ HRESULT WINAPI ItemMonikerImpl_QueryInterface(IMoniker* iface,REFIID riid,void** ******************************************************************************/ ULONG WINAPI ItemMonikerImpl_AddRef(IMoniker* iface) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; TRACE("(%p)\n",This); @@ -201,7 +201,7 @@ ULONG WINAPI ItemMonikerImpl_AddRef(IMoniker* iface) ******************************************************************************/ ULONG WINAPI ItemMonikerImpl_Release(IMoniker* iface) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; TRACE("(%p)\n",This); @@ -252,7 +252,7 @@ HRESULT WINAPI ItemMonikerImpl_IsDirty(IMoniker* iface) HRESULT WINAPI ItemMonikerImpl_Load(IMoniker* iface,IStream* pStm) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; HRESULT res; DWORD delimiterLength,nameLength,lenW; CHAR *itemNameA,*itemDelimiterA; @@ -320,7 +320,7 @@ HRESULT WINAPI ItemMonikerImpl_Save(IMoniker* iface, IStream* pStm,/* pointer to the stream where the object is to be saved */ BOOL fClearDirty)/* Specifies whether to clear the dirty flag */ { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; HRESULT res; CHAR *itemNameA,*itemDelimiterA; @@ -350,7 +350,7 @@ HRESULT WINAPI ItemMonikerImpl_Save(IMoniker* iface, HRESULT WINAPI ItemMonikerImpl_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize)/* Pointer to size of stream needed to save object */ { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; DWORD delimiterLength=lstrlenW(This->itemDelimiter)+1; DWORD nameLength=lstrlenW(This->itemName)+1; @@ -436,7 +436,7 @@ HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, REFIID riid, VOID** ppvResult) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; HRESULT res; IID refid=IID_IOleItemContainer; @@ -473,7 +473,7 @@ HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker* iface, REFIID riid, VOID** ppvResult) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; HRESULT res; IOleItemContainer *poic=0; @@ -645,7 +645,7 @@ HRESULT WINAPI ItemMonikerImpl_IsEqual(IMoniker* iface,IMoniker* pmkOtherMoniker ******************************************************************************/ HRESULT WINAPI ItemMonikerImpl_Hash(IMoniker* iface,DWORD* pdwHash) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; int h = 0,i,skip,len; int off = 0; @@ -685,7 +685,7 @@ HRESULT WINAPI ItemMonikerImpl_IsRunning(IMoniker* iface, IRunningObjectTable* rot; HRESULT res; IOleItemContainer *poic=0; - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,pmkNewlyRunning); @@ -827,7 +827,7 @@ HRESULT WINAPI ItemMonikerImpl_GetDisplayName(IMoniker* iface, IMoniker* pmkToLeft, LPOLESTR *ppszDisplayName) { - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; TRACE("(%p,%p,%p,%p)\n",iface,pbc,pmkToLeft,ppszDisplayName); @@ -863,7 +863,7 @@ HRESULT WINAPI ItemMonikerImpl_ParseDisplayName(IMoniker* iface, IParseDisplayName* ppdn=0; LPOLESTR displayName; HRESULT res; - ICOM_THIS(ItemMonikerImpl,iface); + ItemMonikerImpl *This = (ItemMonikerImpl *)iface; /* If pmkToLeft is NULL, this method returns MK_E_SYNTAX */ if (pmkToLeft==NULL) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index 3a196cc97f7..24bbe37cce9 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -216,14 +216,14 @@ StdMarshalImpl_QueryInterface(LPMARSHAL iface,REFIID riid,LPVOID *ppv) { static ULONG WINAPI StdMarshalImpl_AddRef(LPMARSHAL iface) { - ICOM_THIS(StdMarshalImpl,iface); + StdMarshalImpl *This = (StdMarshalImpl *)iface; This->ref++; return This->ref; } static ULONG WINAPI StdMarshalImpl_Release(LPMARSHAL iface) { - ICOM_THIS(StdMarshalImpl,iface); + StdMarshalImpl *This = (StdMarshalImpl *)iface; This->ref--; if (This->ref) diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 56dc4ae6d8b..447ae0d4c06 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -109,7 +109,7 @@ static IRunningObjectTableVtbl VT_RunningObjectTableImpl = */ HRESULT WINAPI RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface,REFIID riid,void** ppvObject) { - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p,%p,%p)\n",This,riid,ppvObject); @@ -141,7 +141,7 @@ HRESULT WINAPI RunningObjectTableImpl_QueryInterface(IRunningObjectTable* iface, */ ULONG WINAPI RunningObjectTableImpl_AddRef(IRunningObjectTable* iface) { - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p)\n",This); @@ -173,7 +173,7 @@ HRESULT WINAPI RunningObjectTableImpl_Destroy() ULONG WINAPI RunningObjectTableImpl_Release(IRunningObjectTable* iface) { DWORD i; - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p)\n",This); @@ -265,7 +265,7 @@ HRESULT WINAPI RunningObjectTableImpl_Register(IRunningObjectTable* iface, DWORD *pdwRegister) /* Pointer to the value identifying the registration */ { HRESULT res=S_OK; - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p,%ld,%p,%p,%p)\n",This,grfFlags,punkObject,pmkObjectName,pdwRegister); @@ -328,7 +328,7 @@ HRESULT WINAPI RunningObjectTableImpl_Revoke( IRunningObjectTable* iface, { DWORD index,j; - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p,%ld)\n",This,dwRegister); @@ -361,7 +361,7 @@ HRESULT WINAPI RunningObjectTableImpl_Revoke( IRunningObjectTable* iface, HRESULT WINAPI RunningObjectTableImpl_IsRunning( IRunningObjectTable* iface, IMoniker *pmkObjectName) /* Pointer to the moniker of the object whose status is desired */ { - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p,%p)\n",This,pmkObjectName); @@ -376,7 +376,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetObject( IRunningObjectTable* iface, IUnknown **ppunkObject) /* Address of output variable that receives the IUnknown interface pointer */ { DWORD index; - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p,%p,%p)\n",This,pmkObjectName,ppunkObject); @@ -406,7 +406,7 @@ HRESULT WINAPI RunningObjectTableImpl_NoteChangeTime(IRunningObjectTable* iface, FILETIME *pfiletime) /* Pointer to structure containing object's last change time */ { DWORD index=-1; - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p,%ld,%p)\n",This,dwRegister,pfiletime); @@ -428,7 +428,7 @@ HRESULT WINAPI RunningObjectTableImpl_GetTimeOfLastChange(IRunningObjectTable* i FILETIME *pfiletime) /* Pointer to structure that receives object's last change time */ { DWORD index=-1; - ICOM_THIS(RunningObjectTableImpl,iface); + RunningObjectTableImpl *This = (RunningObjectTableImpl *)iface; TRACE("(%p,%p,%p)\n",This,pmkObjectName,pfiletime); @@ -517,7 +517,7 @@ HRESULT WINAPI GetRunningObjectTable(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot HRESULT WINAPI OleRun(LPUNKNOWN pUnknown) { IRunnableObject *runable; - ICOM_THIS(IRunnableObject,pUnknown); + IRunnableObject *This = (IRunnableObject *)pUnknown; LRESULT ret; ret = IRunnableObject_QueryInterface(This,&IID_IRunnableObject,(LPVOID*)&runable); diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index b3ef66bd94c..3c21c6e0f16 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -73,7 +73,7 @@ typedef struct * IMalloc16_QueryInterface [COMPOBJ.500] */ HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID *obj) { - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->QueryInterface(%s,%p)\n",This,debugstr_guid(refiid),obj); if ( !memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown)) || @@ -89,7 +89,7 @@ HRESULT WINAPI IMalloc16_fnQueryInterface(IMalloc16* iface,REFIID refiid,LPVOID * IMalloc16_AddRef [COMPOBJ.501] */ ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) { - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->AddRef()\n",This); return 1; /* cannot be freed */ } @@ -98,7 +98,7 @@ ULONG WINAPI IMalloc16_fnAddRef(IMalloc16* iface) { * IMalloc16_Release [COMPOBJ.502] */ ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) { - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->Release()\n",This); return 1; /* cannot be freed */ } @@ -107,7 +107,7 @@ ULONG WINAPI IMalloc16_fnRelease(IMalloc16* iface) { * IMalloc16_Alloc [COMPOBJ.503] */ SEGPTR WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) { - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->Alloc(%ld)\n",This,cb); return MapLS( HeapAlloc( GetProcessHeap(), 0, cb ) ); } @@ -118,7 +118,7 @@ SEGPTR WINAPI IMalloc16_fnAlloc(IMalloc16* iface,DWORD cb) { VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv) { void *ptr = MapSL(pv); - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->Free(%08lx)\n",This,pv); UnMapLS(pv); HeapFree( GetProcessHeap(), 0, ptr ); @@ -130,7 +130,7 @@ VOID WINAPI IMalloc16_fnFree(IMalloc16* iface,SEGPTR pv) SEGPTR WINAPI IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) { SEGPTR ret; - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->Realloc(%08lx,%ld)\n",This,pv,cb); if (!pv) ret = IMalloc16_fnAlloc(iface, cb); @@ -149,7 +149,7 @@ SEGPTR WINAPI IMalloc16_fnRealloc(IMalloc16* iface,SEGPTR pv,DWORD cb) */ DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv) { - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->GetSize(%08lx)\n",This,pv); return HeapSize( GetProcessHeap(), 0, MapSL(pv) ); } @@ -158,7 +158,7 @@ DWORD WINAPI IMalloc16_fnGetSize(const IMalloc16* iface,SEGPTR pv) * IMalloc16_DidAlloc [COMPOBJ.507] */ INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) { - ICOM_THIS(IMalloc16,iface); + IMalloc16 *This = (IMalloc16 *)iface; TRACE("(%p)->DidAlloc(%p)\n",This,pv); return (INT16)-1; } @@ -167,7 +167,7 @@ INT16 WINAPI IMalloc16_fnDidAlloc(const IMalloc16* iface,LPVOID pv) { * IMalloc16_HeapMinimize [COMPOBJ.508] */ LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) { - ICOM_THIS(IMalloc16Impl,iface); + IMalloc16Impl *This = (IMalloc16Impl *)iface; TRACE("(%p)->HeapMinimize()\n",This); return NULL; } diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 8ed06d3556f..339a33644f3 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -139,7 +139,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface( REFIID riid, LPVOID* ppvObj) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObj); /* * Sanity check @@ -177,7 +177,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_QueryInterface( static ULONG WINAPI OleAdviseHolderImpl_AddRef( LPOLEADVISEHOLDER iface) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; TRACE("(%p)->(ref=%ld)\n", This, This->ref); return ++(This->ref); } @@ -188,7 +188,7 @@ static ULONG WINAPI OleAdviseHolderImpl_AddRef( static ULONG WINAPI OleAdviseHolderImpl_Release( LPOLEADVISEHOLDER iface) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; TRACE("(%p)->(ref=%ld)\n", This, This->ref); This->ref--; @@ -212,7 +212,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Advise( { DWORD index; - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; TRACE("(%p)->(%p, %p)\n", This, pAdvise, pdwConnection); @@ -276,7 +276,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise( LPOLEADVISEHOLDER iface, DWORD dwConnection) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; TRACE("(%p)->(%lu)\n", This, dwConnection); @@ -311,7 +311,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_Unadvise( static HRESULT WINAPI OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumAdvise) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; FIXME("(%p)->(%p)\n", This, ppenumAdvise); *ppenumAdvise = NULL; @@ -325,7 +325,7 @@ OleAdviseHolderImpl_EnumAdvise (LPOLEADVISEHOLDER iface, IEnumSTATDATA **ppenumA static HRESULT WINAPI OleAdviseHolderImpl_SendOnRename (LPOLEADVISEHOLDER iface, IMoniker *pmk) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; FIXME("(%p)->(%p)\n", This, pmk); @@ -338,7 +338,7 @@ OleAdviseHolderImpl_SendOnRename (LPOLEADVISEHOLDER iface, IMoniker *pmk) static HRESULT WINAPI OleAdviseHolderImpl_SendOnSave (LPOLEADVISEHOLDER iface) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; FIXME("(%p)\n", This); return S_OK; @@ -350,7 +350,7 @@ OleAdviseHolderImpl_SendOnSave (LPOLEADVISEHOLDER iface) static HRESULT WINAPI OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER iface) { - ICOM_THIS(OleAdviseHolderImpl, iface); + OleAdviseHolderImpl *This = (OleAdviseHolderImpl *)iface; FIXME("(%p)\n", This); @@ -475,7 +475,7 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface( REFIID riid, void** ppvObject) { - ICOM_THIS(DataAdviseHolder, iface); + DataAdviseHolder *This = (DataAdviseHolder *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppvObject); /* * Perform a sanity check on the parameters. @@ -522,7 +522,7 @@ static HRESULT WINAPI DataAdviseHolder_QueryInterface( static ULONG WINAPI DataAdviseHolder_AddRef( IDataAdviseHolder* iface) { - ICOM_THIS(DataAdviseHolder, iface); + DataAdviseHolder *This = (DataAdviseHolder *)iface; TRACE("(%p) (ref=%ld)\n", This, This->ref); This->ref++; @@ -537,7 +537,7 @@ static ULONG WINAPI DataAdviseHolder_AddRef( static ULONG WINAPI DataAdviseHolder_Release( IDataAdviseHolder* iface) { - ICOM_THIS(DataAdviseHolder, iface); + DataAdviseHolder *This = (DataAdviseHolder *)iface; TRACE("(%p) (ref=%ld)\n", This, This->ref); /* @@ -572,7 +572,7 @@ static HRESULT WINAPI DataAdviseHolder_Advise( { DWORD index; - ICOM_THIS(DataAdviseHolder, iface); + DataAdviseHolder *This = (DataAdviseHolder *)iface; TRACE("(%p)->(%p, %p, %08lx, %p, %p)\n", This, pDataObject, pFetc, advf, pAdvise, pdwConnection); @@ -633,7 +633,7 @@ static HRESULT WINAPI DataAdviseHolder_Unadvise( IDataAdviseHolder* iface, DWORD dwConnection) { - ICOM_THIS(DataAdviseHolder, iface); + DataAdviseHolder *This = (DataAdviseHolder *)iface; TRACE("(%p)->(%lu)\n", This, dwConnection); @@ -665,7 +665,7 @@ static HRESULT WINAPI DataAdviseHolder_EnumAdvise( IDataAdviseHolder* iface, IEnumSTATDATA** ppenumAdvise) { - ICOM_THIS(DataAdviseHolder, iface); + DataAdviseHolder *This = (DataAdviseHolder *)iface; FIXME("(%p)->(%p)\n", This, ppenumAdvise); return E_NOTIMPL; @@ -680,7 +680,7 @@ static HRESULT WINAPI DataAdviseHolder_SendOnDataChange( DWORD dwReserved, DWORD advf) { - ICOM_THIS(DataAdviseHolder, iface); + DataAdviseHolder *This = (DataAdviseHolder *)iface; DWORD index; STGMEDIUM stg; HRESULT res; diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index d2d000cee76..e442d650808 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -102,7 +102,7 @@ CFStub_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *ppv) { static ULONG WINAPI CFStub_AddRef(LPRPCSTUBBUFFER iface) { - ICOM_THIS(CFStub,iface); + CFStub *This = (CFStub *)iface; This->ref++; return This->ref; @@ -110,7 +110,7 @@ CFStub_AddRef(LPRPCSTUBBUFFER iface) { static ULONG WINAPI CFStub_Release(LPRPCSTUBBUFFER iface) { - ICOM_THIS(CFStub,iface); + CFStub *This = (CFStub *)iface; This->ref--; if (This->ref) @@ -121,7 +121,7 @@ CFStub_Release(LPRPCSTUBBUFFER iface) { static HRESULT WINAPI CFStub_Connect(LPRPCSTUBBUFFER iface, IUnknown *pUnkServer) { - ICOM_THIS(CFStub,iface); + CFStub *This = (CFStub *)iface; This->pUnkServer = pUnkServer; IUnknown_AddRef(pUnkServer); @@ -130,7 +130,7 @@ CFStub_Connect(LPRPCSTUBBUFFER iface, IUnknown *pUnkServer) { static void WINAPI CFStub_Disconnect(LPRPCSTUBBUFFER iface) { - ICOM_THIS(CFStub,iface); + CFStub *This = (CFStub *)iface; IUnknown_Release(This->pUnkServer); This->pUnkServer = NULL; @@ -139,7 +139,7 @@ static HRESULT WINAPI CFStub_Invoke( LPRPCSTUBBUFFER iface,RPCOLEMESSAGE* msg,IRpcChannelBuffer* chanbuf ) { - ICOM_THIS(CFStub,iface); + CFStub *This = (CFStub *)iface; HRESULT hres; if (msg->iMethod == 3) { /* CreateInstance */ diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index bca524d20a3..511bc341483 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -285,14 +285,14 @@ PipeBuf_QueryInterface( static ULONG WINAPI PipeBuf_AddRef(LPRPCCHANNELBUFFER iface) { - ICOM_THIS(PipeBuf,iface); + PipeBuf *This = (PipeBuf *)iface; This->ref++; return This->ref; } static ULONG WINAPI PipeBuf_Release(LPRPCCHANNELBUFFER iface) { - ICOM_THIS(PipeBuf,iface); + PipeBuf *This = (PipeBuf *)iface; wine_rpc_disconnect_header header; HANDLE pipe; DWORD reqtype = REQTYPE_DISCONNECT; @@ -320,7 +320,7 @@ static HRESULT WINAPI PipeBuf_GetBuffer( LPRPCCHANNELBUFFER iface,RPCOLEMESSAGE* msg,REFIID riid ) { - /*ICOM_THIS(PipeBuf,iface);*/ + /*PipeBuf *This = (PipeBuf *)iface;*/ TRACE("(%p,%s)\n",msg,debugstr_guid(riid)); /* probably reuses IID in real. */ @@ -415,7 +415,7 @@ static HRESULT WINAPI PipeBuf_SendReceive( LPRPCCHANNELBUFFER iface,RPCOLEMESSAGE* msg,ULONG *status ) { - ICOM_THIS(PipeBuf,iface); + PipeBuf *This = (PipeBuf *)iface; wine_rpc_request *req; HRESULT hres; diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 0a3fe8f8086..a57ab571c84 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -970,7 +970,7 @@ typedef struct HRESULT WINAPI IStream16_fnQueryInterface( IStream16* iface,REFIID refiid,LPVOID *obj ) { - ICOM_THIS(IStream16Impl,iface); + IStream16Impl *This = (IStream16Impl *)iface; TRACE_(relay)("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj); if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { *obj = This; @@ -984,7 +984,7 @@ HRESULT WINAPI IStream16_fnQueryInterface( * IStream16_AddRef [STORAGE.519] */ ULONG WINAPI IStream16_fnAddRef(IStream16* iface) { - ICOM_THIS(IStream16Impl,iface); + IStream16Impl *This = (IStream16Impl *)iface; return ++(This->ref); } @@ -992,7 +992,7 @@ ULONG WINAPI IStream16_fnAddRef(IStream16* iface) { * IStream16_Release [STORAGE.520] */ ULONG WINAPI IStream16_fnRelease(IStream16* iface) { - ICOM_THIS(IStream16Impl,iface); + IStream16Impl *This = (IStream16Impl *)iface; FlushFileBuffers(This->hf); This->ref--; if (!This->ref) { @@ -1013,7 +1013,7 @@ ULONG WINAPI IStream16_fnRelease(IStream16* iface) { HRESULT WINAPI IStream16_fnSeek( IStream16* iface,LARGE_INTEGER offset,DWORD whence,ULARGE_INTEGER *newpos ) { - ICOM_THIS(IStream16Impl,iface); + IStream16Impl *This = (IStream16Impl *)iface; TRACE_(relay)("(%p)->([%ld.%ld],%ld,%p)\n",This,offset.u.HighPart,offset.u.LowPart,whence,newpos); switch (whence) { @@ -1057,7 +1057,7 @@ HRESULT WINAPI IStream16_fnSeek( HRESULT WINAPI IStream16_fnRead( IStream16* iface,void *pv,ULONG cb,ULONG *pcbRead ) { - ICOM_THIS(IStream16Impl,iface); + IStream16Impl *This = (IStream16Impl *)iface; BYTE block[BIGSIZE]; ULONG *bytesread=pcbRead,xxread; int blocknr; @@ -1119,7 +1119,7 @@ HRESULT WINAPI IStream16_fnRead( HRESULT WINAPI IStream16_fnWrite( IStream16* iface,const void *pv,ULONG cb,ULONG *pcbWrite ) { - ICOM_THIS(IStream16Impl,iface); + IStream16Impl *This = (IStream16Impl *)iface; BYTE block[BIGSIZE]; ULONG *byteswritten=pcbWrite,xxwritten; int oldsize,newsize,i,curoffset=0,lastblocknr,blocknr,cc; @@ -1463,7 +1463,7 @@ typedef struct HRESULT WINAPI IStream_fnQueryInterface( IStream* iface,REFIID refiid,LPVOID *obj ) { - ICOM_THIS(IStream32Impl,iface); + IStream32Impl *This = (IStream32Impl *)iface; TRACE_(relay)("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj); if (!memcmp(&IID_IUnknown,refiid,sizeof(IID_IUnknown))) { @@ -1478,7 +1478,7 @@ HRESULT WINAPI IStream_fnQueryInterface( * IStream32_AddRef [VTABLE] */ ULONG WINAPI IStream_fnAddRef(IStream* iface) { - ICOM_THIS(IStream32Impl,iface); + IStream32Impl *This = (IStream32Impl *)iface; return ++(This->ref); } @@ -1486,7 +1486,7 @@ ULONG WINAPI IStream_fnAddRef(IStream* iface) { * IStream32_Release [VTABLE] */ ULONG WINAPI IStream_fnRelease(IStream* iface) { - ICOM_THIS(IStream32Impl,iface); + IStream32Impl *This = (IStream32Impl *)iface; FlushFileBuffers(This->hf); This->ref--; if (!This->ref) { @@ -1517,7 +1517,7 @@ typedef struct HRESULT WINAPI IStorage16_fnQueryInterface( IStorage16* iface,REFIID refiid,LPVOID *obj ) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; TRACE_(relay)("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj); @@ -1532,7 +1532,7 @@ HRESULT WINAPI IStorage16_fnQueryInterface( * IStorage16_AddRef [STORAGE.501] */ ULONG WINAPI IStorage16_fnAddRef(IStorage16* iface) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; return ++(This->ref); } @@ -1540,7 +1540,7 @@ ULONG WINAPI IStorage16_fnAddRef(IStorage16* iface) { * IStorage16_Release [STORAGE.502] */ ULONG WINAPI IStorage16_fnRelease(IStorage16* iface) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; This->ref--; if (This->ref) return This->ref; @@ -1555,7 +1555,7 @@ ULONG WINAPI IStorage16_fnRelease(IStorage16* iface) { HRESULT WINAPI IStorage16_fnStat( LPSTORAGE16 iface,STATSTG16 *pstatstg, DWORD grfStatFlag ) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; DWORD len = WideCharToMultiByte( CP_ACP, 0, This->stde.pps_rawname, -1, NULL, 0, NULL, NULL ); LPSTR nameA = HeapAlloc( GetProcessHeap(), 0, len ); @@ -1583,7 +1583,7 @@ HRESULT WINAPI IStorage16_fnStat( HRESULT WINAPI IStorage16_fnCommit( LPSTORAGE16 iface,DWORD commitflags ) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; FIXME("(%p)->(0x%08lx),STUB!\n", This,commitflags ); @@ -1594,7 +1594,7 @@ HRESULT WINAPI IStorage16_fnCommit( * IStorage16_CopyTo [STORAGE.507] */ HRESULT WINAPI IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID *rgiidExclude,SNB16 SNB16Exclude,IStorage16 *pstgDest) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; FIXME("IStorage16(%p)->(0x%08lx,%s,%p,%p),stub!\n", This,ciidExclude,debugstr_guid(rgiidExclude),SNB16Exclude,pstgDest ); @@ -1608,7 +1608,7 @@ HRESULT WINAPI IStorage16_fnCopyTo(LPSTORAGE16 iface,DWORD ciidExclude,const IID HRESULT WINAPI IStorage16_fnCreateStorage( LPSTORAGE16 iface,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD dwStgFormat,DWORD reserved2, IStorage16 **ppstg ) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; IStorage16Impl* lpstg; int ppsent,x; struct storage_pps_entry stde; @@ -1673,7 +1673,7 @@ HRESULT WINAPI IStorage16_fnCreateStorage( HRESULT WINAPI IStorage16_fnCreateStream( LPSTORAGE16 iface,LPCOLESTR16 pwcsName,DWORD grfMode,DWORD reserved1,DWORD reserved2, IStream16 **ppstm ) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; IStream16Impl* lpstr; int ppsent,x; struct storage_pps_entry stde; @@ -1731,7 +1731,7 @@ HRESULT WINAPI IStorage16_fnCreateStream( HRESULT WINAPI IStorage16_fnOpenStorage( LPSTORAGE16 iface,LPCOLESTR16 pwcsName, IStorage16 *pstgPrio, DWORD grfMode, SNB16 snbExclude, DWORD reserved, IStorage16 **ppstg ) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; IStream16Impl* lpstg; WCHAR name[33]; int newpps; @@ -1766,7 +1766,7 @@ HRESULT WINAPI IStorage16_fnOpenStorage( HRESULT WINAPI IStorage16_fnOpenStream( LPSTORAGE16 iface,LPCOLESTR16 pwcsName, void *reserved1, DWORD grfMode, DWORD reserved2, IStream16 **ppstm ) { - ICOM_THIS(IStorage16Impl,iface); + IStorage16Impl *This = (IStorage16Impl *)iface; IStream16Impl* lpstr; WCHAR name[33]; int newpps; diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index d360d2e1697..9d01a686d4b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -240,7 +240,7 @@ HRESULT WINAPI StorageBaseImpl_QueryInterface( REFIID riid, void** ppvObject) { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; /* * Perform a sanity check on the parameters. */ @@ -290,7 +290,7 @@ HRESULT WINAPI StorageBaseImpl_QueryInterface( ULONG WINAPI StorageBaseImpl_AddRef( IStorage* iface) { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; This->ref++; return This->ref; @@ -307,7 +307,7 @@ ULONG WINAPI StorageBaseImpl_AddRef( ULONG WINAPI StorageBaseImpl_Release( IStorage* iface) { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; /* * Decrease the reference count on this object. */ @@ -346,7 +346,7 @@ HRESULT WINAPI StorageBaseImpl_OpenStream( DWORD reserved2, /* [in] */ IStream** ppstm) /* [out] */ { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; IEnumSTATSTGImpl* propertyEnumeration; StgStreamImpl* newStream; StgProperty currentProperty; @@ -462,7 +462,7 @@ HRESULT WINAPI StorageBaseImpl_OpenStorage( DWORD reserved, /* [in] */ IStorage** ppstg) /* [out] */ { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; StorageInternalImpl* newStorage; IEnumSTATSTGImpl* propertyEnumeration; StgProperty currentProperty; @@ -587,7 +587,7 @@ HRESULT WINAPI StorageBaseImpl_EnumElements( DWORD reserved3, /* [in] */ IEnumSTATSTG** ppenum) /* [out] */ { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; IEnumSTATSTGImpl* newEnum; TRACE("(%p, %ld, %p, %ld, %p)\n", @@ -634,7 +634,7 @@ HRESULT WINAPI StorageBaseImpl_Stat( STATSTG* pstatstg, /* [out] */ DWORD grfStatFlag) /* [in] */ { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; StgProperty curProperty; BOOL readSuccessful; HRESULT res = STG_E_UNKNOWN; @@ -697,7 +697,7 @@ HRESULT WINAPI StorageBaseImpl_RenameElement( const OLECHAR* pwcsOldName, /* [in] */ const OLECHAR* pwcsNewName) /* [in] */ { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; IEnumSTATSTGImpl* propertyEnumeration; StgProperty currentProperty; ULONG foundPropertyIndex; @@ -855,7 +855,7 @@ HRESULT WINAPI StorageBaseImpl_CreateStream( DWORD reserved2, /* [in] */ IStream** ppstm) /* [out] */ { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; IEnumSTATSTGImpl* propertyEnumeration; StgStreamImpl* newStream; StgProperty currentProperty, newStreamProperty; @@ -1005,7 +1005,7 @@ HRESULT WINAPI StorageBaseImpl_SetClass( IStorage* iface, REFCLSID clsid) /* [in] */ { - ICOM_THIS(StorageBaseImpl,iface); + StorageBaseImpl *This = (StorageBaseImpl *)iface; HRESULT hRes = E_FAIL; StgProperty curProperty; BOOL success; diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index 94bb173a835..e6bf0987151 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -140,7 +140,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( REFIID riid, void** ppvObject) { - ICOM_THIS(ConnectionPointImpl, iface); + ConnectionPointImpl *This = (ConnectionPointImpl *)iface; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); /* @@ -192,7 +192,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface( */ 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++; @@ -207,7 +207,7 @@ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface) static ULONG WINAPI ConnectionPointImpl_Release( IConnectionPoint* iface) { - ICOM_THIS(ConnectionPointImpl, iface); + ConnectionPointImpl *This = (ConnectionPointImpl *)iface; TRACE("(%p)->(ref=%ld)\n", This, This->ref); /* @@ -236,7 +236,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface( 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; @@ -250,7 +250,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer( IConnectionPoint *iface, IConnectionPointContainer **ppCPC) { - ICOM_THIS(ConnectionPointImpl, iface); + ConnectionPointImpl *This = (ConnectionPointImpl *)iface; TRACE("(%p)->(%p)\n", This, ppCPC); return IUnknown_QueryInterface(This->Obj, @@ -267,7 +267,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, DWORD *pdwCookie) { DWORD i; - ICOM_THIS(ConnectionPointImpl, iface); + ConnectionPointImpl *This = (ConnectionPointImpl *)iface; IUnknown *lpSink; TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie); @@ -298,7 +298,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface, 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; @@ -319,7 +319,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( IConnectionPoint *iface, LPENUMCONNECTIONS *ppEnum) { - ICOM_THIS(ConnectionPointImpl, iface); + ConnectionPointImpl *This = (ConnectionPointImpl *)iface; CONNECTDATA *pCD; DWORD i, nextslot; EnumConnectionsImpl *EnumObj; @@ -420,7 +420,7 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( REFIID riid, void** ppvObject) { - ICOM_THIS(ConnectionPointImpl, iface); + ConnectionPointImpl *This = (ConnectionPointImpl *)iface; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); /* @@ -472,7 +472,7 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface( */ 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); @@ -486,7 +486,7 @@ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface) */ 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); @@ -517,7 +517,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, 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); @@ -552,7 +552,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface, 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) @@ -570,7 +570,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface, */ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) { - ICOM_THIS(EnumConnectionsImpl, iface); + EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface; TRACE("(%p)\n", This); This->nCur = 0; @@ -586,7 +586,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface) 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); diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index bb34cd1e368..5e0ca90917d 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -255,7 +255,7 @@ static HRESULT WINAPI StdDispatch_QueryInterface( 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) || @@ -275,7 +275,7 @@ static HRESULT WINAPI StdDispatch_QueryInterface( */ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) { - ICOM_THIS(StdDispatch, iface); + StdDispatch *This = (StdDispatch *)iface; TRACE("()\n"); return ++This->ref; @@ -288,7 +288,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface) */ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) { - ICOM_THIS(StdDispatch, iface); + StdDispatch *This = (StdDispatch *)iface; ULONG ret; TRACE("(%p)->()\n", This); @@ -322,7 +322,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface) */ 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; @@ -349,7 +349,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti */ 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; @@ -392,7 +392,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI */ 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)) @@ -430,7 +430,7 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember, 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)) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 6c8d1c2f6af..a4bd9938b48 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -2078,7 +2078,7 @@ typedef struct static HRESULT WINAPI SFCF_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; @@ -2086,12 +2086,12 @@ SFCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { static ULONG WINAPI SFCF_AddRef(LPCLASSFACTORY iface) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; return ++(This->ref); } static ULONG WINAPI SFCF_Release(LPCLASSFACTORY iface) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; /* static class, won't be freed */ return --(This->ref); } @@ -2104,7 +2104,7 @@ static HRESULT WINAPI SFCF_CreateInstance( } static HRESULT WINAPI SFCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 795a7be1783..b1fa7fee278 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -306,7 +306,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface( REFIID riid, void** ppvObject) { - ICOM_THIS(OLEPictureImpl, iface); + OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject); /* @@ -397,7 +397,7 @@ static void OLEPicture_SendNotify(OLEPictureImpl* this, DISPID dispID) 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++; @@ -412,7 +412,7 @@ static ULONG WINAPI OLEPictureImpl_AddRef( static ULONG WINAPI OLEPictureImpl_Release( IPicture* iface) { - ICOM_THIS(OLEPictureImpl, iface); + OLEPictureImpl *This = (OLEPictureImpl *)iface; TRACE("(%p)->(ref=%ld)\n", This, This->ref); /* @@ -440,7 +440,7 @@ static ULONG WINAPI OLEPictureImpl_Release( 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: @@ -469,7 +469,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface, 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; } @@ -480,7 +480,7 @@ static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface, 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; @@ -492,7 +492,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface, 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; @@ -504,7 +504,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface, 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; @@ -521,7 +521,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, 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) @@ -596,7 +596,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, 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; @@ -608,7 +608,7 @@ static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface, 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; @@ -622,7 +622,7 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface, 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); @@ -645,7 +645,7 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface, 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; @@ -659,7 +659,7 @@ static HRESULT WINAPI OLEPictureImpl_get_KeepOriginalFormat(IPicture *iface, 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? */ @@ -671,7 +671,7 @@ static HRESULT WINAPI OLEPictureImpl_put_KeepOriginalFormat(IPicture *iface, */ 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; @@ -685,7 +685,7 @@ static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, 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); } @@ -696,7 +696,7 @@ static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, 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) { @@ -1655,7 +1655,7 @@ typedef struct 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; @@ -1663,12 +1663,12 @@ SPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { 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); } @@ -1686,7 +1686,7 @@ static HRESULT WINAPI SPCF_CreateInstance( } 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; } diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 41b1bdd8fdc..54a4eea9c2f 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -1498,7 +1498,7 @@ TMStubImpl_QueryInterface(LPRPCSTUBBUFFER iface, REFIID riid, LPVOID *ppv) static ULONG WINAPI TMStubImpl_AddRef(LPRPCSTUBBUFFER iface) { - ICOM_THIS(TMStubImpl,iface); + TMStubImpl *This = (TMStubImpl *)iface; TRACE("(%p) before %lu\n", This, This->ref); @@ -1509,7 +1509,7 @@ static ULONG WINAPI TMStubImpl_Release(LPRPCSTUBBUFFER iface) { ULONG refs; - ICOM_THIS(TMStubImpl,iface); + TMStubImpl *This = (TMStubImpl *)iface; TRACE("(%p) after %lu\n", This, This->ref-1); @@ -1525,7 +1525,7 @@ TMStubImpl_Release(LPRPCSTUBBUFFER iface) static HRESULT WINAPI TMStubImpl_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN pUnkServer) { - ICOM_THIS(TMStubImpl,iface); + TMStubImpl *This = (TMStubImpl *)iface; TRACE("(%p)->(%p)\n", This, pUnkServer); @@ -1537,7 +1537,7 @@ TMStubImpl_Connect(LPRPCSTUBBUFFER iface, LPUNKNOWN pUnkServer) static void WINAPI TMStubImpl_Disconnect(LPRPCSTUBBUFFER iface) { - ICOM_THIS(TMStubImpl,iface); + TMStubImpl *This = (TMStubImpl *)iface; TRACE("(%p)->()\n", This); @@ -1552,7 +1552,7 @@ TMStubImpl_Invoke( { int i; FUNCDESC *fdesc; - ICOM_THIS(TMStubImpl,iface); + TMStubImpl *This = (TMStubImpl *)iface; HRESULT hres; DWORD *args, res, *xargs, nrofargs; marshal_state buf; @@ -1737,7 +1737,7 @@ TMStubImpl_IsIIDSupported(LPRPCSTUBBUFFER iface, REFIID riid) { static ULONG WINAPI TMStubImpl_CountRefs(LPRPCSTUBBUFFER iface) { - ICOM_THIS(TMStubImpl,iface); + TMStubImpl *This = (TMStubImpl *)iface; return This->ref; /*FIXME? */ } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 95e2d5d1d73..f907e680bde 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3371,7 +3371,7 @@ static HRESULT WINAPI ITypeLib2_fnQueryInterface( REFIID riid, VOID **ppvObject) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("(%p)->(IID: %s)\n",This,debugstr_guid(riid)); @@ -3397,7 +3397,7 @@ static HRESULT WINAPI ITypeLib2_fnQueryInterface( */ static ULONG WINAPI ITypeLib2_fnAddRef( ITypeLib2 *iface) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("(%p)->ref was %u\n",This, This->ref); @@ -3408,7 +3408,7 @@ static ULONG WINAPI ITypeLib2_fnAddRef( ITypeLib2 *iface) */ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; --(This->ref); @@ -3466,7 +3466,7 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) */ static UINT WINAPI ITypeLib2_fnGetTypeInfoCount( ITypeLib2 *iface) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("(%p)->count is %d\n",This, This->TypeInfoCount); return This->TypeInfoCount; } @@ -3482,7 +3482,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( { int i; - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; ITypeInfoImpl *pTypeInfo = This->pTypeInfo; TRACE("(%p)->(index=%d) \n", This, index); @@ -3517,7 +3517,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( UINT index, TYPEKIND *pTKind) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; int i; ITypeInfoImpl *pTInfo = This->pTypeInfo; @@ -3551,7 +3551,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoOfGuid( REFGUID guid, ITypeInfo **ppTInfo) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; ITypeInfoImpl *pTypeInfo = This->pTypeInfo; /* head of list */ TRACE("(%p)\n\tguid:\t%s)\n",This,debugstr_guid(guid)); @@ -3589,7 +3589,7 @@ static HRESULT WINAPI ITypeLib2_fnGetLibAttr( ITypeLib2 *iface, LPTLIBATTR *ppTLibAttr) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("(%p)\n",This); *ppTLibAttr = HeapAlloc(GetProcessHeap(), 0, sizeof(**ppTLibAttr)); memcpy(*ppTLibAttr, &This->LibAttr, sizeof(**ppTLibAttr)); @@ -3606,7 +3606,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeComp( ITypeLib2 *iface, ITypeComp **ppTComp) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("(%p)->(%p)\n",This,ppTComp); *ppTComp = (ITypeComp *)&This->lpVtblTypeComp; @@ -3632,7 +3632,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation( DWORD *pdwHelpContext, BSTR *pBstrHelpFile) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; HRESULT result = E_INVALIDARG; @@ -3714,7 +3714,7 @@ static HRESULT WINAPI ITypeLib2_fnIsName( ULONG lHashVal, BOOL *pfName) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; ITypeInfoImpl *pTInfo; TLBFuncDesc *pFInfo; TLBVarDesc *pVInfo; @@ -3760,7 +3760,7 @@ static HRESULT WINAPI ITypeLib2_fnFindName( MEMBERID *rgMemId, UINT16 *pcFound) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; ITypeInfoImpl *pTInfo; TLBFuncDesc *pFInfo; TLBVarDesc *pVInfo; @@ -3801,7 +3801,7 @@ static VOID WINAPI ITypeLib2_fnReleaseTLibAttr( ITypeLib2 *iface, TLIBATTR *pTLibAttr) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("freeing (%p)\n",This); HeapFree(GetProcessHeap(),0,pTLibAttr); @@ -3816,7 +3816,7 @@ static HRESULT WINAPI ITypeLib2_fnGetCustData( REFGUID guid, VARIANT *pVarVal) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TLBCustData *pCData; for(pCData=This->pCustData; pCData; pCData = pCData->next) @@ -3846,7 +3846,7 @@ static HRESULT WINAPI ITypeLib2_fnGetLibStatistics( ULONG *pcUniqueNames, ULONG *pcchUniqueNames) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; FIXME("(%p): stub!\n", This); @@ -3870,7 +3870,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( DWORD *pdwHelpStringContext, BSTR *pbstrHelpStringDll) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; HRESULT result; ITypeInfo *pTInfo; @@ -3931,7 +3931,7 @@ static HRESULT WINAPI ITypeLib2_fnGetAllCustData( ITypeLib2 * iface, CUSTDATA *pCustData) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TLBCustData *pCData; int i; TRACE("(%p) returning %d items\n", This, This->ctCustData); @@ -4050,7 +4050,7 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( REFIID riid, VOID **ppvObject) { - ICOM_THIS( ITypeLibImpl, iface); + ITypeLibImpl *This = (ITypeLibImpl *)iface; TRACE("(%p)->(IID: %s)\n",This,debugstr_guid(riid)); @@ -4073,7 +4073,7 @@ static HRESULT WINAPI ITypeInfo_fnQueryInterface( */ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; ++(This->ref); ITypeLib2_AddRef((ITypeLib2*)This->pTypeLib); @@ -4086,7 +4086,7 @@ static ULONG WINAPI ITypeInfo_fnAddRef( ITypeInfo2 *iface) */ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; --(This->ref); @@ -4132,7 +4132,7 @@ static ULONG WINAPI ITypeInfo_fnRelease(ITypeInfo2 *iface) static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, LPTYPEATTR *ppTypeAttr) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TRACE("(%p)\n",This); /* FIXME: must do a copy here */ *ppTypeAttr=&This->TypeAttr; @@ -4148,7 +4148,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeAttr( ITypeInfo2 *iface, static HRESULT WINAPI ITypeInfo_fnGetTypeComp( ITypeInfo2 *iface, ITypeComp * *ppTComp) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TRACE("(%p)->(%p) stub!\n", This, ppTComp); @@ -4166,7 +4166,7 @@ static HRESULT WINAPI ITypeInfo_fnGetTypeComp( ITypeInfo2 *iface, static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, LPFUNCDESC *ppFuncDesc) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; TLBFuncDesc * pFDesc; TRACE("(%p) index %d\n", This, index); @@ -4188,7 +4188,7 @@ static HRESULT WINAPI ITypeInfo_fnGetFuncDesc( ITypeInfo2 *iface, UINT index, static HRESULT WINAPI ITypeInfo_fnGetVarDesc( ITypeInfo2 *iface, UINT index, LPVARDESC *ppVarDesc) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; TLBVarDesc * pVDesc; TRACE("(%p) index %d\n", This, index); @@ -4211,7 +4211,7 @@ static HRESULT WINAPI ITypeInfo_fnGetVarDesc( ITypeInfo2 *iface, UINT index, static HRESULT WINAPI ITypeInfo_fnGetNames( ITypeInfo2 *iface, MEMBERID memid, BSTR *rgBstrNames, UINT cMaxNames, UINT *pcNames) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; int i; @@ -4279,7 +4279,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( UINT index, HREFTYPE *pRefType) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int(i); TLBImplType *pImpl = This->impltypelist; @@ -4331,7 +4331,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeOfImplType( static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( ITypeInfo2 *iface, UINT index, INT *pImplTypeFlags) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; int i; TLBImplType *pImpl; @@ -4354,7 +4354,7 @@ static HRESULT WINAPI ITypeInfo_fnGetImplTypeFlags( ITypeInfo2 *iface, static HRESULT WINAPI ITypeInfo_fnGetIDsOfNames( ITypeInfo2 *iface, LPOLESTR *rgszNames, UINT cNames, MEMBERID *pMemId) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; HRESULT ret=S_OK; @@ -4689,7 +4689,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( EXCEPINFO *pExcepInfo, UINT *pArgErr) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; int i; @@ -4931,7 +4931,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDocumentation( ITypeInfo2 *iface, MEMBERID memid, BSTR *pBstrName, BSTR *pBstrDocString, DWORD *pdwHelpContext, BSTR *pBstrHelpFile) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; TRACE("(%p) memid %ld Name(%p) DocString(%p)" @@ -4981,7 +4981,7 @@ static HRESULT WINAPI ITypeInfo_fnGetDllEntry( ITypeInfo2 *iface, MEMBERID memid INVOKEKIND invKind, BSTR *pBstrDllName, BSTR *pBstrName, WORD *pwOrdinal) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBFuncDesc *pFDesc; FIXME("(%p, memid %lx, %d, %p, %p, %p), partial stub!\n", This, memid, invKind, pBstrDllName, pBstrName, pwOrdinal); @@ -5023,7 +5023,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( HREFTYPE hRefType, ITypeInfo **ppTInfo) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; HRESULT result = E_FAIL; @@ -5118,7 +5118,7 @@ static HRESULT WINAPI ITypeInfo_fnGetRefTypeInfo( static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface, MEMBERID memid, INVOKEKIND invKind, PVOID *ppv) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; FIXME("(%p) stub!\n", This); return S_OK; } @@ -5131,7 +5131,7 @@ static HRESULT WINAPI ITypeInfo_fnAddressOfMember( ITypeInfo2 *iface, static HRESULT WINAPI ITypeInfo_fnCreateInstance( ITypeInfo2 *iface, IUnknown *pUnk, REFIID riid, VOID **ppvObj) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; FIXME("(%p) stub!\n", This); return S_OK; } @@ -5143,7 +5143,7 @@ static HRESULT WINAPI ITypeInfo_fnCreateInstance( ITypeInfo2 *iface, static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, BSTR *pBstrMops) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; FIXME("(%p) stub!\n", This); return S_OK; } @@ -5156,7 +5156,7 @@ static HRESULT WINAPI ITypeInfo_fnGetMops( ITypeInfo2 *iface, MEMBERID memid, static HRESULT WINAPI ITypeInfo_fnGetContainingTypeLib( ITypeInfo2 *iface, ITypeLib * *ppTLib, UINT *pIndex) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; /* If a pointer is null, we simply ignore it, the ATL in particular passes pIndex as 0 */ if (pIndex) { @@ -5181,7 +5181,7 @@ static HRESULT WINAPI ITypeInfo_fnGetContainingTypeLib( ITypeInfo2 *iface, static void WINAPI ITypeInfo_fnReleaseTypeAttr( ITypeInfo2 *iface, TYPEATTR* pTypeAttr) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TRACE("(%p)->(%p)\n", This, pTypeAttr); } @@ -5193,7 +5193,7 @@ static void WINAPI ITypeInfo_fnReleaseFuncDesc( ITypeInfo2 *iface, FUNCDESC *pFuncDesc) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TRACE("(%p)->(%p)\n", This, pFuncDesc); } @@ -5204,7 +5204,7 @@ static void WINAPI ITypeInfo_fnReleaseFuncDesc( static void WINAPI ITypeInfo_fnReleaseVarDesc( ITypeInfo2 *iface, VARDESC *pVarDesc) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TRACE("(%p)->(%p)\n", This, pVarDesc); } @@ -5216,7 +5216,7 @@ static void WINAPI ITypeInfo_fnReleaseVarDesc( ITypeInfo2 *iface, static HRESULT WINAPI ITypeInfo2_fnGetTypeKind( ITypeInfo2 * iface, TYPEKIND *pTypeKind) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; *pTypeKind=This->TypeAttr.typekind; TRACE("(%p) type 0x%0x\n", This,*pTypeKind); return S_OK; @@ -5231,7 +5231,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeKind( ITypeInfo2 * iface, */ static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags( ITypeInfo2 *iface, ULONG *pTypeFlags) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; *pTypeFlags=This->TypeAttr.wTypeFlags; TRACE("(%p) flags 0x%lx\n", This,*pTypeFlags); return S_OK; @@ -5245,7 +5245,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetTypeFlags( ITypeInfo2 *iface, ULONG *pType static HRESULT WINAPI ITypeInfo2_fnGetFuncIndexOfMemId( ITypeInfo2 * iface, MEMBERID memid, INVOKEKIND invKind, UINT *pFuncIndex) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBFuncDesc *pFuncInfo; int i; HRESULT result; @@ -5273,7 +5273,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncIndexOfMemId( ITypeInfo2 * iface, static HRESULT WINAPI ITypeInfo2_fnGetVarIndexOfMemId( ITypeInfo2 * iface, MEMBERID memid, UINT *pVarIndex) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBVarDesc *pVarInfo; int i; HRESULT result; @@ -5301,7 +5301,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetCustData( REFGUID guid, VARIANT *pVarVal) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; for(pCData=This->pCustData; pCData; pCData = pCData->next) @@ -5328,7 +5328,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetFuncCustData( REFGUID guid, VARIANT *pVarVal) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBFuncDesc * pFDesc; int i; @@ -5360,7 +5360,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetParamCustData( REFGUID guid, VARIANT *pVarVal) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBFuncDesc * pFDesc; int i; @@ -5393,7 +5393,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetVarCustData( REFGUID guid, VARIANT *pVarVal) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBVarDesc * pVDesc; int i; @@ -5429,7 +5429,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetImplTypeCustData( REFGUID guid, VARIANT *pVarVal) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBImplType * pRDesc; int i; @@ -5470,7 +5470,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetDocumentation2( DWORD *pdwHelpStringContext, BSTR *pbstrHelpStringDll) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBFuncDesc * pFDesc; TLBVarDesc * pVDesc; TRACE("(%p) memid %ld lcid(0x%lx) HelpString(%p) " @@ -5526,7 +5526,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllCustData( ITypeInfo2 * iface, CUSTDATA *pCustData) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; int i; @@ -5556,7 +5556,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllFuncCustData( UINT index, CUSTDATA *pCustData) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; TLBFuncDesc * pFDesc; int i; @@ -5592,7 +5592,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllFuncCustData( static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData( ITypeInfo2 * iface, UINT indexFunc, UINT indexParam, CUSTDATA *pCustData) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData=NULL; TLBFuncDesc * pFDesc; int i; @@ -5629,7 +5629,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData( ITypeInfo2 * iface, static HRESULT WINAPI ITypeInfo2_fnGetAllVarCustData( ITypeInfo2 * iface, UINT index, CUSTDATA *pCustData) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; TLBVarDesc * pVDesc; int i; @@ -5667,7 +5667,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllImplTypeCustData( UINT index, CUSTDATA *pCustData) { - ICOM_THIS( ITypeInfoImpl, iface); + ITypeInfoImpl *This = (ITypeInfoImpl *)iface; TLBCustData *pCData; TLBImplType * pRDesc; int i; diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 4463443571f..7916c5e2ec5 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -1104,7 +1104,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnQueryInterface( REFIID riid, VOID **ppvObject) { - ICOM_THIS( ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; TRACE("(%p)->(IID: %s)\n",This,debugstr_guid(riid)); @@ -1136,7 +1136,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnQueryInterface( */ static ULONG WINAPI ICreateTypeInfo2_fnAddRef(ICreateTypeInfo2 *iface) { - ICOM_THIS( ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; TRACE("(%p)->ref was %u\n",This, This->ref); @@ -1150,7 +1150,7 @@ static ULONG WINAPI ICreateTypeInfo2_fnAddRef(ICreateTypeInfo2 *iface) */ static ULONG WINAPI ICreateTypeInfo2_fnRelease(ICreateTypeInfo2 *iface) { - ICOM_THIS( ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; --(This->ref); @@ -1178,7 +1178,7 @@ static ULONG WINAPI ICreateTypeInfo2_fnRelease(ICreateTypeInfo2 *iface) */ static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface, REFGUID guid) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; MSFT_GuidEntry guidentry; int offset; @@ -1209,7 +1209,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetGuid(ICreateTypeInfo2 *iface, REFGUI */ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeFlags(ICreateTypeInfo2 *iface, UINT uTypeFlags) { - ICOM_THIS( ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; TRACE("(%p,0x%x)\n", iface, uTypeFlags); @@ -1262,7 +1262,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetDocString( ICreateTypeInfo2* iface, LPOLESTR pStrDoc) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; int offset; @@ -1283,7 +1283,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetHelpContext( ICreateTypeInfo2* iface, DWORD dwHelpContext) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; TRACE("(%p,%ld)\n", iface, dwHelpContext); @@ -1302,7 +1302,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVersion( WORD wMajorVerNum, WORD wMinorVerNum) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; TRACE("(%p,%d,%d)\n", iface, wMajorVerNum, wMinorVerNum); @@ -1320,7 +1320,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( ITypeInfo* pTInfo, HREFTYPE* phRefType) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; ITypeLib *container; int index; @@ -1362,7 +1362,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddFuncDesc( UINT index, FUNCDESC* pFuncDesc) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; int offset; int *typedata; @@ -1446,7 +1446,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddImplType( UINT index, HREFTYPE hRefType) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; TRACE("(%p,%d,%ld)\n", iface, index, hRefType); @@ -1515,7 +1515,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetImplTypeFlags( UINT index, INT implTypeFlags) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; int offset; MSFT_RefRecord *ref; @@ -1543,7 +1543,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetAlignment( ICreateTypeInfo2* iface, WORD cbAlignment) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; TRACE("(%p,%d)\n", iface, cbAlignment); @@ -1601,7 +1601,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddVarDesc( UINT index, VARDESC* pVarDesc) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; int offset; INT *typedata; int var_datawidth; @@ -1694,7 +1694,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetFuncAndParamNames( LPOLESTR* rgszNames, UINT cNames) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; int i; int offset; @@ -1732,7 +1732,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarName( UINT index, LPOLESTR szName) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; int offset; char *namedata; @@ -1768,7 +1768,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetTypeDescAlias( ICreateTypeInfo2* iface, TYPEDESC* pTDescAlias) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; int encoded_typedesc; int width; @@ -1828,7 +1828,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnSetVarDocString( UINT index, LPOLESTR szDocString) { - ICOM_THIS(ICreateTypeInfo2Impl, iface); + ICreateTypeInfo2Impl *This = (ICreateTypeInfo2Impl *)iface; FIXME("(%p,%d,%s), stub!\n", iface, index, debugstr_w(szDocString)); @@ -2971,7 +2971,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnQueryInterface( REFIID riid, VOID **ppvObject) { - ICOM_THIS( ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; TRACE("(%p)->(IID: %s)\n",This,debugstr_guid(riid)); @@ -3003,7 +3003,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnQueryInterface( */ static ULONG WINAPI ICreateTypeLib2_fnAddRef(ICreateTypeLib2 *iface) { - ICOM_THIS( ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; TRACE("(%p)->ref was %u\n",This, This->ref); @@ -3017,7 +3017,7 @@ static ULONG WINAPI ICreateTypeLib2_fnAddRef(ICreateTypeLib2 *iface) */ static ULONG WINAPI ICreateTypeLib2_fnRelease(ICreateTypeLib2 *iface) { - ICOM_THIS( ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; --(This->ref); @@ -3064,7 +3064,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo( TYPEKIND tkind, ICreateTypeInfo **ppCTInfo) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; TRACE("(%p,%s,%d,%p)\n", iface, debugstr_w(szName), tkind, ppCTInfo); @@ -3084,7 +3084,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetName( ICreateTypeLib2 * iface, LPOLESTR szName) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; int offset; @@ -3103,7 +3103,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetName( */ static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 * iface, WORD wMajorVerNum, WORD wMinorVerNum) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; TRACE("(%p,%d,%d)\n", iface, wMajorVerNum, wMinorVerNum); @@ -3118,7 +3118,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetVersion(ICreateTypeLib2 * iface, WORD */ static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 * iface, REFGUID guid) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; MSFT_GuidEntry guidentry; int offset; @@ -3145,7 +3145,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetGuid(ICreateTypeLib2 * iface, REFGUID */ static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 * iface, LPOLESTR szDoc) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; int offset; @@ -3164,7 +3164,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetDocString(ICreateTypeLib2 * iface, LP */ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpFileName(ICreateTypeLib2 * iface, LPOLESTR szHelpFileName) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; int offset; @@ -3195,7 +3195,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetHelpContext(ICreateTypeLib2 * iface, */ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lcid) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; TRACE("(%p,%ld)\n", iface, lcid); @@ -3211,7 +3211,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetLcid(ICreateTypeLib2 * iface, LCID lc */ static HRESULT WINAPI ICreateTypeLib2_fnSetLibFlags(ICreateTypeLib2 * iface, UINT uLibFlags) { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; TRACE("(%p,0x%x)\n", iface, uLibFlags); @@ -3287,7 +3287,7 @@ static void ctl2_write_typeinfos(ICreateTypeLib2Impl *This, HANDLE hFile) */ static HRESULT WINAPI ICreateTypeLib2_fnSaveAllChanges(ICreateTypeLib2 * iface) { - ICOM_THIS( ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; int retval; int filepos; @@ -3378,7 +3378,7 @@ static HRESULT WINAPI ICreateTypeLib2_fnSetCustData( REFGUID guid, /* [I] The GUID used as a key to retrieve the custom data. */ VARIANT *pVarVal) /* [I] The custom data itself. */ { - ICOM_THIS(ICreateTypeLib2Impl, iface); + ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; TRACE("(%p,%s,%p)\n", iface, debugstr_guid(guid), pVarVal); diff --git a/include/objbase.h b/include/objbase.h index 43a86110a17..f92152e884f 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -171,11 +171,11 @@ * * This continues the above example. This example assumes that the implementation is in C. * - * typedef struct _IDirect3D { + * typedef struct IDirect3DImpl { * void* lpVtbl; * // ... * - * } _IDirect3D; + * } IDirect3DImpl; * * static IDirect3DVtbl d3dvt; * @@ -183,7 +183,7 @@ * * int IDirect3D_QueryInterface(IDirect3D* me) * { - * ICOM_THIS(IDirect3D,me); + * IDirect3DImpl *This = (IDirect3DImpl *)me; * // ... * } * @@ -198,13 +198,13 @@ * }; * * Comments: - * - We first define what the interface really contains. This is th e_IDirect3D structure. The + * - We first define what the interface really contains. This is the IDirect3DImpl structure. The * first field must of course be the virtual table pointer. Everything else is free. * - Then we predeclare our static virtual table variable, we will need its address in some * methods to initialize the virtual table pointer of the returned interface objects. * - Then we implement the interface methods. To match what has been declared in the header file - * they must take a pointer to a IDirect3D structure and we must cast it to an _IDirect3D so that - * we can manipulate the fields. This is performed by the ICOM_THIS macro. + * they must take a pointer to a IDirect3D structure and we must cast it to an IDirect3DImpl so + * that we can manipulate the fields. * - Finally we initialize the virtual table. */ @@ -267,10 +267,6 @@ #endif /* __cplusplus && !CINTERFACE */ -/* Wine-specific macros */ - -#define ICOM_THIS(impl,iface) impl* const This=(impl*)(iface) - #include #ifndef RC_INVOKED -- 2.11.4.GIT