From f5f7a1822cd70d6e10d58bbf56c97d830172aa63 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 8 Sep 2004 01:50:37 +0000 Subject: [PATCH] Removed some more uses of the non-standard ICOM_THIS macro. --- dlls/d3d8/basetexture.c | 32 ++--- dlls/d3d8/cubetexture.c | 38 +++--- dlls/d3d8/device.c | 200 +++++++++++++++--------------- dlls/d3d8/directx.c | 34 ++--- dlls/d3d8/drawprim.c | 20 +-- dlls/d3d8/indexbuffer.c | 28 ++--- dlls/d3d8/resource.c | 24 ++-- dlls/d3d8/surface.c | 30 ++--- dlls/d3d8/swapchain.c | 10 +- dlls/d3d8/texture.c | 38 +++--- dlls/d3d8/utils.c | 2 +- dlls/d3d8/vertexbuffer.c | 28 ++--- dlls/d3d8/volume.c | 26 ++-- dlls/d3d8/volumetexture.c | 38 +++--- dlls/d3d9/basetexture.c | 34 ++--- dlls/d3d9/cubetexture.c | 46 +++---- dlls/d3d9/device.c | 174 +++++++++++++------------- dlls/d3d9/directx.c | 34 ++--- dlls/d3d9/indexbuffer.c | 30 ++--- dlls/d3d9/pixelshader.c | 28 ++--- dlls/d3d9/query.c | 18 +-- dlls/d3d9/resource.c | 22 ++-- dlls/d3d9/stateblock.c | 18 +-- dlls/d3d9/surface.c | 34 ++--- dlls/d3d9/swapchain.c | 26 ++-- dlls/d3d9/texture.c | 46 +++---- dlls/d3d9/vertexbuffer.c | 30 ++--- dlls/d3d9/vertexdeclaration.c | 16 +-- dlls/d3d9/vertexshader.c | 28 ++--- dlls/d3d9/volume.c | 22 ++-- dlls/d3d9/volumetexture.c | 46 +++---- dlls/d3d9/vshaderdeclaration.c | 6 +- dlls/d3dx8/d3dxbuffer.c | 10 +- dlls/ddraw/d3ddevice/main.c | 2 +- dlls/ddraw/d3ddevice/mesa.c | 2 +- dlls/ddraw/dclipper/main.c | 18 +-- dlls/ddraw/ddraw/hal.c | 6 +- dlls/ddraw/ddraw/main.c | 54 ++++---- dlls/ddraw/ddraw/user.c | 4 +- dlls/ddraw/dpalette/hal.c | 2 +- dlls/ddraw/dpalette/main.c | 14 +-- dlls/ddraw/dsurface/dib.c | 6 +- dlls/ddraw/dsurface/fakezbuffer.c | 4 +- dlls/ddraw/dsurface/main.c | 64 +++++----- dlls/ddraw/main.c | 10 +- dlls/quartz/avidec.c | 34 ++--- dlls/quartz/avisplit.c | 38 +++--- dlls/quartz/control.c | 20 +-- dlls/quartz/dsoundrender.c | 34 ++--- dlls/quartz/enumfilters.c | 12 +- dlls/quartz/enummedia.c | 12 +- dlls/quartz/enummoniker.c | 12 +- dlls/quartz/enumpins.c | 12 +- dlls/quartz/enumregfilters.c | 8 +- dlls/quartz/filesource.c | 34 ++--- dlls/quartz/filtermapper.c | 6 +- dlls/quartz/main.c | 10 +- dlls/quartz/memallocator.c | 64 +++++----- dlls/quartz/pin.c | 48 +++---- dlls/quartz/systemclock.c | 14 +-- dlls/quartz/videorenderer.c | 34 ++--- dlls/winmm/winealsa/audio.c | 42 +++---- dlls/winmm/winealsa/audio_05.c | 42 +++---- dlls/winmm/wineaudioio/audio.c | 42 +++---- dlls/winmm/wineoss/audio.c | 120 +++++++++--------- 65 files changed, 1020 insertions(+), 1020 deletions(-) diff --git a/dlls/d3d8/basetexture.c b/dlls/d3d8/basetexture.c index 40c32e1e8c1..b718c693507 100644 --- a/dlls/d3d8/basetexture.c +++ b/dlls/d3d8/basetexture.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DBaseTexture8 (Inherited from IUnknown) */ HRESULT WINAPI IDirect3DBaseTexture8Impl_QueryInterface(LPDIRECT3DBASETEXTURE8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; TRACE("(%p) : QueryInterface\n", This); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) @@ -50,13 +50,13 @@ HRESULT WINAPI IDirect3DBaseTexture8Impl_QueryInterface(LPDIRECT3DBASETEXTURE8 i } ULONG WINAPI IDirect3DBaseTexture8Impl_AddRef(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DBaseTexture8Impl_Release(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) @@ -66,7 +66,7 @@ ULONG WINAPI IDirect3DBaseTexture8Impl_Release(LPDIRECT3DBASETEXTURE8 iface) { /* IDirect3DBaseTexture8 (Inherited from IDirect3DResource8) */ HRESULT WINAPI IDirect3DBaseTexture8Impl_GetDevice(LPDIRECT3DBASETEXTURE8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; /** @@ -77,50 +77,50 @@ HRESULT WINAPI IDirect3DBaseTexture8Impl_GetDevice(LPDIRECT3DBASETEXTURE return D3D_OK; } HRESULT WINAPI IDirect3DBaseTexture8Impl_SetPrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DBaseTexture8Impl_GetPrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DBaseTexture8Impl_FreePrivateData(LPDIRECT3DBASETEXTURE8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DBaseTexture8Impl_SetPriority(LPDIRECT3DBASETEXTURE8 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DBaseTexture8Impl_GetPriority(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } void WINAPI IDirect3DBaseTexture8Impl_PreLoad(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); } D3DRESOURCETYPE WINAPI IDirect3DBaseTexture8Impl_GetType(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; /*TRACE("(%p) : returning %d\n", This, This->ResourceType);*/ return This->ResourceType; } /* IDirect3DBaseTexture8 */ DWORD WINAPI IDirect3DBaseTexture8Impl_SetLOD(LPDIRECT3DBASETEXTURE8 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DBaseTexture8Impl_GetLOD(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DBaseTexture8Impl_GetLevelCount(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->levels); return This->levels; } @@ -144,13 +144,13 @@ IDirect3DBaseTexture8Vtbl Direct3DBaseTexture8_Vtbl = }; BOOL WINAPI IDirect3DBaseTexture8Impl_IsDirty(LPDIRECT3DBASETEXTURE8 iface) { - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; return This->Dirty; } BOOL WINAPI IDirect3DBaseTexture8Impl_SetDirty(LPDIRECT3DBASETEXTURE8 iface, BOOL dirty) { BOOL old; - ICOM_THIS(IDirect3DBaseTexture8Impl,iface); + IDirect3DBaseTexture8Impl *This = (IDirect3DBaseTexture8Impl *)iface; old = This->Dirty; This->Dirty = dirty; diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 9365650d9bf..04ad395fead 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DCubeTexture8 IUnknown parts follow: */ HRESULT WINAPI IDirect3DCubeTexture8Impl_QueryInterface(LPDIRECT3DCUBETEXTURE8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) : QueryInterface\n", This); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) @@ -51,13 +51,13 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_QueryInterface(LPDIRECT3DCUBETEXTURE8 i } ULONG WINAPI IDirect3DCubeTexture8Impl_AddRef(LPDIRECT3DCUBETEXTURE8 iface) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 iface) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; ULONG ref = --This->ref; unsigned int i, j; @@ -78,7 +78,7 @@ ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 iface) { /* IDirect3DCubeTexture8 (Inherited from IDirect3DResource8) */ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; /** @@ -89,27 +89,27 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE return D3D_OK; } HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DCubeTexture8Impl_GetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DCubeTexture8Impl_FreePrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DCubeTexture8Impl_SetPriority(LPDIRECT3DCUBETEXTURE8 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DCubeTexture8Impl_GetPriority(LPDIRECT3DCUBETEXTURE8 iface) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } @@ -134,7 +134,7 @@ static const GLenum cube_targets[6] = { void WINAPI IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 iface) { unsigned int i, j; - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) : About to load texture: dirtified(%d)\n", This, This->Dirty); ENTER_GL(); @@ -195,32 +195,32 @@ void WINAPI IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 } D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(LPDIRECT3DCUBETEXTURE8 iface) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->ResourceType); return This->ResourceType; } /* IDirect3DCubeTexture8 (Inherited from IDirect3DBaseTexture8) */ DWORD WINAPI IDirect3DCubeTexture8Impl_SetLOD(LPDIRECT3DCUBETEXTURE8 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(LPDIRECT3DCUBETEXTURE8 iface) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DCubeTexture8Impl_GetLevelCount(LPDIRECT3DCUBETEXTURE8 iface) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->levels); return This->levels; } /* IDirect3DCubeTexture8 */ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE8 iface, UINT Level, D3DSURFACE_DESC* pDesc) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; if (Level < This->levels) { TRACE("(%p) level (%d)\n", This, Level); return IDirect3DSurface8Impl_GetDesc((LPDIRECT3DSURFACE8) This->surfaces[0][Level], pDesc); @@ -231,7 +231,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXT return D3D_OK; } HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level, IDirect3DSurface8** ppCubeMapSurface) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; if (Level < This->levels) { *ppCubeMapSurface = (LPDIRECT3DSURFACE8) This->surfaces[FaceType][Level]; IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) *ppCubeMapSurface); @@ -244,7 +244,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUB } HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { HRESULT hr; - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; if (Level < This->levels) { /** * Not dirtified while Surfaces don't notify dirtification @@ -260,7 +260,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(LPDIRECT3DCUBETEXTURE8 } HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level) { HRESULT hr; - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; if (Level < This->levels) { hr = IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) This->surfaces[FaceType][Level]); TRACE("(%p) -> faceType(%d) level(%d) success(%lu)\n", This, FaceType, Level, hr); @@ -271,7 +271,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(LPDIRECT3DCUBETEXTUR return hr; } HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { - ICOM_THIS(IDirect3DCubeTexture8Impl,iface); + IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; This->Dirty = TRUE; TRACE("(%p) : dirtyfication of faceType(%d) Level (0)\n", This, FaceType); return IDirect3DSurface8Impl_AddDirtyRect((LPDIRECT3DSURFACE8) This->surfaces[FaceType][0], pDirtyRect); diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 99278c5793a..da8272616f7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -72,7 +72,7 @@ do { /* Apply the current values to the specified texture stage */ void setupTextureStates(LPDIRECT3DDEVICE8 iface, DWORD Stage, DWORD Flags) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; int i = 0; float col[4]; BOOL changeTexture = TRUE; @@ -154,7 +154,7 @@ void setup_light(LPDIRECT3DDEVICE8 iface, LONG Index, PLIGHTINFOEL *lightInfo) { float quad_att; float colRGBA[] = {0.0, 0.0, 0.0, 0.0}; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* Light settings are affected by the model view in OpenGL, the View transform in direct3d*/ glMatrixMode(GL_MODELVIEW); @@ -282,7 +282,7 @@ static void set_texture_matrix(float *smat, DWORD flags) /* IDirect3D IUnknown parts follow: */ HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DDevice8)) { @@ -296,13 +296,13 @@ HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 iface,REFII } ULONG WINAPI IDirect3DDevice8Impl_AddRef(LPDIRECT3DDEVICE8 iface) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -314,13 +314,13 @@ ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { /* IDirect3DDevice Interface follow: */ HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(LPDIRECT3DDEVICE8 iface) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : stub\n", This); /* No way of notifying yet! */ return D3D_OK; } UINT WINAPI IDirect3DDevice8Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE8 iface) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : stub, emulating 32Mb for now\n", This); /* * pretend we have 32MB of any type of memory queried. @@ -329,12 +329,12 @@ UINT WINAPI IDirect3DDevice8Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE8 i } HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(LPDIRECT3DDEVICE8 iface, DWORD Bytes) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(LPDIRECT3DDEVICE8 iface, IDirect3D8** ppD3D8) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->direct3d8); /* Inc ref count */ @@ -344,7 +344,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(LPDIRECT3DDEVICE8 iface, IDire return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(LPDIRECT3DDEVICE8 iface, D3DCAPS8* pCaps) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub, calling idirect3d for now\n", This); IDirect3D8Impl_GetDeviceCaps((LPDIRECT3D8) This->direct3d8, This->adapterNo, This->devType, pCaps); return D3D_OK; @@ -354,7 +354,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetDisplayMode(LPDIRECT3DDEVICE8 iface, D3 HDC hdc; int bpp = 0; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; pMode->Width = GetSystemMetrics(SM_CXSCREEN); pMode->Height = GetSystemMetrics(SM_CYSCREEN); pMode->RefreshRate = 85; /*FIXME: How to identify? */ @@ -378,14 +378,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetDisplayMode(LPDIRECT3DDEVICE8 iface, D3 return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(LPDIRECT3DDEVICE8 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) copying to %p\n", This, pParameters); memcpy(pParameters, &This->CreateParms, sizeof(D3DDEVICE_CREATION_PARAMETERS)); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface8* pCursorBitmap) { IDirect3DSurface8Impl* pSur = (IDirect3DSurface8Impl*) pCursorBitmap; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : Spot Pos(%u,%u)\n", This, XHotSpot, YHotSpot); if (D3DFMT_A8R8G8B8 != pSur->myDesc.Format) { @@ -402,21 +402,21 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 ifac return D3D_OK; } void WINAPI IDirect3DDevice8Impl_SetCursorPosition(LPDIRECT3DDEVICE8 iface, UINT XScreenSpace, UINT YScreenSpace, DWORD Flags) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : SetPos to (%u,%u)\n", This, XScreenSpace, YScreenSpace); This->xScreenSpace = XScreenSpace; This->yScreenSpace = YScreenSpace; return; } BOOL WINAPI IDirect3DDevice8Impl_ShowCursor(LPDIRECT3DDEVICE8 iface, BOOL bShow) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : visible(%d)\n", This, bShow); This->bCursorVisible = bShow; return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain8** pSwapChain) { IDirect3DSwapChain8Impl* object; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DDevice8Impl)); @@ -480,14 +480,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_Present(LPDIRECT3DDEVICE8 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : complete stub!\n", This); ENTER_GL(); @@ -562,7 +562,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Present(LPDIRECT3DDEVICE8 iface, return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(LPDIRECT3DDEVICE8 iface, UINT BackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8** ppBackBuffer) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; *ppBackBuffer = (LPDIRECT3DSURFACE8) This->backBuffer; TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, BackBuffer, Type, *ppBackBuffer); @@ -577,13 +577,13 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(LPDIRECT3DDEVICE8 iface, UIN return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(LPDIRECT3DDEVICE8 iface, D3DRASTER_STATUS* pRasterStatus) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DWORD Flags, CONST D3DGAMMARAMP* pRamp) { HDC hDC; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : pRamp@%p\n", This, pRamp); hDC = GetDC(This->win_handle); @@ -593,7 +593,7 @@ void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DWOR } void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) { HDC hDC; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : pRamp@%p\n", This, pRamp); hDC = GetDC(This->win_handle); @@ -608,7 +608,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(LPDIRECT3DDEVICE8 iface, UIN UINT tmpW; UINT tmpH; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* Allocate the storage for the device */ TRACE("(%p) : W(%d) H(%d), Lvl(%d) Usage(%ld), Fmt(%u,%s), Pool(%d)\n", This, Width, Height, Levels, Usage, Format, debug_d3dformat(Format), Pool); @@ -672,7 +672,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateVolumeTexture(LPDIRECT3DDEVICE8 ifac UINT tmpH; UINT tmpD; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* Allocate the storage for it */ TRACE("(%p) : W(%d) H(%d) D(%d), Lvl(%d) Usage(%ld), Fmt(%u,%s), Pool(%s)\n", This, Width, Height, Depth, Levels, Usage, Format, debug_d3dformat(Format), debug_d3dpool(Pool)); @@ -758,7 +758,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 iface, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture8** ppCubeTexture) { IDirect3DCubeTexture8Impl *object; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; unsigned int i,j; UINT tmpW; @@ -815,7 +815,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateCubeTexture(LPDIRECT3DDEVICE8 iface, HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 iface, UINT Size, DWORD Usage, DWORD FVF, D3DPOOL Pool, IDirect3DVertexBuffer8** ppVertexBuffer) { IDirect3DVertexBuffer8Impl *object; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexBuffer8Impl)); @@ -838,7 +838,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexBuffer(LPDIRECT3DDEVICE8 iface HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(LPDIRECT3DDEVICE8 iface, UINT Length, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DIndexBuffer8** ppIndexBuffer) { IDirect3DIndexBuffer8Impl *object; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : Len=%d, Use=%lx, Format=(%u,%s), Pool=%d\n", This, Length, Usage, Format, debug_d3dformat(Format), Pool); /* Allocate the storage for the device */ @@ -864,7 +864,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateIndexBuffer(LPDIRECT3DDEVICE8 iface, } HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, IDirect3DSurface8** ppSurface) { IDirect3DSurface8Impl *object; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl)); if (NULL == object) { @@ -903,7 +903,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, IDirect3DSurface8** ppSurface) { IDirect3DSurface8Impl *object; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl)); if (NULL == object) { @@ -942,7 +942,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) { IDirect3DSurface8Impl *object; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface8Impl)); *ppSurface = (LPDIRECT3DSURFACE8) object; @@ -990,7 +990,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8Impl* src = (IDirect3DSurface8Impl*) pSourceSurface; IDirect3DSurface8Impl* dst = (IDirect3DSurface8Impl*) pDestinationSurface; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", This, pSourceSurface, pSourceRectsArray, cRects, pDestinationSurface, pDestPointsArray); @@ -1095,7 +1095,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_UpdateTexture(LPDIRECT3DDEVICE8 iface, IDi D3DRESOURCETYPE srcType; D3DRESOURCETYPE dstType; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : first try\n", This); srcType = IDirect3DBaseTexture8Impl_GetType(pSourceTexture); @@ -1170,7 +1170,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetFrontBuffer(LPDIRECT3DDEVICE8 iface, ID GLint prev_store; GLenum prev_read; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : Should return whole screen, only returns GL context window in top left corner\n", This); @@ -1226,7 +1226,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(LPDIRECT3DDEVICE8 iface, I HRESULT hr = D3D_OK; D3DVIEWPORT8 viewport; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* If pRenderTarget == NULL, it seems to default to back buffer */ if (pRenderTarget == NULL) pRenderTarget = (IDirect3DSurface8*)This->backBuffer; @@ -1261,7 +1261,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(LPDIRECT3DDEVICE8 iface, I } HRESULT WINAPI IDirect3DDevice8Impl_GetRenderTarget(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8** ppRenderTarget) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)->returning (%p) default is backbuffer=(%p)\n", This, This->renderTarget, This->backBuffer); @@ -1272,7 +1272,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetRenderTarget(LPDIRECT3DDEVICE8 iface, I } HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(LPDIRECT3DDEVICE8 iface, IDirect3DSurface8** ppZStencilSurface) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)->(%p) default(%p)\n", This, This->stencilBufferTarget, This->depthStencilBuffer); @@ -1284,7 +1284,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(LPDIRECT3DDEVICE8 i } HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : stub\n", This); return D3D_OK; } @@ -1292,7 +1292,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) { HRESULT WINAPI IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) { IDirect3DBaseTexture8* cont = NULL; HRESULT hr; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)\n", This); ENTER_GL(); @@ -1351,7 +1351,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) { return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* TODO: From MSDN This method fails if you specify the D3DCLEAR_ZBUFFER or D3DCLEAR_STENCIL flags when the render target does not have an attached depth buffer. Similarly, if you specify the D3DCLEAR_STENCIL flag @@ -1463,7 +1463,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; unsigned int k; /* Most of this routine, comments included copied from ddraw tree initially: */ @@ -1578,7 +1578,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DT } HRESULT WINAPI IDirect3DDevice8Impl_GetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE State,D3DMATRIX* pMatrix) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : for State %d\n", This, State); memcpy(pMatrix, &This->StateBlock->transforms[State], sizeof(D3DMATRIX)); return D3D_OK; @@ -1591,7 +1591,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_MultiplyTransform(LPDIRECT3DDEVICE8 iface, /* Note: Using UpdateStateBlock means it would be recorded in a state block change, but works regardless of recording being on. If this is found to be wrong, change to StateBlock. */ - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : For state %u\n", This, State); if (State < HIGHEST_TRANSFORMSTATE) @@ -1627,7 +1627,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_MultiplyTransform(LPDIRECT3DDEVICE8 iface, return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetViewport(LPDIRECT3DDEVICE8 iface, CONST D3DVIEWPORT8* pViewport) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)\n", This); This->UpdateStateBlock->Changed.viewport = TRUE; @@ -1658,14 +1658,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetViewport(LPDIRECT3DDEVICE8 iface, CONST } HRESULT WINAPI IDirect3DDevice8Impl_GetViewport(LPDIRECT3DDEVICE8 iface, D3DVIEWPORT8* pViewport) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)\n", This); memcpy(pViewport, &This->StateBlock->viewport, sizeof(D3DVIEWPORT8)); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetMaterial(LPDIRECT3DDEVICE8 iface, CONST D3DMATERIAL8* pMaterial) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; This->UpdateStateBlock->Changed.material = TRUE; This->UpdateStateBlock->Set.material = TRUE; @@ -1707,7 +1707,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetMaterial(LPDIRECT3DDEVICE8 iface, CONST return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetMaterial(LPDIRECT3DDEVICE8 iface, D3DMATERIAL8* pMaterial) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; memcpy(pMaterial, &This->UpdateStateBlock->material, sizeof (D3DMATERIAL8)); TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, pMaterial->Diffuse.b, pMaterial->Diffuse.a); TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, pMaterial->Ambient.b, pMaterial->Ambient.a); @@ -1727,7 +1727,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetLight(LPDIRECT3DDEVICE8 iface, DWORD In float rho; PLIGHTINFOEL *object, *temp; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : Idx(%ld), pLight(%p)\n", This, Index, pLight); /* If recording state block, just add to end of lights chain */ @@ -1871,7 +1871,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetLight(LPDIRECT3DDEVICE8 iface, DWORD In } HRESULT WINAPI IDirect3DDevice8Impl_GetLight(LPDIRECT3DDEVICE8 iface, DWORD Index,D3DLIGHT8* pLight) { PLIGHTINFOEL *lightInfo = NULL; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : Idx(%ld), pLight(%p)\n", This, Index, pLight); /* Locate the light in the live lights */ @@ -1888,7 +1888,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetLight(LPDIRECT3DDEVICE8 iface, DWORD In } HRESULT WINAPI IDirect3DDevice8Impl_LightEnable(LPDIRECT3DDEVICE8 iface, DWORD Index,BOOL Enable) { PLIGHTINFOEL *lightInfo = NULL; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : Idx(%ld), enable? %d\n", This, Index, Enable); /* If recording state block, just add to end of lights chain with changedEnable set to true */ @@ -2115,7 +2115,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_LightEnable(LPDIRECT3DDEVICE8 iface, DWORD HRESULT WINAPI IDirect3DDevice8Impl_GetLightEnable(LPDIRECT3DDEVICE8 iface, DWORD Index,BOOL* pEnable) { PLIGHTINFOEL *lightInfo = NULL; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : for idx(%ld)\n", This, Index); /* Locate the light in the live lights */ @@ -2130,7 +2130,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetLightEnable(LPDIRECT3DDEVICE8 iface, DW return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetClipPlane(LPDIRECT3DDEVICE8 iface, DWORD Index,CONST float* pPlane) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : for idx %ld, %p\n", This, Index, pPlane); /* Validate Index */ @@ -2176,7 +2176,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetClipPlane(LPDIRECT3DDEVICE8 iface, DWOR return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetClipPlane(LPDIRECT3DDEVICE8 iface, DWORD Index,float* pPlane) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : for idx %ld\n", This, Index); /* Validate Index */ @@ -2196,7 +2196,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(LPDIRECT3DDEVICE8 iface, D3 DWORD d; float f; } tmpvalue; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; DWORD OldValue = This->StateBlock->renderstate[State]; TRACE("(%p)->state = %s(%d), value = %ld\n", This, debug_d3drenderstate(State), State, Value); @@ -3068,13 +3068,13 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(LPDIRECT3DDEVICE8 iface, D3 return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(LPDIRECT3DDEVICE8 iface, D3DRENDERSTATETYPE State,DWORD* pValue) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) for State %d = %ld\n", This, State, This->UpdateStateBlock->renderstate[State]); *pValue = This->StateBlock->renderstate[State]; return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_BeginStateBlock(LPDIRECT3DDEVICE8 iface) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)\n", This); @@ -3082,7 +3082,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_BeginStateBlock(LPDIRECT3DDEVICE8 iface) { } HRESULT WINAPI IDirect3DDevice8Impl_EndStateBlock(LPDIRECT3DDEVICE8 iface, DWORD* pToken) { IDirect3DStateBlockImpl* pSB; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT res; TRACE("(%p)\n", This); @@ -3094,7 +3094,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_EndStateBlock(LPDIRECT3DDEVICE8 iface, DWO HRESULT WINAPI IDirect3DDevice8Impl_ApplyStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) { IDirect3DStateBlockImpl* pSB = (IDirect3DStateBlockImpl*) Token; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)\n", This); @@ -3103,7 +3103,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_ApplyStateBlock(LPDIRECT3DDEVICE8 iface, D } HRESULT WINAPI IDirect3DDevice8Impl_CaptureStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) { IDirect3DStateBlockImpl* pSB = (IDirect3DStateBlockImpl*) Token; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)\n", This); @@ -3111,7 +3111,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CaptureStateBlock(LPDIRECT3DDEVICE8 iface, } HRESULT WINAPI IDirect3DDevice8Impl_DeleteStateBlock(LPDIRECT3DDEVICE8 iface, DWORD Token) { IDirect3DStateBlockImpl* pSB = (IDirect3DStateBlockImpl*) Token; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p)\n", This); @@ -3120,7 +3120,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_DeleteStateBlock(LPDIRECT3DDEVICE8 iface, HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(LPDIRECT3DDEVICE8 iface, D3DSTATEBLOCKTYPE Type, DWORD* pToken) { IDirect3DStateBlockImpl* pSB; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT res; TRACE("(%p) : for type %d\n", This, Type); @@ -3131,7 +3131,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(LPDIRECT3DDEVICE8 iface, } HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(LPDIRECT3DDEVICE8 iface, CONST D3DCLIPSTATUS8* pClipStatus) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); if (NULL == pClipStatus) { return D3DERR_INVALIDCALL; @@ -3141,7 +3141,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(LPDIRECT3DDEVICE8 iface, CON return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(LPDIRECT3DDEVICE8 iface, D3DCLIPSTATUS8* pClipStatus) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); if (NULL == pClipStatus) { return D3DERR_INVALIDCALL; @@ -3151,7 +3151,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(LPDIRECT3DDEVICE8 iface, D3D return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage,IDirect3DBaseTexture8** ppTexture) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : returning %p for stage %ld\n", This, This->UpdateStateBlock->textures[Stage], Stage); *ppTexture = (LPDIRECT3DBASETEXTURE8) This->UpdateStateBlock->textures[Stage]; if (*ppTexture) @@ -3165,7 +3165,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD INT oldTextureDimensions = -1; DWORD reapplyFlags = 0; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; D3DRESOURCETYPE textureType; oldTxt = This->UpdateStateBlock->textures[Stage]; @@ -3292,14 +3292,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD } HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage,D3DTEXTURESTAGESTATETYPE Type,DWORD* pValue) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : requesting Stage %ld, Type %d getting %ld\n", This, Stage, Type, This->UpdateStateBlock->texture_state[Stage][Type]); *pValue = This->UpdateStateBlock->texture_state[Stage][Type]; return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; union { float f; DWORD d; @@ -3818,17 +3818,17 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE8 ifa return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_ValidateDevice(LPDIRECT3DDEVICE8 iface, DWORD* pNumPasses) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : stub\n", This); /* FIXME: Needs doing, but called often and is harmless */ return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(LPDIRECT3DDEVICE8 iface, DWORD DevInfoID, void* pDevInfoStruct, DWORD DevInfoStructSize) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetPaletteEntries(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : setting p[%u] <= RGBA(%02x,%02x,%02x,%02x)\n", This, PaletteNumber, pEntries->peRed, pEntries->peGreen, pEntries->peBlue, pEntries->peFlags); if (PaletteNumber >= MAX_PALETTES) { @@ -3838,7 +3838,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetPaletteEntries(LPDIRECT3DDEVICE8 iface, return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetPaletteEntries(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber, PALETTEENTRY* pEntries) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; if (PaletteNumber >= MAX_PALETTES) { return D3DERR_INVALIDCALL; } @@ -3848,7 +3848,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetPaletteEntries(LPDIRECT3DDEVICE8 iface, return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : Setting to (%u)\n", This, PaletteNumber); if (PaletteNumber >= MAX_PALETTES) { return D3DERR_INVALIDCALL; @@ -3877,14 +3877,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE8 return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetCurrentTexturePalette(LPDIRECT3DDEVICE8 iface, UINT *PaletteNumber) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; *PaletteNumber = This->currentPalette; FIXME("(%p) : Returning (%u)\n", This, *PaletteNumber); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; This->StateBlock->streamIsUP = FALSE; TRACE("(%p) : Type=(%d,%s), Start=%d, Count=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType), StartVertex, PrimitiveCount); @@ -3898,7 +3898,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE8 ifa IDirect3DIndexBuffer8 *pIB; D3DINDEXBUFFER_DESC IdxBufDsc; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; pIB = This->StateBlock->pIndexData; This->StateBlock->streamIsUP = FALSE; @@ -3919,7 +3919,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE8 ifa return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitiveUP(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : Type=(%d,%s), pCount=%d, pVtxData=%p, Stride=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType), PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride); @@ -3942,7 +3942,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVICE8 i D3DFORMAT IndexDataFormat,CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) { int idxStride; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : Type=(%d,%s), MinVtxIdx=%d, NumVIdx=%d, PCount=%d, pidxdata=%p, IdxFmt=%d, pVtxdata=%p, stride=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType), MinVertexIndex, NumVertexIndices, PrimitiveCount, pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride); @@ -3967,11 +3967,11 @@ HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVICE8 i return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 iface, UINT SrcStartIndex,UINT DestIndex,UINT VertexCount,IDirect3DVertexBuffer8* pDestBuffer,DWORD Flags) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 iface, CONST DWORD* pDeclaration, CONST DWORD* pFunction, DWORD* pHandle, DWORD Usage) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexShaderImpl* object; IDirect3DVertexShaderDeclarationImpl* attached_decl; HRESULT res; @@ -4002,7 +4002,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8 iface return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; This->UpdateStateBlock->VertexShader = Handle; This->UpdateStateBlock->Changed.vertexShader = TRUE; @@ -4030,14 +4030,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 iface, D return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShader(LPDIRECT3DDEVICE8 iface, DWORD* pHandle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE_(d3d_shader)("(%p) : GetVertexShader returning %ld\n", This, This->StateBlock->VertexShader); *pHandle = This->StateBlock->VertexShader; return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexShaderImpl* object; IDirect3DVertexShaderDeclarationImpl* attached_decl; @@ -4079,7 +4079,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE8 iface } HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, CONST void* pConstantData, DWORD ConstantCount) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; if (Register + ConstantCount > D3D8_VSHADER_MAX_CONSTANTS) { ERR_(d3d_shader)("(%p) : SetVertexShaderConstant C[%lu] invalid\n", This, Register); @@ -4105,7 +4105,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEVICE8 return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, void* pConstantData, DWORD ConstantCount) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE_(d3d_shader)("(%p) : C[%lu] count=%ld\n", This, Register, ConstantCount); if (Register + ConstantCount > D3D8_VSHADER_MAX_CONSTANTS) { @@ -4118,7 +4118,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEVICE8 return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3DDEVICE8 iface, DWORD Handle, void* pData, DWORD* pSizeOfData) { - /*ICOM_THIS(IDirect3DDevice8Impl,iface);*/ + /*IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;*/ IDirect3DVertexShaderDeclarationImpl* attached_decl; attached_decl = VERTEX_SHADER_DECL(Handle); @@ -4128,7 +4128,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3DDEVIC return IDirect3DVertexShaderDeclarationImpl_GetDeclaration8(attached_decl, pData, (UINT*) pSizeOfData); } HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEVICE8 iface, DWORD Handle, void* pData, DWORD* pSizeOfData) { - /*ICOM_THIS(IDirect3DDevice8Impl,iface);*/ + /*IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;*/ IDirect3DVertexShaderImpl* object; object = VERTEX_SHADER(Handle); @@ -4139,7 +4139,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEVICE8 } HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, IDirect3DIndexBuffer8* pIndexData, UINT BaseVertexIndex) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DIndexBuffer8 *oldIdxs; TRACE("(%p) : Setting to %p, base %d\n", This, pIndexData, BaseVertexIndex); @@ -4161,7 +4161,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, IDirec return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, IDirect3DIndexBuffer8** ppIndexData,UINT* pBaseVertexIndex) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); *ppIndexData = This->StateBlock->pIndexData; @@ -4172,7 +4172,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, IDirec return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(LPDIRECT3DDEVICE8 iface, CONST DWORD* pFunction, DWORD* pHandle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DPixelShaderImpl* object; HRESULT res; UINT i; @@ -4198,7 +4198,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_CreatePixelShader(LPDIRECT3DDEVICE8 iface, } HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; This->UpdateStateBlock->PixelShader = Handle; This->UpdateStateBlock->Changed.pixelShader = TRUE; @@ -4220,14 +4220,14 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 iface, DW } HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(LPDIRECT3DDEVICE8 iface, DWORD* pHandle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE_(d3d_shader)("(%p) : GetPixelShader returning %ld\n", This, This->StateBlock->PixelShader); *pHandle = This->StateBlock->PixelShader; return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 iface, DWORD Handle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DPixelShaderImpl* object; if (Handle <= VS_HIGHESTFIXEDFXF) { /* only delete user defined shaders */ @@ -4251,7 +4251,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 iface, } HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, CONST void* pConstantData, DWORD ConstantCount) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; if (Register + ConstantCount > D3D8_PSHADER_MAX_CONSTANTS) { ERR_(d3d_shader)("(%p) : SetPixelShaderConstant C[%lu] invalid\n", This, Register); @@ -4277,7 +4277,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShaderConstant(LPDIRECT3DDEVICE8 i return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, void* pConstantData, DWORD ConstantCount) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE_(d3d_shader)("(%p) : C[%lu] count=%ld\n", This, Register, ConstantCount); if (Register + ConstantCount > D3D8_PSHADER_MAX_CONSTANTS) { @@ -4299,21 +4299,21 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderFunction(LPDIRECT3DDEVICE8 i return IDirect3DPixelShaderImpl_GetFunction(object, pData, (UINT*) pSizeOfData); } HRESULT WINAPI IDirect3DDevice8Impl_DrawRectPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DRECTPATCH_INFO* pRectPatchInfo) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, UINT Handle) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_SetStreamSource(LPDIRECT3DDEVICE8 iface, UINT StreamNumber,IDirect3DVertexBuffer8* pStreamData,UINT Stride) { IDirect3DVertexBuffer8 *oldSrc; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; oldSrc = This->StateBlock->stream_source[StreamNumber]; TRACE("(%p) : StreamNo: %d, OldStream (%p), NewStream (%p), NewStride %d\n", This, StreamNumber, oldSrc, pStreamData, Stride); @@ -4334,7 +4334,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetStreamSource(LPDIRECT3DDEVICE8 iface, U return D3D_OK; } HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(LPDIRECT3DDEVICE8 iface, UINT StreamNumber,IDirect3DVertexBuffer8** pStream,UINT* pStride) { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("(%p) : StreamNo: %d, Stream (%p), Stride %d\n", This, StreamNumber, This->StateBlock->stream_source[StreamNumber], This->StateBlock->stream_stride[StreamNumber]); *pStream = This->StateBlock->stream_source[StreamNumber]; *pStride = This->StateBlock->stream_stride[StreamNumber]; @@ -4447,7 +4447,7 @@ IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl = HRESULT WINAPI IDirect3DDevice8Impl_CleanRender(LPDIRECT3DDEVICE8 iface) { #if defined(GL_VERSION_1_3) /* @see comments on ActiveRender */ - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; ENTER_GL(); @@ -4492,7 +4492,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_ActiveRender(LPDIRECT3DDEVICE8 iface, UINT Height = ((IDirect3DSurface8Impl*) RenderSurface)->myDesc.Height; IDirect3DSurface8Impl* tmp; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; #define PUSH1(att) attribs[nAttribs++] = (att); #define PUSH2(att,value) attribs[nAttribs++] = (att); attribs[nAttribs++] = (value); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 56c8e591b8c..2db740231ca 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -171,7 +171,7 @@ void WineD3DReleaseFakeGLContext(WineD3D_Context* ctx) { /* IDirect3D IUnknown parts follow: */ HRESULT WINAPI IDirect3D8Impl_QueryInterface(LPDIRECT3D8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D8)) { @@ -185,13 +185,13 @@ HRESULT WINAPI IDirect3D8Impl_QueryInterface(LPDIRECT3D8 iface,REFIID riid,LPVOI } ULONG WINAPI IDirect3D8Impl_AddRef(LPDIRECT3D8 iface) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) @@ -201,13 +201,13 @@ ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) { /* IDirect3D Interface follow: */ HRESULT WINAPI IDirect3D8Impl_RegisterSoftwareDevice (LPDIRECT3D8 iface, void* pInitializeFunction) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; FIXME_(d3d_caps)("(%p)->(%p): stub\n", This, pInitializeFunction); return D3D_OK; } UINT WINAPI IDirect3D8Impl_GetAdapterCount (LPDIRECT3D8 iface) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; /* FIXME: Set to one for now to imply the display */ TRACE_(d3d_caps)("(%p): Mostly stub, only returns primary display\n", This); return 1; @@ -215,7 +215,7 @@ UINT WINAPI IDirect3D8Impl_GetAdapterCount (LPDIRECT3D8 iface) { HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier (LPDIRECT3D8 iface, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER8* pIdentifier) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p}->(Adapter: %d, Flags: %lx, pId=%p)\n", This, Adapter, Flags, pIdentifier); @@ -270,7 +270,7 @@ HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier (LPDIRECT3D8 iface, UINT WINAPI IDirect3D8Impl_GetAdapterModeCount (LPDIRECT3D8 iface, UINT Adapter) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p}->(Adapter: %d)\n", This, Adapter); @@ -300,7 +300,7 @@ UINT WINAPI IDirect3D8Impl_GetAdapterModeCount (LPDIRECT3D8 iface, HRESULT WINAPI IDirect3D8Impl_EnumAdapterModes (LPDIRECT3D8 iface, UINT Adapter, UINT Mode, D3DDISPLAYMODE* pMode) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p}->(Adapter:%d, mode:%d, pMode:%p)\n", This, Adapter, Mode, pMode); @@ -363,7 +363,7 @@ HRESULT WINAPI IDirect3D8Impl_EnumAdapterModes (LPDIRECT3D8 iface, HRESULT WINAPI IDirect3D8Impl_GetAdapterDisplayMode (LPDIRECT3D8 iface, UINT Adapter, D3DDISPLAYMODE* pMode) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p}->(Adapter: %d, pMode: %p)\n", This, Adapter, pMode); if (NULL == pMode || @@ -405,7 +405,7 @@ HRESULT WINAPI IDirect3D8Impl_GetAdapterDisplayMode (LPDIRECT3D8 iface, HRESULT WINAPI IDirect3D8Impl_CheckDeviceType (LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p)->(Adptr:%d, CheckType:(%x,%s), DispFmt:(%x,%s), BackBuf:(%x,%s), Win?%d): stub\n", This, Adapter, @@ -439,7 +439,7 @@ HRESULT WINAPI IDirect3D8Impl_CheckDeviceType (LPDIRECT3D8 iface, HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType:(%u,%s), AdptFmt:(%u,%s), Use:(%lu,%s), ResTyp:(%x,%s), CheckFmt:(%u,%s)) ", This, Adapter, @@ -530,7 +530,7 @@ HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 iface, HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType:(%x,%s), SurfFmt:(%x,%s), Win?%d, MultiSamp:%x)\n", This, Adapter, @@ -551,7 +551,7 @@ HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(LPDIRECT3D8 iface, HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(LPDIRECT3D8 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType:(%x,%s), AdptFmt:(%x,%s), RendrTgtFmt:(%x,%s), DepthStencilFmt:(%x,%s))\n", This, Adapter, @@ -587,7 +587,7 @@ HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Adapter, D BOOL gotContext = FALSE; GLint gl_tex_size = 0; WineD3D_Context* fake_ctx = NULL; - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE_(d3d_caps)("(%p)->(Adptr:%d, DevType: %x, pCaps: %p)\n", This, Adapter, DeviceType, pCaps); @@ -876,7 +876,7 @@ HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Adapter, D } HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT Adapter) { - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; FIXME_(d3d_caps)("(%p)->(Adptr:%d)\n", This, Adapter); if (Adapter >= IDirect3D8Impl_GetAdapterCount(iface)) { @@ -895,7 +895,7 @@ static void IDirect3D8Impl_FillGLCaps(LPDIRECT3D8 iface, Display* display) { const char* gl_string_cursor = NULL; Bool test = 0; int major, minor; - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; if (This->gl_info.bIsFilled) return; This->gl_info.bIsFilled = 1; @@ -1240,7 +1240,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDevice (LPDIRECT3D8 iface, XVisualInfo template; HDC hDc; - ICOM_THIS(IDirect3D8Impl,iface); + IDirect3D8Impl *This = (IDirect3D8Impl *)iface; TRACE("(%p)->(Adptr:%d, DevType: %x, FocusHwnd: %p, BehFlags: %lx, PresParms: %p, RetDevInt: %p)\n", This, Adapter, DeviceType, hFocusWindow, BehaviourFlags, pPresentationParameters, ppReturnedDeviceInterface); diff --git a/dlls/d3d8/drawprim.c b/dlls/d3d8/drawprim.c index c968f88c785..ff0df02c70c 100644 --- a/dlls/d3d8/drawprim.c +++ b/dlls/d3d8/drawprim.c @@ -61,7 +61,7 @@ BOOL initializeFVF(LPDIRECT3DDEVICE8 iface, BOOL *useVertexShaderFunction) /* Should we use the vertex shader */ { - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* The first thing to work out is if we are using the fixed function pipeline which is either SetVertexShader with < VS_HIGHESTFIXEDFXF - in which case this @@ -165,7 +165,7 @@ DWORD primitiveToGl(D3DPRIMITIVETYPE PrimitiveType, void init_materials(LPDIRECT3DDEVICE8 iface, BOOL isDiffuseSupplied) { BOOL requires_material_reset = FALSE; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; if (This->tracking_color == NEEDS_TRACKING && isDiffuseSupplied == TRUE) { /* If we have not set up the material color tracking, do it now as required */ @@ -230,7 +230,7 @@ static GLfloat invymat[16]={ BOOL primitiveInitState(LPDIRECT3DDEVICE8 iface, BOOL vtx_transformed, BOOL vtx_lit, BOOL useVS) { BOOL isLightingOn = FALSE; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* If no normals, DISABLE lighting otherwise, don't touch lighing as it is set by the appropriate render state. Note Vertex Shader output is already lit */ @@ -368,7 +368,7 @@ void primitiveConvertToStridedData(LPDIRECT3DDEVICE8 iface, Direct3DVertexStride int coordIdxInfo = 0x00; /* Information on number of coords supplied */ int numCoords[8]; /* Holding place for D3DFVF_TEXTUREFORMATx */ - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* OK, Now to setup the data locations For the non-created vertex shaders, the VertexShader var holds the real @@ -523,7 +523,7 @@ void draw_vertex(LPDIRECT3DDEVICE8 iface, /* interf { unsigned int textureNo; float s, t, r, q; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; /* Diffuse -------------------------------- */ if (isDiffuse == TRUE) { @@ -668,7 +668,7 @@ void drawStridedFast(LPDIRECT3DDEVICE8 iface, Direct3DVertexStridedData *sd, unsigned int textureNo = 0; GLenum glPrimType = GL_POINTS; int NumVertexes = NumPrimitives; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("Using fast vertex array code\n"); @@ -940,7 +940,7 @@ void drawStridedSlow(LPDIRECT3DDEVICE8 iface, Direct3DVertexStridedData *sd, float ptSize = 0.0f; /* Point size */ DWORD diffuseColor = 0xFFFFFFFF; /* Diffuse Color */ DWORD specularColor = 0; /* Specular Color */ - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("Using slow vertex array code\n"); @@ -1249,7 +1249,7 @@ void drawStridedSoftwareVS(LPDIRECT3DDEVICE8 iface, Direct3DVertexStridedData *s float ptSize = 0.0f; /* Point size */ D3DVECTOR_4 texcoords[8]; /* Texture Coords */ int numcoords[8]; /* Number of coords */ - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DVertexShaderImpl* vertex_shader = NULL; @@ -1378,7 +1378,7 @@ void drawStridedHardwareVS(LPDIRECT3DDEVICE8 iface, Direct3DVertexStridedData *s int glPrimType; int maxAttribs; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("Drawing with hardware vertex shaders\n"); /* Retrieve the VS information */ @@ -1466,7 +1466,7 @@ void drawPrimitive(LPDIRECT3DDEVICE8 iface, BOOL useVertexShaderFunction = FALSE; BOOL isLightingOn = FALSE; Direct3DVertexStridedData dataLocations; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; unsigned int i; int useHW = FALSE; diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index bf3a69c30b4..c2c7396e5aa 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DIndexBuffer8 IUnknown parts follow: */ HRESULT WINAPI IDirect3DIndexBuffer8Impl_QueryInterface(LPDIRECT3DINDEXBUFFER8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) @@ -50,13 +50,13 @@ HRESULT WINAPI IDirect3DIndexBuffer8Impl_QueryInterface(LPDIRECT3DINDEXBUFFER8 i } ULONG WINAPI IDirect3DIndexBuffer8Impl_AddRef(LPDIRECT3DINDEXBUFFER8 iface) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 iface) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -68,57 +68,57 @@ ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 iface) { /* IDirect3DResource Interface follow: */ HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; IDirect3DDevice8Impl_AddRef(*ppDevice); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer8Impl_FreePrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DIndexBuffer8Impl_SetPriority(LPDIRECT3DINDEXBUFFER8 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DIndexBuffer8Impl_GetPriority(LPDIRECT3DINDEXBUFFER8 iface) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } void WINAPI IDirect3DIndexBuffer8Impl_PreLoad(LPDIRECT3DINDEXBUFFER8 iface) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); } D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(LPDIRECT3DINDEXBUFFER8 iface) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->ResourceType); return This->ResourceType; } /* IDirect3DIndexBuffer8 */ HRESULT WINAPI IDirect3DIndexBuffer8Impl_Lock(LPDIRECT3DINDEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) : no locking yet, offset %d, size %d, Flags=%lx\n", This, OffsetToLock, SizeToLock, Flags); *ppbData = (BYTE *)This->allocatedMemory + OffsetToLock; return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer8Impl_Unlock(LPDIRECT3DINDEXBUFFER8 iface) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 iface, D3DINDEXBUFFER_DESC *pDesc) { - ICOM_THIS(IDirect3DIndexBuffer8Impl,iface); + IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); memcpy(pDesc, &This->currentDesc, sizeof(D3DINDEXBUFFER_DESC)); diff --git a/dlls/d3d8/resource.c b/dlls/d3d8/resource.c index 6054b885eb5..77ced1141e9 100644 --- a/dlls/d3d8/resource.c +++ b/dlls/d3d8/resource.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DResource IUnknown parts follow: */ HRESULT WINAPI IDirect3DResource8Impl_QueryInterface(LPDIRECT3DRESOURCE8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8)) { @@ -49,13 +49,13 @@ HRESULT WINAPI IDirect3DResource8Impl_QueryInterface(LPDIRECT3DRESOURCE8 iface,R } ULONG WINAPI IDirect3DResource8Impl_AddRef(LPDIRECT3DRESOURCE8 iface) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DResource8Impl_Release(LPDIRECT3DRESOURCE8 iface) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) @@ -65,46 +65,46 @@ ULONG WINAPI IDirect3DResource8Impl_Release(LPDIRECT3DRESOURCE8 iface) { /* IDirect3DResource Interface follow: */ HRESULT WINAPI IDirect3DResource8Impl_GetDevice(LPDIRECT3DRESOURCE8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; IDirect3DDevice8Impl_AddRef(*ppDevice); return D3D_OK; } HRESULT WINAPI IDirect3DResource8Impl_SetPrivateData(LPDIRECT3DRESOURCE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DResource8Impl_GetPrivateData(LPDIRECT3DRESOURCE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DResource8Impl_FreePrivateData(LPDIRECT3DRESOURCE8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DResource8Impl_SetPriority(LPDIRECT3DRESOURCE8 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DResource8Impl_GetPriority(LPDIRECT3DRESOURCE8 iface) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } void WINAPI IDirect3DResource8Impl_PreLoad(LPDIRECT3DRESOURCE8 iface) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; FIXME("(%p) : stub\n", This); } D3DRESOURCETYPE WINAPI IDirect3DResource8Impl_GetType(LPDIRECT3DRESOURCE8 iface) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->ResourceType); return This->ResourceType; } D3DPOOL WINAPI IDirect3DResource8Impl_GetPool(LPDIRECT3DRESOURCE8 iface) { - ICOM_THIS(IDirect3DResource8Impl,iface); + IDirect3DResource8Impl *This = (IDirect3DResource8Impl *)iface; switch (This->ResourceType) { case D3DRTYPE_SURFACE: diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 115cca75ef5..7a098df0808 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* IDirect3DVolume IUnknown parts follow: */ HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DSurface8)) { @@ -54,13 +54,13 @@ HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 iface,REF } ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -72,7 +72,7 @@ ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { /* IDirect3DSurface8: */ HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; /** @@ -84,25 +84,25 @@ HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface, IDirect } HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 iface, REFIID riid, void** ppContainer) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; HRESULT res; res = IUnknown_QueryInterface(This->Container, riid, ppContainer); if (E_NOINTERFACE == res) { @@ -118,7 +118,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 iface, REFI } HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFACE_DESC *pDesc) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); memcpy(pDesc, &This->myDesc, sizeof(D3DSURFACE_DESC)); @@ -127,7 +127,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3DSURFAC HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { HRESULT hr; - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; /* fixme: should we really lock as such? */ if (This->inTexture && This->inPBuffer) { @@ -287,7 +287,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKE HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(LPDIRECT3DSURFACE8 iface) { GLint skipBytes = 0; - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; if (FALSE == This->locked) { ERR("trying to Unlock an unlocked surf@%p\n", This); @@ -478,7 +478,7 @@ IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl = HRESULT WINAPI IDirect3DSurface8Impl_LoadTexture(LPDIRECT3DSURFACE8 iface, GLenum gl_target, GLenum gl_level) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; if (This->inTexture) return D3D_OK; @@ -645,7 +645,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_LoadTexture(LPDIRECT3DSURFACE8 iface, GLenu HRESULT WINAPI IDirect3DSurface8Impl_SaveSnapshot(LPDIRECT3DSURFACE8 iface, const char* filename) { FILE* f = NULL; ULONG i; - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; f = fopen(filename, "w+"); if (NULL == f) { @@ -722,7 +722,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_SaveSnapshot(LPDIRECT3DSURFACE8 iface, cons } HRESULT WINAPI IDirect3DSurface8Impl_CleanDirtyRect(LPDIRECT3DSURFACE8 iface) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; This->Dirty = FALSE; This->dirtyRect.left = This->myDesc.Width; This->dirtyRect.top = This->myDesc.Height; @@ -736,7 +736,7 @@ HRESULT WINAPI IDirect3DSurface8Impl_CleanDirtyRect(LPDIRECT3DSURFACE8 iface) { * very stupid way to handle multiple dirty rects but it works :) */ extern HRESULT WINAPI IDirect3DSurface8Impl_AddDirtyRect(LPDIRECT3DSURFACE8 iface, CONST RECT* pDirtyRect) { - ICOM_THIS(IDirect3DSurface8Impl,iface); + IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; This->Dirty = TRUE; if (NULL != pDirtyRect) { This->dirtyRect.left = min(This->dirtyRect.left, pDirtyRect->left); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index d113d592809..9eb9679e3b6 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DSwapChain IUnknown parts follow: */ HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DSwapChain8Impl,iface); + IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DSwapChain8)) { @@ -49,13 +49,13 @@ HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN8 iface } ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { - ICOM_THIS(IDirect3DSwapChain8Impl,iface); + IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) { - ICOM_THIS(IDirect3DSwapChain8Impl,iface); + IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -66,13 +66,13 @@ ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) { /* IDirect3DSwapChain parts follow: */ HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) { - ICOM_THIS(IDirect3DSwapChain8Impl,iface); + IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8 iface, UINT BackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface8** ppBackBuffer) { - ICOM_THIS(IDirect3DSwapChain8Impl,iface); + IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; *ppBackBuffer = (LPDIRECT3DSURFACE8) This->backBuffer; TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, BackBuffer, Type, *ppBackBuffer); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 7cac447eae2..a19169d657f 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DTexture8 IUnknown parts follow: */ HRESULT WINAPI IDirect3DTexture8Impl_QueryInterface(LPDIRECT3DTEXTURE8 iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) : QueryInterface for %s\n", This, debugstr_guid(riid)); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) @@ -51,13 +51,13 @@ HRESULT WINAPI IDirect3DTexture8Impl_QueryInterface(LPDIRECT3DTEXTURE8 iface, RE } ULONG WINAPI IDirect3DTexture8Impl_AddRef(LPDIRECT3DTEXTURE8 iface) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; ULONG ref = --This->ref; unsigned int i; @@ -76,7 +76,7 @@ ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { /* IDirect3DTexture8 IDirect3DResource8 Interface follow: */ HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; /** @@ -87,30 +87,30 @@ HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, return D3D_OK; } HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DTexture8Impl_SetPriority(LPDIRECT3DTEXTURE8 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 iface) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { unsigned int i; - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) : About to load texture\n", This); ENTER_GL(); @@ -153,31 +153,31 @@ void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { return ; } D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 iface) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) : is %d \n", This, This->ResourceType); return This->ResourceType; } /* IDirect3DTexture8 IDirect3DBaseTexture8 Interface follow: */ DWORD WINAPI IDirect3DTexture8Impl_SetLOD(LPDIRECT3DTEXTURE8 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DTexture8Impl_GetLOD(LPDIRECT3DTEXTURE8 iface) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DTexture8Impl_GetLevelCount(LPDIRECT3DTEXTURE8 iface) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->levels); return This->levels; } /* IDirect3DTexture8 */ HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 iface, UINT Level, D3DSURFACE_DESC* pDesc) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; if (Level < This->levels) { TRACE("(%p) Level (%d)\n", This, Level); @@ -189,7 +189,7 @@ HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 ifa return D3D_OK; } HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 iface, UINT Level, IDirect3DSurface8** ppSurfaceLevel) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; *ppSurfaceLevel = (LPDIRECT3DSURFACE8)This->surfaces[Level]; IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) This->surfaces[Level]); TRACE("(%p) : returning %p for level %d\n", This, *ppSurfaceLevel, Level); @@ -197,7 +197,7 @@ HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 } HRESULT WINAPI IDirect3DTexture8Impl_LockRect(LPDIRECT3DTEXTURE8 iface, UINT Level,D3DLOCKED_RECT* pLockedRect,CONST RECT* pRect,DWORD Flags) { HRESULT hr; - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) Level (%d)\n", This, Level); if (Level < This->levels) { /** @@ -214,7 +214,7 @@ HRESULT WINAPI IDirect3DTexture8Impl_LockRect(LPDIRECT3DTEXTURE8 iface, } HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(LPDIRECT3DTEXTURE8 iface, UINT Level) { HRESULT hr; - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; TRACE("(%p) Level (%d)\n", This, Level); if (Level < This->levels) { hr = IDirect3DSurface8Impl_UnlockRect((LPDIRECT3DSURFACE8) This->surfaces[Level]); @@ -226,7 +226,7 @@ HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(LPDIRECT3DTEXTURE8 iface return hr; } HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTURE8 iface, CONST RECT* pDirtyRect) { - ICOM_THIS(IDirect3DTexture8Impl,iface); + IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; This->Dirty = TRUE; TRACE("(%p) : dirtyfication of surface Level (0)\n", This); return IDirect3DSurface8Impl_AddDirtyRect((LPDIRECT3DSURFACE8) This->surfaces[0], pDirtyRect); diff --git a/dlls/d3d8/utils.c b/dlls/d3d8/utils.c index aa2f1a379c5..74861ab320f 100644 --- a/dlls/d3d8/utils.c +++ b/dlls/d3d8/utils.c @@ -748,7 +748,7 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o GLenum scal_target; GLenum opr=0, invopr, src3_target, opr3_target; BOOL Handled = FALSE; - ICOM_THIS(IDirect3DDevice8Impl,iface); + IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; TRACE("Alpha?(%d), Stage:%d Op(%d), a1(%ld), a2(%ld), a3(%ld)\n", isAlpha, Stage, op, arg1, arg2, arg3); diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index 5b774703857..4129bd165fd 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DResource IUnknown parts follow: */ HRESULT WINAPI IDirect3DVertexBuffer8Impl_QueryInterface(LPDIRECT3DVERTEXBUFFER8 iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) @@ -50,13 +50,13 @@ HRESULT WINAPI IDirect3DVertexBuffer8Impl_QueryInterface(LPDIRECT3DVERTEXBUFFER8 } ULONG WINAPI IDirect3DVertexBuffer8Impl_AddRef(LPDIRECT3DVERTEXBUFFER8 iface) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 iface) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -68,57 +68,57 @@ ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 iface) { /* IDirect3DResource Interface follow: */ HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFER8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; IDirect3DDevice8Impl_AddRef(*ppDevice); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer8Impl_FreePrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DVertexBuffer8Impl_SetPriority(LPDIRECT3DVERTEXBUFFER8 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DVertexBuffer8Impl_GetPriority(LPDIRECT3DVERTEXBUFFER8 iface) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } void WINAPI IDirect3DVertexBuffer8Impl_PreLoad(LPDIRECT3DVERTEXBUFFER8 iface) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; FIXME("(%p) : stub\n", This); } D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer8Impl_GetType(LPDIRECT3DVERTEXBUFFER8 iface) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->ResourceType); return This->ResourceType; } /* IDirect3DVertexBuffer8 */ HRESULT WINAPI IDirect3DVertexBuffer8Impl_Lock(LPDIRECT3DVERTEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE** ppbData, DWORD Flags) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) : returning memory of %p (base:%p,offset:%u)\n", This, This->allocatedMemory + OffsetToLock, This->allocatedMemory, OffsetToLock); /* TODO: check Flags compatibility with This->currentDesc.Usage (see MSDN) */ *ppbData = This->allocatedMemory + OffsetToLock; return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer8Impl_Unlock(LPDIRECT3DVERTEXBUFFER8 iface) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 iface, D3DVERTEXBUFFER_DESC *pDesc) { - ICOM_THIS(IDirect3DVertexBuffer8Impl,iface); + IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; TRACE("(%p)\n", This); pDesc->Format = This->currentDesc.Format; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 017ed965ae9..c65d90790e7 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DVolume IUnknown parts follow: */ HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVolume8)) { @@ -51,13 +51,13 @@ HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 iface, REFI } ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -69,7 +69,7 @@ ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { /* IDirect3DVolume8: */ HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; @@ -81,25 +81,25 @@ HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, IDirect3D } HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID riid, void** ppContainer) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Container); *ppContainer = This->Container; IUnknown_AddRef(This->Container); @@ -107,14 +107,14 @@ HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, REFIID } HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC* pDesc) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); memcpy(pDesc, &This->myDesc, sizeof(D3DVOLUME_DESC)); return D3D_OK; } HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; FIXME("(%p) : pBox=%p stub\n", This, pBox); /* fixme: should we really lock as such? */ @@ -173,7 +173,7 @@ HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_B } HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; if (FALSE == This->locked) { ERR("trying to lock unlocked volume@%p\n", This); return D3DERR_INVALIDCALL; @@ -202,7 +202,7 @@ IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl = HRESULT WINAPI IDirect3DVolume8Impl_CleanDirtyBox(LPDIRECT3DVOLUME8 iface) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; This->Dirty = FALSE; This->lockedBox.Left = This->myDesc.Width; This->lockedBox.Top = This->myDesc.Height; @@ -218,7 +218,7 @@ HRESULT WINAPI IDirect3DVolume8Impl_CleanDirtyBox(LPDIRECT3DVOLUME8 iface) { * very stupid way to handle multiple dirty box but it works :) */ HRESULT WINAPI IDirect3DVolume8Impl_AddDirtyBox(LPDIRECT3DVOLUME8 iface, CONST D3DBOX* pDirtyBox) { - ICOM_THIS(IDirect3DVolume8Impl,iface); + IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; This->Dirty = TRUE; if (NULL != pDirtyBox) { This->lockedBox.Left = min(This->lockedBox.Left, pDirtyBox->Left); diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index 576740c92de..7ad3a18754f 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DVolumeTexture8 IUnknown parts follow: */ HRESULT WINAPI IDirect3DVolumeTexture8Impl_QueryInterface(LPDIRECT3DVOLUMETEXTURE8 iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) : QueryInterface\n", This); if (IsEqualGUID(riid, &IID_IUnknown) @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_QueryInterface(LPDIRECT3DVOLUMETEXTUR } ULONG WINAPI IDirect3DVolumeTexture8Impl_AddRef(LPDIRECT3DVOLUMETEXTURE8 iface) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 iface) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; ULONG ref = --This->ref; UINT i; @@ -77,7 +77,7 @@ ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 iface) /* IDirect3DVolumeTexture8 IDirect3DResource8 Interface follow: */ HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXTURE8 iface, IDirect3DDevice8** ppDevice) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE8) This->Device; /** @@ -88,33 +88,33 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEX return D3D_OK; } HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolumeTexture8Impl_FreePrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DVolumeTexture8Impl_SetPriority(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; FIXME("(%p) : stub returning 0\n", This); return 0; } DWORD WINAPI IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMETEXTURE8 iface) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; FIXME("(%p) : stub returning 0\n", This); return 0; } void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8 iface) { unsigned int i; - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) : About to load texture\n", This); ENTER_GL(); @@ -175,31 +175,31 @@ void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTU return ; } D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(LPDIRECT3DVOLUMETEXTURE8 iface) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->ResourceType); return This->ResourceType; } /* IDirect3DVolumeTexture8 IDirect3DBaseTexture8 Interface follow: */ DWORD WINAPI IDirect3DVolumeTexture8Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; FIXME("(%p) : stub returning 0\n", This); return 0; } DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE8 iface) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; FIXME("(%p) : stub returning 0\n", This); return 0; } DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLevelCount(LPDIRECT3DVOLUMETEXTURE8 iface) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; TRACE("(%p) : returning %d\n", This, This->levels); return This->levels; } /* IDirect3DVolumeTexture8 */ HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level,D3DVOLUME_DESC *pDesc) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; if (Level < This->levels) { TRACE("(%p) Level (%d)\n", This, Level); return IDirect3DVolume8Impl_GetDesc((LPDIRECT3DVOLUME8) This->volumes[Level], pDesc); @@ -209,7 +209,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetLevelDesc(LPDIRECT3DVOLUME return D3D_OK; } HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, IDirect3DVolume8** ppVolumeLevel) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; if (Level < This->levels) { *ppVolumeLevel = (LPDIRECT3DVOLUME8)This->volumes[Level]; IDirect3DVolume8Impl_AddRef((LPDIRECT3DVOLUME8) *ppVolumeLevel); @@ -223,7 +223,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLU } HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { HRESULT hr; - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; if (Level < This->levels) { /** * Not dirtified while Surfaces don't notify dirtification @@ -239,7 +239,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTU } HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { HRESULT hr; - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; if (Level < This->levels) { hr = IDirect3DVolume8Impl_UnlockBox((LPDIRECT3DVOLUME8) This->volumes[Level]); TRACE("(%p) -> level(%d) success(%lu)\n", This, Level, hr); @@ -250,7 +250,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEX return hr; } HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE8 iface, CONST D3DBOX* pDirtyBox) { - ICOM_THIS(IDirect3DVolumeTexture8Impl,iface); + IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; This->Dirty = TRUE; TRACE("(%p) : dirtyfication of volume Level (0)\n", This); return IDirect3DVolume8Impl_AddDirtyBox((LPDIRECT3DVOLUME8) This->volumes[0], pDirtyBox); diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c index fa870e4a3fb..76d677f4a2a 100644 --- a/dlls/d3d9/basetexture.c +++ b/dlls/d3d9/basetexture.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DBaseTexture9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DBaseTexture9Impl_QueryInterface(LPDIRECT3DBASETEXTURE9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DBaseTexture9Impl_QueryInterface(LPDIRECT3DBASETEXTURE9 i } ULONG WINAPI IDirect3DBaseTexture9Impl_AddRef(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DBaseTexture9Impl_Release(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) @@ -68,82 +68,82 @@ ULONG WINAPI IDirect3DBaseTexture9Impl_Release(LPDIRECT3DBASETEXTURE9 iface) { /* IDirect3DBaseTexture9 IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DBaseTexture9Impl_GetDevice(LPDIRECT3DBASETEXTURE9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); } HRESULT WINAPI IDirect3DBaseTexture9Impl_SetPrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DBaseTexture9Impl_GetPrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DBaseTexture9Impl_FreePrivateData(LPDIRECT3DBASETEXTURE9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DBaseTexture9Impl_SetPriority(LPDIRECT3DBASETEXTURE9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; return IDirect3DResource9Impl_SetPriority((LPDIRECT3DRESOURCE9) This, PriorityNew); } DWORD WINAPI IDirect3DBaseTexture9Impl_GetPriority(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; return IDirect3DResource9Impl_GetPriority((LPDIRECT3DRESOURCE9) This); } void WINAPI IDirect3DBaseTexture9Impl_PreLoad(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } D3DRESOURCETYPE WINAPI IDirect3DBaseTexture9Impl_GetType(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; return IDirect3DResource9Impl_GetType((LPDIRECT3DRESOURCE9) This); } /* IDirect3DBaseTexture9 Interface follow: */ DWORD WINAPI IDirect3DBaseTexture9Impl_SetLOD(LPDIRECT3DBASETEXTURE9 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DBaseTexture9Impl_GetLOD(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DBaseTexture9Impl_GetLevelCount(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } HRESULT WINAPI IDirect3DBaseTexture9Impl_SetAutoGenFilterType(LPDIRECT3DBASETEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } D3DTEXTUREFILTERTYPE WINAPI IDirect3DBaseTexture9Impl_GetAutoGenFilterType(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3DTEXF_NONE; } void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPDIRECT3DBASETEXTURE9 iface) { - ICOM_THIS(IDirect3DBaseTexture9Impl,iface); + IDirect3DBaseTexture9Impl *This = (IDirect3DBaseTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index acfb6d48dd2..aef31fd43c2 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DCubeTexture9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(LPDIRECT3DCUBETEXTURE9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) @@ -53,13 +53,13 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(LPDIRECT3DCUBETEXTURE9 i } ULONG WINAPI IDirect3DCubeTexture9Impl_AddRef(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DCubeTexture9Impl_Release(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; ULONG ref = --This->ref; unsigned int i, j; @@ -80,84 +80,84 @@ ULONG WINAPI IDirect3DCubeTexture9Impl_Release(LPDIRECT3DCUBETEXTURE9 iface) { /* IDirect3DCubeTexture9 IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DCubeTexture9Impl_GetDevice(LPDIRECT3DCUBETEXTURE9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); } HRESULT WINAPI IDirect3DCubeTexture9Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DCubeTexture9Impl_GetPrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DCubeTexture9Impl_FreePrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DCubeTexture9Impl_SetPriority(LPDIRECT3DCUBETEXTURE9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DResource9Impl_SetPriority((LPDIRECT3DRESOURCE9) This, PriorityNew); } DWORD WINAPI IDirect3DCubeTexture9Impl_GetPriority(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DResource9Impl_GetPriority((LPDIRECT3DRESOURCE9) This); } void WINAPI IDirect3DCubeTexture9Impl_PreLoad(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DResource9Impl_GetType((LPDIRECT3DRESOURCE9) This); } /* IDirect3DCubeTexture9 IDirect3DBaseTexture9 Interface follow: */ DWORD WINAPI IDirect3DCubeTexture9Impl_SetLOD(LPDIRECT3DCUBETEXTURE9 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_SetLOD((LPDIRECT3DBASETEXTURE9) This, LODNew); } DWORD WINAPI IDirect3DCubeTexture9Impl_GetLOD(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetLOD((LPDIRECT3DBASETEXTURE9) This); } DWORD WINAPI IDirect3DCubeTexture9Impl_GetLevelCount(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetLevelCount((LPDIRECT3DBASETEXTURE9) This); } HRESULT WINAPI IDirect3DCubeTexture9Impl_SetAutoGenFilterType(LPDIRECT3DCUBETEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_SetAutoGenFilterType((LPDIRECT3DBASETEXTURE9) This, FilterType); } D3DTEXTUREFILTERTYPE WINAPI IDirect3DCubeTexture9Impl_GetAutoGenFilterType(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetAutoGenFilterType((LPDIRECT3DBASETEXTURE9) This); } void WINAPI IDirect3DCubeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DCUBETEXTURE9 iface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } /* IDirect3DCubeTexture9 Interface follow: */ HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE9 iface, UINT Level, D3DSURFACE_DESC* pDesc) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; if (Level < This->levels) { TRACE("(%p) level (%d)\n", This, Level); return IDirect3DSurface9Impl_GetDesc((LPDIRECT3DSURFACE9) This->surfaces[0][Level], pDesc); @@ -169,7 +169,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(LPDIRECT3DCUBETEXTURE9 ifa } HRESULT WINAPI IDirect3DCubeTexture9Impl_GetCubeMapSurface(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level, IDirect3DSurface9** ppCubeMapSurface) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; if (Level < This->levels) { *ppCubeMapSurface = (LPDIRECT3DSURFACE9) This->surfaces[FaceType][Level]; IDirect3DSurface9Impl_AddRef((LPDIRECT3DSURFACE9) *ppCubeMapSurface); @@ -183,7 +183,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_GetCubeMapSurface(LPDIRECT3DCUBETEXTURE HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { HRESULT hr; - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; if (Level < This->levels) { /** * Not dirtified while Surfaces don't notify dirtification @@ -200,7 +200,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(LPDIRECT3DCUBETEXTURE9 iface, HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level) { HRESULT hr; - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; if (Level < This->levels) { hr = IDirect3DSurface9Impl_UnlockRect((LPDIRECT3DSURFACE9) This->surfaces[FaceType][Level]); TRACE("(%p) -> faceType(%d) level(%d) success(%lu)\n", This, FaceType, Level, hr); @@ -212,7 +212,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(LPDIRECT3DCUBETEXTURE9 iface } HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { - ICOM_THIS(IDirect3DCubeTexture9Impl,iface); + IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); This->Dirty = TRUE; return D3D_OK; @@ -252,7 +252,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateCubeTexture(LPDIRECT3DDEVICE9 iface, D3DFORMAT Format, D3DPOOL Pool, IDirect3DCubeTexture9** ppCubeTexture, HANDLE* pSharedHandle) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 1585a0ac10c..2d2cddd6cd2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -43,7 +43,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_shader); /* IDirect3D IUnknown parts follow: */ HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DDevice9)) { @@ -57,13 +57,13 @@ HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9 iface, REFI } ULONG WINAPI IDirect3DDevice9Impl_AddRef(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -74,13 +74,13 @@ ULONG WINAPI IDirect3DDevice9Impl_Release(LPDIRECT3DDEVICE9 iface) { /* IDirect3DDevice Interface follow: */ HRESULT WINAPI IDirect3DDevice9Impl_TestCooperativeLevel(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : stub\n", This); /* No way of notifying yet! */ return D3D_OK; } UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : stub, emulating 32Mb for now\n", This); /* * pretend we have 32MB of any type of memory queried. @@ -89,13 +89,13 @@ UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9 i } HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedRessources(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(LPDIRECT3DDEVICE9 iface, IDirect3D9** ppD3D9) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->direct3d); /* Inc ref count */ *ppD3D9 = (IDirect3D9*) This->direct3d; @@ -104,20 +104,20 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(LPDIRECT3DDEVICE9 iface, IDire } HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9 iface, D3DCAPS9* pCaps) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub, calling idirect3d for now\n", This); IDirect3D9Impl_GetDeviceCaps((LPDIRECT3D9) This->direct3d, This->adapterNo, This->devType, pCaps); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetDisplayMode(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DDISPLAYMODE* pMode) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) copying to %p\n", This, pParameters); memcpy(pParameters, &This->CreateParms, sizeof(D3DDEVICE_CREATION_PARAMETERS)); return D3D_OK; @@ -125,7 +125,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9 if HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVICE9 iface, UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9* pCursorBitmap) { IDirect3DSurface9Impl* pSur = (IDirect3DSurface9Impl*) pCursorBitmap; - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : Spot Pos(%u,%u)\n", This, XHotSpot, YHotSpot); if (D3DFMT_A8R8G8B8 != pSur->myDesc.Format) { @@ -143,7 +143,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVICE9 ifac } void WINAPI IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9 iface, int XScreenSpace, int YScreenSpace, DWORD Flags) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : SetPos to (%u,%u)\n", This, XScreenSpace, YScreenSpace); This->xScreenSpace = XScreenSpace; This->yScreenSpace = YScreenSpace; @@ -151,26 +151,26 @@ void WINAPI IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9 iface, } BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9 iface, BOOL bShow) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : visible(%d)\n", This, bShow); This->bCursorVisible = bShow; return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_Reset(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_Present(LPDIRECT3DDEVICE9 iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : stub!\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, UINT BackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; *ppBackBuffer = (LPDIRECT3DSURFACE9) This->backBuffer; TRACE("(%p) : BackBuf %d Type %d returning %p\n", This, BackBuffer, Type, *ppBackBuffer); if (BackBuffer > This->PresentParms.BackBufferCount - 1) { @@ -183,20 +183,20 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9 iface, UIN } HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetDialogBoxMode(LPDIRECT3DDEVICE9 iface, BOOL bEnableDialogs) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } void WINAPI IDirect3DDevice9Impl_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, DWORD Flags, CONST D3DGAMMARAMP* pRamp) { HDC hDC; - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : pRamp@%p\n", This, pRamp); hDC = GetDC(This->win_handle); @@ -207,7 +207,7 @@ void WINAPI IDirect3DDevice9Impl_SetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwa void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { HDC hDC; - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : pRamp@%p\n", This, pRamp); hDC = GetDC(This->win_handle); @@ -217,115 +217,115 @@ void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9 iface, UINT iSwa } HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Lockable, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_UpdateSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestinationSurface, CONST POINT* pDestPoint) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(LPDIRECT3DDEVICE9 iface, IDirect3DBaseTexture9* pSourceTexture, IDirect3DBaseTexture9* pDestinationTexture) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBuffer(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pDestSurface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pRenderTarget, IDirect3DSurface9* pDestSurface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSurface9* pDestSurface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_StretchRects(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect, D3DTEXTUREFILTERTYPE Filter) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pSurface, CONST RECT* pRect, D3DCOLOR color) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9** ppSurface, HANDLE* pSharedHandle) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9 iface, DWORD RenderTargetIndex, IDirect3DSurface9* pRenderTarget) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9 iface, DWORD RenderTargetIndex, IDirect3DSurface9** ppRenderTarget) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetDepthStencilSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9* pZStencilSurface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(LPDIRECT3DDEVICE9 iface, IDirect3DSurface9** ppZStencilSurface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_Clear(LPDIRECT3DDEVICE9 iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE d3dts, CONST D3DMATRIX* lpmatrix) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetTransform(LPDIRECT3DDEVICE9 iface, D3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : for State %d\n", This, State); memcpy(pMatrix, &This->StateBlock->transforms[State], sizeof(D3DMATRIX)); return D3D_OK; @@ -338,7 +338,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_MultiplyTransform(LPDIRECT3DDEVICE9 iface, /* Note: Using UpdateStateBlock means it would be recorded in a state block change, but works regardless of recording being on. If this is found to be wrong, change to StateBlock. */ - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : For state %u\n", This, State); if (State < HIGHEST_TRANSFORMSTATE) { @@ -374,26 +374,26 @@ HRESULT WINAPI IDirect3DDevice9Impl_MultiplyTransform(LPDIRECT3DDEVICE9 iface, } HRESULT WINAPI IDirect3DDevice9Impl_SetViewport(LPDIRECT3DDEVICE9 iface, CONST D3DVIEWPORT9* pViewport) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetViewport(LPDIRECT3DDEVICE9 iface, D3DVIEWPORT9* pViewport) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p)\n", This); memcpy(pViewport, &This->StateBlock->viewport, sizeof(D3DVIEWPORT9)); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetMaterial(LPDIRECT3DDEVICE9 iface, CONST D3DMATERIAL9* pMaterial) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetMaterial(LPDIRECT3DDEVICE9 iface, D3DMATERIAL9* pMaterial) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; memcpy(pMaterial, &This->UpdateStateBlock->material, sizeof (D3DMATERIAL9)); TRACE("(%p) : Diffuse (%f,%f,%f,%f)\n", This, pMaterial->Diffuse.r, pMaterial->Diffuse.g, pMaterial->Diffuse.b, pMaterial->Diffuse.a); TRACE("(%p) : Ambient (%f,%f,%f,%f)\n", This, pMaterial->Ambient.r, pMaterial->Ambient.g, pMaterial->Ambient.b, pMaterial->Ambient.a); @@ -404,68 +404,68 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetMaterial(LPDIRECT3DDEVICE9 iface, D3DMA } HRESULT WINAPI IDirect3DDevice9Impl_SetLight(LPDIRECT3DDEVICE9 iface, DWORD Index, CONST D3DLIGHT9* pLight) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetLight(LPDIRECT3DDEVICE9 iface, DWORD Index,D3DLIGHT9* pLight) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_LightEnable(LPDIRECT3DDEVICE9 iface, DWORD Index, BOOL Enable) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetLightEnable(LPDIRECT3DDEVICE9 iface, DWORD Index, BOOL* pEnable) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetClipPlane(LPDIRECT3DDEVICE9 iface, DWORD Index, CONST float* pPlane) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9 iface, DWORD Index, float* pPlane) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9 iface, D3DRENDERSTATETYPE State, DWORD Value) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetRenderState(LPDIRECT3DDEVICE9 iface, D3DRENDERSTATETYPE State, DWORD* pValue) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) for State %d = %ld\n", This, State, This->UpdateStateBlock->renderstate[State]); *pValue = This->StateBlock->renderstate[State]; return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(LPDIRECT3DDEVICE9 iface, CONST D3DCLIPSTATUS9* pClipStatus) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(LPDIRECT3DDEVICE9 iface, D3DCLIPSTATUS9* pClipStatus) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9 iface, DWORD Stage, IDirect3DBaseTexture9** ppTexture) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : returning %p for stage %ld\n", This, This->UpdateStateBlock->textures[Stage], Stage); *ppTexture = (LPDIRECT3DBASETEXTURE9) This->UpdateStateBlock->textures[Stage]; IDirect3DBaseTexture9Impl_AddRef(*ppTexture); @@ -473,120 +473,120 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9 iface, DWORD } HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(LPDIRECT3DDEVICE9 iface, DWORD Stage, IDirect3DBaseTexture9* pTexture) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : requesting Stage %ld, Type %d getting %ld\n", This, Stage, Type, This->UpdateStateBlock->texture_state[Stage][Type]); *pValue = This->UpdateStateBlock->texture_state[Stage][Type]; return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9 iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(LPDIRECT3DDEVICE9 iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD* pValue) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9 iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_ValidateDevice(LPDIRECT3DDEVICE9 iface, DWORD* pNumPasses) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetPaletteEntries(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : setting p[%u] <= RGBA(%02x,%02x,%02x,%02x)\n", This, PaletteNumber, pEntries->peRed, pEntries->peGreen, pEntries->peBlue, pEntries->peFlags); memcpy(This->palettes[PaletteNumber], pEntries, 256 * sizeof(PALETTEENTRY)); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetPaletteEntries(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber, PALETTEENTRY* pEntries) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; memcpy(pEntries, This->palettes[PaletteNumber], 256 * sizeof(PALETTEENTRY)); FIXME("(%p) : returning p[%u] => RGBA(%02x,%02x,%02x,%02x)\n", This, PaletteNumber, pEntries->peRed, pEntries->peGreen, pEntries->peBlue, pEntries->peFlags); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE9 iface, UINT PaletteNumber) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetCurrentTexturePalette(LPDIRECT3DDEVICE9 iface, UINT* PaletteNumber) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; *PaletteNumber = This->currentPalette; FIXME("(%p) : Returning (%u)\n", This, *PaletteNumber); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetScissorRect(LPDIRECT3DDEVICE9 iface, CONST RECT* pRect) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetScissorRect(LPDIRECT3DDEVICE9 iface, RECT* pRect) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetSoftwareVertexProcessing(LPDIRECT3DDEVICE9 iface, BOOL bSoftware) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } BOOL WINAPI IDirect3DDevice9Impl_GetSoftwareVertexProcessing(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetNPatchMode(LPDIRECT3DDEVICE9 iface, float nSegments) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } float WINAPI IDirect3DDevice9Impl_GetNPatchMode(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return 0.0f; } HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitive(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT StartVertex, UINT PrimitiveCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitiveUP(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT PrimitiveCount, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } @@ -594,32 +594,32 @@ HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitiveUP(LPDIRECT3DDEVICE9 iface, D HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVICE9 iface, D3DPRIMITIVETYPE PrimitiveType, UINT MinVertexIndex, UINT NumVertexIndices, UINT PrimitiveCount, CONST void* pIndexData, D3DFORMAT IndexDataFormat, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9 iface, UINT SrcStartIndex, UINT DestIndex, UINT VertexCount, IDirect3DVertexBuffer9* pDestBuffer, IDirect3DVertexDeclaration9* pVertexDecl, DWORD Flags) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9 iface, DWORD FVF) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(LPDIRECT3DDEVICE9 iface, DWORD* pFVF) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, IDirect3DVertexBuffer9* pStreamData, UINT OffsetInBytes, UINT Stride) { IDirect3DVertexBuffer9 *oldSrc; - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; oldSrc = This->StateBlock->stream_source[StreamNumber]; TRACE("(%p) : StreamNo: %d, OldStream (%p), NewStream (%p), NewStride %d\n", This, StreamNumber, oldSrc, pStreamData, Stride); @@ -641,7 +641,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(LPDIRECT3DDEVICE9 iface, U } HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, IDirect3DVertexBuffer9** pStream, UINT* OffsetInBytes, UINT* pStride) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : StreamNo: %d, Stream (%p), Stride %d\n", This, StreamNumber, This->StateBlock->stream_source[StreamNumber], This->StateBlock->stream_stride[StreamNumber]); *pStream = This->StateBlock->stream_source[StreamNumber]; *pStride = This->StateBlock->stream_stride[StreamNumber]; @@ -650,19 +650,19 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(LPDIRECT3DDEVICE9 iface, U } HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSourceFreq(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, UINT Divider) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSourceFreq(LPDIRECT3DDEVICE9 iface, UINT StreamNumber, UINT* Divider) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9* pIndexData) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DIndexBuffer9 *oldIdxs; TRACE("(%p) : Setting to %p\n", This, pIndexData); @@ -684,7 +684,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9 iface, IDirec } HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9** ppIndexData) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); *ppIndexData = This->StateBlock->pIndexData; @@ -695,19 +695,19 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9 iface, IDirec } HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9 iface, UINT Handle,CONST float* pNumSegs,CONST D3DRECTPATCH_INFO* pRectPatchInfo) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9 iface, UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT Handle) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 30f03c2d5fe..d85cde423fe 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3D9 IUnknown parts follow: */ HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D9)) { @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9 iface, REFIID riid, LPV } ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9 iface) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) @@ -68,38 +68,38 @@ ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9 iface) { /* IDirect3D9 Interface follow: */ HRESULT WINAPI IDirect3D9Impl_RegisterSoftwareDevice(LPDIRECT3D9 iface, void* pInitializeFunction) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p)->(%p): stub\n", This, pInitializeFunction); return D3D_OK; } UINT WINAPI IDirect3D9Impl_GetAdapterCount(LPDIRECT3D9 iface) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; /* FIXME: Set to one for now to imply the display */ TRACE("(%p): Mostly stub, only returns primary display\n", This); return 1; } HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9 iface, UINT Adapter, DWORD Flags, D3DADAPTER_IDENTIFIER9* pIdentifier) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return 0; } HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9 iface, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adapter, D3DDISPLAYMODE* pMode) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } @@ -107,7 +107,7 @@ HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9 iface, UINT Adap HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE CheckType, D3DFORMAT DisplayFormat, D3DFORMAT BackBufferFormat, BOOL Windowed) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } @@ -115,7 +115,7 @@ HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(LPDIRECT3D9 iface, HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, DWORD Usage, D3DRESOURCETYPE RType, D3DFORMAT CheckFormat) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } @@ -123,7 +123,7 @@ HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(LPDIRECT3D9 iface, HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SurfaceFormat, BOOL Windowed, D3DMULTISAMPLE_TYPE MultiSampleType, DWORD* pQualityLevels) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } @@ -131,26 +131,26 @@ HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(LPDIRECT3D9 iface, HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT AdapterFormat, D3DFORMAT RenderTargetFormat, D3DFORMAT DepthStencilFormat) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DCAPS9* pCaps) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9 iface, UINT Adapter) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p) : stub\n", This); return NULL; } @@ -159,7 +159,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3 DWORD BehaviourFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice9** ppReturnedDeviceInterface) { - ICOM_THIS(IDirect3D9Impl,iface); + IDirect3D9Impl *This = (IDirect3D9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index 1e78effc70b..541036d1e98 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DIndexBuffer9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DIndexBuffer9Impl_QueryInterface(LPDIRECT3DINDEXBUFFER9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DIndexBuffer9Impl_QueryInterface(LPDIRECT3DINDEXBUFFER9 i } ULONG WINAPI IDirect3DIndexBuffer9Impl_AddRef(LPDIRECT3DINDEXBUFFER9 iface) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 iface) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -70,64 +70,64 @@ ULONG WINAPI IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 iface) { /* IDirect3DIndexBuffer9 IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDevice(LPDIRECT3DINDEXBUFFER9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); } HRESULT WINAPI IDirect3DIndexBuffer9Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetPrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer9Impl_FreePrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DIndexBuffer9Impl_SetPriority(LPDIRECT3DINDEXBUFFER9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; return IDirect3DResource9Impl_SetPriority((LPDIRECT3DRESOURCE9) This, PriorityNew); } DWORD WINAPI IDirect3DIndexBuffer9Impl_GetPriority(LPDIRECT3DINDEXBUFFER9 iface) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; return IDirect3DResource9Impl_GetPriority((LPDIRECT3DRESOURCE9) This); } void WINAPI IDirect3DIndexBuffer9Impl_PreLoad(LPDIRECT3DINDEXBUFFER9 iface) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer9Impl_GetType(LPDIRECT3DINDEXBUFFER9 iface) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; return IDirect3DResource9Impl_GetType((LPDIRECT3DRESOURCE9) This); } /* IDirect3DIndexBuffer9 Interface follow: */ HRESULT WINAPI IDirect3DIndexBuffer9Impl_Lock(LPDIRECT3DINDEXBUFFER9 iface, UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer9Impl_Unlock(LPDIRECT3DINDEXBUFFER9 iface) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9 iface, D3DINDEXBUFFER_DESC *pDesc) { - ICOM_THIS(IDirect3DIndexBuffer9Impl,iface); + IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); memcpy(pDesc, &This->myDesc, sizeof(D3DINDEXBUFFER_DESC)); return D3D_OK; @@ -159,7 +159,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateIndexBuffer(LPDIRECT3DDEVICE9 iface, IDirect3DIndexBuffer9** ppIndexBuffer, HANDLE* pSharedHandle) { IDirect3DIndexBuffer9Impl *object; - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; /*TRACE("(%p) : Len=%d, Use=%lx, Format=(%u,%s), Pool=%d\n", This, Length, Usage, Format, debug_d3dformat(Format), Pool);*/ diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 9f099d41efb..b6f12da3656 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); /* IDirect3DPixelShader9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DPixelShader9Impl_QueryInterface(LPDIRECT3DPIXELSHADER9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DPixelShader9Impl,iface); + IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DPixelShader9)) { @@ -51,13 +51,13 @@ HRESULT WINAPI IDirect3DPixelShader9Impl_QueryInterface(LPDIRECT3DPIXELSHADER9 i } ULONG WINAPI IDirect3DPixelShader9Impl_AddRef(LPDIRECT3DPIXELSHADER9 iface) { - ICOM_THIS(IDirect3DPixelShader9Impl,iface); + IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 iface) { - ICOM_THIS(IDirect3DPixelShader9Impl,iface); + IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); @@ -69,7 +69,7 @@ ULONG WINAPI IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 iface) { /* IDirect3DPixelShader9 Interface follow: */ HRESULT WINAPI IDirect3DPixelShader9Impl_GetDevice(LPDIRECT3DPIXELSHADER9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DPixelShader9Impl,iface); + IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; IDirect3DDevice9Impl_AddRef(*ppDevice); @@ -77,7 +77,7 @@ HRESULT WINAPI IDirect3DPixelShader9Impl_GetDevice(LPDIRECT3DPIXELSHADER9 iface, } HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPIXELSHADER9 iface, VOID* pData, UINT* pSizeOfData) { - ICOM_THIS(IDirect3DPixelShader9Impl,iface); + IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; FIXME("(%p): stub\n", This); return D3D_OK; } @@ -95,13 +95,13 @@ IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl = /* IDirect3DDevice9 IDirect3DPixelShader9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(LPDIRECT3DDEVICE9 iface, CONST DWORD* pFunction, IDirect3DPixelShader9** ppShader) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9 iface, IDirect3DPixelShader9* pShader) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; This->UpdateStateBlock->PixelShader = pShader; This->UpdateStateBlock->Changed.pixelShader = TRUE; @@ -119,7 +119,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9 iface, IDir } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDirect3DPixelShader9** ppShader) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : GetPixelShader returning %p\n", This, This->StateBlock->PixelShader); *ppShader = This->StateBlock->PixelShader; IDirect3DPixelShader9Impl_AddRef(*ppShader); @@ -127,7 +127,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9 iface, IDir } HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, CONST float* pConstantData, UINT Vector4fCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; if (Register + Vector4fCount > D3D_VSHADER_MAX_CONSTANTS) { ERR("(%p) : SetPixelShaderConstant C[%u] invalid\n", This, Register); @@ -154,7 +154,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(LPDIRECT3DDEVICE9 if } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, float* pConstantData, UINT Vector4fCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : C[%u] count=%u\n", This, Register, Vector4fCount); if (Register + Vector4fCount > D3D_VSHADER_MAX_CONSTANTS) { @@ -168,7 +168,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9 if } HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, CONST int* pConstantData, UINT Vector4iCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; if (Register + Vector4iCount > D3D_VSHADER_MAX_CONSTANTS) { ERR("(%p) : SetPixelShaderConstantI C[%u] invalid\n", This, Register); @@ -195,7 +195,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9 if } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, int* pConstantData, UINT Vector4iCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : C[%u] count=%u\n", This, Register, Vector4iCount); if (Register + Vector4iCount > D3D_VSHADER_MAX_CONSTANTS) { @@ -209,7 +209,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9 if } HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, CONST BOOL* pConstantData, UINT BoolCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; UINT i; if (Register + BoolCount > D3D_VSHADER_MAX_CONSTANTS) { @@ -237,7 +237,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9 if } HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, BOOL* pConstantData, UINT BoolCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index cf10a85c91c..d0ef924813e 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DQuery9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DQuery9)) { @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface, REFIID } ULONG WINAPI IDirect3DQuery9Impl_AddRef(LPDIRECT3DQUERY9 iface) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -69,7 +69,7 @@ ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { /* IDirect3DQuery9 Interface follow: */ HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(LPDIRECT3DQUERY9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; IDirect3DDevice9Impl_AddRef(*ppDevice); @@ -77,25 +77,25 @@ HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(LPDIRECT3DQUERY9 iface, IDirect3DDe } D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dwIssueFlags) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DQuery9Impl_GetData(LPDIRECT3DQUERY9 iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { - ICOM_THIS(IDirect3DQuery9Impl,iface); + IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } @@ -116,7 +116,7 @@ IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl = /* IDirect3DDevice9 IDirect3DQuery9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface, D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/resource.c b/dlls/d3d9/resource.c index b4577e9e241..af3c89b3b71 100644 --- a/dlls/d3d9/resource.c +++ b/dlls/d3d9/resource.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DResource9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DResource9Impl_QueryInterface(LPDIRECT3DRESOURCE9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9)) { @@ -51,13 +51,13 @@ HRESULT WINAPI IDirect3DResource9Impl_QueryInterface(LPDIRECT3DRESOURCE9 iface, } ULONG WINAPI IDirect3DResource9Impl_AddRef(LPDIRECT3DRESOURCE9 iface) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DResource9Impl_Release(LPDIRECT3DRESOURCE9 iface) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -68,7 +68,7 @@ ULONG WINAPI IDirect3DResource9Impl_Release(LPDIRECT3DRESOURCE9 iface) { /* IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DResource9Impl_GetDevice(LPDIRECT3DRESOURCE9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; IDirect3DDevice9Impl_AddRef(*ppDevice); @@ -76,42 +76,42 @@ HRESULT WINAPI IDirect3DResource9Impl_GetDevice(LPDIRECT3DRESOURCE9 iface, IDire } HRESULT WINAPI IDirect3DResource9Impl_SetPrivateData(LPDIRECT3DRESOURCE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DResource9Impl_GetPrivateData(LPDIRECT3DRESOURCE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DResource9Impl_FreePrivateData(LPDIRECT3DRESOURCE9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DResource9Impl_SetPriority(LPDIRECT3DRESOURCE9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } DWORD WINAPI IDirect3DResource9Impl_GetPriority(LPDIRECT3DRESOURCE9 iface) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; FIXME("(%p) : stub\n", This); return 0; } void WINAPI IDirect3DResource9Impl_PreLoad(LPDIRECT3DRESOURCE9 iface) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; FIXME("(%p) : stub\n", This); } D3DRESOURCETYPE WINAPI IDirect3DResource9Impl_GetType(LPDIRECT3DRESOURCE9 iface) { - ICOM_THIS(IDirect3DResource9Impl,iface); + IDirect3DResource9Impl *This = (IDirect3DResource9Impl *)iface; TRACE("(%p) : returning %d\n", This, This->ResourceType); return This->ResourceType; } diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index b9c06c8d5cf..5ff237da310 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DStateBlock9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLOCK9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DStateBlock9Impl,iface); + IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) { @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLOCK9 ifa } ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(LPDIRECT3DSTATEBLOCK9 iface) { - ICOM_THIS(IDirect3DStateBlock9Impl,iface); + IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface) { - ICOM_THIS(IDirect3DStateBlock9Impl,iface); + IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -69,7 +69,7 @@ ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface) { /* IDirect3DStateBlock9 Interface follow: */ HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(LPDIRECT3DSTATEBLOCK9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DStateBlock9Impl,iface); + IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; IDirect3DDevice9Impl_AddRef(*ppDevice); @@ -77,13 +77,13 @@ HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(LPDIRECT3DSTATEBLOCK9 iface, I } HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 iface) { - ICOM_THIS(IDirect3DStateBlock9Impl,iface); + IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOCK9 iface) { - ICOM_THIS(IDirect3DStateBlock9Impl,iface); + IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } @@ -102,19 +102,19 @@ IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl = /* IDirect3DDevice9 IDirect3DStateBlock9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9 iface, D3DSTATEBLOCKTYPE Type, IDirect3DStateBlock9** ppSB) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(LPDIRECT3DDEVICE9 iface, IDirect3DStateBlock9** ppSB) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index e9be1837c82..f590cb654c2 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); /* IDirect3DSurface9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) @@ -53,13 +53,13 @@ HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 iface, RE } ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -71,52 +71,52 @@ ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { /* IDirect3DSurface9 IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(LPDIRECT3DSURFACE9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); } HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DSurface9Impl_SetPriority(LPDIRECT3DSURFACE9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; return IDirect3DResource9Impl_SetPriority((LPDIRECT3DRESOURCE9) This, PriorityNew); } DWORD WINAPI IDirect3DSurface9Impl_GetPriority(LPDIRECT3DSURFACE9 iface) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; return IDirect3DResource9Impl_GetPriority((LPDIRECT3DRESOURCE9) This); } void WINAPI IDirect3DSurface9Impl_PreLoad(LPDIRECT3DSURFACE9 iface) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(LPDIRECT3DSURFACE9 iface) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; return IDirect3DResource9Impl_GetType((LPDIRECT3DRESOURCE9) This); } /* IDirect3DSurface9 Interface follow: */ HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFIID riid, void** ppContainer) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT res; res = IUnknown_QueryInterface(This->Container, riid, ppContainer); if (E_NOINTERFACE == res) { @@ -132,32 +132,32 @@ HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFI } HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3DSURFACE_DESC* pDesc) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); memcpy(pDesc, &This->myDesc, sizeof(D3DSURFACE_DESC)); return D3D_OK; } HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(LPDIRECT3DSURFACE9 iface) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface9Impl_GetDC(LPDIRECT3DSURFACE9 iface, HDC* phdc) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, HDC hdc) { - ICOM_THIS(IDirect3DSurface9Impl,iface); + IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 4c98dd883ab..f670bd1931e 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DSwapChain IUnknown parts follow: */ HRESULT WINAPI IDirect3DSwapChain9Impl_QueryInterface(LPDIRECT3DSWAPCHAIN9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) { @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_QueryInterface(LPDIRECT3DSWAPCHAIN9 iface } ULONG WINAPI IDirect3DSwapChain9Impl_AddRef(LPDIRECT3DSWAPCHAIN9 iface) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -69,37 +69,37 @@ ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) { /* IDirect3DSwapChain9 parts follow: */ HRESULT WINAPI IDirect3DSwapChain9Impl_Present(LPDIRECT3DSWAPCHAIN9 iface, CONST RECT* pSourceRect, CONST RECT* pDestRect, HWND hDestWindowOverride, CONST RGNDATA* pDirtyRegion, DWORD dwFlags) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSwapChain9Impl_GetFrontBufferData(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DSurface9* pDestSurface) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN9 iface, UINT iBackBuffer, D3DBACKBUFFER_TYPE Type, IDirect3DSurface9** ppBackBuffer) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAIN9 iface, D3DRASTER_STATUS* pRasterStatus) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSwapChain9Impl_GetDisplayMode(LPDIRECT3DSWAPCHAIN9 iface, D3DDISPLAYMODE* pMode) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DSwapChain9Impl_GetDevice(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; @@ -110,7 +110,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_GetDevice(LPDIRECT3DSWAPCHAIN9 iface, IDi } HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWAPCHAIN9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters) { - ICOM_THIS(IDirect3DSwapChain9Impl,iface); + IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; FIXME("(%p) : copy\n", This); memcpy(pPresentationParameters, &This->PresentParms, sizeof(D3DPRESENT_PARAMETERS)); return D3D_OK; @@ -134,19 +134,19 @@ IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl = /* IDirect3DDevice9 IDirect3DSwapChain9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreateAdditionalSwapChain(LPDIRECT3DDEVICE9 iface, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DSwapChain9** pSwapChain) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSwapChain9** pSwapChain) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(LPDIRECT3DDEVICE9 iface) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return 1; } diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 8ecf2c33d5e..21e8c9000e6 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DTexture9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(LPDIRECT3DTEXTURE9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) @@ -53,13 +53,13 @@ HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(LPDIRECT3DTEXTURE9 iface, RE } ULONG WINAPI IDirect3DTexture9Impl_AddRef(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; ULONG ref = --This->ref; unsigned int i; @@ -78,84 +78,84 @@ ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) { /* IDirect3DTexture9 IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DTexture9Impl_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); } HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DTexture9Impl_SetPriority(LPDIRECT3DTEXTURE9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DResource9Impl_SetPriority((LPDIRECT3DRESOURCE9) This, PriorityNew); } DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DResource9Impl_GetPriority((LPDIRECT3DRESOURCE9) This); } void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DResource9Impl_GetType((LPDIRECT3DRESOURCE9) This); } /* IDirect3DTexture9 IDirect3DBaseTexture9 Interface follow: */ DWORD WINAPI IDirect3DTexture9Impl_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_SetLOD((LPDIRECT3DBASETEXTURE9) This, LODNew); } DWORD WINAPI IDirect3DTexture9Impl_GetLOD(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetLOD((LPDIRECT3DBASETEXTURE9) This); } DWORD WINAPI IDirect3DTexture9Impl_GetLevelCount(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetLevelCount((LPDIRECT3DBASETEXTURE9) This); } HRESULT WINAPI IDirect3DTexture9Impl_SetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_SetAutoGenFilterType((LPDIRECT3DBASETEXTURE9) This, FilterType); } D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetAutoGenFilterType((LPDIRECT3DBASETEXTURE9) This); } void WINAPI IDirect3DTexture9Impl_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } /* IDirect3DTexture9 Interface follow: */ HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DSURFACE_DESC* pDesc) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; if (Level < This->levels) { TRACE("(%p) Level (%d)\n", This, Level); @@ -168,7 +168,7 @@ HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 iface, UINT } HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 iface, UINT Level, IDirect3DSurface9** ppSurfaceLevel) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; *ppSurfaceLevel = (LPDIRECT3DSURFACE9) This->surfaces[Level]; IDirect3DSurface9Impl_AddRef((LPDIRECT3DSURFACE9) This->surfaces[Level]); TRACE("(%p) : returning %p for level %d\n", This, *ppSurfaceLevel, Level); @@ -177,7 +177,7 @@ HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 iface, U HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level,D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { HRESULT hr; - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; if (Level < This->levels) { /** * Not dirtified while Surfaces don't notify dirtification @@ -194,7 +194,7 @@ HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Lev HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) { HRESULT hr; - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; if (Level < This->levels) { hr = IDirect3DSurface9Impl_UnlockRect((LPDIRECT3DSURFACE9) This->surfaces[Level]); TRACE("(%p) Level (%d) success(%lu)\n", This, Level, hr); @@ -206,7 +206,7 @@ HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT L } HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONST RECT* pDirtyRect) { - ICOM_THIS(IDirect3DTexture9Impl,iface); + IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; FIXME("(%p) : stub\n", This); This->Dirty = TRUE; return D3D_OK; @@ -243,7 +243,7 @@ IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl = /* IDirect3DDevice9 IDirect3DTexture9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(LPDIRECT3DDEVICE9 iface, UINT Width, UINT Height, UINT Levels, DWORD Usage, D3DFORMAT Format, D3DPOOL Pool, IDirect3DTexture9** ppTexture, HANDLE* pSharedHandle) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d0e97e669ca..97b417c8501 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DVertexBuffer9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DVertexBuffer9Impl_QueryInterface(LPDIRECT3DVERTEXBUFFER9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DVertexBuffer9Impl_QueryInterface(LPDIRECT3DVERTEXBUFFER9 } ULONG WINAPI IDirect3DVertexBuffer9Impl_AddRef(LPDIRECT3DVERTEXBUFFER9 iface) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 iface) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -70,64 +70,64 @@ ULONG WINAPI IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 iface) { /* IDirect3DVertexBuffer9 IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDevice(LPDIRECT3DVERTEXBUFFER9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); } HRESULT WINAPI IDirect3DVertexBuffer9Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetPrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer9Impl_FreePrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DVertexBuffer9Impl_SetPriority(LPDIRECT3DVERTEXBUFFER9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; return IDirect3DResource9Impl_SetPriority((LPDIRECT3DRESOURCE9) This, PriorityNew); } DWORD WINAPI IDirect3DVertexBuffer9Impl_GetPriority(LPDIRECT3DVERTEXBUFFER9 iface) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; return IDirect3DResource9Impl_GetPriority((LPDIRECT3DRESOURCE9) This); } void WINAPI IDirect3DVertexBuffer9Impl_PreLoad(LPDIRECT3DVERTEXBUFFER9 iface) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer9Impl_GetType(LPDIRECT3DVERTEXBUFFER9 iface) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; return IDirect3DResource9Impl_GetType((LPDIRECT3DRESOURCE9) This); } /* IDirect3DVertexBuffer9 Interface follow: */ HRESULT WINAPI IDirect3DVertexBuffer9Impl_Lock(LPDIRECT3DVERTEXBUFFER9 iface, UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer9Impl_Unlock(LPDIRECT3DVERTEXBUFFER9 iface) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 iface, D3DVERTEXBUFFER_DESC* pDesc) { - ICOM_THIS(IDirect3DVertexBuffer9Impl,iface); + IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); memcpy(pDesc, &This->myDesc, sizeof(D3DVERTEXBUFFER_DESC)); return D3D_OK; @@ -159,7 +159,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexBuffer(LPDIRECT3DDEVICE9 iface, IDirect3DVertexBuffer9** ppVertexBuffer, HANDLE* pSharedHandle) { IDirect3DVertexBuffer9Impl *object; - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; /* Allocate the storage for the device */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DVertexBuffer9Impl)); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index c469de062da..10ea3dee2a4 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DVertexDeclaration9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DVertexDeclaration9Impl_QueryInterface(LPDIRECT3DVERTEXDECLARATION9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DVertexDeclaration9Impl,iface); + IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9)) { @@ -52,13 +52,13 @@ HRESULT WINAPI IDirect3DVertexDeclaration9Impl_QueryInterface(LPDIRECT3DVERTEXDE } ULONG WINAPI IDirect3DVertexDeclaration9Impl_AddRef(LPDIRECT3DVERTEXDECLARATION9 iface) { - ICOM_THIS(IDirect3DVertexDeclaration9Impl,iface); + IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECLARATION9 iface) { - ICOM_THIS(IDirect3DVertexDeclaration9Impl,iface); + IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -69,7 +69,7 @@ ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECLARATION /* IDirect3DVertexDeclaration9 Interface follow: */ HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDevice(LPDIRECT3DVERTEXDECLARATION9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DVertexDeclaration9Impl,iface); + IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; IDirect3DDevice9Impl_AddRef(*ppDevice); @@ -77,7 +77,7 @@ HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDevice(LPDIRECT3DVERTEXDECLARA } HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDeclaration(LPDIRECT3DVERTEXDECLARATION9 iface, D3DVERTEXELEMENT9* pDecl, UINT* pNumElements) { - ICOM_THIS(IDirect3DVertexDeclaration9Impl,iface); + IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } @@ -95,19 +95,19 @@ IDirect3DVertexDeclaration9Vtbl Direct3DVertexDeclaration9_Vtbl = /* IDirect3DDevice9 IDirect3DVertexDeclaration9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 iface, CONST D3DVERTEXELEMENT9* pVertexElements, IDirect3DVertexDeclaration9** ppDecl) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9* pDecl) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9** ppDecl) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 671a8fe6b43..622aa580b1c 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); /* IDirect3DVertexShader9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DVertexShader9Impl_QueryInterface(LPDIRECT3DVERTEXSHADER9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DVertexShader9Impl,iface); + IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVertexShader9)) { @@ -51,13 +51,13 @@ HRESULT WINAPI IDirect3DVertexShader9Impl_QueryInterface(LPDIRECT3DVERTEXSHADER9 } ULONG WINAPI IDirect3DVertexShader9Impl_AddRef(LPDIRECT3DVERTEXSHADER9 iface) { - ICOM_THIS(IDirect3DVertexShader9Impl,iface); + IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 iface) { - ICOM_THIS(IDirect3DVertexShader9Impl,iface); + IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); @@ -69,7 +69,7 @@ ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 iface) { /* IDirect3DVertexShader9 Interface follow: */ HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADER9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DVertexShader9Impl,iface); + IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; IDirect3DDevice9Impl_AddRef(*ppDevice); @@ -77,7 +77,7 @@ HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADER9 ifac } HRESULT WINAPI IDirect3DVertexShader9Impl_GetFunction(LPDIRECT3DVERTEXSHADER9 iface, VOID* pData, UINT* pSizeOfData) { - ICOM_THIS(IDirect3DVertexShader9Impl,iface); + IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } @@ -95,13 +95,13 @@ IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl = /* IDirect3DDevice9 IDirect3DVertexShader9 Methods follow: */ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9 iface, CONST DWORD* pFunction, IDirect3DVertexShader9** ppShader) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9 iface, IDirect3DVertexShader9* pShader) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; This->UpdateStateBlock->VertexShader = pShader; This->UpdateStateBlock->Changed.vertexShader = TRUE; @@ -119,7 +119,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9 iface, IDi } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9 iface, IDirect3DVertexShader9** ppShader) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : GetVertexShader returning %p\n", This, This->StateBlock->VertexShader); *ppShader = This->StateBlock->VertexShader; IDirect3DVertexShader9Impl_AddRef(*ppShader); @@ -127,7 +127,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9 iface, IDi } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, CONST float* pConstantData, UINT Vector4fCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; if (Register + Vector4fCount > D3D_VSHADER_MAX_CONSTANTS) { ERR("(%p) : SetVertexShaderConstant C[%u] invalid\n", This, Register); @@ -154,7 +154,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9 i } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9 iface, UINT Register, float* pConstantData, UINT Vector4fCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : C[%u] count=%u\n", This, Register, Vector4fCount); if (Register + Vector4fCount > D3D_VSHADER_MAX_CONSTANTS) { @@ -168,7 +168,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9 i } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, CONST int* pConstantData, UINT Vector4iCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; if (Register + Vector4iCount > D3D_VSHADER_MAX_CONSTANTS) { ERR("(%p) : SetVertexShaderConstantI C[%u] invalid\n", This, Register); @@ -195,7 +195,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantI(LPDIRECT3DDEVICE9 i } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantI(LPDIRECT3DDEVICE9 iface, UINT Register, int* pConstantData, UINT Vector4iCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; TRACE("(%p) : C[%u] count=%u\n", This, Register, Vector4iCount); if (Register + Vector4iCount > D3D_VSHADER_MAX_CONSTANTS) { @@ -209,7 +209,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantI(LPDIRECT3DDEVICE9 i } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, CONST BOOL* pConstantData, UINT BoolCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; UINT i; if (Register + BoolCount > D3D_VSHADER_MAX_CONSTANTS) { @@ -237,7 +237,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(LPDIRECT3DDEVICE9 i } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantB(LPDIRECT3DDEVICE9 iface, UINT Register, BOOL* pConstantData, UINT BoolCount) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 23795403c7d..0fcb8bec594 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DVolume9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(LPDIRECT3DVOLUME9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVolume9)) { @@ -51,13 +51,13 @@ HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(LPDIRECT3DVOLUME9 iface, REFI } ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -69,7 +69,7 @@ ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { /* IDirect3DVolume9 Interface follow: */ HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Device); *ppDevice = (LPDIRECT3DDEVICE9) This->Device; @@ -81,25 +81,25 @@ HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, IDirect3D } HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolume9Impl_FreePrivateData(LPDIRECT3DVOLUME9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, REFIID riid, void** ppContainer) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; TRACE("(%p) : returning %p\n", This, This->Container); *ppContainer = This->Container; IUnknown_AddRef(This->Container); @@ -107,20 +107,20 @@ HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, REFIID } HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_DESC* pDesc) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; TRACE("(%p) : copying into %p\n", This, pDesc); memcpy(pDesc, &This->myDesc, sizeof(D3DVOLUME_DESC)); return D3D_OK; } HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) { - ICOM_THIS(IDirect3DVolume9Impl,iface); + IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index f1c3b2c89bd..03d41d6df97 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* IDirect3DVolumeTexture9 IUnknown parts follow: */ HRESULT WINAPI IDirect3DVolumeTexture9Impl_QueryInterface(LPDIRECT3DVOLUMETEXTURE9 iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) @@ -53,13 +53,13 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_QueryInterface(LPDIRECT3DVOLUMETEXTUR } ULONG WINAPI IDirect3DVolumeTexture9Impl_AddRef(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI IDirect3DVolumeTexture9Impl_Release(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; ULONG ref = --This->ref; UINT i; @@ -78,84 +78,84 @@ ULONG WINAPI IDirect3DVolumeTexture9Impl_Release(LPDIRECT3DVOLUMETEXTURE9 iface) /* IDirect3DVolumeTexture9 IDirect3DResource9 Interface follow: */ HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetDevice(LPDIRECT3DVOLUMETEXTURE9 iface, IDirect3DDevice9** ppDevice) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DResource9Impl_GetDevice((LPDIRECT3DRESOURCE9) This, ppDevice); } HRESULT WINAPI IDirect3DVolumeTexture9Impl_SetPrivateData(LPDIRECT3DVOLUMETEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetPrivateData(LPDIRECT3DVOLUMETEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DVolumeTexture9Impl_FreePrivateData(LPDIRECT3DVOLUMETEXTURE9 iface, REFGUID refguid) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } DWORD WINAPI IDirect3DVolumeTexture9Impl_SetPriority(LPDIRECT3DVOLUMETEXTURE9 iface, DWORD PriorityNew) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DResource9Impl_SetPriority((LPDIRECT3DRESOURCE9) This, PriorityNew); } DWORD WINAPI IDirect3DVolumeTexture9Impl_GetPriority(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DResource9Impl_GetPriority((LPDIRECT3DRESOURCE9) This); } void WINAPI IDirect3DVolumeTexture9Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture9Impl_GetType(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DResource9Impl_GetType((LPDIRECT3DRESOURCE9) This); } /* IDirect3DVolumeTexture9 IDirect3DBaseTexture9 Interface follow: */ DWORD WINAPI IDirect3DVolumeTexture9Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE9 iface, DWORD LODNew) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_SetLOD((LPDIRECT3DBASETEXTURE9) This, LODNew); } DWORD WINAPI IDirect3DVolumeTexture9Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetLOD((LPDIRECT3DBASETEXTURE9) This); } DWORD WINAPI IDirect3DVolumeTexture9Impl_GetLevelCount(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetLevelCount((LPDIRECT3DBASETEXTURE9) This); } HRESULT WINAPI IDirect3DVolumeTexture9Impl_SetAutoGenFilterType(LPDIRECT3DVOLUMETEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_SetAutoGenFilterType((LPDIRECT3DBASETEXTURE9) This, FilterType); } D3DTEXTUREFILTERTYPE WINAPI IDirect3DVolumeTexture9Impl_GetAutoGenFilterType(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; return IDirect3DBaseTexture9Impl_GetAutoGenFilterType((LPDIRECT3DBASETEXTURE9) This); } void WINAPI IDirect3DVolumeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DVOLUMETEXTURE9 iface) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); return ; } /* IDirect3DVolumeTexture9 Interface follow: */ HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DVOLUME_DESC* pDesc) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; if (Level < This->levels) { TRACE("(%p) Level (%d)\n", This, Level); return IDirect3DVolume9Impl_GetDesc((LPDIRECT3DVOLUME9) This->volumes[Level], pDesc); @@ -167,7 +167,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(LPDIRECT3DVOLUMETEXTURE9 } HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, IDirect3DVolume9** ppVolumeLevel) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; if (Level < This->levels) { *ppVolumeLevel = (LPDIRECT3DVOLUME9) This->volumes[Level]; IDirect3DVolume9Impl_AddRef((LPDIRECT3DVOLUME9) *ppVolumeLevel); @@ -181,7 +181,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(LPDIRECT3DVOLUMETEXTUR } HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) { HRESULT hr; - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; if (Level < This->levels) { /** * Not dirtified while Surfaces don't notify dirtification @@ -198,7 +198,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTURE9 ifac HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE9 iface, UINT Level) { HRESULT hr; - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; if (Level < This->levels) { hr = IDirect3DVolume9Impl_UnlockBox((LPDIRECT3DVOLUME9) This->volumes[Level]); TRACE("(%p) -> level(%d) success(%lu)\n", This, Level, hr); @@ -210,7 +210,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE9 if } HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE9 iface, CONST D3DBOX* pDirtyBox) { - ICOM_THIS(IDirect3DVolumeTexture9Impl,iface); + IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; FIXME("(%p) : stub\n", This); This->Dirty = TRUE; return D3D_OK; @@ -250,7 +250,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVolumeTexture(LPDIRECT3DDEVICE9 ifac D3DFORMAT Format, D3DPOOL Pool, IDirect3DVolumeTexture9** ppVolumeTexture, HANDLE* pSharedHandle) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3d9/vshaderdeclaration.c b/dlls/d3d9/vshaderdeclaration.c index da44e99373e..75fe14ac8fa 100644 --- a/dlls/d3d9/vshaderdeclaration.c +++ b/dlls/d3d9/vshaderdeclaration.c @@ -66,19 +66,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); */ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexDeclaration(LPDIRECT3DDEVICE9 iface, CONST D3DVERTEXELEMENT9* pVertexElements, IDirect3DVertexDeclaration9** ppDecl) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9* pDecl) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9 iface, IDirect3DVertexDeclaration9** ppDecl) { - ICOM_THIS(IDirect3DDevice9Impl,iface); + IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; FIXME("(%p) : stub\n", This); return D3D_OK; } diff --git a/dlls/d3dx8/d3dxbuffer.c b/dlls/d3dx8/d3dxbuffer.c index 16a0d39447b..86cdf4ae4ea 100644 --- a/dlls/d3dx8/d3dxbuffer.c +++ b/dlls/d3dx8/d3dxbuffer.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* ID3DXBuffer IUnknown parts follow: */ HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID riid, LPVOID* ppobj) { - ICOM_THIS(ID3DXBufferImpl,iface); + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXBuffer)) { @@ -50,13 +50,13 @@ HRESULT WINAPI ID3DXBufferImpl_QueryInterface(LPD3DXBUFFER iface, REFIID riid, L } ULONG WINAPI ID3DXBufferImpl_AddRef(LPD3DXBUFFER iface) { - ICOM_THIS(ID3DXBufferImpl,iface); + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; TRACE("(%p) : AddRef from %ld\n", This, This->ref); return ++(This->ref); } ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) { - ICOM_THIS(ID3DXBufferImpl,iface); + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; ULONG ref = --This->ref; TRACE("(%p) : ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -68,12 +68,12 @@ ULONG WINAPI ID3DXBufferImpl_Release(LPD3DXBUFFER iface) { /* ID3DXBuffer Interface follow: */ LPVOID WINAPI ID3DXBufferImpl_GetBufferPointer(LPD3DXBUFFER iface) { - ICOM_THIS(ID3DXBufferImpl,iface); + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; return This->buffer; } DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) { - ICOM_THIS(ID3DXBufferImpl,iface); + ID3DXBufferImpl *This = (ID3DXBufferImpl *)iface; return This->bufferSize; } diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c index 13fdc4539f2..646fa14d7db 100644 --- a/dlls/ddraw/d3ddevice/main.c +++ b/dlls/ddraw/d3ddevice/main.c @@ -966,7 +966,7 @@ Main_IDirect3DDeviceImpl_7_SetClipPlane(LPDIRECT3DDEVICE7 iface, HRESULT WINAPI Main_IDirect3DDeviceImpl_7_GetClipPlane(LPDIRECT3DDEVICE7 iface, DWORD dwIndex, D3DVALUE* pPlaneEquation) { - ICOM_THIS(IDirect3DDeviceImpl,iface); + IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; TRACE("(%p)->(%ld,%p)\n", This, dwIndex, pPlaneEquation); diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c index a455de0fe1e..4907cc20eca 100644 --- a/dlls/ddraw/d3ddevice/mesa.c +++ b/dlls/ddraw/d3ddevice/mesa.c @@ -2504,7 +2504,7 @@ GL_IDirect3DDeviceImpl_7_LightEnable(LPDIRECT3DDEVICE7 iface, HRESULT WINAPI GL_IDirect3DDeviceImpl_7_SetClipPlane(LPDIRECT3DDEVICE7 iface, DWORD dwIndex, CONST D3DVALUE* pPlaneEquation) { - ICOM_THIS(IDirect3DDeviceImpl,iface); + IDirect3DDeviceImpl *This = (IDirect3DDeviceImpl *)iface; IDirect3DDeviceGLImpl* glThis = (IDirect3DDeviceGLImpl*) This; TRACE("(%p)->(%ld,%p)\n", This, dwIndex, pPlaneEquation); diff --git a/dlls/ddraw/dclipper/main.c b/dlls/ddraw/dclipper/main.c index 9cbdbea9ec7..0195ea2e446 100644 --- a/dlls/ddraw/dclipper/main.c +++ b/dlls/ddraw/dclipper/main.c @@ -86,7 +86,7 @@ HRESULT DDRAW_CreateDirectDrawClipper(IUnknown* pUnkOuter, REFIID riid, HRESULT WINAPI Main_DirectDrawClipper_SetHwnd( LPDIRECTDRAWCLIPPER iface, DWORD dwFlags, HWND hWnd ) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; TRACE("(%p)->SetHwnd(0x%08lx,0x%08lx)\n",This,dwFlags,(DWORD)hWnd); if( dwFlags ) { @@ -113,7 +113,7 @@ void Main_DirectDrawClipper_ForceDestroy(IDirectDrawClipperImpl* This) } ULONG WINAPI Main_DirectDrawClipper_Release(LPDIRECTDRAWCLIPPER iface) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (--This->ref == 0) @@ -145,7 +145,7 @@ HRESULT WINAPI Main_DirectDrawClipper_GetClipList( LPDIRECTDRAWCLIPPER iface, LPRECT lpRect, LPRGNDATA lpClipList, LPDWORD lpdwSize) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; TRACE("(%p,%p,%p,%p)\n", This, lpRect, lpClipList, lpdwSize); @@ -195,7 +195,7 @@ HRESULT WINAPI Main_DirectDrawClipper_GetClipList( HRESULT WINAPI Main_DirectDrawClipper_SetClipList( LPDIRECTDRAWCLIPPER iface,LPRGNDATA lprgn,DWORD dwFlag ) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; static int warned = 0; if (warned++ < 10 || lprgn == NULL) FIXME("(%p,%p,%ld),stub!\n",This,lprgn,dwFlag); @@ -205,7 +205,7 @@ HRESULT WINAPI Main_DirectDrawClipper_SetClipList( HRESULT WINAPI Main_DirectDrawClipper_QueryInterface( LPDIRECTDRAWCLIPPER iface, REFIID riid, LPVOID* ppvObj ) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; if (IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDirectDrawClipper, riid)) @@ -222,7 +222,7 @@ HRESULT WINAPI Main_DirectDrawClipper_QueryInterface( ULONG WINAPI Main_DirectDrawClipper_AddRef( LPDIRECTDRAWCLIPPER iface ) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++This->ref; } @@ -230,7 +230,7 @@ ULONG WINAPI Main_DirectDrawClipper_AddRef( LPDIRECTDRAWCLIPPER iface ) HRESULT WINAPI Main_DirectDrawClipper_GetHWnd( LPDIRECTDRAWCLIPPER iface, HWND* hWndPtr ) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; FIXME("(%p)->(%p),stub!\n",This,hWndPtr); *hWndPtr = This->hWnd; @@ -242,7 +242,7 @@ HRESULT WINAPI Main_DirectDrawClipper_Initialize( LPDIRECTDRAWCLIPPER iface, LPDIRECTDRAW lpDD, DWORD dwFlags ) { IDirectDrawImpl* pOwner; - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; FIXME("(%p)->(%p,0x%08lx),stub!\n",This,lpDD,dwFlags); if (This->ddraw_owner != NULL) return DDERR_ALREADYINITIALIZED; @@ -257,7 +257,7 @@ HRESULT WINAPI Main_DirectDrawClipper_Initialize( HRESULT WINAPI Main_DirectDrawClipper_IsClipListChanged( LPDIRECTDRAWCLIPPER iface, BOOL* lpbChanged ) { - ICOM_THIS(IDirectDrawClipperImpl,iface); + IDirectDrawClipperImpl *This = (IDirectDrawClipperImpl *)iface; FIXME("(%p)->(%p),stub!\n",This,lpbChanged); /* XXX What is safest? */ diff --git a/dlls/ddraw/ddraw/hal.c b/dlls/ddraw/ddraw/hal.c index c534440d9b4..049daa15ce6 100644 --- a/dlls/ddraw/ddraw/hal.c +++ b/dlls/ddraw/ddraw/hal.c @@ -483,7 +483,7 @@ HAL_DirectDraw_GetDeviceIdentifier(LPDIRECTDRAW7 iface, HRESULT WINAPI HAL_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; HRESULT hr; TRACE("(%p)\n", iface); @@ -504,7 +504,7 @@ HAL_DirectDraw_SetDisplayMode(LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; HRESULT hr; @@ -526,7 +526,7 @@ HAL_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { unsigned int i; - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; if (*pNumCodes) *pNumCodes=dd_gbl.dwNumFourCC; if (pCodes && dd_gbl.dwNumFourCC) diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c index 736f615d030..b4e9b8ed0c7 100644 --- a/dlls/ddraw/ddraw/main.c +++ b/dlls/ddraw/ddraw/main.c @@ -148,7 +148,7 @@ void Main_DirectDraw_final_release(IDirectDrawImpl* This) /* There is no Main_DirectDraw_Create. */ ULONG WINAPI Main_DirectDraw_AddRef(LPDIRECTDRAW7 iface) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++This->ref; @@ -156,7 +156,7 @@ ULONG WINAPI Main_DirectDraw_AddRef(LPDIRECTDRAW7 iface) { ULONG WINAPI Main_DirectDraw_Release(LPDIRECTDRAW7 iface) { ULONG ref; - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); ref = --This->ref; @@ -180,7 +180,7 @@ ULONG WINAPI Main_DirectDraw_Release(LPDIRECTDRAW7 iface) { HRESULT WINAPI Main_DirectDraw_QueryInterface( LPDIRECTDRAW7 iface,REFIID refiid,LPVOID *obj ) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(refiid), obj); /* According to COM docs, if the QueryInterface fails, obj should be set to NULL */ @@ -268,7 +268,7 @@ HRESULT WINAPI Main_DirectDraw_CreateClipper(LPDIRECTDRAW7 iface, LPDIRECTDRAWCLIPPER *ppClipper, IUnknown *pUnkOuter) { - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; HRESULT hr; TRACE("(%p)->(0x%lx, %p, %p)\n", iface, dwFlags, ppClipper, pUnkOuter); @@ -295,7 +295,7 @@ Main_DirectDraw_CreatePalette(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDIRECTDRAWPALETTE* ppPalette, LPUNKNOWN pUnknown) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; LPDIRECTDRAWPALETTE pPalette; HRESULT hr; @@ -631,7 +631,7 @@ Main_DirectDraw_CreateSurface(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD, IUnknown *pUnkOuter) { HRESULT hr; - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%p,%p,%p)\n",This,pDDSD,ppSurf,pUnkOuter); if (TRACE_ON(ddraw)) { @@ -709,7 +709,7 @@ HRESULT WINAPI Main_DirectDraw_DuplicateSurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 src, LPDIRECTDRAWSURFACE7* dst) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; IDirectDrawSurfaceImpl *pSrc = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, src); @@ -896,7 +896,7 @@ Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, LPDDSURFACEDESC2 lpDDSD2, LPVOID context, LPDDENUMSURFACESCALLBACK7 callback) { - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(0x%lx, %p, %p, %p)\n", iface, dwFlags, lpDDSD2, context, callback); @@ -925,7 +925,7 @@ Main_DirectDraw_EnumSurfaces(LPDIRECTDRAW7 iface, DWORD dwFlags, HRESULT WINAPI Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; FIXME("(%p)->() stub\n", This); return DD_OK; @@ -934,7 +934,7 @@ Main_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface,DWORD a,DWORD* b) HRESULT WINAPI Main_DirectDraw_FlipToGDISurface(LPDIRECTDRAW7 iface) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->()\n",This); return DD_OK; } @@ -943,7 +943,7 @@ HRESULT WINAPI Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, LPDDCAPS pHELCaps) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p,%p,%p)\n",This,pDriverCaps,pHELCaps); if (pDriverCaps != NULL) { DD_STRUCT_COPY_BYSIZE(pDriverCaps,&This->caps); @@ -970,7 +970,7 @@ HRESULT WINAPI Main_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, LPDWORD pCodes) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; if (*pNumCodes) { *pNumCodes=0; } @@ -982,7 +982,7 @@ HRESULT WINAPI Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, LPDIRECTDRAWSURFACE7 *lplpGDIDDSSurface) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%p)\n", This, lplpGDIDDSSurface); TRACE("returning primary (%p)\n", This->primary_surface); *lplpGDIDDSSurface = ICOM_INTERFACE(This->primary_surface, IDirectDrawSurface7); @@ -994,7 +994,7 @@ Main_DirectDraw_GetGDISurface(LPDIRECTDRAW7 iface, HRESULT WINAPI Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; FIXME("(%p)->(%p) returns 60 Hz always\n",This,freq); *freq = 60*100; /* 60 Hz */ return DD_OK; @@ -1003,7 +1003,7 @@ Main_DirectDraw_GetMonitorFrequency(LPDIRECTDRAW7 iface,LPDWORD freq) HRESULT WINAPI Main_DirectDraw_GetScanLine(LPDIRECTDRAW7 iface, LPDWORD lpdwScanLine) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; FIXME("(%p)->(%p)\n", This, lpdwScanLine); *lpdwScanLine = 1; @@ -1015,7 +1015,7 @@ HRESULT WINAPI Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, LPDIRECTDRAWSURFACE7 *lpDDS) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; FIXME("(%p)->(%08ld,%p)\n", This, (DWORD) hdc, lpDDS); return DD_OK; @@ -1024,7 +1024,7 @@ Main_DirectDraw_GetSurfaceFromDC(LPDIRECTDRAW7 iface, HDC hdc, HRESULT WINAPI Main_DirectDraw_GetVerticalBlankStatus(LPDIRECTDRAW7 iface, LPBOOL status) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%p)\n",This,status); *status = TRUE; return DD_OK; @@ -1043,7 +1043,7 @@ Main_DirectDraw_Initialize(LPDIRECTDRAW7 iface, LPGUID lpGuid) HRESULT WINAPI Main_DirectDraw_RestoreAllSurfaces(LPDIRECTDRAW7 iface) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; IDirectDrawSurfaceImpl* surf; TRACE("(%p)->()\n", This); @@ -1069,7 +1069,7 @@ HRESULT WINAPI Main_DirectDraw_SetCooperativeLevel(LPDIRECTDRAW7 iface, HWND hwnd, DWORD cooplevel) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; FIXME("(%p)->(%08lx,%08lx)\n",This,(DWORD)hwnd,cooplevel); DDRAW_dump_cooperativelevel(cooplevel); @@ -1131,7 +1131,7 @@ Main_DirectDraw_SetDisplayMode(LPDIRECTDRAW7 iface, DWORD dwWidth, short screenX; short screenY; - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->SetDisplayMode(%ld,%ld)\n",This,dwWidth,dwHeight); @@ -1164,7 +1164,7 @@ Main_DirectDraw_SetDisplayMode(LPDIRECTDRAW7 iface, DWORD dwWidth, HRESULT WINAPI Main_DirectDraw_RestoreDisplayMode(LPDIRECTDRAW7 iface) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)\n",This); if (!(This->cooperative_level & DDSCL_EXCLUSIVE)) @@ -1189,7 +1189,7 @@ HRESULT WINAPI Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HANDLE h) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; FIXME("(%p)->(flags=0x%08lx,handle=%p)\n",This,dwFlags,h); return DD_OK; } @@ -1197,7 +1197,7 @@ Main_DirectDraw_WaitForVerticalBlank(LPDIRECTDRAW7 iface, DWORD dwFlags, HRESULT WINAPI Main_DirectDraw_GetDisplayMode(LPDIRECTDRAW7 iface, LPDDSURFACEDESC2 pDDSD) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->GetDisplayMode(%p)\n",This,pDDSD); pDDSD->dwFlags = DDSD_HEIGHT|DDSD_WIDTH|DDSD_PITCH|DDSD_PIXELFORMAT|DDSD_REFRESHRATE; @@ -1227,7 +1227,7 @@ HRESULT WINAPI Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, LPDWORD total, LPDWORD free) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%p,%p,%p)\n", This,ddscaps,total,free); if (TRACE_ON(ddraw)) { @@ -1247,7 +1247,7 @@ Main_DirectDraw_GetAvailableVidMem(LPDIRECTDRAW7 iface, LPDDSCAPS2 ddscaps, } HRESULT WINAPI Main_DirectDraw_TestCooperativeLevel(LPDIRECTDRAW7 iface) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(): stub\n", This); return DD_OK; @@ -1257,7 +1257,7 @@ HRESULT WINAPI Main_DirectDraw_StartModeTest(LPDIRECTDRAW7 iface, LPSIZE pModes, DWORD dwNumModes, DWORD dwFlags) { - ICOM_THIS(IDirectDrawImpl,iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; FIXME("(%p)->() stub\n", This); return DD_OK; @@ -1460,7 +1460,7 @@ static HRESULT WINAPI Uninit_DirectDraw_Initialize(LPDIRECTDRAW7 iface, LPGUID pDeviceGuid) { const ddraw_driver* driver; - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%p)\n", iface, pDeviceGuid); diff --git a/dlls/ddraw/ddraw/user.c b/dlls/ddraw/ddraw/user.c index bfbcb6e5ba8..1e24e14ea30 100644 --- a/dlls/ddraw/ddraw/user.c +++ b/dlls/ddraw/ddraw/user.c @@ -454,7 +454,7 @@ User_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, #undef FX_CAPS #undef ROPS - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; TRACE("(%p)->(%p,%p)\n",This,pDriverCaps,pHELCaps); @@ -495,7 +495,7 @@ User_DirectDraw_SetDisplayMode(LPDIRECTDRAW7 iface, DWORD dwWidth, DWORD dwHeight, DWORD dwBPP, DWORD dwRefreshRate, DWORD dwFlags) { - ICOM_THIS(IDirectDrawImpl, iface); + IDirectDrawImpl *This = (IDirectDrawImpl *)iface; const DDPIXELFORMAT* pixelformat; DEVMODEW devmode; diff --git a/dlls/ddraw/dpalette/hal.c b/dlls/ddraw/dpalette/hal.c index 527baf747a9..5b37a70743d 100644 --- a/dlls/ddraw/dpalette/hal.c +++ b/dlls/ddraw/dpalette/hal.c @@ -89,7 +89,7 @@ HAL_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; LPDDRAWI_DIRECTDRAW_GBL dd_gbl = This->local.lpDD_lcl->lpGbl; DDHAL_SETENTRIESDATA data; diff --git a/dlls/ddraw/dpalette/main.c b/dlls/ddraw/dpalette/main.c index 5758f94f5b9..532837835da 100644 --- a/dlls/ddraw/dpalette/main.c +++ b/dlls/ddraw/dpalette/main.c @@ -110,7 +110,7 @@ Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; TRACE("(%p)->GetEntries(%08lx,%ld,%ld,%p)\n",This,dwFlags,dwStart,dwCount, palent); @@ -138,7 +138,7 @@ Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; TRACE("(%p)->SetEntries(%08lx,%ld,%ld,%p)\n",This,dwFlags,dwStart,dwCount, palent); @@ -207,7 +207,7 @@ void Main_DirectDrawPalette_ForceDestroy(IDirectDrawPaletteImpl* This) ULONG WINAPI Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; TRACE("(%p)->() decrementing from %lu.\n", This, This->ref ); if (!--This->ref) @@ -220,7 +220,7 @@ Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) } ULONG WINAPI Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; TRACE("(%p)->() incrementing from %lu.\n", This, This->ref ); return ++This->ref; } @@ -230,7 +230,7 @@ Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, LPDIRECTDRAW ddraw, DWORD dwFlags, LPPALETTEENTRY palent) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; TRACE("(%p)->(%p,%ld,%p)\n", This, ddraw, dwFlags, palent); return DDERR_ALREADYINITIALIZED; } @@ -238,7 +238,7 @@ Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, HRESULT WINAPI Main_DirectDrawPalette_GetCaps(LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; TRACE("(%p)->(%p)\n",This,lpdwCaps); *lpdwCaps = This->global.dwFlags; @@ -250,7 +250,7 @@ HRESULT WINAPI Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, REFIID refiid, LPVOID *obj) { - ICOM_THIS(IDirectDrawPaletteImpl,iface); + IDirectDrawPaletteImpl *This = (IDirectDrawPaletteImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(refiid),obj); if (IsEqualGUID(refiid, &IID_IUnknown) diff --git a/dlls/ddraw/dsurface/dib.c b/dlls/ddraw/dsurface/dib.c index 8db4bb529da..c01850bf816 100644 --- a/dlls/ddraw/dsurface/dib.c +++ b/dlls/ddraw/dsurface/dib.c @@ -490,7 +490,7 @@ DIB_DirectDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { - ICOM_THIS(IDirectDrawSurfaceImpl,iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; RECT xdst,xsrc; DDSURFACEDESC2 ddesc,sdesc; HRESULT ret = DD_OK; @@ -961,7 +961,7 @@ DIB_DirectDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, DWORD dsty, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD trans) { - ICOM_THIS(IDirectDrawSurfaceImpl,iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; int bpp, w, h, x, y; DDSURFACEDESC2 ddesc,sdesc; HRESULT ret = DD_OK; @@ -1302,7 +1302,7 @@ HRESULT WINAPI DIB_DirectDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD, DWORD dwFlags) { - ICOM_THIS(IDirectDrawSurfaceImpl,iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; DIB_PRIV_VAR(priv, This); HRESULT hr = DD_OK; DWORD flags = pDDSD->dwFlags; diff --git a/dlls/ddraw/dsurface/fakezbuffer.c b/dlls/ddraw/dsurface/fakezbuffer.c index 9bada9226ce..bd772afcde6 100644 --- a/dlls/ddraw/dsurface/fakezbuffer.c +++ b/dlls/ddraw/dsurface/fakezbuffer.c @@ -170,7 +170,7 @@ FakeZBuffer_DirectDrawSurface_Blt(LPDIRECTDRAWSURFACE7 iface, LPRECT rdst, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD dwFlags, LPDDBLTFX lpbltfx) { - ICOM_THIS(IDirectDrawSurfaceImpl,iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; if (TRACE_ON(ddraw)) { TRACE("(%p)->(%p,%p,%p,%08lx,%p)\n", This,rdst,src,rsrc,dwFlags,lpbltfx); @@ -212,7 +212,7 @@ FakeZBuffer_DirectDrawSurface_BltFast(LPDIRECTDRAWSURFACE7 iface, DWORD dstx, DWORD dsty, LPDIRECTDRAWSURFACE7 src, LPRECT rsrc, DWORD trans) { - ICOM_THIS(IDirectDrawSurfaceImpl,iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; if (TRACE_ON(ddraw)) { FIXME("(%p)->(%ld,%ld,%p,%p,%08lx)\n", diff --git a/dlls/ddraw/dsurface/main.c b/dlls/ddraw/dsurface/main.c index a5c174cd2d6..dc9ae16822d 100644 --- a/dlls/ddraw/dsurface/main.c +++ b/dlls/ddraw/dsurface/main.c @@ -122,7 +122,7 @@ void Main_DirectDrawSurface_ForceDestroy(IDirectDrawSurfaceImpl* This) ULONG WINAPI Main_DirectDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(): decreasing from %ld\n", This, This->ref); @@ -142,7 +142,7 @@ ULONG WINAPI Main_DirectDrawSurface_Release(LPDIRECTDRAWSURFACE7 iface) ULONG WINAPI Main_DirectDrawSurface_AddRef(LPDIRECTDRAWSURFACE7 iface) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(): increasing from %ld\n", This, This->ref); @@ -153,7 +153,7 @@ HRESULT WINAPI Main_DirectDrawSurface_QueryInterface(LPDIRECTDRAWSURFACE7 iface, REFIID riid, LPVOID* ppObj) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppObj); *ppObj = NULL; @@ -322,7 +322,7 @@ HRESULT WINAPI Main_DirectDrawSurface_AddAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 pAttach) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; IDirectDrawSurfaceImpl* surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pAttach); @@ -390,7 +390,7 @@ Main_DirectDrawSurface_BltBatch(LPDIRECTDRAWSURFACE7 iface, HRESULT WINAPI Main_DirectDrawSurface_ChangeUniquenessValue(LPDIRECTDRAWSURFACE7 iface) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; volatile IDirectDrawSurfaceImpl* vThis = This; TRACE("(%p)\n",This); @@ -419,7 +419,7 @@ Main_DirectDrawSurface_DeleteAttachedSurface(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDIRECTDRAWSURFACE7 pAttach) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; IDirectDrawSurfaceImpl* surf = ICOM_OBJECT(IDirectDrawSurfaceImpl, IDirectDrawSurface7, pAttach); @@ -455,7 +455,7 @@ Main_DirectDrawSurface_EnumAttachedSurfaces(LPDIRECTDRAWSURFACE7 iface, LPVOID context, LPDDENUMSURFACESCALLBACK7 cb) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; IDirectDrawSurfaceImpl* surf; TRACE("(%p)->(%p,%p)\n",This,context,cb); @@ -528,7 +528,7 @@ HRESULT WINAPI Main_DirectDrawSurface_Flip(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWSURFACE7 override, DWORD dwFlags) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; IDirectDrawSurfaceImpl* target; HRESULT hr; @@ -677,7 +677,7 @@ static PrivateData* find_private_data(IDirectDrawSurfaceImpl *This, HRESULT WINAPI Main_DirectDrawSurface_FreePrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; PrivateData *data; data = find_private_data(This, tag); @@ -706,7 +706,7 @@ Main_DirectDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps, LPDIRECTDRAWSURFACE7* ppSurface) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; IDirectDrawSurfaceImpl* surf; IDirectDrawSurfaceImpl* found = NULL; DDSCAPS2 our_caps; @@ -792,7 +792,7 @@ Main_DirectDrawSurface_GetBltStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) HRESULT WINAPI Main_DirectDrawSurface_GetCaps(LPDIRECTDRAWSURFACE7 iface, LPDDSCAPS2 pCaps) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pCaps); *pCaps = This->surface_desc.ddsCaps; @@ -803,7 +803,7 @@ HRESULT WINAPI Main_DirectDrawSurface_GetClipper(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWCLIPPER* ppClipper) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,ppClipper); if (This->clipper == NULL) @@ -823,7 +823,7 @@ Main_DirectDrawSurface_GetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, * isn't there? That's like saying that an int isn't there. (Which MS * has done in other docs.) */ - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%08lx,%p)\n",This,dwFlags,pCKey); if (TRACE_ON(ddraw)) { @@ -862,7 +862,7 @@ Main_DirectDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) { DDSURFACEDESC2 ddsd; HRESULT hr; - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,phDC); CHECK_LOST(This); @@ -903,7 +903,7 @@ Main_DirectDrawSurface_GetDC(LPDIRECTDRAWSURFACE7 iface, HDC *phDC) HRESULT WINAPI Main_DirectDrawSurface_GetDDInterface(LPDIRECTDRAWSURFACE7 iface, LPVOID* pDD) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pDD); *pDD = ICOM_INTERFACE(This->ddraw_owner, IDirectDraw7); @@ -931,7 +931,7 @@ Main_DirectDrawSurface_GetFlipStatus(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags) HRESULT WINAPI Main_DirectDrawSurface_GetLOD(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwMaxLOD) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pdwMaxLOD); CHECK_TEXTURE(This); @@ -951,7 +951,7 @@ HRESULT WINAPI Main_DirectDrawSurface_GetPalette(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWPALETTE* ppPalette) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,ppPalette); if (This->palette == NULL) @@ -968,7 +968,7 @@ Main_DirectDrawSurface_GetPixelFormat(LPDIRECTDRAWSURFACE7 iface, LPDDPIXELFORMAT pDDPixelFormat) { /* What is DDERR_INVALIDSURFACETYPE for here? */ - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pDDPixelFormat); DD_STRUCT_COPY_BYSIZE(pDDPixelFormat,&This->surface_desc.u4.ddpfPixelFormat); @@ -979,7 +979,7 @@ HRESULT WINAPI Main_DirectDrawSurface_GetPriority(LPDIRECTDRAWSURFACE7 iface, LPDWORD pdwPriority) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pdwPriority); CHECK_TEXTURE(This); @@ -993,7 +993,7 @@ Main_DirectDrawSurface_GetPrivateData(LPDIRECTDRAWSURFACE7 iface, REFGUID tag, LPVOID pBuffer, LPDWORD pcbBufferSize) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; PrivateData* data; data = find_private_data(This, tag); @@ -1027,7 +1027,7 @@ HRESULT WINAPI Main_DirectDrawSurface_GetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, LPDDSURFACEDESC2 pDDSD) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pDDSD); if ((pDDSD->dwSize < sizeof(DDSURFACEDESC)) || @@ -1047,7 +1047,7 @@ HRESULT WINAPI Main_DirectDrawSurface_GetUniquenessValue(LPDIRECTDRAWSURFACE7 iface, LPDWORD pValue) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pValue); *pValue = This->uniqueness_value; @@ -1065,7 +1065,7 @@ Main_DirectDrawSurface_Initialize(LPDIRECTDRAWSURFACE7 iface, HRESULT WINAPI Main_DirectDrawSurface_IsLost(LPDIRECTDRAWSURFACE7 iface) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p) is%s lost\n",This, (This->lost ? "" : " not")); return This->lost ? DDERR_SURFACELOST : DD_OK; @@ -1078,7 +1078,7 @@ HRESULT WINAPI Main_DirectDrawSurface_Lock(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, LPDDSURFACEDESC2 pDDSD, DWORD flags, HANDLE h) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; if (TRACE_ON(ddraw)) { TRACE("(%p)->Lock(%p,%p,%08lx,%08lx)\n",This,prect,pDDSD,flags,(DWORD)h); @@ -1163,7 +1163,7 @@ HRESULT WINAPI Main_DirectDrawSurface_ReleaseDC(LPDIRECTDRAWSURFACE7 iface, HDC hDC) { HRESULT hr; - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,hDC); @@ -1187,7 +1187,7 @@ HRESULT WINAPI Main_DirectDrawSurface_SetClipper(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWCLIPPER pDDClipper) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%p)\n",This,pDDClipper); if (pDDClipper == ICOM_INTERFACE(This->clipper, IDirectDrawClipper)) @@ -1209,7 +1209,7 @@ HRESULT WINAPI Main_DirectDrawSurface_SetColorKey(LPDIRECTDRAWSURFACE7 iface, DWORD dwFlags, LPDDCOLORKEY pCKey) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%08lx,%p)\n",This,dwFlags,pCKey); @@ -1283,7 +1283,7 @@ Main_DirectDrawSurface_SetColorKey(LPDIRECTDRAWSURFACE7 iface, HRESULT WINAPI Main_DirectDrawSurface_SetLOD(LPDIRECTDRAWSURFACE7 iface, DWORD dwMaxLOD) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%08lx)\n",This,dwMaxLOD); CHECK_TEXTURE(This); @@ -1303,7 +1303,7 @@ HRESULT WINAPI Main_DirectDrawSurface_SetPalette(LPDIRECTDRAWSURFACE7 iface, LPDIRECTDRAWPALETTE pPalette) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; IDirectDrawPalette *pal_to_rel = NULL; TRACE("(%p)->(%p)\n",This,pPalette); @@ -1339,7 +1339,7 @@ HRESULT WINAPI Main_DirectDrawSurface_SetPriority(LPDIRECTDRAWSURFACE7 iface, DWORD dwPriority) { - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->(%08lx)\n",This,dwPriority); CHECK_TEXTURE(This); @@ -1356,7 +1356,7 @@ Main_DirectDrawSurface_SetPrivateData(LPDIRECTDRAWSURFACE7 iface, DWORD cbSize, DWORD dwFlags) { PrivateData* data; - ICOM_THIS(IDirectDrawSurfaceImpl, iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; data = find_private_data(This, tag); if (data == NULL) @@ -1409,7 +1409,7 @@ Main_DirectDrawSurface_SetPrivateData(LPDIRECTDRAWSURFACE7 iface, HRESULT WINAPI Main_DirectDrawSurface_Unlock(LPDIRECTDRAWSURFACE7 iface, LPRECT pRect) { - ICOM_THIS(IDirectDrawSurfaceImpl,iface); + IDirectDrawSurfaceImpl *This = (IDirectDrawSurfaceImpl *)iface; TRACE("(%p)->Unlock(%p)\n",This,pRect); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 9e0b0ea04c3..a6828162b94 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -475,7 +475,7 @@ static const struct object_creation_info object_creation[] = static HRESULT WINAPI DDCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj); @@ -492,7 +492,7 @@ DDCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) } static ULONG WINAPI DDCF_AddRef(LPCLASSFACTORY iface) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; TRACE("(%p)->() incrementing from %ld.\n", This, This->ref); @@ -500,7 +500,7 @@ static ULONG WINAPI DDCF_AddRef(LPCLASSFACTORY iface) { } static ULONG WINAPI DDCF_Release(LPCLASSFACTORY iface) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; TRACE("(%p)->() decrementing from %ld.\n", This, This->ref); @@ -514,7 +514,7 @@ static ULONG WINAPI DDCF_Release(LPCLASSFACTORY iface) { static HRESULT WINAPI DDCF_CreateInstance( LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj ) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); @@ -522,7 +522,7 @@ static HRESULT WINAPI DDCF_CreateInstance( } static HRESULT WINAPI DDCF_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/quartz/avidec.c b/dlls/quartz/avidec.c index bb81b633721..81ebb85638e 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -141,7 +141,7 @@ error: static HRESULT AVIDec_Sample(LPVOID iface, IMediaSample * pSample) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; @@ -352,7 +352,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -379,14 +379,14 @@ static HRESULT WINAPI AVIDec_QueryInterface(IBaseFilter * iface, REFIID riid, LP static ULONG WINAPI AVIDec_AddRef(IBaseFilter * iface) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI AVIDec_Release(IBaseFilter * iface) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); if (!InterlockedDecrement(&This->refCount)) { @@ -417,7 +417,7 @@ static ULONG WINAPI AVIDec_Release(IBaseFilter * iface) static HRESULT WINAPI AVIDec_GetClassID(IBaseFilter * iface, CLSID * pClsid) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pClsid); @@ -430,7 +430,7 @@ static HRESULT WINAPI AVIDec_GetClassID(IBaseFilter * iface, CLSID * pClsid) static HRESULT WINAPI AVIDec_Stop(IBaseFilter * iface) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)\n", This, iface); @@ -445,7 +445,7 @@ static HRESULT WINAPI AVIDec_Stop(IBaseFilter * iface) static HRESULT WINAPI AVIDec_Pause(IBaseFilter * iface) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); @@ -461,7 +461,7 @@ static HRESULT WINAPI AVIDec_Pause(IBaseFilter * iface) static HRESULT WINAPI AVIDec_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { HRESULT hr = S_OK; - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); @@ -478,7 +478,7 @@ static HRESULT WINAPI AVIDec_Run(IBaseFilter * iface, REFERENCE_TIME tStart) static HRESULT WINAPI AVIDec_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%ld, %p)\n", This, iface, dwMilliSecsTimeout, pState); @@ -493,7 +493,7 @@ static HRESULT WINAPI AVIDec_GetState(IBaseFilter * iface, DWORD dwMilliSecsTime static HRESULT WINAPI AVIDec_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pClock); @@ -512,7 +512,7 @@ static HRESULT WINAPI AVIDec_SetSyncSource(IBaseFilter * iface, IReferenceClock static HRESULT WINAPI AVIDec_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, ppClock); @@ -531,7 +531,7 @@ static HRESULT WINAPI AVIDec_GetSyncSource(IBaseFilter * iface, IReferenceClock static HRESULT WINAPI AVIDec_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { ENUMPINDETAILS epd; - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); @@ -542,7 +542,7 @@ static HRESULT WINAPI AVIDec_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) static HRESULT WINAPI AVIDec_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); @@ -555,7 +555,7 @@ static HRESULT WINAPI AVIDec_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppP static HRESULT WINAPI AVIDec_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); @@ -571,7 +571,7 @@ static HRESULT WINAPI AVIDec_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *p static HRESULT WINAPI AVIDec_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { HRESULT hr = S_OK; - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p, %s)\n", This, iface, pGraph, debugstr_w(pName)); @@ -590,7 +590,7 @@ static HRESULT WINAPI AVIDec_JoinFilterGraph(IBaseFilter * iface, IFilterGraph * static HRESULT WINAPI AVIDec_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) { - ICOM_THIS(AVIDecImpl, iface); + AVIDecImpl *This = (AVIDecImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pVendorInfo); return E_NOTIMPL; } @@ -638,7 +638,7 @@ static const IPinVtbl AVIDec_InputPin_Vtbl = HRESULT WINAPI AVIDec_Output_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; ENUMMEDIADETAILS emd; TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 70013c019f3..d6ea22da8de 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -183,7 +183,7 @@ static HRESULT AVISplitter_OutputPin_Construct(const PIN_INFO * pPinInfo, ALLOCA static HRESULT WINAPI AVISplitter_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -210,14 +210,14 @@ static HRESULT WINAPI AVISplitter_QueryInterface(IBaseFilter * iface, REFIID rii static ULONG WINAPI AVISplitter_AddRef(IBaseFilter * iface) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("()\n"); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI AVISplitter_Release(IBaseFilter * iface) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("()\n"); if (!InterlockedDecrement(&This->refCount)) { @@ -257,7 +257,7 @@ static HRESULT WINAPI AVISplitter_GetClassID(IBaseFilter * iface, CLSID * pClsid static HRESULT WINAPI AVISplitter_Stop(IBaseFilter * iface) { HRESULT hr; - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("()\n"); @@ -275,7 +275,7 @@ static HRESULT WINAPI AVISplitter_Pause(IBaseFilter * iface) { HRESULT hr = S_OK; BOOL bInit; - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("()\n"); @@ -321,7 +321,7 @@ static HRESULT WINAPI AVISplitter_Pause(IBaseFilter * iface) static HRESULT WINAPI AVISplitter_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { HRESULT hr = S_OK; - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%s)\n", wine_dbgstr_longlong(tStart)); @@ -337,7 +337,7 @@ static HRESULT WINAPI AVISplitter_Run(IBaseFilter * iface, REFERENCE_TIME tStart static HRESULT WINAPI AVISplitter_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%ld, %p)\n", dwMilliSecsTimeout, pState); @@ -359,7 +359,7 @@ static HRESULT WINAPI AVISplitter_GetState(IBaseFilter * iface, DWORD dwMilliSec static HRESULT WINAPI AVISplitter_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%p)\n", pClock); @@ -378,7 +378,7 @@ static HRESULT WINAPI AVISplitter_SetSyncSource(IBaseFilter * iface, IReferenceC static HRESULT WINAPI AVISplitter_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%p)\n", ppClock); @@ -397,7 +397,7 @@ static HRESULT WINAPI AVISplitter_GetSyncSource(IBaseFilter * iface, IReferenceC static HRESULT WINAPI AVISplitter_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { ENUMPINDETAILS epd; - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%p)\n", ppEnum); @@ -417,7 +417,7 @@ static HRESULT WINAPI AVISplitter_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin static HRESULT WINAPI AVISplitter_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%p)\n", pInfo); @@ -433,7 +433,7 @@ static HRESULT WINAPI AVISplitter_QueryFilterInfo(IBaseFilter * iface, FILTER_IN static HRESULT WINAPI AVISplitter_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { HRESULT hr = S_OK; - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; TRACE("(%p, %s)\n", pGraph, debugstr_w(pName)); @@ -494,7 +494,7 @@ static HRESULT AVISplitter_NextChunk(LONGLONG * pllCurrentChunkOffset, RIFFCHUNK static HRESULT AVISplitter_Sample(LPVOID iface, IMediaSample * pSample) { - ICOM_THIS(AVISplitter, iface); + AVISplitter *This = (AVISplitter *)iface; LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; @@ -886,7 +886,7 @@ static HRESULT AVISplitter_RemoveOutputPins(AVISplitter * This) /* FIXME: fix leaks on failure here */ static HRESULT AVISplitter_InputPin_PreConnect(IPin * iface, IPin * pConnectPin) { - ICOM_THIS(PullPin, iface); + PullPin *This = (PullPin *)iface; HRESULT hr; RIFFLIST list; LONGLONG pos = 0; /* in bytes */ @@ -1068,7 +1068,7 @@ static const IMediaSeekingVtbl AVISplitter_Seeking_Vtbl = HRESULT WINAPI AVISplitter_OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(AVISplitter_OutputPin, iface); + AVISplitter_OutputPin *This = (AVISplitter_OutputPin *)iface; TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); @@ -1094,7 +1094,7 @@ HRESULT WINAPI AVISplitter_OutputPin_QueryInterface(IPin * iface, REFIID riid, L static ULONG WINAPI AVISplitter_OutputPin_Release(IPin * iface) { - ICOM_THIS(AVISplitter_OutputPin, iface); + AVISplitter_OutputPin *This = (AVISplitter_OutputPin *)iface; TRACE("()\n"); @@ -1112,7 +1112,7 @@ static ULONG WINAPI AVISplitter_OutputPin_Release(IPin * iface) static HRESULT WINAPI AVISplitter_OutputPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { ENUMMEDIADETAILS emd; - ICOM_THIS(AVISplitter_OutputPin, iface); + AVISplitter_OutputPin *This = (AVISplitter_OutputPin *)iface; TRACE("(%p)\n", ppEnum); @@ -1125,7 +1125,7 @@ static HRESULT WINAPI AVISplitter_OutputPin_EnumMediaTypes(IPin * iface, IEnumMe static HRESULT AVISplitter_OutputPin_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt) { - ICOM_THIS(AVISplitter_OutputPin, iface); + AVISplitter_OutputPin *This = (AVISplitter_OutputPin *)iface; TRACE("()\n"); dump_AM_MEDIA_TYPE(pmt); @@ -1185,7 +1185,7 @@ static HRESULT AVISplitter_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLEP static HRESULT WINAPI AVISplitter_InputPin_Disconnect(IPin * iface) { HRESULT hr; - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("()\n"); diff --git a/dlls/quartz/control.c b/dlls/quartz/control.c index 1776bfb53bb..b9d87903adb 100644 --- a/dlls/quartz/control.c +++ b/dlls/quartz/control.c @@ -54,7 +54,7 @@ HRESULT MediaSeekingImpl_Init(LPVOID pUserData, CHANGEPROC fnChangeStop, CHANGEP HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%p)\n", pCapabilities); @@ -65,7 +65,7 @@ HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * p HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; HRESULT hr; DWORD dwCommonCaps; @@ -121,7 +121,7 @@ HRESULT WINAPI MediaSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pDuration) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%p)\n", pDuration); @@ -132,7 +132,7 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG * pStop) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%p)\n", pStop); @@ -143,7 +143,7 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLONG * pCurrent) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%p)\n", pCurrent); @@ -182,7 +182,7 @@ __inline LONGLONG Adjust(LONGLONG value, LONGLONG * pModifier, DWORD dwFlags) HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, DWORD dwCurrentFlags, LONGLONG * pStop, DWORD dwStopFlags) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; BOOL bChangeStart = FALSE, bChangeStop = FALSE; LONGLONG llNewStart, llNewStop; @@ -214,7 +214,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p HRESULT WINAPI MediaSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, LONGLONG * pStop) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%p, %p)\n", pCurrent, pStop); @@ -226,7 +226,7 @@ HRESULT WINAPI MediaSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * p HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * pEarliest, LONGLONG * pLatest) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%p, %p)\n", pEarliest, pLatest); @@ -238,7 +238,7 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; BOOL bChangeRate = (dRate != This->dRate); TRACE("(%e)\n", dRate); @@ -253,7 +253,7 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) { - ICOM_THIS(MediaSeekingImpl, iface); + MediaSeekingImpl *This = (MediaSeekingImpl *)iface; TRACE("(%p)\n", dRate); diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 6940191f1e5..9191a7acd1e 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -107,7 +107,7 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) AM_MEDIA_TYPE amt; WAVEFORMATEX* format; DSBUFFERDESC buf_desc; - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; hr = IPin_ConnectionMediaType(This->ppPins[0], &amt); if (FAILED(hr)) { @@ -214,7 +214,7 @@ static DWORD DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DW static HRESULT DSoundRender_Sample(LPVOID iface, IMediaSample * pSample) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; @@ -331,7 +331,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p, %p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -360,14 +360,14 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri static ULONG WINAPI DSoundRender_AddRef(IBaseFilter * iface) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); if (!InterlockedDecrement(&This->refCount)) { @@ -394,7 +394,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) static HRESULT WINAPI DSoundRender_GetClassID(IBaseFilter * iface, CLSID * pClsid) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pClsid); *pClsid = CLSID_DSoundRender; @@ -407,7 +407,7 @@ static HRESULT WINAPI DSoundRender_GetClassID(IBaseFilter * iface, CLSID * pClsi static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) { HRESULT hr = S_OK; - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); @@ -423,7 +423,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) { HRESULT hr = S_OK; - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); @@ -439,7 +439,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { HRESULT hr = S_OK; - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); @@ -455,7 +455,7 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar static HRESULT WINAPI DSoundRender_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%ld, %p)\n", This, iface, dwMilliSecsTimeout, pState); @@ -470,7 +470,7 @@ static HRESULT WINAPI DSoundRender_GetState(IBaseFilter * iface, DWORD dwMilliSe static HRESULT WINAPI DSoundRender_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pClock); @@ -489,7 +489,7 @@ static HRESULT WINAPI DSoundRender_SetSyncSource(IBaseFilter * iface, IReference static HRESULT WINAPI DSoundRender_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, ppClock); @@ -508,7 +508,7 @@ static HRESULT WINAPI DSoundRender_GetSyncSource(IBaseFilter * iface, IReference static HRESULT WINAPI DSoundRender_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { ENUMPINDETAILS epd; - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); @@ -519,7 +519,7 @@ static HRESULT WINAPI DSoundRender_EnumPins(IBaseFilter * iface, IEnumPins **ppE static HRESULT WINAPI DSoundRender_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%s,%p)\n", This, iface, debugstr_w(Id), ppPin); @@ -532,7 +532,7 @@ static HRESULT WINAPI DSoundRender_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin static HRESULT WINAPI DSoundRender_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); @@ -548,7 +548,7 @@ static HRESULT WINAPI DSoundRender_QueryFilterInfo(IBaseFilter * iface, FILTER_I static HRESULT WINAPI DSoundRender_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { HRESULT hr; - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%p, %s)\n", This, iface, pGraph, debugstr_w(pName)); @@ -569,7 +569,7 @@ static HRESULT WINAPI DSoundRender_JoinFilterGraph(IBaseFilter * iface, IFilterG static HRESULT WINAPI DSoundRender_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) { - ICOM_THIS(DSoundRenderImpl, iface); + DSoundRenderImpl *This = (DSoundRenderImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pVendorInfo); return E_NOTIMPL; } diff --git a/dlls/quartz/enumfilters.c b/dlls/quartz/enumfilters.c index 567cbb76cb6..1ff2e4c8857 100644 --- a/dlls/quartz/enumfilters.c +++ b/dlls/quartz/enumfilters.c @@ -91,14 +91,14 @@ static HRESULT WINAPI IEnumFiltersImpl_QueryInterface(IEnumFilters * iface, REFI static ULONG WINAPI IEnumFiltersImpl_AddRef(IEnumFilters * iface) { - ICOM_THIS(IEnumFiltersImpl, iface); + IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; TRACE("(%p)->()\n", iface); return ++This->refCount; } static ULONG WINAPI IEnumFiltersImpl_Release(IEnumFilters * iface) { - ICOM_THIS(IEnumFiltersImpl, iface); + IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; TRACE("(%p)->()\n", iface); if (!--This->refCount) { @@ -114,7 +114,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters { ULONG cFetched; ULONG i; - ICOM_THIS(IEnumFiltersImpl, iface); + IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; cFetched = min(This->nFilters, This->uIndex + cFilters) - This->uIndex; @@ -138,7 +138,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Next(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters) { - ICOM_THIS(IEnumFiltersImpl, iface); + IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; TRACE("(%p)->(%lu)\n", iface, cFilters); @@ -152,7 +152,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Skip(IEnumFilters * iface, ULONG cFilters static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) { - ICOM_THIS(IEnumFiltersImpl, iface); + IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; TRACE("(%p)->()\n", iface); @@ -163,7 +163,7 @@ static HRESULT WINAPI IEnumFiltersImpl_Reset(IEnumFilters * iface) static HRESULT WINAPI IEnumFiltersImpl_Clone(IEnumFilters * iface, IEnumFilters ** ppEnum) { HRESULT hr; - ICOM_THIS(IEnumFiltersImpl, iface); + IEnumFiltersImpl *This = (IEnumFiltersImpl *)iface; TRACE("(%p)->(%p)\n", iface, ppEnum); diff --git a/dlls/quartz/enummedia.c b/dlls/quartz/enummedia.c index c8ddd317533..3c04e6b713a 100644 --- a/dlls/quartz/enummedia.c +++ b/dlls/quartz/enummedia.c @@ -119,14 +119,14 @@ static HRESULT WINAPI IEnumMediaTypesImpl_QueryInterface(IEnumMediaTypes * iface static ULONG WINAPI IEnumMediaTypesImpl_AddRef(IEnumMediaTypes * iface) { - ICOM_THIS(IEnumMediaTypesImpl, iface); + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; TRACE("()\n"); return ++This->refCount; } static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) { - ICOM_THIS(IEnumMediaTypesImpl, iface); + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; TRACE("()\n"); if (!--This->refCount) { @@ -141,7 +141,7 @@ static ULONG WINAPI IEnumMediaTypesImpl_Release(IEnumMediaTypes * iface) static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched) { ULONG cFetched; - ICOM_THIS(IEnumMediaTypesImpl, iface); + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; cFetched = min(This->enumMediaDetails.cMediaTypes, This->uIndex + cMediaTypes) - This->uIndex; @@ -168,7 +168,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Next(IEnumMediaTypes * iface, ULONG cM static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cMediaTypes) { - ICOM_THIS(IEnumMediaTypesImpl, iface); + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; TRACE("(%lu)\n", cMediaTypes); @@ -182,7 +182,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Skip(IEnumMediaTypes * iface, ULONG cM static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) { - ICOM_THIS(IEnumMediaTypesImpl, iface); + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; TRACE("()\n"); @@ -193,7 +193,7 @@ static HRESULT WINAPI IEnumMediaTypesImpl_Reset(IEnumMediaTypes * iface) static HRESULT WINAPI IEnumMediaTypesImpl_Clone(IEnumMediaTypes * iface, IEnumMediaTypes ** ppEnum) { HRESULT hr; - ICOM_THIS(IEnumMediaTypesImpl, iface); + IEnumMediaTypesImpl *This = (IEnumMediaTypesImpl *)iface; TRACE("(%p)\n", ppEnum); diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c index 72f59de9a59..7448c749541 100644 --- a/dlls/quartz/enummoniker.c +++ b/dlls/quartz/enummoniker.c @@ -81,7 +81,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface( REFIID riid, LPVOID *ppvObj) { - ICOM_THIS(EnumMonikerImpl, iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("\n\tIID:\t%s\n",debugstr_guid(riid)); if (This == NULL || ppvObj == NULL) return E_POINTER; @@ -103,7 +103,7 @@ static HRESULT WINAPI EnumMonikerImpl_QueryInterface( */ static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface) { - ICOM_THIS(EnumMonikerImpl, iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("\n"); @@ -117,7 +117,7 @@ static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface) */ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface) { - ICOM_THIS(EnumMonikerImpl, iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("\n"); @@ -134,7 +134,7 @@ static ULONG WINAPI EnumMonikerImpl_Release(LPENUMMONIKER iface) static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMoniker ** rgelt, ULONG * pceltFetched) { ULONG fetched; - ICOM_THIS(EnumMonikerImpl, iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("(%ld, %p, %p)\n", celt, rgelt, pceltFetched); @@ -157,7 +157,7 @@ static HRESULT WINAPI EnumMonikerImpl_Next(LPENUMMONIKER iface, ULONG celt, IMon static HRESULT WINAPI EnumMonikerImpl_Skip(LPENUMMONIKER iface, ULONG celt) { - ICOM_THIS(EnumMonikerImpl, iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("(%ld)\n", celt); @@ -168,7 +168,7 @@ static HRESULT WINAPI EnumMonikerImpl_Skip(LPENUMMONIKER iface, ULONG celt) static HRESULT WINAPI EnumMonikerImpl_Reset(LPENUMMONIKER iface) { - ICOM_THIS(EnumMonikerImpl, iface); + EnumMonikerImpl *This = (EnumMonikerImpl *)iface; TRACE("()\n"); diff --git a/dlls/quartz/enumpins.c b/dlls/quartz/enumpins.c index 87e4754ff52..4544a7ddb7e 100644 --- a/dlls/quartz/enumpins.c +++ b/dlls/quartz/enumpins.c @@ -74,7 +74,7 @@ static HRESULT WINAPI IEnumPinsImpl_QueryInterface(IEnumPins * iface, REFIID rii static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) { - ICOM_THIS(IEnumPinsImpl, iface); + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; TRACE("()\n"); @@ -83,7 +83,7 @@ static ULONG WINAPI IEnumPinsImpl_AddRef(IEnumPins * iface) static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) { - ICOM_THIS(IEnumPinsImpl, iface); + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; TRACE("()\n"); @@ -99,7 +99,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ppPins, ULONG * pcFetched) { ULONG cFetched; - ICOM_THIS(IEnumPinsImpl, iface); + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; cFetched = min(This->enumPinDetails.cPins, This->uIndex + cPins) - This->uIndex; @@ -126,7 +126,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) { - ICOM_THIS(IEnumPinsImpl, iface); + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; TRACE("(%lu)\n", cPins); @@ -140,7 +140,7 @@ static HRESULT WINAPI IEnumPinsImpl_Skip(IEnumPins * iface, ULONG cPins) static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) { - ICOM_THIS(IEnumPinsImpl, iface); + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; TRACE("IEnumPinsImpl::Reset()\n"); @@ -151,7 +151,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins * iface) static HRESULT WINAPI IEnumPinsImpl_Clone(IEnumPins * iface, IEnumPins ** ppEnum) { HRESULT hr; - ICOM_THIS(IEnumPinsImpl, iface); + IEnumPinsImpl *This = (IEnumPinsImpl *)iface; TRACE("(%p)\n", ppEnum); diff --git a/dlls/quartz/enumregfilters.c b/dlls/quartz/enumregfilters.c index d7e38fe46f8..73bd3809d00 100644 --- a/dlls/quartz/enumregfilters.c +++ b/dlls/quartz/enumregfilters.c @@ -114,7 +114,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_QueryInterface(IEnumRegFilters * iface static ULONG WINAPI IEnumRegFiltersImpl_AddRef(IEnumRegFilters * iface) { - ICOM_THIS(IEnumRegFiltersImpl, iface); + IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; TRACE("(%p)\n", iface); @@ -123,7 +123,7 @@ static ULONG WINAPI IEnumRegFiltersImpl_AddRef(IEnumRegFilters * iface) static ULONG WINAPI IEnumRegFiltersImpl_Release(IEnumRegFilters * iface) { - ICOM_THIS(IEnumRegFiltersImpl, iface); + IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; TRACE("(%p)\n", iface); @@ -138,7 +138,7 @@ static ULONG WINAPI IEnumRegFiltersImpl_Release(IEnumRegFilters * iface) static HRESULT WINAPI IEnumRegFiltersImpl_Next(IEnumRegFilters * iface, ULONG cFilters, REGFILTER ** ppRegFilter, ULONG * pcFetched) { ULONG cFetched; - ICOM_THIS(IEnumRegFiltersImpl, iface); + IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; int i; cFetched = min(This->size, This->uIndex + cFilters) - This->uIndex; @@ -183,7 +183,7 @@ static HRESULT WINAPI IEnumRegFiltersImpl_Skip(IEnumRegFilters * iface, ULONG n) static HRESULT WINAPI IEnumRegFiltersImpl_Reset(IEnumRegFilters * iface) { - ICOM_THIS(IEnumRegFiltersImpl, iface); + IEnumRegFiltersImpl *This = (IEnumRegFiltersImpl *)iface; TRACE("(%p)\n", iface); diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 31ad63c2cf9..037cc2c4d43 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -321,7 +321,7 @@ HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); @@ -351,7 +351,7 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii static ULONG WINAPI AsyncReader_AddRef(IBaseFilter * iface) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("()\n"); @@ -360,7 +360,7 @@ static ULONG WINAPI AsyncReader_AddRef(IBaseFilter * iface) static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("()\n"); @@ -392,7 +392,7 @@ static HRESULT WINAPI AsyncReader_GetClassID(IBaseFilter * iface, CLSID * pClsid static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("()\n"); @@ -403,7 +403,7 @@ static HRESULT WINAPI AsyncReader_Stop(IBaseFilter * iface) static HRESULT WINAPI AsyncReader_Pause(IBaseFilter * iface) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("()\n"); @@ -414,7 +414,7 @@ static HRESULT WINAPI AsyncReader_Pause(IBaseFilter * iface) static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("(%lx%08lx)\n", (ULONG)(tStart >> 32), (ULONG)tStart); @@ -425,7 +425,7 @@ static HRESULT WINAPI AsyncReader_Run(IBaseFilter * iface, REFERENCE_TIME tStart static HRESULT WINAPI AsyncReader_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("(%lu, %p)\n", dwMilliSecsTimeout, pState); @@ -436,7 +436,7 @@ static HRESULT WINAPI AsyncReader_GetState(IBaseFilter * iface, DWORD dwMilliSec static HRESULT WINAPI AsyncReader_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { -/* ICOM_THIS(AsyncReader, iface);*/ +/* AsyncReader *This = (AsyncReader *)iface;*/ TRACE("(%p)\n", pClock); @@ -445,7 +445,7 @@ static HRESULT WINAPI AsyncReader_SetSyncSource(IBaseFilter * iface, IReferenceC static HRESULT WINAPI AsyncReader_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) { -/* ICOM_THIS(AsyncReader, iface);*/ +/* AsyncReader *This = (AsyncReader *)iface;*/ TRACE("(%p)\n", ppClock); @@ -457,7 +457,7 @@ static HRESULT WINAPI AsyncReader_GetSyncSource(IBaseFilter * iface, IReferenceC static HRESULT WINAPI AsyncReader_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { ENUMPINDETAILS epd; - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("(%p)\n", ppEnum); @@ -475,7 +475,7 @@ static HRESULT WINAPI AsyncReader_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin static HRESULT WINAPI AsyncReader_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("(%p)\n", pInfo); @@ -490,7 +490,7 @@ static HRESULT WINAPI AsyncReader_QueryFilterInfo(IBaseFilter * iface, FILTER_IN static HRESULT WINAPI AsyncReader_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; TRACE("(%p, %s)\n", pGraph, debugstr_w(pName)); @@ -689,7 +689,7 @@ typedef struct FileAsyncReader static HRESULT AcceptProcAFR(LPVOID iface, const AM_MEDIA_TYPE *pmt) { - ICOM_THIS(AsyncReader, iface); + AsyncReader *This = (AsyncReader *)iface; FIXME("(%p, %p)\n", iface, pmt); @@ -705,7 +705,7 @@ static HRESULT AcceptProcAFR(LPVOID iface, const AM_MEDIA_TYPE *pmt) static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(FileAsyncReader, iface); + FileAsyncReader *This = (FileAsyncReader *)iface; TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -730,7 +730,7 @@ static HRESULT WINAPI FileAsyncReaderPin_QueryInterface(IPin * iface, REFIID rii static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) { - ICOM_THIS(FileAsyncReader, iface); + FileAsyncReader *This = (FileAsyncReader *)iface; TRACE("()\n"); @@ -754,7 +754,7 @@ static ULONG WINAPI FileAsyncReaderPin_Release(IPin * iface) static HRESULT WINAPI FileAsyncReaderPin_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { ENUMMEDIADETAILS emd; - ICOM_THIS(FileAsyncReader, iface); + FileAsyncReader *This = (FileAsyncReader *)iface; TRACE("(%p)\n", ppEnum); @@ -792,7 +792,7 @@ static const IPinVtbl FileAsyncReaderPin_Vtbl = * doesn't need the IMemInputPin interface on the receiving pin */ static HRESULT FileAsyncReaderPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - ICOM_THIS(OutputPin, iface); + OutputPin *This = (OutputPin *)iface; HRESULT hr; TRACE("(%p, %p)\n", pReceivePin, pmt); diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index c61256282c4..c19079567d6 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -184,7 +184,7 @@ HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) static HRESULT WINAPI FilterMapper2_QueryInterface(IFilterMapper2 * iface, REFIID riid, LPVOID *ppv) { - ICOM_THIS(FilterMapper2Impl, iface); + FilterMapper2Impl *This = (FilterMapper2Impl *)iface; TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); @@ -209,7 +209,7 @@ static HRESULT WINAPI FilterMapper2_QueryInterface(IFilterMapper2 * iface, REFII static ULONG WINAPI FilterMapper2_AddRef(IFilterMapper2 * iface) { - ICOM_THIS(FilterMapper2Impl, iface); + FilterMapper2Impl *This = (FilterMapper2Impl *)iface; TRACE("(%p)->()\n", iface); @@ -218,7 +218,7 @@ static ULONG WINAPI FilterMapper2_AddRef(IFilterMapper2 * iface) static ULONG WINAPI FilterMapper2_Release(IFilterMapper2 * iface) { - ICOM_THIS(FilterMapper2Impl, iface); + FilterMapper2Impl *This = (FilterMapper2Impl *)iface; TRACE("(%p)->()\n", iface); diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index d0905a14d3d..91f270548dc 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -75,7 +75,7 @@ static const struct object_creation_info object_creation[] = static HRESULT WINAPI DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) @@ -90,12 +90,12 @@ DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) } static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; return ++(This->ref); } static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; ULONG ref = --This->ref; @@ -108,7 +108,7 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) { static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IClassFactoryImpl,iface); + IClassFactoryImpl *This = (IClassFactoryImpl *)iface; HRESULT hres; LPUNKNOWN punk; @@ -129,7 +129,7 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter } static HRESULT WINAPI DSCF_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/quartz/memallocator.c b/dlls/quartz/memallocator.c index 3fb59fef987..bddc9b0ea51 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -115,7 +115,7 @@ static HRESULT BaseMemAllocator_Init(HRESULT (* fnAlloc)(IMemAllocator *), HRESU static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -138,7 +138,7 @@ static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REF static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; TRACE("()\n"); @@ -147,7 +147,7 @@ static ULONG WINAPI BaseMemAllocator_AddRef(IMemAllocator * iface) static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; TRACE("()\n"); @@ -166,7 +166,7 @@ static ULONG WINAPI BaseMemAllocator_Release(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pRequest, ALLOCATOR_PROPERTIES *pActual) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; HRESULT hr; TRACE("(%p, %p)\n", pRequest, pActual); @@ -201,7 +201,7 @@ static HRESULT WINAPI BaseMemAllocator_SetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLOCATOR_PROPERTIES *pProps) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; HRESULT hr = S_OK; TRACE("(%p)\n", pProps); @@ -226,7 +226,7 @@ static HRESULT WINAPI BaseMemAllocator_GetProperties(IMemAllocator * iface, ALLO static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; HRESULT hr; TRACE("()\n"); @@ -266,7 +266,7 @@ static HRESULT WINAPI BaseMemAllocator_Commit(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; HRESULT hr; TRACE("()\n"); @@ -306,7 +306,7 @@ static HRESULT WINAPI BaseMemAllocator_Decommit(IMemAllocator * iface) static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSample ** pSample, REFERENCE_TIME *pStartTime, REFERENCE_TIME *pEndTime, DWORD dwFlags) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; HRESULT hr = S_OK; /* NOTE: The pStartTime and pEndTime parameters are not applied to the sample. @@ -353,7 +353,7 @@ static HRESULT WINAPI BaseMemAllocator_GetBuffer(IMemAllocator * iface, IMediaSa static HRESULT WINAPI BaseMemAllocator_ReleaseBuffer(IMemAllocator * iface, IMediaSample * pSample) { - ICOM_THIS(BaseMemAllocator, iface); + BaseMemAllocator *This = (BaseMemAllocator *)iface; StdMediaSample2 * pStdSample = (StdMediaSample2 *)pSample; HRESULT hr = S_OK; @@ -446,7 +446,7 @@ static void StdMediaSample2_Delete(StdMediaSample2 * This) static HRESULT WINAPI StdMediaSample2_QueryInterface(IMediaSample2 * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%s, %p)\n", qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -471,7 +471,7 @@ static HRESULT WINAPI StdMediaSample2_QueryInterface(IMediaSample2 * iface, REFI static ULONG WINAPI StdMediaSample2_AddRef(IMediaSample2 * iface) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p)->() AddRef from %ld\n", iface, This->ref); @@ -480,7 +480,7 @@ static ULONG WINAPI StdMediaSample2_AddRef(IMediaSample2 * iface) static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p)->() Release from %ld\n", iface, This->ref); @@ -494,7 +494,7 @@ static ULONG WINAPI StdMediaSample2_Release(IMediaSample2 * iface) static HRESULT WINAPI StdMediaSample2_GetPointer(IMediaSample2 * iface, BYTE ** ppBuffer) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p)\n", ppBuffer); @@ -505,7 +505,7 @@ static HRESULT WINAPI StdMediaSample2_GetPointer(IMediaSample2 * iface, BYTE ** static long WINAPI StdMediaSample2_GetSize(IMediaSample2 * iface) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("StdMediaSample2_GetSize()\n"); @@ -515,7 +515,7 @@ static long WINAPI StdMediaSample2_GetSize(IMediaSample2 * iface) static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_TIME * pStart, REFERENCE_TIME * pEnd) { HRESULT hr; - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p, %p)\n", pStart, pEnd); @@ -541,7 +541,7 @@ static HRESULT WINAPI StdMediaSample2_GetTime(IMediaSample2 * iface, REFERENCE_T static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 * iface, REFERENCE_TIME * pStart, REFERENCE_TIME * pEnd) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p, %p)\n", pStart, pEnd); @@ -566,7 +566,7 @@ static HRESULT WINAPI StdMediaSample2_SetTime(IMediaSample2 * iface, REFERENCE_T static HRESULT WINAPI StdMediaSample2_IsSyncPoint(IMediaSample2 * iface) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("()\n"); @@ -575,7 +575,7 @@ static HRESULT WINAPI StdMediaSample2_IsSyncPoint(IMediaSample2 * iface) static HRESULT WINAPI StdMediaSample2_SetSyncPoint(IMediaSample2 * iface, BOOL bIsSyncPoint) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%s)\n", bIsSyncPoint ? "TRUE" : "FALSE"); @@ -586,7 +586,7 @@ static HRESULT WINAPI StdMediaSample2_SetSyncPoint(IMediaSample2 * iface, BOOL b static HRESULT WINAPI StdMediaSample2_IsPreroll(IMediaSample2 * iface) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("()\n"); @@ -595,7 +595,7 @@ static HRESULT WINAPI StdMediaSample2_IsPreroll(IMediaSample2 * iface) static HRESULT WINAPI StdMediaSample2_SetPreroll(IMediaSample2 * iface, BOOL bIsPreroll) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%s)\n", bIsPreroll ? "TRUE" : "FALSE"); @@ -606,7 +606,7 @@ static HRESULT WINAPI StdMediaSample2_SetPreroll(IMediaSample2 * iface, BOOL bIs static LONG WINAPI StdMediaSample2_GetActualDataLength(IMediaSample2 * iface) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("()\n"); @@ -615,7 +615,7 @@ static LONG WINAPI StdMediaSample2_GetActualDataLength(IMediaSample2 * iface) static HRESULT WINAPI StdMediaSample2_SetActualDataLength(IMediaSample2 * iface, LONG len) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%ld)\n", len); @@ -630,7 +630,7 @@ static HRESULT WINAPI StdMediaSample2_SetActualDataLength(IMediaSample2 * iface, static HRESULT WINAPI StdMediaSample2_GetMediaType(IMediaSample2 * iface, AM_MEDIA_TYPE ** ppMediaType) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p)\n", ppMediaType); @@ -645,7 +645,7 @@ static HRESULT WINAPI StdMediaSample2_GetMediaType(IMediaSample2 * iface, AM_MED static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MEDIA_TYPE * pMediaType) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p)\n", pMediaType); @@ -659,7 +659,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaType(IMediaSample2 * iface, AM_MED static HRESULT WINAPI StdMediaSample2_IsDiscontinuity(IMediaSample2 * iface) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("()\n"); @@ -668,7 +668,7 @@ static HRESULT WINAPI StdMediaSample2_IsDiscontinuity(IMediaSample2 * iface) static HRESULT WINAPI StdMediaSample2_SetDiscontinuity(IMediaSample2 * iface, BOOL bIsDiscontinuity) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%s)\n", bIsDiscontinuity ? "TRUE" : "FALSE"); @@ -679,7 +679,7 @@ static HRESULT WINAPI StdMediaSample2_SetDiscontinuity(IMediaSample2 * iface, BO static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLONG * pStart, LONGLONG * pEnd) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p, %p)\n", pStart, pEnd); @@ -694,7 +694,7 @@ static HRESULT WINAPI StdMediaSample2_GetMediaTime(IMediaSample2 * iface, LONGLO static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 * iface, LONGLONG * pStart, LONGLONG * pEnd) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%p, %p)\n", pStart, pEnd); @@ -713,7 +713,7 @@ static HRESULT WINAPI StdMediaSample2_SetMediaTime(IMediaSample2 * iface, LONGLO static HRESULT WINAPI StdMediaSample2_GetProperties(IMediaSample2 * iface, DWORD cbProperties, BYTE * pbProperties) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%ld, %p)\n", cbProperties, pbProperties); @@ -724,7 +724,7 @@ static HRESULT WINAPI StdMediaSample2_GetProperties(IMediaSample2 * iface, DWORD static HRESULT WINAPI StdMediaSample2_SetProperties(IMediaSample2 * iface, DWORD cbProperties, const BYTE * pbProperties) { - ICOM_THIS(StdMediaSample2, iface); + StdMediaSample2 *This = (StdMediaSample2 *)iface; TRACE("(%ld, %p)\n", cbProperties, pbProperties); @@ -767,7 +767,7 @@ typedef struct StdMemAllocator static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) { - ICOM_THIS(StdMemAllocator, iface); + StdMemAllocator *This = (StdMemAllocator *)iface; StdMediaSample2 * pSample = NULL; SYSTEM_INFO si; long i; @@ -802,7 +802,7 @@ static HRESULT StdMemAllocator_Alloc(IMemAllocator * iface) static HRESULT StdMemAllocator_Free(IMemAllocator * iface) { - ICOM_THIS(StdMemAllocator, iface); + StdMemAllocator *This = (StdMemAllocator *)iface; struct list * cursor; assert(list_empty(&This->base.used_list)); diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index a466e0c9323..812cf936514 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -57,7 +57,7 @@ static void Copy_PinInfo(PIN_INFO * pDest, const PIN_INFO * pSrc) /* NOTE: not part of standard interface */ static HRESULT OutputPin_ConnectSpecific(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - ICOM_THIS(OutputPin, iface); + OutputPin *This = (OutputPin *)iface; HRESULT hr; IMemAllocator * pMemAlloc = NULL; ALLOCATOR_PROPERTIES actual; /* FIXME: should we put the actual props back in to This? */ @@ -215,7 +215,7 @@ HRESULT OutputPin_Construct(const PIN_INFO * pPinInfo, ALLOCATOR_PROPERTIES *pro ULONG WINAPI IPinImpl_AddRef(IPin * iface) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("()\n"); @@ -225,7 +225,7 @@ ULONG WINAPI IPinImpl_AddRef(IPin * iface) HRESULT WINAPI IPinImpl_Disconnect(IPin * iface) { HRESULT hr; - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("()\n"); @@ -248,7 +248,7 @@ HRESULT WINAPI IPinImpl_Disconnect(IPin * iface) HRESULT WINAPI IPinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) { HRESULT hr; - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; /* TRACE("(%p)\n", ppPin);*/ @@ -271,7 +271,7 @@ HRESULT WINAPI IPinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) HRESULT WINAPI IPinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt) { HRESULT hr; - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pmt); @@ -295,7 +295,7 @@ HRESULT WINAPI IPinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt) HRESULT WINAPI IPinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); @@ -306,7 +306,7 @@ HRESULT WINAPI IPinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) HRESULT WINAPI IPinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pPinDir); @@ -317,7 +317,7 @@ HRESULT WINAPI IPinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) HRESULT WINAPI IPinImpl_QueryId(IPin * iface, LPWSTR * Id) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, Id); @@ -332,7 +332,7 @@ HRESULT WINAPI IPinImpl_QueryId(IPin * iface, LPWSTR * Id) HRESULT WINAPI IPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pmt); @@ -341,7 +341,7 @@ HRESULT WINAPI IPinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt) HRESULT WINAPI IPinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; ENUMMEDIADETAILS emd; TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); @@ -355,7 +355,7 @@ HRESULT WINAPI IPinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum) HRESULT WINAPI IPinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin) { - ICOM_THIS(IPinImpl, iface); + IPinImpl *This = (IPinImpl *)iface; TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin); @@ -366,7 +366,7 @@ HRESULT WINAPI IPinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, UL HRESULT WINAPI InputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(InputPin, iface); + InputPin *This = (InputPin *)iface; TRACE("(%p)->(%s, %p)\n", iface, qzdebugstr_guid(riid), ppv); @@ -392,7 +392,7 @@ HRESULT WINAPI InputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) ULONG WINAPI InputPin_Release(IPin * iface) { - ICOM_THIS(InputPin, iface); + InputPin *This = (InputPin *)iface; TRACE("()\n"); @@ -418,7 +418,7 @@ HRESULT WINAPI InputPin_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_ HRESULT WINAPI InputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { - ICOM_THIS(InputPin, iface); + InputPin *This = (InputPin *)iface; PIN_DIRECTION pindirReceive; HRESULT hr = S_OK; @@ -478,7 +478,7 @@ HRESULT WINAPI InputPin_EndFlush(IPin * iface) HRESULT WINAPI InputPin_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) { - ICOM_THIS(InputPin, iface); + InputPin *This = (InputPin *)iface; TRACE("(%lx%08lx, %lx%08lx, %e)\n", (ULONG)(tStart >> 32), (ULONG)tStart, (ULONG)(tStop >> 32), (ULONG)tStop, dRate); @@ -626,7 +626,7 @@ static const IMemInputPinVtbl MemInputPin_Vtbl = HRESULT WINAPI OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(OutputPin, iface); + OutputPin *This = (OutputPin *)iface; TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); @@ -650,7 +650,7 @@ HRESULT WINAPI OutputPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) ULONG WINAPI OutputPin_Release(IPin * iface) { - ICOM_THIS(OutputPin, iface); + OutputPin *This = (OutputPin *)iface; TRACE("(%p/%p)->()\n", This, iface); @@ -666,7 +666,7 @@ ULONG WINAPI OutputPin_Release(IPin * iface) HRESULT WINAPI OutputPin_Connect(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) { HRESULT hr; - ICOM_THIS(OutputPin, iface); + OutputPin *This = (OutputPin *)iface; TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); @@ -744,7 +744,7 @@ HRESULT WINAPI OutputPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, con HRESULT WINAPI OutputPin_Disconnect(IPin * iface) { HRESULT hr; - ICOM_THIS(OutputPin, iface); + OutputPin *This = (OutputPin *)iface; TRACE("()\n"); @@ -1021,7 +1021,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const { PIN_DIRECTION pindirReceive; HRESULT hr = S_OK; - ICOM_THIS(PullPin, iface); + PullPin *This = (PullPin *)iface; TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); @@ -1079,7 +1079,7 @@ HRESULT WINAPI PullPin_ReceiveConnection(IPin * iface, IPin * pReceivePin, const HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(PullPin, iface); + PullPin *This = (PullPin *)iface; TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); @@ -1103,7 +1103,7 @@ HRESULT WINAPI PullPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) ULONG WINAPI PullPin_Release(IPin * iface) { - ICOM_THIS(PullPin, iface); + PullPin *This = (PullPin *)iface; TRACE("(%p/%p)->()\n", This, iface); @@ -1128,7 +1128,7 @@ static DWORD WINAPI PullPin_Thread_Main(LPVOID pv) static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) { - ICOM_THIS(PullPin, iface); + PullPin *This = (PullPin *)iface; HRESULT hr; REFERENCE_TIME rtCurrent; @@ -1178,7 +1178,7 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) static void CALLBACK PullPin_Thread_Stop(ULONG_PTR iface) { - ICOM_THIS(PullPin, iface); + PullPin *This = (PullPin *)iface; TRACE("(%p/%p)->()\n", This, (LPVOID)iface); diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 8f840bf2763..02d9f2cfea7 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -186,13 +186,13 @@ static BOOL SystemClockPostMessageToAdviseThread(SystemClockImpl* This, UINT iMs IReferenceClockVtbl SystemClock_Vtbl; static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) { - ICOM_THIS(SystemClockImpl,iface); + SystemClockImpl *This = (SystemClockImpl *)iface; TRACE("(%p): AddRef from %ld\n", This, This->ref); return ++(This->ref); } static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REFIID riid, void** ppobj) { - ICOM_THIS(SystemClockImpl,iface); + SystemClockImpl *This = (SystemClockImpl *)iface; TRACE("(%p, %s,%p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown) || @@ -207,7 +207,7 @@ static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock* iface, REF } static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { - ICOM_THIS(SystemClockImpl,iface); + SystemClockImpl *This = (SystemClockImpl *)iface; ULONG ref = --This->ref; TRACE("(%p): ReleaseRef to %ld\n", This, This->ref); if (ref == 0) { @@ -222,7 +222,7 @@ static ULONG WINAPI SystemClockImpl_Release(IReferenceClock* iface) { } static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock* iface, REFERENCE_TIME* pTime) { - ICOM_THIS(SystemClockImpl,iface); + SystemClockImpl *This = (SystemClockImpl *)iface; DWORD curTimeTickCount; HRESULT hr = S_OK; @@ -247,7 +247,7 @@ static HRESULT WINAPI SystemClockImpl_GetTime(IReferenceClock* iface, REFERENCE_ } static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFERENCE_TIME rtBaseTime, REFERENCE_TIME rtStreamTime, HEVENT hEvent, DWORD_PTR* pdwAdviseCookie) { - ICOM_THIS(SystemClockImpl,iface); + SystemClockImpl *This = (SystemClockImpl *)iface; SystemClockAdviseEntry* pEntry = NULL; TRACE("(%p, %lld, %lld, %ld, %p)\n", This, rtBaseTime, rtStreamTime, hEvent, pdwAdviseCookie); @@ -281,7 +281,7 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock* iface, REFEREN } static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME rtStartTime, REFERENCE_TIME rtPeriodTime, HSEMAPHORE hSemaphore, DWORD_PTR* pdwAdviseCookie) { - ICOM_THIS(SystemClockImpl,iface); + SystemClockImpl *This = (SystemClockImpl *)iface; SystemClockAdviseEntry* pEntry = NULL; TRACE("(%p, %lld, %lld, %ld, %p)\n", This, rtStartTime, rtPeriodTime, hSemaphore, pdwAdviseCookie); @@ -315,7 +315,7 @@ static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REF } static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock* iface, DWORD_PTR dwAdviseCookie) { - ICOM_THIS(SystemClockImpl,iface); + SystemClockImpl *This = (SystemClockImpl *)iface; SystemClockAdviseEntry* pEntry = NULL; SystemClockAdviseEntry* it = NULL; HRESULT ret = S_OK; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 7c6d44eab79..14cf5734c97 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -117,7 +117,7 @@ static HRESULT VideoRenderer_CreatePrimarySurface(IBaseFilter * iface) HRESULT hr; DDSURFACEDESC sdesc; DDSCAPS ddscaps; - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; hr = DirectDrawCreate(NULL, &This->ddraw, NULL); @@ -245,7 +245,7 @@ static DWORD VideoRenderer_SendSampleData(VideoRendererImpl* This, LPBYTE data, static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; LPBYTE pbSrcStream = NULL; long cbSrcStream = 0; REFERENCE_TIME tStart, tStop; @@ -361,7 +361,7 @@ HRESULT VideoRenderer_create(IUnknown * pUnkOuter, LPVOID * ppv) static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%s, %p)\n", This, iface, qzdebugstr_guid(riid), ppv); *ppv = NULL; @@ -392,14 +392,14 @@ static HRESULT WINAPI VideoRenderer_QueryInterface(IBaseFilter * iface, REFIID r static ULONG WINAPI VideoRenderer_AddRef(IBaseFilter * iface) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->() AddRef from %ld\n", This, iface, This->refCount); return InterlockedIncrement(&This->refCount); } static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->() Release from %ld\n", This, iface, This->refCount); if (!InterlockedDecrement(&This->refCount)) { @@ -424,7 +424,7 @@ static ULONG WINAPI VideoRenderer_Release(IBaseFilter * iface) static HRESULT WINAPI VideoRenderer_GetClassID(IBaseFilter * iface, CLSID * pClsid) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pClsid); @@ -437,7 +437,7 @@ static HRESULT WINAPI VideoRenderer_GetClassID(IBaseFilter * iface, CLSID * pCls static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); @@ -452,7 +452,7 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface) static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->()\n", This, iface); @@ -467,7 +467,7 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(tStart)); @@ -483,7 +483,7 @@ static HRESULT WINAPI VideoRenderer_Run(IBaseFilter * iface, REFERENCE_TIME tSta static HRESULT WINAPI VideoRenderer_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%ld, %p)\n", This, iface, dwMilliSecsTimeout, pState); @@ -498,7 +498,7 @@ static HRESULT WINAPI VideoRenderer_GetState(IBaseFilter * iface, DWORD dwMilliS static HRESULT WINAPI VideoRenderer_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pClock); @@ -517,7 +517,7 @@ static HRESULT WINAPI VideoRenderer_SetSyncSource(IBaseFilter * iface, IReferenc static HRESULT WINAPI VideoRenderer_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, ppClock); @@ -536,7 +536,7 @@ static HRESULT WINAPI VideoRenderer_GetSyncSource(IBaseFilter * iface, IReferenc static HRESULT WINAPI VideoRenderer_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { ENUMPINDETAILS epd; - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); @@ -547,7 +547,7 @@ static HRESULT WINAPI VideoRenderer_EnumPins(IBaseFilter * iface, IEnumPins **pp static HRESULT WINAPI VideoRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPin **ppPin) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p,%p)\n", This, iface, debugstr_w(Id), ppPin); @@ -560,7 +560,7 @@ static HRESULT WINAPI VideoRenderer_FindPin(IBaseFilter * iface, LPCWSTR Id, IPi static HRESULT WINAPI VideoRenderer_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); @@ -575,7 +575,7 @@ static HRESULT WINAPI VideoRenderer_QueryFilterInfo(IBaseFilter * iface, FILTER_ static HRESULT WINAPI VideoRenderer_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p, %s)\n", This, iface, pGraph, debugstr_w(pName)); @@ -594,7 +594,7 @@ static HRESULT WINAPI VideoRenderer_JoinFilterGraph(IBaseFilter * iface, IFilter static HRESULT WINAPI VideoRenderer_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo) { - ICOM_THIS(VideoRendererImpl, iface); + VideoRendererImpl *This = (VideoRendererImpl *)iface; TRACE("(%p/%p)->(%p)\n", This, iface, pVendorInfo); return E_NOTIMPL; } diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 2323f5183b6..ecbd5741c30 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -2361,21 +2361,21 @@ static void DSDB_DestroyMMAP(IDsDriverBufferImpl* pdbi) static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, REFIID riid, LPVOID *ppobj) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ FIXME("(): stub!\n"); return DSERR_UNSUPPORTED; } static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p)\n",iface); return ++This->ref; } static ULONG WINAPI IDsDriverBufferImpl_Release(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p)\n",iface); if (--This->ref) return This->ref; @@ -2392,7 +2392,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, DWORD dwWritePosition,DWORD dwWriteLen, DWORD dwFlags) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p)\n",iface); return DSERR_UNSUPPORTED; } @@ -2401,7 +2401,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, LPVOID pvAudio1,DWORD dwLen1, LPVOID pvAudio2,DWORD dwLen2) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p)\n",iface); return DSERR_UNSUPPORTED; } @@ -2409,14 +2409,14 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, LPWAVEFORMATEX pwfx) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%p)\n",iface,pwfx); return DSERR_BUFFERLOST; } static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, DWORD dwFreq) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwFreq); return DSERR_UNSUPPORTED; } @@ -2424,7 +2424,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, D static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, PDSVOLUMEPAN pVolPan) { DWORD vol; - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p,%p)\n",iface,pVolPan); vol = pVolPan->dwTotalLeftAmpFactor | (pVolPan->dwTotalRightAmpFactor << 16); @@ -2438,7 +2438,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, P static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DWORD dwNewPos) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwNewPos); return DSERR_UNSUPPORTED; } @@ -2446,7 +2446,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DW static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, LPDWORD lpdwPlay, LPDWORD lpdwWrite) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; WINE_WAVEOUT * wwo = &(WOutDev[This->drv->wDevID]); snd_pcm_uframes_t hw_ptr; snd_pcm_uframes_t period_size; @@ -2478,7 +2478,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwRes1, DWORD dwRes2, DWORD dwFlags) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; WINE_WAVEOUT * wwo = &(WOutDev[This->drv->wDevID]); snd_pcm_state_t state; int err; @@ -2503,7 +2503,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; WINE_WAVEOUT * wwo = &(WOutDev[This->drv->wDevID]); int err; DWORD play; @@ -2547,14 +2547,14 @@ static IDsDriverBufferVtbl dsdbvt = static HRESULT WINAPI IDsDriverImpl_QueryInterface(PIDSDRIVER iface, REFIID riid, LPVOID *ppobj) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ FIXME("(%p): stub!\n",iface); return DSERR_UNSUPPORTED; } static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p)\n",iface); This->ref++; return This->ref; @@ -2562,7 +2562,7 @@ static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p)\n",iface); if (--This->ref) return This->ref; @@ -2572,7 +2572,7 @@ static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDESC pDesc) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); memcpy(pDesc, &(WOutDev[This->wDevID].ds_desc), sizeof(DSDRIVERDESC)); pDesc->dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT | @@ -2593,21 +2593,21 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p)\n",iface); return DS_OK; } static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p)\n",iface); return DS_OK; } static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCaps) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pCaps); memset(pCaps, 0, sizeof(*pCaps)); @@ -2638,7 +2638,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, LPBYTE *ppbBuffer, LPVOID *ppvObj) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; int err; @@ -2679,7 +2679,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, PIDSDRIVERBUFFER pBuffer, LPVOID *ppvObj) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%p): stub\n",iface,pBuffer); return DSERR_INVALIDCALL; } diff --git a/dlls/winmm/winealsa/audio_05.c b/dlls/winmm/winealsa/audio_05.c index c3fea8f9321..e45283032f8 100644 --- a/dlls/winmm/winealsa/audio_05.c +++ b/dlls/winmm/winealsa/audio_05.c @@ -1392,21 +1392,21 @@ static HRESULT DSDB_UnmapPrimary(IDsDriverBufferImpl *dsdb) static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, REFIID riid, LPVOID *ppobj) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ FIXME("(): stub!\n"); return DSERR_UNSUPPORTED; } static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; This->ref++; return This->ref; } static ULONG WINAPI IDsDriverBufferImpl_Release(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; if (--This->ref) return This->ref; if (This == This->drv->primary) @@ -1422,7 +1422,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, DWORD dwWritePosition,DWORD dwWriteLen, DWORD dwFlags) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ /* FIXME: we need to implement it */ TRACE("(%p)\n",iface); return DSERR_UNSUPPORTED; @@ -1432,7 +1432,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, LPVOID pvAudio1,DWORD dwLen1, LPVOID pvAudio2,DWORD dwLen2) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p)\n",iface); return DSERR_UNSUPPORTED; } @@ -1440,7 +1440,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, LPWAVEFORMATEX pwfx) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%p)\n",iface,pwfx); /* On our request (GetDriverDesc flags), DirectSound has by now used @@ -1454,21 +1454,21 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, DWORD dwFreq) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwFreq); return DSERR_UNSUPPORTED; } static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, PDSVOLUMEPAN pVolPan) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ FIXME("(%p,%p): stub!\n",iface,pVolPan); return DSERR_UNSUPPORTED; } static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DWORD dwNewPos) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwNewPos); return DSERR_UNSUPPORTED; } @@ -1477,7 +1477,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, LPDWORD lpdwPlay, LPDWORD lpdwWrite) { #if 0 - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TODO; count_info info; DWORD ptr; @@ -1510,7 +1510,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwRes1, DWORD dwRes2, DWORD dwFlags) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p,%lx,%lx,%lx)\n",iface,dwRes1,dwRes2,dwFlags); @@ -1522,7 +1522,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p)\n",iface); @@ -1555,21 +1555,21 @@ static IDsDriverBufferVtbl dsdbvt = static HRESULT WINAPI IDsDriverImpl_QueryInterface(PIDSDRIVER iface, REFIID riid, LPVOID *ppobj) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ FIXME("(%p): stub!\n",iface); return DSERR_UNSUPPORTED; } static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; This->ref++; return This->ref; } static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; if (--This->ref) return This->ref; HeapFree(GetProcessHeap(),0,This); @@ -1578,7 +1578,7 @@ static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDESC pDesc) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); pDesc->dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT | DSDDESC_USESYSTEMMEMORY; @@ -1600,7 +1600,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p)\n",iface); /* FIXME: error handling */ @@ -1611,7 +1611,7 @@ static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p)\n",iface); if (This->primary) { ERR("problem with DirectSound: primary not released\n"); @@ -1622,7 +1622,7 @@ static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCaps) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%p)\n",iface,pCaps); memset(pCaps, 0, sizeof(*pCaps)); /* FIXME: need to check actual capabilities */ @@ -1641,7 +1641,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, LPBYTE *ppbBuffer, LPVOID *ppvObj) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; WINE_WAVEOUT *wwo = &(WOutDev[This->wDevID]); struct snd_pcm_channel_setup setup; @@ -1724,7 +1724,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, PIDSDRIVERBUFFER pBuffer, LPVOID *ppvObj) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%p): stub\n",iface,pBuffer); return DSERR_INVALIDCALL; } diff --git a/dlls/winmm/wineaudioio/audio.c b/dlls/winmm/wineaudioio/audio.c index 2bec13c44de..c2b425812fc 100644 --- a/dlls/winmm/wineaudioio/audio.c +++ b/dlls/winmm/wineaudioio/audio.c @@ -1333,21 +1333,21 @@ static HRESULT DSDB_UnmapPrimary(IDsDriverBufferImpl *dsdb) static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, REFIID riid, LPVOID *ppobj) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ FIXME("(): stub!\n"); return DSERR_UNSUPPORTED; } static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; This->ref++; return This->ref; } static ULONG WINAPI IDsDriverBufferImpl_Release(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; if (--This->ref) return This->ref; if (This == This->drv->primary) @@ -1363,7 +1363,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, DWORD dwWritePosition,DWORD dwWriteLen, DWORD dwFlags) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ /* since we (GetDriverDesc flags) have specified DSDDESC_DONTNEEDPRIMARYLOCK, * and that we don't support secondary buffers, this method will never be called */ TRACE("(%p): stub\n",iface); @@ -1374,7 +1374,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, LPVOID pvAudio1,DWORD dwLen1, LPVOID pvAudio2,DWORD dwLen2) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p): stub\n",iface); return DSERR_UNSUPPORTED; } @@ -1382,7 +1382,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, LPWAVEFORMATEX pwfx) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%p)\n",iface,pwfx); /* On our request (GetDriverDesc flags), DirectSound has by now used @@ -1396,21 +1396,21 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, DWORD dwFreq) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwFreq); return DSERR_UNSUPPORTED; } static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, PDSVOLUMEPAN pVolPan) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ FIXME("(%p,%p): stub!\n",iface,pVolPan); return DS_OK; } static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DWORD dwNewPos) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwNewPos); return DSERR_UNSUPPORTED; } @@ -1418,7 +1418,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DW static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, LPDWORD lpdwPlay, LPDWORD lpdwWrite) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; #if 0 count_info info; #endif @@ -1436,7 +1436,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwRes1, DWORD dwRes2, DWORD dwFlags) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; #if 0 int enable = PCM_ENABLE_OUTPUT; TRACE("(%p,%lx,%lx,%lx)\n",iface,dwRes1,dwRes2,dwFlags); @@ -1450,7 +1450,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; int enable = 0; #if 0 TRACE("(%p)\n",iface); @@ -1492,21 +1492,21 @@ static IDsDriverBufferVtbl dsdbvt = static HRESULT WINAPI IDsDriverImpl_QueryInterface(PIDSDRIVER iface, REFIID riid, LPVOID *ppobj) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ FIXME("(%p): stub!\n",iface); return DSERR_UNSUPPORTED; } static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; This->ref++; return This->ref; } static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; if (--This->ref) return This->ref; HeapFree(GetProcessHeap(),0,This); @@ -1515,7 +1515,7 @@ static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDESC pDesc) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); pDesc->dwFlags = DSDDESC_DOMMSYSTEMOPEN | DSDDESC_DOMMSYSTEMSETFORMAT | DSDDESC_USESYSTEMMEMORY | DSDDESC_DONTNEEDPRIMARYLOCK; @@ -1537,7 +1537,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDES static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; int enable = 0; TRACE("(%p)\n",iface); @@ -1553,7 +1553,7 @@ static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p)\n",iface); if (This->primary) { ERR("problem with DirectSound: primary not released\n"); @@ -1564,7 +1564,7 @@ static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCaps) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%p)\n",iface,pCaps); memset(pCaps, 0, sizeof(*pCaps)); /* FIXME: need to check actual capabilities */ @@ -1585,7 +1585,7 @@ static HRESULT WINAPI IDsDriverImpl_CreateSoundBuffer(PIDSDRIVER iface, LPBYTE *ppbBuffer, LPVOID *ppvObj) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; HRESULT err; #if 0 @@ -1652,7 +1652,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, PIDSDRIVERBUFFER pBuffer, LPVOID *ppvObj) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%p): stub\n",iface,pBuffer); return DSERR_INVALIDCALL; } diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index b1f3b1aae27..35d05813faa 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -2496,7 +2496,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_QueryInterface( REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsDriverPropertySetImpl,iface); + IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if ( IsEqualGUID(riid, &IID_IUnknown) || @@ -2514,7 +2514,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_QueryInterface( static ULONG WINAPI IDsDriverPropertySetImpl_AddRef(PIDSDRIVERPROPERTYSET iface) { - ICOM_THIS(IDsDriverPropertySetImpl,iface); + IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -2522,7 +2522,7 @@ static ULONG WINAPI IDsDriverPropertySetImpl_AddRef(PIDSDRIVERPROPERTYSET iface) static ULONG WINAPI IDsDriverPropertySetImpl_Release(PIDSDRIVERPROPERTYSET iface) { - ICOM_THIS(IDsDriverPropertySetImpl,iface); + IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -2544,7 +2544,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Get( ULONG cbPropertyData, PULONG pcbReturnedData ) { - ICOM_THIS(IDsDriverPropertySetImpl,iface); + IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; FIXME("(%p,%p,%p,%lx,%p,%lx,%p)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData,pcbReturnedData); return DSERR_UNSUPPORTED; } @@ -2557,7 +2557,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_Set( LPVOID pPropertyData, ULONG cbPropertyData ) { - ICOM_THIS(IDsDriverPropertySetImpl,iface); + IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; FIXME("(%p,%p,%p,%lx,%p,%lx)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData); return DSERR_UNSUPPORTED; } @@ -2568,7 +2568,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_QuerySupport( ULONG PropertyId, PULONG pSupport ) { - ICOM_THIS(IDsDriverPropertySetImpl,iface); + IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface; FIXME("(%p,%s,%lx,%p)\n",This,debugstr_guid(PropertySetId),PropertyId,pSupport); return DSERR_UNSUPPORTED; } @@ -2592,7 +2592,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_QueryInterface( REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsDriverNotifyImpl,iface); + IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if ( IsEqualGUID(riid, &IID_IUnknown) || @@ -2610,7 +2610,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_QueryInterface( static ULONG WINAPI IDsDriverNotifyImpl_AddRef(PIDSDRIVERNOTIFY iface) { - ICOM_THIS(IDsDriverNotifyImpl,iface); + IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -2618,7 +2618,7 @@ static ULONG WINAPI IDsDriverNotifyImpl_AddRef(PIDSDRIVERNOTIFY iface) static ULONG WINAPI IDsDriverNotifyImpl_Release(PIDSDRIVERNOTIFY iface) { - ICOM_THIS(IDsDriverNotifyImpl,iface); + IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -2638,7 +2638,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions( DWORD howmuch, LPCDSBPOSITIONNOTIFY notify) { - ICOM_THIS(IDsDriverNotifyImpl,iface); + IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface; TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify); if (!notify) { @@ -2742,7 +2742,7 @@ static HRESULT DSDB_UnmapBuffer(IDsDriverBufferImpl *dsdb) static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p,%s,%p)\n",iface,debugstr_guid(riid),*ppobj); if ( IsEqualGUID(riid, &IID_IUnknown) || @@ -2785,7 +2785,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_QueryInterface(PIDSDRIVERBUFFER iface, static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -2793,7 +2793,7 @@ static ULONG WINAPI IDsDriverBufferImpl_AddRef(PIDSDRIVERBUFFER iface) static ULONG WINAPI IDsDriverBufferImpl_Release(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -2834,7 +2834,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Lock(PIDSDRIVERBUFFER iface, DWORD dwWritePosition,DWORD dwWriteLen, DWORD dwFlags) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ /* since we (GetDriverDesc flags) have specified DSDDESC_DONTNEEDPRIMARYLOCK, * and that we don't support secondary buffers, this method will never be called */ TRACE("(%p): stub\n",iface); @@ -2845,7 +2845,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, LPVOID pvAudio1,DWORD dwLen1, LPVOID pvAudio2,DWORD dwLen2) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p): stub\n",iface); return DSERR_UNSUPPORTED; } @@ -2853,7 +2853,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Unlock(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, LPWAVEFORMATEX pwfx) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%p)\n",iface,pwfx); /* On our request (GetDriverDesc flags), DirectSound has by now used @@ -2867,7 +2867,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFormat(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, DWORD dwFreq) { - /* ICOM_THIS(IDsDriverBufferImpl,iface); */ + /* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwFreq); return DSERR_UNSUPPORTED; } @@ -2875,7 +2875,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, D static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, PDSVOLUMEPAN pVolPan) { DWORD vol; - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; TRACE("(%p,%p)\n",This,pVolPan); vol = pVolPan->dwTotalLeftAmpFactor | (pVolPan->dwTotalRightAmpFactor << 16); @@ -2890,7 +2890,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetVolumePan(PIDSDRIVERBUFFER iface, P static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DWORD dwNewPos) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%ld): stub\n",iface,dwNewPos); return DSERR_UNSUPPORTED; } @@ -2898,7 +2898,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DW static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, LPDWORD lpdwPlay, LPDWORD lpdwWrite) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; count_info info; DWORD ptr; @@ -2929,7 +2929,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwRes1, DWORD dwRes2, DWORD dwFlags) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; int enable; TRACE("(%p,%lx,%lx,%lx)\n",iface,dwRes1,dwRes2,dwFlags); WOutDev[This->drv->wDevID].ossdev->bOutputEnabled = TRUE; @@ -2959,7 +2959,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Play(PIDSDRIVERBUFFER iface, DWORD dwR static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) { - ICOM_THIS(IDsDriverBufferImpl,iface); + IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; int enable; TRACE("(%p)\n",iface); /* no more playing */ @@ -3005,7 +3005,7 @@ static IDsDriverBufferVtbl dsdbvt = static HRESULT WINAPI IDsDriverImpl_QueryInterface(PIDSDRIVER iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if ( IsEqualGUID(riid, &IID_IUnknown) || @@ -3024,7 +3024,7 @@ static HRESULT WINAPI IDsDriverImpl_QueryInterface(PIDSDRIVER iface, REFIID riid static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -3032,7 +3032,7 @@ static ULONG WINAPI IDsDriverImpl_AddRef(PIDSDRIVER iface) static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -3047,7 +3047,7 @@ static ULONG WINAPI IDsDriverImpl_Release(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, PDSDRIVERDESC pDesc) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pDesc); /* copy version from driver */ @@ -3072,7 +3072,7 @@ static HRESULT WINAPI IDsDriverImpl_GetDriverDesc(PIDSDRIVER iface, static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; int enable; TRACE("(%p)\n",iface); @@ -3088,7 +3088,7 @@ static HRESULT WINAPI IDsDriverImpl_Open(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p)\n",iface); if (This->primary) { ERR("problem with DirectSound: primary not released\n"); @@ -3099,7 +3099,7 @@ static HRESULT WINAPI IDsDriverImpl_Close(PIDSDRIVER iface) static HRESULT WINAPI IDsDriverImpl_GetCaps(PIDSDRIVER iface, PDSDRIVERCAPS pCaps) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; TRACE("(%p,%p)\n",iface,pCaps); memcpy(pCaps, &(WOutDev[This->wDevID].ossdev->ds_caps), sizeof(DSDRIVERCAPS)); return DS_OK; @@ -3113,7 +3113,7 @@ static HRESULT WINAPI DSD_CreatePrimaryBuffer(PIDSDRIVER iface, LPBYTE *ppbBuffer, LPVOID *ppvObj) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; HRESULT err; audio_buf_info info; @@ -3179,7 +3179,7 @@ static HRESULT WINAPI DSD_CreateSecondaryBuffer(PIDSDRIVER iface, LPBYTE *ppbBuffer, LPVOID *ppvObj) { - ICOM_THIS(IDsDriverImpl,iface); + IDsDriverImpl *This = (IDsDriverImpl *)iface; IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj; FIXME("(%p,%p,%lx,%lx,%p,%p,%p): stub\n",This,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj); @@ -3207,7 +3207,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, PIDSDRIVERBUFFER pBuffer, LPVOID *ppvObj) { - /* ICOM_THIS(IDsDriverImpl,iface); */ + /* IDsDriverImpl *This = (IDsDriverImpl *)iface; */ TRACE("(%p,%p): stub\n",iface,pBuffer); return DSERR_INVALIDCALL; } @@ -4131,7 +4131,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_QueryInterface( REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsCaptureDriverPropertySetImpl,iface); + IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if ( IsEqualGUID(riid, &IID_IUnknown) || @@ -4150,7 +4150,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_QueryInterface( static ULONG WINAPI IDsCaptureDriverPropertySetImpl_AddRef( PIDSDRIVERPROPERTYSET iface) { - ICOM_THIS(IDsCaptureDriverPropertySetImpl,iface); + IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -4159,7 +4159,7 @@ static ULONG WINAPI IDsCaptureDriverPropertySetImpl_AddRef( static ULONG WINAPI IDsCaptureDriverPropertySetImpl_Release( PIDSDRIVERPROPERTYSET iface) { - ICOM_THIS(IDsCaptureDriverPropertySetImpl,iface); + IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -4182,7 +4182,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_Get( ULONG cbPropertyData, PULONG pcbReturnedData ) { - ICOM_THIS(IDsCaptureDriverPropertySetImpl,iface); + IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface; FIXME("(%p,%p,%p,%lx,%p,%lx,%p)\n",This,pDsProperty,pPropertyParams, cbPropertyParams,pPropertyData,cbPropertyData,pcbReturnedData); return DSERR_UNSUPPORTED; @@ -4196,7 +4196,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_Set( LPVOID pPropertyData, ULONG cbPropertyData ) { - ICOM_THIS(IDsCaptureDriverPropertySetImpl,iface); + IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface; FIXME("(%p,%p,%p,%lx,%p,%lx)\n",This,pDsProperty,pPropertyParams, cbPropertyParams,pPropertyData,cbPropertyData); return DSERR_UNSUPPORTED; @@ -4208,7 +4208,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_QuerySupport( ULONG PropertyId, PULONG pSupport ) { - ICOM_THIS(IDsCaptureDriverPropertySetImpl,iface); + IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface; FIXME("(%p,%s,%lx,%p)\n",This,debugstr_guid(PropertySetId),PropertyId, pSupport); return DSERR_UNSUPPORTED; @@ -4233,7 +4233,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_QueryInterface( REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsCaptureDriverNotifyImpl,iface); + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if ( IsEqualGUID(riid, &IID_IUnknown) || @@ -4252,7 +4252,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_QueryInterface( static ULONG WINAPI IDsCaptureDriverNotifyImpl_AddRef( PIDSDRIVERNOTIFY iface) { - ICOM_THIS(IDsCaptureDriverNotifyImpl,iface); + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -4261,7 +4261,7 @@ static ULONG WINAPI IDsCaptureDriverNotifyImpl_AddRef( static ULONG WINAPI IDsCaptureDriverNotifyImpl_Release( PIDSDRIVERNOTIFY iface) { - ICOM_THIS(IDsCaptureDriverNotifyImpl,iface); + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -4280,7 +4280,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions( DWORD howmuch, LPCDSBPOSITIONNOTIFY notify) { - ICOM_THIS(IDsCaptureDriverNotifyImpl,iface); + IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface; TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify); if (!notify) { @@ -4358,7 +4358,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface( REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); *ppobj = 0; @@ -4398,7 +4398,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface( static ULONG WINAPI IDsCaptureDriverBufferImpl_AddRef(PIDSCDRIVERBUFFER iface) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -4406,7 +4406,7 @@ static ULONG WINAPI IDsCaptureDriverBufferImpl_AddRef(PIDSCDRIVERBUFFER iface) static ULONG WINAPI IDsCaptureDriverBufferImpl_Release(PIDSCDRIVERBUFFER iface) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -4431,7 +4431,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Lock( DWORD dwWriteLen, DWORD dwFlags) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; FIXME("(%p,%p,%p,%p,%p,%ld,%ld,0x%08lx): stub!\n",This,ppvAudio1,pdwLen1, ppvAudio2,pdwLen2,dwWritePosition,dwWriteLen,dwFlags); return DS_OK; @@ -4444,7 +4444,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Unlock( LPVOID pvAudio2, DWORD dwLen2) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; FIXME("(%p,%p,%ld,%p,%ld): stub!\n",This,pvAudio1,dwLen1,pvAudio2,dwLen2); return DS_OK; } @@ -4454,7 +4454,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetPosition( LPDWORD lpdwCapture, LPDWORD lpdwRead) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; count_info info; DWORD ptr; TRACE("(%p,%p,%p)\n",This,lpdwCapture,lpdwRead); @@ -4495,7 +4495,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_GetStatus( PIDSCDRIVERBUFFER iface, LPDWORD lpdwStatus) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; TRACE("(%p,%p)\n",This,lpdwStatus); if (This->is_capturing) { @@ -4513,7 +4513,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Start( PIDSCDRIVERBUFFER iface, DWORD dwFlags) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; int enable; TRACE("(%p,%lx)\n",This,dwFlags); @@ -4554,7 +4554,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_Start( static HRESULT WINAPI IDsCaptureDriverBufferImpl_Stop(PIDSCDRIVERBUFFER iface) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; int enable; TRACE("(%p)\n",This); @@ -4590,7 +4590,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat( PIDSCDRIVERBUFFER iface, LPWAVEFORMATEX pwfx) { - ICOM_THIS(IDsCaptureDriverBufferImpl,iface); + IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface; FIXME("(%p): stub!\n",This); return DSERR_UNSUPPORTED; } @@ -4614,7 +4614,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_QueryInterface( REFIID riid, LPVOID *ppobj) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); if ( IsEqualGUID(riid, &IID_IUnknown) || @@ -4633,7 +4633,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_QueryInterface( static ULONG WINAPI IDsCaptureDriverImpl_AddRef(PIDSCDRIVER iface) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; TRACE("(%p) ref was %ld\n", This, This->ref); return InterlockedIncrement(&(This->ref)); @@ -4641,7 +4641,7 @@ static ULONG WINAPI IDsCaptureDriverImpl_AddRef(PIDSCDRIVER iface) static ULONG WINAPI IDsCaptureDriverImpl_Release(PIDSCDRIVER iface) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; DWORD ref; TRACE("(%p) ref was %ld\n", This, This->ref); @@ -4657,7 +4657,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_GetDriverDesc( PIDSCDRIVER iface, PDSDRIVERDESC pDesc) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; TRACE("(%p,%p)\n",This,pDesc); if (!pDesc) { @@ -4685,14 +4685,14 @@ static HRESULT WINAPI IDsCaptureDriverImpl_GetDriverDesc( static HRESULT WINAPI IDsCaptureDriverImpl_Open(PIDSCDRIVER iface) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; TRACE("(%p)\n",This); return DS_OK; } static HRESULT WINAPI IDsCaptureDriverImpl_Close(PIDSCDRIVER iface) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; TRACE("(%p)\n",This); if (This->capture_buffer) { ERR("problem with DirectSound: capture buffer not released\n"); @@ -4705,7 +4705,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_GetCaps( PIDSCDRIVER iface, PDSCDRIVERCAPS pCaps) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; TRACE("(%p,%p)\n",This,pCaps); memcpy(pCaps, &(WInDev[This->wDevID].ossdev->dsc_caps), sizeof(DSCDRIVERCAPS)); return DS_OK; @@ -4720,7 +4720,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_CreateCaptureBuffer( LPBYTE *ppbBuffer, LPVOID *ppvObj) { - ICOM_THIS(IDsCaptureDriverImpl,iface); + IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface; IDsCaptureDriverBufferImpl** ippdscdb = (IDsCaptureDriverBufferImpl**)ppvObj; HRESULT err; audio_buf_info info;