From 4dbf1c49007fc5ebcf79cff71a8512ac4182987a Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Tue, 20 Oct 2009 11:05:02 +0200 Subject: [PATCH] d3d9: Add traces. --- dlls/d3d9/cubetexture.c | 65 ++++-- dlls/d3d9/device.c | 387 +++++++++++++++++++++++----------- dlls/d3d9/directx.c | 104 ++++++--- dlls/d3d9/indexbuffer.c | 45 ++-- dlls/d3d9/pixelshader.c | 42 ++-- dlls/d3d9/query.c | 25 ++- dlls/d3d9/stateblock.c | 22 +- dlls/d3d9/surface.c | 57 +++-- dlls/d3d9/swapchain.c | 34 +-- dlls/d3d9/texture.c | 64 ++++-- dlls/d3d9/vertexbuffer.c | 44 ++-- dlls/d3d9/vertexdeclaration.c | 14 +- dlls/d3d9/vertexshader.c | 41 ++-- dlls/d3d9/volume.c | 31 +-- dlls/d3d9/volumetexture.c | 47 +++-- 15 files changed, 679 insertions(+), 343 deletions(-) diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 10336b51dd8..3ebc5c8ac83 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -29,6 +29,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); /* IDirect3DCubeTexture9 IUnknown parts follow: */ static HRESULT WINAPI IDirect3DCubeTexture9Impl_QueryInterface(LPDIRECT3DCUBETEXTURE9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) @@ -47,7 +50,7 @@ static ULONG WINAPI IDirect3DCubeTexture9Impl_AddRef(LPDIRECT3DCUBETEXTURE9 ifac IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -64,7 +67,7 @@ static ULONG WINAPI IDirect3DCubeTexture9Impl_Release(LPDIRECT3DCUBETEXTURE9 ifa IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -86,7 +89,8 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetDevice(LPDIRECT3DCUBETEXTURE9 IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_GetDevice(This->wineD3DCubeTexture, &wined3d_device); @@ -103,7 +107,9 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetDevice(LPDIRECT3DCUBETEXTURE9 static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_SetPrivateData(This->wineD3DCubeTexture,refguid,pData,SizeOfData,Flags); @@ -115,7 +121,9 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetPrivateData(LPDIRECT3DCUBETEX static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetPrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_GetPrivateData(This->wineD3DCubeTexture,refguid,pData,pSizeOfData); @@ -127,7 +135,8 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetPrivateData(LPDIRECT3DCUBETEX static HRESULT WINAPI IDirect3DCubeTexture9Impl_FreePrivateData(LPDIRECT3DCUBETEXTURE9 iface, REFGUID refguid) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_FreePrivateData(This->wineD3DCubeTexture,refguid); @@ -139,7 +148,8 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_FreePrivateData(LPDIRECT3DCUBETE static DWORD WINAPI IDirect3DCubeTexture9Impl_SetPriority(LPDIRECT3DCUBETEXTURE9 iface, DWORD PriorityNew) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); ret = IWineD3DCubeTexture_SetPriority(This->wineD3DCubeTexture, PriorityNew); @@ -151,7 +161,8 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_SetPriority(LPDIRECT3DCUBETEXTURE9 static DWORD WINAPI IDirect3DCubeTexture9Impl_GetPriority(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DCubeTexture_GetPriority(This->wineD3DCubeTexture); @@ -162,7 +173,8 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_GetPriority(LPDIRECT3DCUBETEXTURE9 static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture); @@ -172,7 +184,8 @@ static void WINAPI IDirect3DCubeTexture9Impl_PreLoad(LPDIRECT3DCUBETEXTURE9 ifac static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; D3DRESOURCETYPE ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DCubeTexture_GetType(This->wineD3DCubeTexture); @@ -185,7 +198,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture9Impl_GetType(LPDIRECT3DCUBETE static DWORD WINAPI IDirect3DCubeTexture9Impl_SetLOD(LPDIRECT3DCUBETEXTURE9 iface, DWORD LODNew) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, lod %u.\n", iface, LODNew); wined3d_mutex_lock(); ret = IWineD3DCubeTexture_SetLOD(This->wineD3DCubeTexture, LODNew); @@ -197,7 +211,8 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_SetLOD(LPDIRECT3DCUBETEXTURE9 ifac static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLOD(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DCubeTexture_GetLOD(This->wineD3DCubeTexture); @@ -209,7 +224,8 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLOD(LPDIRECT3DCUBETEXTURE9 ifac static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLevelCount(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture); @@ -221,7 +237,8 @@ static DWORD WINAPI IDirect3DCubeTexture9Impl_GetLevelCount(LPDIRECT3DCUBETEXTUR static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetAutoGenFilterType(LPDIRECT3DCUBETEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, filter_type %#x.\n", iface, FilterType); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_SetAutoGenFilterType(This->wineD3DCubeTexture, (WINED3DTEXTUREFILTERTYPE) FilterType); @@ -233,7 +250,8 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_SetAutoGenFilterType(LPDIRECT3DC static D3DTEXTUREFILTERTYPE WINAPI IDirect3DCubeTexture9Impl_GetAutoGenFilterType(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; D3DTEXTUREFILTERTYPE ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = (D3DTEXTUREFILTERTYPE) IWineD3DCubeTexture_GetAutoGenFilterType(This->wineD3DCubeTexture); @@ -244,7 +262,8 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DCubeTexture9Impl_GetAutoGenFilterTyp static void WINAPI IDirect3DCubeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DCUBETEXTURE9 iface) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DCubeTexture_GenerateMipSubLevels(This->wineD3DCubeTexture); @@ -257,7 +276,7 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetLevelDesc(LPDIRECT3DCUBETEXTU WINED3DSURFACE_DESC wined3ddesc; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, level %u, desc %p.\n", iface, Level, pDesc); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_GetLevelDesc(This->wineD3DCubeTexture, Level, &wined3ddesc); @@ -283,7 +302,7 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetCubeMapSurface(LPDIRECT3DCUBE HRESULT hrc = D3D_OK; IWineD3DSurface *mySurface = NULL; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, face %#x, level %u, surface %p.\n", iface, FaceType, Level, ppCubeMapSurface); wined3d_mutex_lock(); hrc = IWineD3DCubeTexture_GetCubeMapSurface(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, &mySurface); @@ -299,7 +318,9 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_GetCubeMapSurface(LPDIRECT3DCUBE static HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, face %#x, level %u, locked_rect %p, rect %p, flags %#x.\n", + iface, FaceType, Level, pLockedRect, pRect, Flags); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_LockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); @@ -311,7 +332,8 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_LockRect(LPDIRECT3DCUBETEXTURE9 static HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, UINT Level) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, face %#x, level %u.\n", iface, FaceType, Level); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_UnlockRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, Level); @@ -323,7 +345,8 @@ static HRESULT WINAPI IDirect3DCubeTexture9Impl_UnlockRect(LPDIRECT3DCUBETEXTURE static HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE9 iface, D3DCUBEMAP_FACES FaceType, CONST RECT* pDirtyRect) { IDirect3DCubeTexture9Impl *This = (IDirect3DCubeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, face %#x, dirty_rect %p.\n", iface, FaceType, pDirtyRect); wined3d_mutex_lock(); hr = IWineD3DCubeTexture_AddDirtyRect(This->wineD3DCubeTexture, (WINED3DCUBEMAP_FACES) FaceType, pDirtyRect); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 79990bb1d0f..538949894a6 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -187,6 +187,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_QueryInterface(LPDIRECT3DDEVICE9EX if IDirect3D9 *d3d; IDirect3D9Impl *d3dimpl; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DDevice9)) { IDirect3DDevice9Ex_AddRef(iface); @@ -230,7 +232,7 @@ static ULONG WINAPI IDirect3DDevice9Impl_AddRef(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); return ref; } @@ -242,7 +244,7 @@ static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(LPDIRECT3DDEV if (This->inDestruction) return 0; ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { unsigned i; @@ -270,7 +272,8 @@ static ULONG WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Release(LPDIRECT3DDEV static HRESULT WINAPI IDirect3DDevice9Impl_TestCooperativeLevel(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p)\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_TestCooperativeLevel(This->WineD3DDevice); @@ -287,7 +290,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_TestCooperativeLevel(LPDIRECT3DDEVI static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_GetAvailableTextureMem(This->WineD3DDevice); @@ -299,7 +303,8 @@ static UINT WINAPI IDirect3DDevice9Impl_GetAvailableTextureMem(LPDIRECT3DDE static HRESULT WINAPI IDirect3DDevice9Impl_EvictManagedResources(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_EvictManagedResources(This->WineD3DDevice); @@ -313,7 +318,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDirect3D(LPDIRECT3DDEVICE9EX iface HRESULT hr = D3D_OK; IWineD3D* pWineD3D; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, d3d9 %p.\n", iface, ppD3D9); if (NULL == ppD3D9) { return D3DERR_INVALIDCALL; @@ -340,7 +345,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9EX i HRESULT hrc = D3D_OK; WINED3DCAPS *pWineCaps; - TRACE("(%p) : Relay pCaps %p\n", This, pCaps); + TRACE("iface %p, caps %p.\n", iface, pCaps); + if(NULL == pCaps){ return D3DERR_INVALIDCALL; } @@ -370,7 +376,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9EX i static HRESULT WINAPI IDirect3DDevice9Impl_GetDisplayMode(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, D3DDISPLAYMODE* pMode) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, swapchain %u, mode %p.\n", iface, iSwapChain, pMode); wined3d_mutex_lock(); hr = IWineD3DDevice_GetDisplayMode(This->WineD3DDevice, iSwapChain, (WINED3DDISPLAYMODE *) pMode); @@ -384,7 +391,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDisplayMode(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_GetCreationParameters(LPDIRECT3DDEVICE9EX iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, parameters %p.\n", iface, pParameters); wined3d_mutex_lock(); hr = IWineD3DDevice_GetCreationParameters(This->WineD3DDevice, (WINED3DDEVICE_CREATION_PARAMETERS *) pParameters); @@ -398,7 +406,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC IDirect3DSurface9Impl *pSurface = (IDirect3DSurface9Impl*)pCursorBitmap; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", + iface, XHotSpot, YHotSpot, pCursorBitmap); + if(!pCursorBitmap) { WARN("No cursor bitmap, returning WINED3DERR_INVALIDCALL\n"); return WINED3DERR_INVALIDCALL; @@ -413,7 +423,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(LPDIRECT3DDEVIC static void WINAPI IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9EX iface, int XScreenSpace, int YScreenSpace, DWORD Flags) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, x %u, y %u, flags %#x.\n", iface, XScreenSpace, YScreenSpace, Flags); wined3d_mutex_lock(); IWineD3DDevice_SetCursorPosition(This->WineD3DDevice, XScreenSpace, YScreenSpace, Flags); @@ -423,7 +434,8 @@ static void WINAPI IDirect3DDevice9Impl_SetCursorPosition(LPDIRECT3DDEVICE9 static BOOL WINAPI IDirect3DDevice9Impl_ShowCursor(LPDIRECT3DDEVICE9EX iface, BOOL bShow) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; BOOL ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, show %#x.\n", iface, bShow); wined3d_mutex_lock(); ret = IWineD3DDevice_ShowCursor(This->WineD3DDevice, bShow); @@ -497,7 +509,7 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Reset(LPDIRECT3DDE BOOL resources_ok = TRUE; UINT i; - TRACE("(%p) Relay pPresentationParameters(%p)\n", This, pPresentationParameters); + TRACE("iface %p, present_parameters %p.\n", iface, pPresentationParameters); /* Reset states that hold a COM object. WineD3D holds an internal reference to set objects, because * such objects can still be used for rendering after their external d3d9 object has been destroyed. @@ -572,7 +584,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_Present(LPDIRECT3D pDirtyRegion) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p.\n", + iface, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion); wined3d_mutex_lock(); hr = IWineD3DDevice_Present(This->WineD3DDevice, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion); @@ -586,7 +600,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9EX i IWineD3DSurface *retSurface = NULL; HRESULT rc = D3D_OK; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, swapchain %u, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", + iface, iSwapChain, BackBuffer, Type, ppBackBuffer); wined3d_mutex_lock(); rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, iSwapChain, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &retSurface); @@ -601,7 +616,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetBackBuffer(LPDIRECT3DDEVICE9EX i static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, D3DRASTER_STATUS* pRasterStatus) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, swapchain %u, raster_status %p.\n", iface, iSwapChain, pRasterStatus); wined3d_mutex_lock(); hr = IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, iSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus); @@ -613,7 +629,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRasterStatus(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_SetDialogBoxMode(LPDIRECT3DDEVICE9EX iface, BOOL bEnableDialogs) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, enable %#x.\n", iface, bEnableDialogs); wined3d_mutex_lock(); hr = IWineD3DDevice_SetDialogBoxMode(This->WineD3DDevice, bEnableDialogs); @@ -626,7 +643,8 @@ static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(IDirect3DDevice9Ex *iface, DWORD Flags, const D3DGAMMARAMP *pRamp) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, swapchain %u, flags %#x, ramp %p.\n", iface, iSwapChain, Flags, pRamp); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ wined3d_mutex_lock(); @@ -636,7 +654,8 @@ static void WINAPI IDirect3DDevice9Impl_SetGammaRamp(IDirect3DDevice9Ex *iface, static void WINAPI IDirect3DDevice9Impl_GetGammaRamp(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, D3DGAMMARAMP* pRamp) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, swapchain %u, ramp %p.\n", iface, iSwapChain, pRamp); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ wined3d_mutex_lock(); @@ -812,7 +831,10 @@ static HRESULT IDirect3DDevice9Impl_CreateSurface(LPDIRECT3DDEVICE9EX iface, UIN IDirect3DSurface9Impl *object; HRESULT hr; - TRACE("(%p) : w(%d) h(%d) fmt(%d) surf@%p\n", This, Width, Height, Format, *ppSurface); + TRACE("iface %p, width %u, height %u, format %#x, lockable %#x, discard %#x, level %u, surface %p.\n" + "usage %#x, pool %#x, multisample_type %#x, multisample_quality %u.\n", + iface, Width, Height, Format, Lockable, Discard, Level, ppSurface, + Usage, Pool, MultiSample, MultisampleQuality); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DSurface9Impl)); if (!object) @@ -841,7 +863,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateRenderTarget(IDirect3DDevice9Ex IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle) { HRESULT hr; - TRACE("Relay\n"); + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" + "lockable %#x, surface %p, shared_handle %p.\n", + iface, Width, Height, Format, MultiSample, MultisampleQuality, + Lockable, ppSurface, pSharedHandle); hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */, 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality); @@ -854,7 +880,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(LPDIRECT3 DWORD MultisampleQuality, BOOL Discard, IDirect3DSurface9 **ppSurface, HANDLE* pSharedHandle) { HRESULT hr; - TRACE("Relay\n"); + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u.\n" + "discard %#x, surface %p, shared_handle %p.\n", + iface, Width, Height, Format, MultiSample, MultisampleQuality, + Discard, ppSurface, pSharedHandle); hr = IDirect3DDevice9Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, Discard, 0 /* Level */, ppSurface, D3DUSAGE_DEPTHSTENCIL, D3DPOOL_DEFAULT, MultiSample, MultisampleQuality); @@ -866,7 +896,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateDepthStencilSurface(LPDIRECT3 static HRESULT WINAPI IDirect3DDevice9Impl_UpdateSurface(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestinationSurface, CONST POINT* pDestPoint) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", + iface, pSourceSurface, pSourceRect, pDestinationSurface, pDestPoint); wined3d_mutex_lock(); hr = IWineD3DDevice_UpdateSurface(This->WineD3DDevice, ((IDirect3DSurface9Impl *)pSourceSurface)->wineD3DSurface, pSourceRect, ((IDirect3DSurface9Impl *)pDestinationSurface)->wineD3DSurface, pDestPoint); @@ -878,7 +910,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateSurface(LPDIRECT3DDEVICE9EX i static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(LPDIRECT3DDEVICE9EX iface, IDirect3DBaseTexture9* pSourceTexture, IDirect3DBaseTexture9* pDestinationTexture) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, src_texture %p, dst_texture %p.\n", iface, pSourceTexture, pDestinationTexture); wined3d_mutex_lock(); hr = IWineD3DDevice_UpdateTexture(This->WineD3DDevice, ((IDirect3DBaseTexture9Impl *)pSourceTexture)->wineD3DBaseTexture, ((IDirect3DBaseTexture9Impl *)pDestinationTexture)->wineD3DBaseTexture); @@ -887,12 +920,14 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(LPDIRECT3DDEVICE9EX i return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9* pRenderTarget, IDirect3DSurface9* pDestSurface) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; +static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(IDirect3DDevice9Ex *iface, + IDirect3DSurface9 *pRenderTarget, IDirect3DSurface9 *pDestSurface) +{ IDirect3DSurface9Impl *renderTarget = (IDirect3DSurface9Impl *)pRenderTarget; IDirect3DSurface9Impl *destSurface = (IDirect3DSurface9Impl *)pDestSurface; HRESULT hr; - TRACE("(%p)->(%p,%p)\n" , This, renderTarget, destSurface); + + TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, pRenderTarget, pDestSurface); wined3d_mutex_lock(); hr = IWineD3DSurface_BltFast(destSurface->wineD3DSurface, 0, 0, renderTarget->wineD3DSurface, NULL, WINEDDBLTFAST_NOCOLORKEY); @@ -905,7 +940,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(LPDIRECT3DDEVICE IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *destSurface = (IDirect3DSurface9Impl *)pDestSurface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, swapchain %u, dst_surface %p.\n", iface, iSwapChain, pDestSurface); wined3d_mutex_lock(); hr = IWineD3DDevice_GetFrontBufferData(This->WineD3DDevice, iSwapChain, destSurface->wineD3DSurface); @@ -914,13 +950,15 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(LPDIRECT3DDEVICE return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(LPDIRECT3DDEVICE9EX iface, IDirect3DSurface9* pSourceSurface, CONST RECT* pSourceRect, IDirect3DSurface9* pDestSurface, CONST RECT* pDestRect, D3DTEXTUREFILTERTYPE Filter) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; +static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(IDirect3DDevice9Ex *iface, IDirect3DSurface9 *pSourceSurface, + const RECT *pSourceRect, IDirect3DSurface9 *pDestSurface, const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter) +{ IDirect3DSurface9Impl *src = (IDirect3DSurface9Impl *) pSourceSurface; IDirect3DSurface9Impl *dst = (IDirect3DSurface9Impl *) pDestSurface; HRESULT hr; - TRACE("(%p)->(%p,%p,%p,%p,%d)\n" , This, src, pSourceRect, dst, pDestRect, Filter); + TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", + iface, pSourceSurface, pSourceRect, pDestSurface, pDestRect, Filter); wined3d_mutex_lock(); hr = IWineD3DSurface_Blt(dst->wineD3DSurface, pDestRect, src->wineD3DSurface, pSourceRect, 0, NULL, Filter); @@ -937,7 +975,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9EX iface DWORD usage; WINED3DSURFACE_DESC desc; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, pSurface, pRect, color); wined3d_mutex_lock(); @@ -966,7 +1005,10 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9EX iface static HRESULT WINAPI IDirect3DDevice9Impl_CreateOffscreenPlainSurface(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE* pSharedHandle) { HRESULT hr; - TRACE("Relay\n"); + + TRACE("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p.\n", + iface, Width, Height, Format, Pool, ppSurface, pSharedHandle); + if(Pool == D3DPOOL_MANAGED ){ FIXME("Attempting to create a managed offscreen plain surface\n"); return D3DERR_INVALIDCALL; @@ -990,7 +1032,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *pSurface = (IDirect3DSurface9Impl*)pRenderTarget; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, idx %u, surface %p.\n", iface, RenderTargetIndex, pRenderTarget); if (RenderTargetIndex >= D3D9_MAX_SIMULTANEOUS_RENDERTARGETS) { @@ -1010,7 +1053,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTarget(LPDIRECT3DDEVICE9EX IWineD3DSurface *pRenderTarget; HRESULT hr; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, idx %u, surface %p.\n", iface, RenderTargetIndex, ppRenderTarget); if (ppRenderTarget == NULL) { return D3DERR_INVALIDCALL; @@ -1049,7 +1092,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetDepthStencilSurface(LPDIRECT3DDE IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *pSurface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, depth_stencil %p.\n", iface, pZStencilSurface); pSurface = (IDirect3DSurface9Impl*)pZStencilSurface; @@ -1065,7 +1109,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(LPDIRECT3DDE HRESULT hr = D3D_OK; IWineD3DSurface *pZStencilSurface; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, depth_stencil %p.\n", iface, ppZStencilSurface); + if(ppZStencilSurface == NULL){ return D3DERR_INVALIDCALL; } @@ -1088,7 +1133,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetDepthStencilSurface(LPDIRECT3DDE static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_BeginScene(This->WineD3DDevice); @@ -1100,7 +1146,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_BeginScene(LPDIRECT3DDEVICE9EX ifac static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_EndScene(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_EndScene(This->WineD3DDevice); @@ -1112,7 +1159,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_EndScene(LPDIRECT3D static HRESULT WINAPI IDirect3DDevice9Impl_Clear(LPDIRECT3DDEVICE9EX iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, rect_count %u, rects %p, flags %#x, color 0x%08x, z %.8e, stencil %u.\n", + iface, Count, pRects, Flags, Color, Z, Stencil); /* Note: D3DRECT is compatible with WINED3DRECT */ wined3d_mutex_lock(); @@ -1125,7 +1174,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_Clear(LPDIRECT3DDEVICE9EX iface, DW static HRESULT WINAPI IDirect3DDevice9Impl_SetTransform(LPDIRECT3DDEVICE9EX iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* lpMatrix) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, state %#x, matrix %p.\n", iface, State, lpMatrix); /* Note: D3DMATRIX is compatible with WINED3DMATRIX */ wined3d_mutex_lock(); @@ -1139,7 +1189,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTransform(LPDIRECT3DDEVICE9EX if IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, state %#x, matrix %p.\n", iface, State, pMatrix); /* Note: D3DMATRIX is compatible with WINED3DMATRIX */ wined3d_mutex_lock(); @@ -1152,7 +1202,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTransform(LPDIRECT3DDEVICE9EX if static HRESULT WINAPI IDirect3DDevice9Impl_MultiplyTransform(LPDIRECT3DDEVICE9EX iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, state %#x, matrix %p.\n", iface, State, pMatrix); /* Note: D3DMATRIX is compatible with WINED3DMATRIX */ wined3d_mutex_lock(); @@ -1165,7 +1216,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_MultiplyTransform(LPDIRECT3DDEVICE9 static HRESULT WINAPI IDirect3DDevice9Impl_SetViewport(LPDIRECT3DDEVICE9EX iface, CONST D3DVIEWPORT9* pViewport) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, viewport %p.\n", iface, pViewport); /* Note: D3DVIEWPORT9 is compatible with WINED3DVIEWPORT */ wined3d_mutex_lock(); @@ -1178,7 +1230,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetViewport(LPDIRECT3DDEVICE9EX ifa static HRESULT WINAPI IDirect3DDevice9Impl_GetViewport(LPDIRECT3DDEVICE9EX iface, D3DVIEWPORT9* pViewport) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, viewport %p.\n", iface, pViewport); /* Note: D3DVIEWPORT9 is compatible with WINED3DVIEWPORT */ wined3d_mutex_lock(); @@ -1191,7 +1244,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetViewport(LPDIRECT3DDEVICE9EX ifa static HRESULT WINAPI IDirect3DDevice9Impl_SetMaterial(LPDIRECT3DDEVICE9EX iface, CONST D3DMATERIAL9* pMaterial) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, material %p.\n", iface, pMaterial); /* Note: D3DMATERIAL9 is compatible with WINED3DMATERIAL */ wined3d_mutex_lock(); @@ -1204,7 +1258,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetMaterial(LPDIRECT3DDEVICE9EX ifa static HRESULT WINAPI IDirect3DDevice9Impl_GetMaterial(LPDIRECT3DDEVICE9EX iface, D3DMATERIAL9* pMaterial) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, material %p.\n", iface, pMaterial); /* Note: D3DMATERIAL9 is compatible with WINED3DMATERIAL */ wined3d_mutex_lock(); @@ -1217,7 +1272,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetMaterial(LPDIRECT3DDEVICE9EX ifa static HRESULT WINAPI IDirect3DDevice9Impl_SetLight(LPDIRECT3DDEVICE9EX iface, DWORD Index, CONST D3DLIGHT9* pLight) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, light %p.\n", iface, Index, pLight); /* Note: D3DLIGHT9 is compatible with WINED3DLIGHT */ wined3d_mutex_lock(); @@ -1230,7 +1286,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetLight(LPDIRECT3DDEVICE9EX iface, static HRESULT WINAPI IDirect3DDevice9Impl_GetLight(LPDIRECT3DDEVICE9EX iface, DWORD Index, D3DLIGHT9* pLight) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, light %p.\n", iface, Index, pLight); /* Note: D3DLIGHT9 is compatible with WINED3DLIGHT */ wined3d_mutex_lock(); @@ -1243,7 +1300,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetLight(LPDIRECT3DDEVICE9EX iface, static HRESULT WINAPI IDirect3DDevice9Impl_LightEnable(LPDIRECT3DDEVICE9EX iface, DWORD Index, BOOL Enable) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, enable %#x.\n", iface, Index, Enable); wined3d_mutex_lock(); hr = IWineD3DDevice_SetLightEnable(This->WineD3DDevice, Index, Enable); @@ -1255,7 +1313,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_LightEnable(LPDIRECT3DDEVICE9EX ifa static HRESULT WINAPI IDirect3DDevice9Impl_GetLightEnable(LPDIRECT3DDEVICE9EX iface, DWORD Index, BOOL* pEnable) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, enable %p.\n", iface, Index, pEnable); wined3d_mutex_lock(); hr = IWineD3DDevice_GetLightEnable(This->WineD3DDevice, Index, pEnable); @@ -1267,7 +1326,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetLightEnable(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_SetClipPlane(LPDIRECT3DDEVICE9EX iface, DWORD Index, CONST float* pPlane) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, plane %p.\n", iface, Index, pPlane); wined3d_mutex_lock(); hr = IWineD3DDevice_SetClipPlane(This->WineD3DDevice, Index, pPlane); @@ -1279,7 +1339,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetClipPlane(LPDIRECT3DDEVICE9EX if static HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9EX iface, DWORD Index, float* pPlane) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, plane %p.\n", iface, Index, pPlane); wined3d_mutex_lock(); hr = IWineD3DDevice_GetClipPlane(This->WineD3DDevice, Index, pPlane); @@ -1291,7 +1352,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetClipPlane(LPDIRECT3DDEVICE9EX if static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, state %#x, value %#x.\n", iface, State, Value); wined3d_mutex_lock(); hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, State, Value); @@ -1303,7 +1365,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetRenderState(LPD static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderState(LPDIRECT3DDEVICE9EX iface, D3DRENDERSTATETYPE State, DWORD* pValue) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, state %#x, value %p.\n", iface, State, pValue); wined3d_mutex_lock(); hr = IWineD3DDevice_GetRenderState(This->WineD3DDevice, State, pValue); @@ -1315,7 +1378,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderState(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(LPDIRECT3DDEVICE9EX iface, CONST D3DCLIPSTATUS9* pClipStatus) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); hr = IWineD3DDevice_SetClipStatus(This->WineD3DDevice, (const WINED3DCLIPSTATUS *)pClipStatus); @@ -1327,7 +1391,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetClipStatus(LPDIRECT3DDEVICE9EX i static HRESULT WINAPI IDirect3DDevice9Impl_GetClipStatus(LPDIRECT3DDEVICE9EX iface, D3DCLIPSTATUS9* pClipStatus) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); wined3d_mutex_lock(); hr = IWineD3DDevice_GetClipStatus(This->WineD3DDevice, (WINED3DCLIPSTATUS *)pClipStatus); @@ -1341,7 +1406,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9EX ifac IWineD3DBaseTexture *retTexture = NULL; HRESULT rc = D3D_OK; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture); if(ppTexture == NULL){ return D3DERR_INVALIDCALL; @@ -1366,7 +1431,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTexture(LPDIRECT3DDEVICE9EX ifac static HRESULT WINAPI IDirect3DDevice9Impl_SetTexture(LPDIRECT3DDEVICE9EX iface, DWORD Stage, IDirect3DBaseTexture9* pTexture) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay %d %p\n" , This, Stage, pTexture); + + TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, pTexture); wined3d_mutex_lock(); hr = IWineD3DDevice_SetTexture(This->WineD3DDevice, Stage, @@ -1416,7 +1482,8 @@ static const WINED3DTEXTURESTAGESTATETYPE tss_lookup[] = static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD* pValue) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, Type, pValue); wined3d_mutex_lock(); hr = IWineD3DDevice_GetTextureStageState(This->WineD3DDevice, Stage, tss_lookup[Type], pValue); @@ -1428,7 +1495,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetTextureStageState(LPDIRECT3DDEVI static HRESULT WINAPI IDirect3DDevice9Impl_SetTextureStageState(LPDIRECT3DDEVICE9EX iface, DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, Type, Value); wined3d_mutex_lock(); hr = IWineD3DDevice_SetTextureStageState(This->WineD3DDevice, Stage, tss_lookup[Type], Value); @@ -1442,7 +1510,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(IDirect3DDevice9Ex *i { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, sampler %u, state %#x, value %p.\n", iface, Sampler, Type, pValue); wined3d_mutex_lock(); hr = IWineD3DDevice_GetSamplerState(This->WineD3DDevice, Sampler, Type, pValue); @@ -1454,7 +1523,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetSamplerState(IDirect3DDevice9Ex *i static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetSamplerState(LPDIRECT3DDEVICE9EX iface, DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, sampler %u, state %#x, value %#x.\n", iface, Sampler, Type, Value); wined3d_mutex_lock(); hr = IWineD3DDevice_SetSamplerState(This->WineD3DDevice, Sampler, Type, Value); @@ -1466,7 +1536,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_SetSamplerState(LPD static HRESULT WINAPI IDirect3DDevice9Impl_ValidateDevice(LPDIRECT3DDEVICE9EX iface, DWORD* pNumPasses) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, pass_count %p.\n", iface, pNumPasses); wined3d_mutex_lock(); hr = IWineD3DDevice_ValidateDevice(This->WineD3DDevice, pNumPasses); @@ -1480,7 +1551,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetPaletteEntries(IDirect3DDevice9Ex { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); wined3d_mutex_lock(); hr = IWineD3DDevice_SetPaletteEntries(This->WineD3DDevice, PaletteNumber, pEntries); @@ -1492,7 +1564,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetPaletteEntries(IDirect3DDevice9Ex static HRESULT WINAPI IDirect3DDevice9Impl_GetPaletteEntries(LPDIRECT3DDEVICE9EX iface, UINT PaletteNumber, PALETTEENTRY* pEntries) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, palette_idx %u, entries %p.\n", iface, PaletteNumber, pEntries); wined3d_mutex_lock(); hr = IWineD3DDevice_GetPaletteEntries(This->WineD3DDevice, PaletteNumber, pEntries); @@ -1504,7 +1577,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetPaletteEntries(LPDIRECT3DDEVICE9 static HRESULT WINAPI IDirect3DDevice9Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE9EX iface, UINT PaletteNumber) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, palette_idx %u.\n", iface, PaletteNumber); wined3d_mutex_lock(); hr = IWineD3DDevice_SetCurrentTexturePalette(This->WineD3DDevice, PaletteNumber); @@ -1516,7 +1590,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCurrentTexturePalette(LPDIRECT3D static HRESULT WINAPI IDirect3DDevice9Impl_GetCurrentTexturePalette(LPDIRECT3DDEVICE9EX iface, UINT* PaletteNumber) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, palette_idx %p.\n", iface, PaletteNumber); wined3d_mutex_lock(); hr = IWineD3DDevice_GetCurrentTexturePalette(This->WineD3DDevice, PaletteNumber); @@ -1528,7 +1603,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetCurrentTexturePalette(LPDIRECT3D static HRESULT WINAPI IDirect3DDevice9Impl_SetScissorRect(LPDIRECT3DDEVICE9EX iface, CONST RECT* pRect) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, rect %p.\n", iface, pRect); wined3d_mutex_lock(); hr = IWineD3DDevice_SetScissorRect(This->WineD3DDevice, pRect); @@ -1540,7 +1616,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetScissorRect(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_GetScissorRect(LPDIRECT3DDEVICE9EX iface, RECT* pRect) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, rect %p.\n", iface, pRect); wined3d_mutex_lock(); hr = IWineD3DDevice_GetScissorRect(This->WineD3DDevice, pRect); @@ -1552,7 +1629,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetScissorRect(LPDIRECT3DDEVICE9EX static HRESULT WINAPI IDirect3DDevice9Impl_SetSoftwareVertexProcessing(LPDIRECT3DDEVICE9EX iface, BOOL bSoftware) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, software %#x.\n", iface, bSoftware); wined3d_mutex_lock(); hr = IWineD3DDevice_SetSoftwareVertexProcessing(This->WineD3DDevice, bSoftware); @@ -1564,7 +1642,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetSoftwareVertexProcessing(LPDIREC static BOOL WINAPI IDirect3DDevice9Impl_GetSoftwareVertexProcessing(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; BOOL ret; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DDevice_GetSoftwareVertexProcessing(This->WineD3DDevice); @@ -1576,7 +1655,8 @@ static BOOL WINAPI IDirect3DDevice9Impl_GetSoftwareVertexProcessing(LPDIREC static HRESULT WINAPI IDirect3DDevice9Impl_SetNPatchMode(LPDIRECT3DDEVICE9EX iface, float nSegments) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, segment_count %.8e.\n", iface, nSegments); wined3d_mutex_lock(); hr = IWineD3DDevice_SetNPatchMode(This->WineD3DDevice, nSegments); @@ -1588,7 +1668,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetNPatchMode(LPDIRECT3DDEVICE9EX i static float WINAPI IDirect3DDevice9Impl_GetNPatchMode(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; float ret; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DDevice_GetNPatchMode(This->WineD3DDevice); @@ -1602,7 +1683,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitive(IDirect3DDevice9Ex *ifa { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, primitive_type %#x, start_vertex %u, primitive_count %u.\n", + iface, PrimitiveType, StartVertex, PrimitiveCount); wined3d_mutex_lock(); IWineD3DDevice_SetPrimitiveType(This->WineD3DDevice, PrimitiveType); @@ -1617,9 +1700,12 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitive(LPDIRECT3DDEVI INT BaseVertexIndex, UINT MinVertexIndex, UINT NumVertices, UINT startIndex, UINT primCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); - /* D3D8 passes the baseVertexIndex in SetIndices, and due to the stateblock functions wined3d has to work that way */ + TRACE("iface %p, primitive_type %#x, base_vertex_idx %u, min_vertex_idx %u,\n" + "vertex_count %u, start_idx %u, primitive_count %u.\n", + iface, PrimitiveType, BaseVertexIndex, MinVertexIndex, + NumVertices, startIndex, primCount); + wined3d_mutex_lock(); IWineD3DDevice_SetBaseVertexIndex(This->WineD3DDevice, BaseVertexIndex); IWineD3DDevice_SetPrimitiveType(This->WineD3DDevice, PrimitiveType); @@ -1635,7 +1721,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawPrimitiveUP(IDirect3DDevice9Ex *i { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, primitive_type %#x, primitive_count %u, data %p, stride %u.\n", + iface, PrimitiveType, PrimitiveCount, pVertexStreamZeroData, VertexStreamZeroStride); wined3d_mutex_lock(); IWineD3DDevice_SetPrimitiveType(This->WineD3DDevice, PrimitiveType); @@ -1652,7 +1740,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDE D3DFORMAT IndexDataFormat, CONST void* pVertexStreamZeroData, UINT VertexStreamZeroStride) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, index_count %u, primitive_count %u,\n" + "index_data %p, index_format %#x, vertex_data %p, vertex_stride %u.\n", + iface, PrimitiveType, MinVertexIndex, NumVertexIndices, PrimitiveCount, + pIndexData, IndexDataFormat, pVertexStreamZeroData, VertexStreamZeroStride); wined3d_mutex_lock(); IWineD3DDevice_SetPrimitiveType(This->WineD3DDevice, PrimitiveType); @@ -1669,7 +1761,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ProcessVertices(LPDIRECT3DDEVICE9EX IDirect3DVertexDeclaration9Impl *Decl = (IDirect3DVertexDeclaration9Impl *) pVertexDecl; HRESULT hr; IDirect3DVertexBuffer9Impl *dest = (IDirect3DVertexBuffer9Impl *) pDestBuffer; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, declaration %p, flags %#x.\n", + iface, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, pVertexDecl, Flags); wined3d_mutex_lock(); hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, Decl ? Decl->wineD3DVertexDeclaration : NULL, Flags, dest->fvf); @@ -1776,7 +1870,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9EX iface, DWO IDirect3DVertexDeclaration9 *decl; HRESULT hr; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, fvf %#x.\n", iface, FVF); if (!FVF) { @@ -1801,11 +1895,12 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(LPDIRECT3DDEVICE9EX iface, DWO return hr; } -static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(LPDIRECT3DDEVICE9EX iface, DWORD* pFVF) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; +static HRESULT WINAPI IDirect3DDevice9Impl_GetFVF(IDirect3DDevice9Ex *iface, DWORD *pFVF) +{ IDirect3DVertexDeclaration9 *decl; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, fvf %p.\n", iface, pFVF); hr = IDirect3DDevice9_GetVertexDeclaration(iface, &decl); if (FAILED(hr)) @@ -1863,7 +1958,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(IDirect3DDevice9Ex static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSource(LPDIRECT3DDEVICE9EX iface, UINT StreamNumber, IDirect3DVertexBuffer9* pStreamData, UINT OffsetInBytes, UINT Stride) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stream_idx %u, buffer %p, offset %u, stride %u.\n", + iface, StreamNumber, pStreamData, OffsetInBytes, Stride); wined3d_mutex_lock(); hr = IWineD3DDevice_SetStreamSource(This->WineD3DDevice, StreamNumber, @@ -1879,7 +1976,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(LPDIRECT3DDEVICE9EX i IWineD3DBuffer *retStream = NULL; HRESULT rc = D3D_OK; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", + iface, StreamNumber, pStream, OffsetInBytes, pStride); if(pStream == NULL){ return D3DERR_INVALIDCALL; @@ -1906,7 +2004,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSourceFreq(IDirect3DDevice9E { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stream_idx %u, freq %u.\n", iface, StreamNumber, Divider); wined3d_mutex_lock(); hr = IWineD3DDevice_SetStreamSourceFreq(This->WineD3DDevice, StreamNumber, Divider); @@ -1918,7 +2017,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetStreamSourceFreq(IDirect3DDevice9E static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSourceFreq(LPDIRECT3DDEVICE9EX iface, UINT StreamNumber, UINT* Divider) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stream_idx %u, freq %p.\n", iface, StreamNumber, Divider); wined3d_mutex_lock(); hr = IWineD3DDevice_GetStreamSourceFreq(This->WineD3DDevice, StreamNumber, Divider); @@ -1931,7 +2031,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetIndices(LPDIRECT3DDEVICE9EX ifac IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; IDirect3DIndexBuffer9Impl *ib = (IDirect3DIndexBuffer9Impl *) pIndexData; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, buffer %p.\n", iface, pIndexData); wined3d_mutex_lock(); hr = IWineD3DDevice_SetIndexBuffer(This->WineD3DDevice, @@ -1947,7 +2048,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(LPDIRECT3DDEVICE9EX ifac IWineD3DBuffer *retIndexData = NULL; HRESULT rc = D3D_OK; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, buffer %p.\n", iface, ppIndexData); if(ppIndexData == NULL){ return D3DERR_INVALIDCALL; @@ -2000,7 +2101,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreatePixelShader(IDirect3DDevice9Ex static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9EX iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, handle %#x, segment_count %p, patch_info %p.\n", + iface, Handle, pNumSegs, pRectPatchInfo); wined3d_mutex_lock(); hr = IWineD3DDevice_DrawRectPatch(This->WineD3DDevice, Handle, pNumSegs, (CONST WINED3DRECTPATCH_INFO *)pRectPatchInfo); @@ -2012,7 +2115,9 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawRectPatch(LPDIRECT3DDEVICE9EX i static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9EX iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, handle %#x, segment_count %p, patch_info %p.\n", + iface, Handle, pNumSegs, pTriPatchInfo); wined3d_mutex_lock(); hr = IWineD3DDevice_DrawTriPatch(This->WineD3DDevice, Handle, pNumSegs, (CONST WINED3DTRIPATCH_INFO *)pTriPatchInfo); @@ -2024,7 +2129,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DrawTriPatch(LPDIRECT3DDEVICE9EX if static HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9EX iface, UINT Handle) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, handle %#x.\n", iface, Handle); wined3d_mutex_lock(); hr = IWineD3DDevice_DeletePatch(This->WineD3DDevice, Handle); @@ -2033,9 +2139,12 @@ static HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9EX ifa return hr; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(LPDIRECT3DDEVICE9EX iface, UINT width, UINT height, float *rows, float *columns) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d, %d, %p, %p) Stub!\n", This, width, height, rows, columns); +static HRESULT WINAPI IDirect3DDevice9ExImpl_SetConvolutionMonoKernel(IDirect3DDevice9Ex *iface, + UINT width, UINT height, float *rows, float *columns) +{ + FIXME("iface %p, width %u, height %u, rows %p, columns %p stub!\n", + iface, width, height, rows, columns); + return WINED3DERR_INVALIDCALL; } @@ -2051,27 +2160,34 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_ComposeRects(IDirect3DDevice9Ex *if return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(LPDIRECT3DDEVICE9EX iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion, DWORD dwFlags) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p= -> (%p), %p, %p, %p, 0x%08x) Stub!\n", This, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, dwFlags); +static HRESULT WINAPI IDirect3DDevice9ExImpl_PresentEx(IDirect3DDevice9Ex *iface, + const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, + const RGNDATA *dirty_region, DWORD flags) +{ + FIXME("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p, flags %#x stub!\n", + iface, src_rect, dst_rect, dst_window_override, dirty_region, flags); + return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_GetGPUThreadPriority(LPDIRECT3DDEVICE9EX iface, INT *pPriority) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%p) Stub!\n", This, pPriority); +static HRESULT WINAPI IDirect3DDevice9ExImpl_GetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT *priority) +{ + FIXME("iface %p, priority %p stub!\n", iface, priority); + return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_SetGPUThreadPriority(LPDIRECT3DDEVICE9EX iface, INT Priority) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d) Stub!\n", This, Priority); +static HRESULT WINAPI IDirect3DDevice9ExImpl_SetGPUThreadPriority(IDirect3DDevice9Ex *iface, INT priority) +{ + FIXME("iface %p, priority %d stub!\n", iface, priority); + return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_WaitForVBlank(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d) Stub!\n", This, iSwapChain); +static HRESULT WINAPI IDirect3DDevice9ExImpl_WaitForVBlank(IDirect3DDevice9Ex *iface, UINT swapchain_idx) +{ + FIXME("iface %p, swapchain_idx %u stub!\n", iface, swapchain_idx); + return WINED3DERR_INVALIDCALL; } @@ -2084,16 +2200,19 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckResourceResidency(IDirect3DDev return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_SetMaximumFrameLatency(LPDIRECT3DDEVICE9EX iface, UINT MaxLatency) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d) Stub!\n", This, MaxLatency); +static HRESULT WINAPI IDirect3DDevice9ExImpl_SetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT max_latency) +{ + FIXME("iface %p, max_latency %u stub!\n", iface, max_latency); + return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(LPDIRECT3DDEVICE9EX iface, UINT *pMaxLatency) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%p) Stub!\n", This, pMaxLatency); - *pMaxLatency = 2; +static HRESULT WINAPI IDirect3DDevice9ExImpl_GetMaximumFrameLatency(IDirect3DDevice9Ex *iface, UINT *max_latency) +{ + FIXME("iface %p, max_latency %p stub!\n", iface, max_latency); + + *max_latency = 2; + return WINED3DERR_INVALIDCALL; } @@ -2104,15 +2223,25 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CheckDeviceState(IDirect3DDevice9Ex return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, DWORD MultiSampleQuality, BOOL Lockable, IDirect3DSurface9 ** ppSurface, HANDLE *pSharedHandle, DWORD Usage) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d, %d, %d, %d, %d, %s, %p, %p, 0x%08x) Stub!\n", This, Width, Height, Format, MultiSample, MultiSampleQuality, Lockable ? "true" : "false", ppSurface, pSharedHandle, Usage); +static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateRenderTargetEx(IDirect3DDevice9Ex *iface, + UINT width, UINT height, D3DFORMAT format, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality, + BOOL lockable, IDirect3DSurface9 **surface, HANDLE *shared_handle, DWORD usage) +{ + FIXME("iface %p, width %u, height %u, format %#x, multisample_type %#x, multisample_quality %u,\n" + "lockable %#x, surface %p, shared_handle %p, usage %#x stub!\n", + iface, width, height, format, multisample_type, multisample_quality, + lockable, surface, shared_handle, usage); + return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(LPDIRECT3DDEVICE9EX iface, UINT Width, UINT Height, D3DFORMAT Format, D3DPOOL Pool, IDirect3DSurface9 **ppSurface, HANDLE *pSharedHandle, DWORD Usage) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d, %d, %d, %d, %p, %p, 0x%08x) Stub!\n", This, Width, Height, Format, Pool, ppSurface, pSharedHandle, Usage); +static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateOffscreenPlainSurfaceEx(IDirect3DDevice9Ex *iface, + UINT width, UINT height, D3DFORMAT format, D3DPOOL pool, IDirect3DSurface9 **surface, + HANDLE *shared_handle, DWORD usage) +{ + FIXME("iface %p, width %u, height %u, format %#x, pool %#x, surface %p, shared_handle %p, usage %#x stub!\n", + iface, width, height, format, pool, surface, shared_handle, usage); + return WINED3DERR_INVALIDCALL; } @@ -2128,15 +2257,19 @@ static HRESULT WINAPI IDirect3DDevice9ExImpl_CreateDepthStencilSurfaceEx(IDirect return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(LPDIRECT3DDEVICE9EX iface, D3DPRESENT_PARAMETERS *pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%p) Stub!\n", This, pPresentationParameters); +static HRESULT WINAPI IDirect3DDevice9ExImpl_ResetEx(IDirect3DDevice9Ex *iface, + D3DPRESENT_PARAMETERS *present_parameters, D3DDISPLAYMODEEX *mode) +{ + FIXME("iface %p, present_parameters %p, mode %p stub!\n", iface, present_parameters, mode); + return WINED3DERR_INVALIDCALL; } -static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(LPDIRECT3DDEVICE9EX iface, UINT iSwapChain, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) { - IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *) iface; - FIXME("(%p)->(%d, %p, %p) Stub!\n", This, iSwapChain, pMode, pRotation); +static HRESULT WINAPI IDirect3DDevice9ExImpl_GetDisplayModeEx(IDirect3DDevice9Ex *iface, + UINT swapchain_idx, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) +{ + FIXME("iface %p, swapchain_idx %u, mode %p, rotation %p stub!\n", iface, swapchain_idx, mode, rotation); + return WINED3DERR_INVALIDCALL; } diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index b1c5459473b..cb5b85e17bd 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -29,6 +29,8 @@ static HRESULT WINAPI IDirect3D9Impl_QueryInterface(LPDIRECT3D9EX iface, REFIID { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D9)) { IDirect3D9Ex_AddRef(iface); @@ -57,7 +59,7 @@ static ULONG WINAPI IDirect3D9Impl_AddRef(LPDIRECT3D9EX iface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); return ref; } @@ -66,7 +68,7 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9EX iface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { wined3d_mutex_lock(); @@ -83,7 +85,8 @@ static ULONG WINAPI IDirect3D9Impl_Release(LPDIRECT3D9EX iface) { static HRESULT WINAPI IDirect3D9Impl_RegisterSoftwareDevice(LPDIRECT3D9EX iface, void* pInitializeFunction) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("(%p)->(%p)\n", This, pInitializeFunction); + + TRACE("iface %p, init_function %p.\n", iface, pInitializeFunction); wined3d_mutex_lock(); hr = IWineD3D_RegisterSoftwareDevice(This->WineD3D, pInitializeFunction); @@ -95,7 +98,8 @@ static HRESULT WINAPI IDirect3D9Impl_RegisterSoftwareDevice(LPDIRECT3D9EX ifac static UINT WINAPI IDirect3D9Impl_GetAdapterCount(LPDIRECT3D9EX iface) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("%p\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3D_GetAdapterCount(This->WineD3D); @@ -109,6 +113,9 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9EX iface, U WINED3DADAPTER_IDENTIFIER adapter_id; HRESULT hr; + TRACE("iface %p, adapter %u, flags %#x, identifier %p.\n", + iface, Adapter, Flags, pIdentifier); + adapter_id.driver = pIdentifier->Driver; adapter_id.driver_size = sizeof(pIdentifier->Driver); adapter_id.description = pIdentifier->Description; @@ -134,7 +141,8 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterIdentifier(LPDIRECT3D9EX iface, U static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9EX iface, UINT Adapter, D3DFORMAT Format) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("(%p)->(%d, %d\n", This, Adapter, Format); + + TRACE("iface %p, adapter %u, format %#x.\n", iface, Adapter, Format); /* Others than that not supported by d3d9, but reported by wined3d for ddraw. Filter them out */ if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5) { @@ -151,7 +159,10 @@ static UINT WINAPI IDirect3D9Impl_GetAdapterModeCount(LPDIRECT3D9EX iface, UINT static HRESULT WINAPI IDirect3D9Impl_EnumAdapterModes(LPDIRECT3D9EX iface, UINT Adapter, D3DFORMAT Format, UINT Mode, D3DDISPLAYMODE* pMode) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("(%p)->(%d, %d, %d, %p)\n", This, Adapter, Format, Mode, pMode); + + TRACE("iface %p, adapter %u, format %#x, mode_idx %u, mode %p.\n", + iface, Adapter, Format, Mode, pMode); + /* We can't pass this to WineD3D, otherwise it'll think it came from D3D8 or DDraw. It's supposed to fail anyway, so no harm returning failure. */ if(Format != D3DFMT_X8R8G8B8 && Format != D3DFMT_R5G6B5) @@ -171,6 +182,8 @@ static HRESULT WINAPI IDirect3D9Impl_GetAdapterDisplayMode(LPDIRECT3D9EX iface, IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; + TRACE("iface %p, adapter %u, mode %p.\n", iface, Adapter, pMode); + wined3d_mutex_lock(); hr = IWineD3D_GetAdapterDisplayMode(This->WineD3D, Adapter, (WINED3DDISPLAYMODE *) pMode); wined3d_mutex_unlock(); @@ -185,8 +198,9 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceType(IDirect3D9Ex *iface, UINT A { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("(%p)->(%d, %d, %d, %d, %s\n", This, Adapter, CheckType, DisplayFormat, - BackBufferFormat, Windowed ? "true" : "false"); + + TRACE("iface %p, adapter %u, device_type %#x, display_format %#x, backbuffer_format %#x, windowed %#x.\n", + iface, Adapter, CheckType, DisplayFormat, BackBufferFormat, Windowed); wined3d_mutex_lock(); hr = IWineD3D_CheckDeviceType(This->WineD3D, Adapter, CheckType, wined3dformat_from_d3dformat(DisplayFormat), @@ -202,7 +216,9 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormat(IDirect3D9Ex *iface, UINT IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; WINED3DRESOURCETYPE WineD3DRType; - TRACE("%p\n", This); + + TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", + iface, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); /* This format is nothing special and it is supported perfectly. * However, ati and nvidia driver on windows do not mark this format as @@ -241,7 +257,9 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDeviceMultiSampleType(IDirect3D9Ex *if { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("%p\n", This); + + TRACE("iface %p, adapter %u, device_type %#x, format %#x, windowed %#x, multisample_type %#x, levels %p.\n", + iface, Adapter, DeviceType, SurfaceFormat, Windowed, MultiSampleType, pQualityLevels); wined3d_mutex_lock(); hr = IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, @@ -256,7 +274,9 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(IDirect3D9Ex *iface, { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("%p\n", This); + + TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, rt_format %#x, ds_format %#x.\n", + iface, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat); wined3d_mutex_lock(); hr = IWineD3D_CheckDepthStencilMatch(This->WineD3D, Adapter, DeviceType, @@ -270,7 +290,9 @@ static HRESULT WINAPI IDirect3D9Impl_CheckDepthStencilMatch(IDirect3D9Ex *iface, static HRESULT WINAPI IDirect3D9Impl_CheckDeviceFormatConversion(LPDIRECT3D9EX iface, UINT Adapter, D3DDEVTYPE DeviceType, D3DFORMAT SourceFormat, D3DFORMAT TargetFormat) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HRESULT hr; - TRACE("%p\n", This); + + TRACE("iface %p, adapter %u, device_type %#x, src_format %#x, dst_format %#x.\n", + iface, Adapter, DeviceType, SourceFormat, TargetFormat); wined3d_mutex_lock(); hr = IWineD3D_CheckDeviceFormatConversion(This->WineD3D, Adapter, DeviceType, @@ -345,7 +367,7 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9EX iface, UINT Ada HRESULT hrc = D3D_OK; WINED3DCAPS *pWineCaps; - TRACE("(%p) Relay %d %u %p\n", This, Adapter, DeviceType, pCaps); + TRACE("iface %p, adapter %u, device_type %#x, caps %p.\n", iface, Adapter, DeviceType, pCaps); if(NULL == pCaps){ return D3DERR_INVALIDCALL; @@ -375,7 +397,8 @@ static HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9EX iface, UINT Ada static HMONITOR WINAPI IDirect3D9Impl_GetAdapterMonitor(LPDIRECT3D9EX iface, UINT Adapter) { IDirect3D9Impl *This = (IDirect3D9Impl *)iface; HMONITOR ret; - TRACE("%p\n", This); + + TRACE("iface %p, adapter %u.\n", iface, Adapter); wined3d_mutex_lock(); ret = IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); @@ -404,7 +427,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(LPDIRECT3D9E WINED3DPRESENT_PARAMETERS *localParameters; UINT i, count = 1; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x, parameters %p, device %p.\n", + iface, Adapter, DeviceType, hFocusWindow, BehaviourFlags, pPresentationParameters, + ppReturnedDeviceInterface); /* Check the validity range of the adapter parameter */ if (Adapter >= IDirect3D9Impl_GetAdapterCount(iface)) { @@ -506,34 +532,50 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9Impl_CreateDevice(LPDIRECT3D9E return hr; } -static UINT WINAPI IDirect3D9ExImpl_GetAdapterModeCountEx(IDirect3D9Ex *iface, UINT Adapter, CONST D3DDISPLAYMODEFILTER *pFilter) { - IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - FIXME("(%p)->(%d, %p): Stub!\n", This, Adapter, pFilter); +static UINT WINAPI IDirect3D9ExImpl_GetAdapterModeCountEx(IDirect3D9Ex *iface, + UINT adapter, const D3DDISPLAYMODEFILTER *filter) +{ + FIXME("iface %p, adapter %u, filter %p stub!\n", iface, adapter, filter); + return D3DERR_DRIVERINTERNALERROR; } -static HRESULT WINAPI IDirect3D9ExImpl_EnumAdapterModesEx(IDirect3D9Ex *iface, UINT Adapter, CONST D3DDISPLAYMODEFILTER *pFilter, UINT Mode, D3DDISPLAYMODEEX* pMode) { - IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - FIXME("(%p)->(%d, %p, %p): Stub!\n", This, Adapter, pFilter, pMode); +static HRESULT WINAPI IDirect3D9ExImpl_EnumAdapterModesEx(IDirect3D9Ex *iface, + UINT adapter, const D3DDISPLAYMODEFILTER *filter, UINT mode_idx, D3DDISPLAYMODEEX *mode) +{ + FIXME("iface %p, adapter %u, filter %p, mode_idx %u, mode %p stub!\n", + iface, adapter, filter, mode_idx, mode); + return D3DERR_DRIVERINTERNALERROR; } -static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, UINT Adapter, D3DDISPLAYMODEEX *pMode, D3DDISPLAYROTATION *pRotation) { - IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - FIXME("(%p)->(%d, %p, %p): Stub!\n", This, Adapter, pMode, pRotation); +static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterDisplayModeEx(IDirect3D9Ex *iface, + UINT adapter, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) +{ + FIXME("iface %p, adapter %u, mode %p, rotation %p stub!\n", + iface, adapter, mode, rotation); + return D3DERR_DRIVERINTERNALERROR; } -static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, struct IDirect3DDevice9Ex **ppReturnedDeviceInterface) { - IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - FIXME("(%p)->(%d, %d, %p, 0x%08x, %p, %p, %p): Stub!\n", This, Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, pFullscreenDisplayMode, ppReturnedDeviceInterface); - *ppReturnedDeviceInterface = NULL; +static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3D9ExImpl_CreateDeviceEx(IDirect3D9Ex *iface, + UINT adapter, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, + D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode, IDirect3DDevice9Ex **device) +{ + FIXME("iface %p, adapter %u, device_type %#x, focus_window %p, flags %#x,\n" + "parameters %p, mode %p, device %p stub!\n", + iface, adapter, device_type, focus_window, flags, + parameters, mode, device); + + *device = NULL; + return D3DERR_DRIVERINTERNALERROR; } -static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT Adapter, LUID *pLUID) { - IDirect3D9Impl *This = (IDirect3D9Impl *)iface; - FIXME("(%p)->(%d, %p)\n", This, Adapter, pLUID); +static HRESULT WINAPI IDirect3D9ExImpl_GetAdapterLUID(IDirect3D9Ex *iface, UINT adapter, LUID *luid) +{ + FIXME("iface %p, adapter %u, luid %p stub!\n", iface, adapter, luid); + return D3DERR_DRIVERINTERNALERROR; } diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index 2748abb9fd6..f2d5fca0070 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DIndexBuffer9Impl_QueryInterface(LPDIRECT3DINDEXBUFFER9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) || IsEqualGUID(riid, &IID_IDirect3DIndexBuffer9)) { @@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DIndexBuffer9Impl_AddRef(LPDIRECT3DINDEXBUFFER9 ifac IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -62,7 +64,7 @@ static ULONG WINAPI IDirect3DIndexBuffer9Impl_Release(LPDIRECT3DINDEXBUFFER9 ifa IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -82,7 +84,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDevice(LPDIRECT3DINDEXBUFFER9 IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DBuffer_GetDevice(This->wineD3DIndexBuffer, &wined3d_device); @@ -99,7 +102,9 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDevice(LPDIRECT3DINDEXBUFFER9 static HRESULT WINAPI IDirect3DIndexBuffer9Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); hr = IWineD3DBuffer_SetPrivateData(This->wineD3DIndexBuffer, refguid, pData, SizeOfData, Flags); @@ -111,7 +116,9 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_SetPrivateData(LPDIRECT3DINDEXBU static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetPrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DBuffer_GetPrivateData(This->wineD3DIndexBuffer, refguid, pData, pSizeOfData); @@ -123,7 +130,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetPrivateData(LPDIRECT3DINDEXBU static HRESULT WINAPI IDirect3DIndexBuffer9Impl_FreePrivateData(LPDIRECT3DINDEXBUFFER9 iface, REFGUID refguid) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DBuffer_FreePrivateData(This->wineD3DIndexBuffer, refguid); @@ -135,7 +143,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_FreePrivateData(LPDIRECT3DINDEXB static DWORD WINAPI IDirect3DIndexBuffer9Impl_SetPriority(LPDIRECT3DINDEXBUFFER9 iface, DWORD PriorityNew) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); ret = IWineD3DBuffer_SetPriority(This->wineD3DIndexBuffer, PriorityNew); @@ -147,7 +156,8 @@ static DWORD WINAPI IDirect3DIndexBuffer9Impl_SetPriority(LPDIRECT3DINDEXBUFFER9 static DWORD WINAPI IDirect3DIndexBuffer9Impl_GetPriority(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DBuffer_GetPriority(This->wineD3DIndexBuffer); @@ -158,16 +168,17 @@ static DWORD WINAPI IDirect3DIndexBuffer9Impl_GetPriority(LPDIRECT3DINDEXBUFFER9 static void WINAPI IDirect3DIndexBuffer9Impl_PreLoad(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DBuffer_PreLoad(This->wineD3DIndexBuffer); wined3d_mutex_unlock(); } -static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer9Impl_GetType(LPDIRECT3DINDEXBUFFER9 iface) { - IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; - TRACE("(%p)\n", This); +static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer9Impl_GetType(IDirect3DIndexBuffer9 *iface) +{ + TRACE("iface %p.\n", iface); return D3DRTYPE_INDEXBUFFER; } @@ -176,7 +187,9 @@ static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer9Impl_GetType(LPDIRECT3DINDEXB static HRESULT WINAPI IDirect3DIndexBuffer9Impl_Lock(LPDIRECT3DINDEXBUFFER9 iface, UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", + iface, OffsetToLock, SizeToLock, ppbData, Flags); wined3d_mutex_lock(); hr = IWineD3DBuffer_Map(This->wineD3DIndexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); @@ -188,7 +201,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_Lock(LPDIRECT3DINDEXBUFFER9 ifac static HRESULT WINAPI IDirect3DIndexBuffer9Impl_Unlock(LPDIRECT3DINDEXBUFFER9 iface) { IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DBuffer_Unmap(This->wineD3DIndexBuffer); @@ -201,7 +215,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXB IDirect3DIndexBuffer9Impl *This = (IDirect3DIndexBuffer9Impl *)iface; HRESULT hr; WINED3DBUFFER_DESC desc; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); hr = IWineD3DBuffer_GetDesc(This->wineD3DIndexBuffer, &desc); diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 1c4214212c0..210fa14ad03 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DPixelShader9Impl_QueryInterface(LPDIRECT3DPIXELSHADER9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DPixelShader9)) { IDirect3DPixelShader9_AddRef(iface); @@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DPixelShader9Impl_AddRef(LPDIRECT3DPIXELSHADER9 ifac IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -61,7 +63,7 @@ static ULONG WINAPI IDirect3DPixelShader9Impl_Release(LPDIRECT3DPIXELSHADER9 ifa IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -81,7 +83,7 @@ static HRESULT WINAPI IDirect3DPixelShader9Impl_GetDevice(LPDIRECT3DPIXELSHADER9 IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; IWineD3DDevice *myDevice = NULL; - TRACE("(%p) : Relay\n", This); + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); IWineD3DPixelShader_GetDevice(This->wineD3DPixelShader, &myDevice); @@ -96,7 +98,8 @@ static HRESULT WINAPI IDirect3DPixelShader9Impl_GetDevice(LPDIRECT3DPIXELSHADER9 static HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPIXELSHADER9 iface, VOID* pData, UINT* pSizeOfData) { IDirect3DPixelShader9Impl *This = (IDirect3DPixelShader9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, data %p, data_size %p.\n", iface, pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DPixelShader_GetFunction(This->wineD3DPixelShader, pData, pSizeOfData); @@ -154,7 +157,8 @@ HRESULT pixelshader_init(IDirect3DPixelShader9Impl *shader, IDirect3DDevice9Impl HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9EX iface, IDirect3DPixelShader9* pShader) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DPixelShader9Impl *shader = (IDirect3DPixelShader9Impl *)pShader; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, shader %p.\n", iface, shader); wined3d_mutex_lock(); IWineD3DDevice_SetPixelShader(This->WineD3DDevice, shader == NULL ? NULL :shader->wineD3DPixelShader); @@ -166,9 +170,10 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShader(LPDIRECT3DDEVICE9EX iface, ID HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9EX iface, IDirect3DPixelShader9** ppShader) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IWineD3DPixelShader *object; + HRESULT hrc; + + TRACE("iface %p, shader %p.\n", iface, ppShader); - HRESULT hrc = D3D_OK; - TRACE("(%p) Relay\n", This); if (ppShader == NULL) { TRACE("(%p) Invalid call\n", This); return D3DERR_INVALIDCALL; @@ -201,7 +206,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShader(LPDIRECT3DDEVICE9EX iface, ID HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantF(LPDIRECT3DDEVICE9EX iface, UINT Register, CONST float* pConstantData, UINT Vector4fCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4fCount); wined3d_mutex_lock(); hr = IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); @@ -214,7 +221,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4fCount); wined3d_mutex_lock(); hr = IWineD3DDevice_GetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); @@ -226,7 +234,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantF(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9EX iface, UINT Register, CONST int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4iCount); wined3d_mutex_lock(); hr = IWineD3DDevice_SetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); @@ -238,7 +248,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantI(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9EX iface, UINT Register, int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4iCount); wined3d_mutex_lock(); hr = IWineD3DDevice_GetPixelShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); @@ -250,7 +262,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantI(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9EX iface, UINT Register, CONST BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, BoolCount); wined3d_mutex_lock(); hr = IWineD3DDevice_SetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); @@ -262,7 +276,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetPixelShaderConstantB(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_GetPixelShaderConstantB(LPDIRECT3DDEVICE9EX iface, UINT Register, BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, BoolCount); wined3d_mutex_lock(); hr = IWineD3DDevice_GetPixelShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index a17d2e8402a..a205e2ad599 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -28,7 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); /* IDirect3DQuery9 IUnknown parts follow: */ static HRESULT WINAPI IDirect3DQuery9Impl_QueryInterface(LPDIRECT3DQUERY9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DQuery9)) { @@ -46,7 +47,8 @@ static ULONG WINAPI IDirect3DQuery9Impl_AddRef(LPDIRECT3DQUERY9 iface) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); + return ref; } @@ -54,7 +56,7 @@ static ULONG WINAPI IDirect3DQuery9Impl_Release(LPDIRECT3DQUERY9 iface) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { wined3d_mutex_lock(); @@ -73,7 +75,7 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(LPDIRECT3DQUERY9 iface, IDir IWineD3DDevice* pDevice; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DQuery_GetDevice(This->wineD3DQuery, &pDevice); @@ -91,7 +93,8 @@ static HRESULT WINAPI IDirect3DQuery9Impl_GetDevice(LPDIRECT3DQUERY9 iface, IDir static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DQuery_GetType(This->wineD3DQuery); @@ -103,7 +106,8 @@ static D3DQUERYTYPE WINAPI IDirect3DQuery9Impl_GetType(LPDIRECT3DQUERY9 iface) { static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DQuery_GetDataSize(This->wineD3DQuery); @@ -115,7 +119,8 @@ static DWORD WINAPI IDirect3DQuery9Impl_GetDataSize(LPDIRECT3DQUERY9 iface) { static HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dwIssueFlags) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, flags %#x.\n", iface, dwIssueFlags); wined3d_mutex_lock(); hr = IWineD3DQuery_Issue(This->wineD3DQuery, dwIssueFlags); @@ -127,7 +132,9 @@ static HRESULT WINAPI IDirect3DQuery9Impl_Issue(LPDIRECT3DQUERY9 iface, DWORD dw static HRESULT WINAPI IDirect3DQuery9Impl_GetData(LPDIRECT3DQUERY9 iface, void* pData, DWORD dwSize, DWORD dwGetDataFlags) { IDirect3DQuery9Impl *This = (IDirect3DQuery9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, data %p, size %u, flags %#x.\n", + iface, pData, dwSize, dwGetDataFlags); wined3d_mutex_lock(); hr = IWineD3DQuery_GetData(This->wineD3DQuery, pData, dwSize, dwGetDataFlags); @@ -156,7 +163,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9EX iface, D3DQU IDirect3DQuery9Impl *object = NULL; HRESULT hr = D3D_OK; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, type %#x, query %p.\n", iface, Type, ppQuery); if (!ppQuery) { diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 29ff5b34d19..8ae5068f95e 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DStateBlock9Impl_QueryInterface(LPDIRECT3DSTATEBLOCK9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DStateBlock9)) { IDirect3DStateBlock9_AddRef(iface); @@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_AddRef(LPDIRECT3DSTATEBLOCK9 iface) IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); return ref; } @@ -54,7 +56,7 @@ static ULONG WINAPI IDirect3DStateBlock9Impl_Release(LPDIRECT3DSTATEBLOCK9 iface IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { wined3d_mutex_lock(); @@ -72,7 +74,8 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(LPDIRECT3DSTATEBLOCK9 i IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DStateBlock_GetDevice(This->wineD3DStateBlock, &wined3d_device); @@ -89,7 +92,8 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_GetDevice(LPDIRECT3DSTATEBLOCK9 i static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 iface) { IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DStateBlock_Capture(This->wineD3DStateBlock); @@ -101,7 +105,8 @@ static HRESULT WINAPI IDirect3DStateBlock9Impl_Capture(LPDIRECT3DSTATEBLOCK9 ifa static HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOCK9 iface) { IDirect3DStateBlock9Impl *This = (IDirect3DStateBlock9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DStateBlock_Apply(This->wineD3DStateBlock); @@ -130,7 +135,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateStateBlock(LPDIRECT3DDEVICE9EX iface, IDirect3DStateBlock9Impl* object; HRESULT hrc = D3D_OK; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, type %#x, stateblock %p.\n", iface, Type, ppStateBlock); if(Type != D3DSBT_ALL && Type != D3DSBT_PIXELSTATE && Type != D3DSBT_VERTEXSTATE ) { @@ -164,7 +169,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_BeginStateBlock(IDirect3DDevice9Ex *iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); @@ -180,7 +186,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_EndStateBlock(IDirect3DDevice9Ex *iface, IDi IDirect3DStateBlock9Impl *object; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, stateblock %p.\n", iface, ppSB); /* Tell wineD3D to endstateblock before anything else (in case we run out * of memory later and cause locking problems) */ diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 0c277b91634..ea34955a45c 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) || IsEqualGUID(riid, &IID_IDirect3DSurface9)) { @@ -44,7 +46,7 @@ static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 if static ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward refcounting */ @@ -53,6 +55,9 @@ static ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("%p increasing refcount to %u.\n", iface, ref); + if (ref == 1) { if (This->parentDevice) IDirect3DDevice9Ex_AddRef(This->parentDevice); @@ -60,7 +65,6 @@ static ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { IWineD3DSurface_AddRef(This->wineD3DSurface); wined3d_mutex_unlock(); } - TRACE("(%p) : AddRef from %d\n", This, ref - 1); return ref; } @@ -70,7 +74,7 @@ static ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward to the containerParent */ @@ -79,7 +83,8 @@ static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -101,7 +106,8 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(LPDIRECT3DSURFACE9 iface, IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p)->(%p)\n", This, ppDevice); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DSurface_GetDevice(This->wineD3DSurface, &wined3d_device); @@ -118,7 +124,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(LPDIRECT3DSURFACE9 iface, static HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); hr = IWineD3DSurface_SetPrivateData(This->wineD3DSurface, refguid, pData, SizeOfData, Flags); @@ -130,7 +138,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_SetPrivateData(LPDIRECT3DSURFACE9 if static HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DSurface_GetPrivateData(This->wineD3DSurface, refguid, pData, pSizeOfData); @@ -142,7 +152,8 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetPrivateData(LPDIRECT3DSURFACE9 if static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(LPDIRECT3DSURFACE9 iface, REFGUID refguid) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DSurface_FreePrivateData(This->wineD3DSurface, refguid); @@ -154,7 +165,8 @@ static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(LPDIRECT3DSURFACE9 i static DWORD WINAPI IDirect3DSurface9Impl_SetPriority(LPDIRECT3DSURFACE9 iface, DWORD PriorityNew) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); hr = IWineD3DSurface_SetPriority(This->wineD3DSurface, PriorityNew); @@ -166,7 +178,8 @@ static DWORD WINAPI IDirect3DSurface9Impl_SetPriority(LPDIRECT3DSURFACE9 iface, static DWORD WINAPI IDirect3DSurface9Impl_GetPriority(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DSurface_GetPriority(This->wineD3DSurface); @@ -177,7 +190,8 @@ static DWORD WINAPI IDirect3DSurface9Impl_GetPriority(LPDIRECT3DSURFACE9 iface) static void WINAPI IDirect3DSurface9Impl_PreLoad(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DSurface_PreLoad(This->wineD3DSurface); @@ -187,7 +201,8 @@ static void WINAPI IDirect3DSurface9Impl_PreLoad(LPDIRECT3DSURFACE9 iface) { static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; D3DRESOURCETYPE ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DSurface_GetType(This->wineD3DSurface); @@ -201,7 +216,7 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 ifac IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT res; - TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); + TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer); if (!This->container) return E_NOINTERFACE; @@ -220,7 +235,8 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3 IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; WINED3DSURFACE_DESC wined3ddesc; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); hr = IWineD3DSurface_GetDesc(This->wineD3DSurface, &wined3ddesc); @@ -244,10 +260,10 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(LPDIRECT3DSURFACE9 iface, D3 static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, locked_rect %p, rect %p, flags %#x.\n", iface, pLockedRect, pRect, Flags); wined3d_mutex_lock(); - TRACE("(%p) calling IWineD3DSurface_LockRect %p %p %p %d\n", This, This->wineD3DSurface, pLockedRect, pRect, Flags); hr = IWineD3DSurface_LockRect(This->wineD3DSurface, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); wined3d_mutex_unlock(); @@ -257,7 +273,8 @@ static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D static HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(LPDIRECT3DSURFACE9 iface) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DSurface_UnlockRect(This->wineD3DSurface); @@ -273,7 +290,8 @@ static HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(LPDIRECT3DSURFACE9 iface) static HRESULT WINAPI IDirect3DSurface9Impl_GetDC(LPDIRECT3DSURFACE9 iface, HDC* phdc) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, hdc %p.\n", iface, phdc); if(!This->getdc_supported) { @@ -292,7 +310,8 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDC(LPDIRECT3DSURFACE9 iface, HDC* static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, HDC hdc) { IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, hdc %p.\n", iface, hdc); wined3d_mutex_lock(); hr = IWineD3DSurface_ReleaseDC(This->wineD3DSurface, hdc); diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 5a7e4a27ab2..86ce5df66df 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -30,6 +30,8 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_QueryInterface(LPDIRECT3DSWAPCHAIN { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DSwapChain9)) { IDirect3DSwapChain9_AddRef(iface); @@ -46,7 +48,7 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_AddRef(LPDIRECT3DSWAPCHAIN9 iface) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if(ref == 1 && This->parentDevice) IDirect3DDevice9Ex_AddRef(This->parentDevice); @@ -57,7 +59,7 @@ static ULONG WINAPI IDirect3DSwapChain9Impl_Release(LPDIRECT3DSWAPCHAIN9 iface) IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -81,7 +83,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DSwapChain9Impl_Present(LPDIRECT IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, src_rect %p, dst_rect %p, dst_window_override %p, dirty_region %p, flags %#x.\n", + iface, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, dwFlags); wined3d_mutex_lock(); hr = IWineD3DSwapChain_Present(This->wineD3DSwapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, dwFlags); @@ -93,7 +96,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DSwapChain9Impl_Present(LPDIRECT static HRESULT WINAPI IDirect3DSwapChain9Impl_GetFrontBufferData(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DSurface9* pDestSurface) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, surface %p.\n", iface, pDestSurface); wined3d_mutex_lock(); hr = IWineD3DSwapChain_GetFrontBufferData(This->wineD3DSwapChain, ((IDirect3DSurface9Impl *)pDestSurface)->wineD3DSurface); @@ -107,7 +111,8 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN9 HRESULT hrc = D3D_OK; IWineD3DSurface *mySurface = NULL; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", + iface, iBackBuffer, Type, ppBackBuffer); wined3d_mutex_lock(); hrc = IWineD3DSwapChain_GetBackBuffer(This->wineD3DSwapChain, iBackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &mySurface); @@ -124,7 +129,8 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN9 static HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAIN9 iface, D3DRASTER_STATUS* pRasterStatus) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); hr = IWineD3DSwapChain_GetRasterStatus(This->wineD3DSwapChain, (WINED3DRASTER_STATUS *) pRasterStatus); @@ -136,7 +142,8 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetRasterStatus(LPDIRECT3DSWAPCHAI static HRESULT WINAPI IDirect3DSwapChain9Impl_GetDisplayMode(LPDIRECT3DSWAPCHAIN9 iface, D3DDISPLAYMODE* pMode) { IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, mode %p.\n", iface, pMode); wined3d_mutex_lock(); hr = IWineD3DSwapChain_GetDisplayMode(This->wineD3DSwapChain, (WINED3DDISPLAYMODE *) pMode); @@ -152,7 +159,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetDevice(LPDIRECT3DSWAPCHAIN9 ifa HRESULT hrc = D3D_OK; IWineD3DDevice *device = NULL; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hrc = IWineD3DSwapChain_GetDevice(This->wineD3DSwapChain, &device); @@ -170,7 +177,7 @@ static HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWA WINED3DPRESENT_PARAMETERS winePresentParameters; HRESULT hr; - TRACE("(%p)->(%p): Relay\n", This, pPresentationParameters); + TRACE("iface %p, parameters %p.\n", iface, pPresentationParameters); wined3d_mutex_lock(); hr = IWineD3DSwapChain_GetPresentParameters(This->wineD3DSwapChain, &winePresentParameters); @@ -217,7 +224,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_CreateAdditionalSwapChain HRESULT hrc = D3D_OK; WINED3DPRESENT_PARAMETERS localParameters; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, parameters %p, swapchain %p.\n", + iface, pPresentationParameters, pSwapChain); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (NULL == object) { @@ -287,7 +295,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDE HRESULT hrc = D3D_OK; IWineD3DSwapChain *swapchain = NULL; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, swapchain_idx %u, swapchain %p.\n", + iface, iSwapChain, pSwapChain); wined3d_mutex_lock(); hrc = IWineD3DDevice_GetSwapChain(This->WineD3DDevice, iSwapChain, &swapchain); @@ -305,7 +314,8 @@ HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice9Impl_GetSwapChain(LPDIRECT3DDE UINT WINAPI IDirect3DDevice9Impl_GetNumberOfSwapChains(LPDIRECT3DDEVICE9EX iface) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; UINT ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DDevice_GetNumberOfSwapChains(This->WineD3DDevice); diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index c63bb25456d..03cd1c25c9c 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(LPDIRECT3DTEXTURE9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) @@ -47,7 +49,7 @@ static ULONG WINAPI IDirect3DTexture9Impl_AddRef(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -64,7 +66,7 @@ static ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -84,7 +86,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DTexture_GetDevice(This->wineD3DTexture, &wined3d_device); @@ -101,7 +104,9 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetDevice(LPDIRECT3DTEXTURE9 iface, static HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); hr = IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags); @@ -113,7 +118,9 @@ static HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(LPDIRECT3DTEXTURE9 if static HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData); @@ -125,7 +132,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(LPDIRECT3DTEXTURE9 if static HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid); @@ -137,7 +145,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(LPDIRECT3DTEXTURE9 i static DWORD WINAPI IDirect3DTexture9Impl_SetPriority(LPDIRECT3DTEXTURE9 iface, DWORD PriorityNew) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); ret = IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew); @@ -149,7 +158,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_SetPriority(LPDIRECT3DTEXTURE9 iface, static DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetPriority(This->wineD3DTexture); @@ -160,7 +170,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) static void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DTexture_PreLoad(This->wineD3DTexture); @@ -170,7 +181,8 @@ static void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) { static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetType(This->wineD3DTexture); @@ -183,7 +195,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 i static DWORD WINAPI IDirect3DTexture9Impl_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD LODNew) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, lod %u.\n", iface, LODNew); wined3d_mutex_lock(); ret = IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew); @@ -195,7 +208,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD static DWORD WINAPI IDirect3DTexture9Impl_GetLOD(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetLOD(This->wineD3DTexture); @@ -207,7 +221,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_GetLOD(LPDIRECT3DTEXTURE9 iface) { static DWORD WINAPI IDirect3DTexture9Impl_GetLevelCount(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetLevelCount(This->wineD3DTexture); @@ -219,7 +234,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_GetLevelCount(LPDIRECT3DTEXTURE9 iface static HRESULT WINAPI IDirect3DTexture9Impl_SetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, filter_type %#x.\n", iface, FilterType); wined3d_mutex_lock(); hr = IWineD3DTexture_SetAutoGenFilterType(This->wineD3DTexture, (WINED3DTEXTUREFILTERTYPE) FilterType); @@ -231,7 +247,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_SetAutoGenFilterType(LPDIRECT3DTEXTU static D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; D3DTEXTUREFILTERTYPE ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = (D3DTEXTUREFILTERTYPE) IWineD3DTexture_GetAutoGenFilterType(This->wineD3DTexture); @@ -242,7 +259,8 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LP static void WINAPI IDirect3DTexture9Impl_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture); @@ -255,7 +273,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 ifac WINED3DSURFACE_DESC wined3ddesc; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, level %u, desc %p.\n", iface, Level, pDesc); wined3d_mutex_lock(); hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc); @@ -281,7 +299,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 i HRESULT hrc = D3D_OK; IWineD3DSurface *mySurface = NULL; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, level %u, surface %p.\n", iface, Level, ppSurfaceLevel); wined3d_mutex_lock(); hrc = IWineD3DTexture_GetSurfaceLevel(This->wineD3DTexture, Level, &mySurface); @@ -297,7 +315,9 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 i static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", + iface, Level, pLockedRect, pRect, Flags); wined3d_mutex_lock(); hr = IWineD3DTexture_LockRect(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); @@ -309,7 +329,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, U static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, level %u.\n", iface, Level); wined3d_mutex_lock(); hr = IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level); @@ -321,7 +342,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, static HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONST RECT* pDirtyRect) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, dirty_rect %p.\n", iface, pDirtyRect); wined3d_mutex_lock(); hr = IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect); diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d1d7b548dc2..16b7d7037c3 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DVertexBuffer9Impl_QueryInterface(LPDIRECT3DVERTEXBUFFER9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) || IsEqualGUID(riid, &IID_IDirect3DVertexBuffer9)) { @@ -46,7 +48,7 @@ static ULONG WINAPI IDirect3DVertexBuffer9Impl_AddRef(LPDIRECT3DVERTEXBUFFER9 if IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -63,7 +65,7 @@ static ULONG WINAPI IDirect3DVertexBuffer9Impl_Release(LPDIRECT3DVERTEXBUFFER9 i IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -83,7 +85,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDevice(LPDIRECT3DVERTEXBUFFE IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DBuffer_GetDevice(This->wineD3DVertexBuffer, &wined3d_device); @@ -101,7 +104,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_SetPrivateData(LPDIRECT3DVERTEX IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); hr = IWineD3DBuffer_SetPrivateData(This->wineD3DVertexBuffer, refguid, pData, SizeOfData, Flags); @@ -113,7 +117,9 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_SetPrivateData(LPDIRECT3DVERTEX static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetPrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DBuffer_GetPrivateData(This->wineD3DVertexBuffer, refguid, pData, pSizeOfData); @@ -125,7 +131,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetPrivateData(LPDIRECT3DVERTEX static HRESULT WINAPI IDirect3DVertexBuffer9Impl_FreePrivateData(LPDIRECT3DVERTEXBUFFER9 iface, REFGUID refguid) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DBuffer_FreePrivateData(This->wineD3DVertexBuffer, refguid); @@ -137,7 +144,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_FreePrivateData(LPDIRECT3DVERTE static DWORD WINAPI IDirect3DVertexBuffer9Impl_SetPriority(LPDIRECT3DVERTEXBUFFER9 iface, DWORD PriorityNew) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); hr = IWineD3DBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); @@ -149,7 +157,8 @@ static DWORD WINAPI IDirect3DVertexBuffer9Impl_SetPriority(LPDIRECT3DVERTEXBUFFE static DWORD WINAPI IDirect3DVertexBuffer9Impl_GetPriority(LPDIRECT3DVERTEXBUFFER9 iface) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DBuffer_GetPriority(This->wineD3DVertexBuffer); @@ -160,16 +169,17 @@ static DWORD WINAPI IDirect3DVertexBuffer9Impl_GetPriority(LPDIRECT3DVERTEXBUFFE static void WINAPI IDirect3DVertexBuffer9Impl_PreLoad(LPDIRECT3DVERTEXBUFFER9 iface) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DBuffer_PreLoad(This->wineD3DVertexBuffer); wined3d_mutex_unlock(); } -static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer9Impl_GetType(LPDIRECT3DVERTEXBUFFER9 iface) { - IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; - TRACE("(%p)\n", This); +static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer9Impl_GetType(IDirect3DVertexBuffer9 *iface) +{ + TRACE("iface %p.\n", iface); return D3DRTYPE_VERTEXBUFFER; } @@ -178,7 +188,9 @@ static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer9Impl_GetType(LPDIRECT3DVERTE static HRESULT WINAPI IDirect3DVertexBuffer9Impl_Lock(LPDIRECT3DVERTEXBUFFER9 iface, UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, offset %u, size %u, data %p, flags %#x.\n", + iface, OffsetToLock, SizeToLock, ppbData, Flags); wined3d_mutex_lock(); hr = IWineD3DBuffer_Map(This->wineD3DVertexBuffer, OffsetToLock, SizeToLock, (BYTE **)ppbData, Flags); @@ -190,7 +202,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_Lock(LPDIRECT3DVERTEXBUFFER9 if static HRESULT WINAPI IDirect3DVertexBuffer9Impl_Unlock(LPDIRECT3DVERTEXBUFFER9 iface) { IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DBuffer_Unmap(This->wineD3DVertexBuffer); @@ -203,7 +216,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 IDirect3DVertexBuffer9Impl *This = (IDirect3DVertexBuffer9Impl *)iface; HRESULT hr; WINED3DBUFFER_DESC desc; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); hr = IWineD3DBuffer_GetDesc(This->wineD3DVertexBuffer, &desc); diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 63b257c1e43..9cb05284d18 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -197,6 +197,8 @@ HRESULT vdecl_convert_fvf( static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_QueryInterface(LPDIRECT3DVERTEXDECLARATION9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration9)) { IDirect3DVertexDeclaration9_AddRef(iface); @@ -213,7 +215,7 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_AddRef(LPDIRECT3DVERTEXDECLA IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if(ref == 1) { IDirect3DDevice9Ex_AddRef(This->parentDevice); @@ -245,7 +247,7 @@ static ULONG WINAPI IDirect3DVertexDeclaration9Impl_Release(LPDIRECT3DVERTEXDECL IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -266,7 +268,7 @@ static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDevice(LPDIRECT3DVERTEX IWineD3DDevice *myDevice = NULL; HRESULT hr = D3D_OK; - TRACE("(%p) : Relay\n", iface); + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DVertexDeclaration_GetDevice(This->wineD3DVertexDeclaration, &myDevice); @@ -282,7 +284,7 @@ static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDevice(LPDIRECT3DVERTEX static HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDeclaration(LPDIRECT3DVERTEXDECLARATION9 iface, D3DVERTEXELEMENT9* pDecl, UINT* pNumElements) { IDirect3DVertexDeclaration9Impl *This = (IDirect3DVertexDeclaration9Impl *)iface; - TRACE("(%p) : pDecl %p, pNumElements %p)\n", This, pDecl, pNumElements); + TRACE("iface %p, elements %p, element_count %p.\n", iface, pDecl, pNumElements); *pNumElements = This->element_count; @@ -418,7 +420,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexDeclaration(LPDIRECT3DDEVICE9EX i IDirect3DVertexDeclaration9Impl *pDeclImpl = (IDirect3DVertexDeclaration9Impl *)pDecl; HRESULT hr = D3D_OK; - TRACE("(%p) : Relay\n", iface); + TRACE("iface %p, vertex declaration %p.\n", iface, pDecl); wined3d_mutex_lock(); hr = IWineD3DDevice_SetVertexDeclaration(This->WineD3DDevice, pDeclImpl == NULL ? NULL : pDeclImpl->wineD3DVertexDeclaration); @@ -432,7 +434,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexDeclaration(LPDIRECT3DDEVICE9EX i IWineD3DVertexDeclaration* pTest = NULL; HRESULT hr = D3D_OK; - TRACE("(%p) : Relay+\n", iface); + TRACE("iface %p, declaration %p.\n", iface, ppDecl); if (NULL == ppDecl) { return D3DERR_INVALIDCALL; diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 9293c204199..1ad9f2b4cbb 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DVertexShader9Impl_QueryInterface(LPDIRECT3DVERTEXSHADER9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVertexShader9)) { IDirect3DVertexShader9_AddRef(iface); @@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DVertexShader9Impl_AddRef(LPDIRECT3DVERTEXSHADER9 if IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -61,7 +63,7 @@ static ULONG WINAPI IDirect3DVertexShader9Impl_Release(LPDIRECT3DVERTEXSHADER9 i IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -81,7 +83,8 @@ static HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADE IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; IWineD3DDevice *myDevice = NULL; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DVertexShader_GetDevice(This->wineD3DVertexShader, &myDevice); @@ -100,7 +103,8 @@ static HRESULT WINAPI IDirect3DVertexShader9Impl_GetDevice(LPDIRECT3DVERTEXSHADE static HRESULT WINAPI IDirect3DVertexShader9Impl_GetFunction(LPDIRECT3DVERTEXSHADER9 iface, VOID* pData, UINT* pSizeOfData) { IDirect3DVertexShader9Impl *This = (IDirect3DVertexShader9Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, data %p, data_size %p.\n", iface, pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DVertexShader_GetFunction(This->wineD3DVertexShader, pData, pSizeOfData); @@ -159,7 +163,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9EX iface, I IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hrc = D3D_OK; - TRACE("(%p) : Relay\n", This); + TRACE("iface %p, shader %p.\n", iface, pShader); wined3d_mutex_lock(); hrc = IWineD3DDevice_SetVertexShader(This->WineD3DDevice, pShader==NULL?NULL:((IDirect3DVertexShader9Impl *)pShader)->wineD3DVertexShader); @@ -174,7 +178,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9EX iface, I IWineD3DVertexShader *pShader; HRESULT hrc = D3D_OK; - TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); + TRACE("iface %p, shader %p.\n", iface, ppShader); wined3d_mutex_lock(); hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader); @@ -203,7 +207,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShader(LPDIRECT3DDEVICE9EX iface, I HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantF(LPDIRECT3DDEVICE9EX iface, UINT Register, CONST float* pConstantData, UINT Vector4fCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4fCount); if(Register + Vector4fCount > D3D9_MAX_VERTEX_SHADER_CONSTANTF) { WARN("Trying to access %u constants, but d3d9 only supports %u\n", @@ -222,14 +228,15 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9EX IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4fCount); + if(Register + Vector4fCount > D3D9_MAX_VERTEX_SHADER_CONSTANTF) { WARN("Trying to access %u constants, but d3d9 only supports %u\n", Register + Vector4fCount, D3D9_MAX_VERTEX_SHADER_CONSTANTF); return D3DERR_INVALIDCALL; } - TRACE("(%p) : Relay\n", This); - wined3d_mutex_lock(); hr = IWineD3DDevice_GetVertexShaderConstantF(This->WineD3DDevice, Register, pConstantData, Vector4fCount); wined3d_mutex_unlock(); @@ -240,7 +247,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantF(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantI(LPDIRECT3DDEVICE9EX iface, UINT Register, CONST int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4iCount); wined3d_mutex_lock(); hr = IWineD3DDevice_SetVertexShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); @@ -252,7 +261,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantI(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantI(LPDIRECT3DDEVICE9EX iface, UINT Register, int* pConstantData, UINT Vector4iCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, Vector4iCount); wined3d_mutex_lock(); hr = IWineD3DDevice_GetVertexShaderConstantI(This->WineD3DDevice, Register, pConstantData, Vector4iCount); @@ -264,7 +275,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantI(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(LPDIRECT3DDEVICE9EX iface, UINT Register, CONST BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, BoolCount); wined3d_mutex_lock(); hr = IWineD3DDevice_SetVertexShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); @@ -276,7 +289,9 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShaderConstantB(LPDIRECT3DDEVICE9EX HRESULT WINAPI IDirect3DDevice9Impl_GetVertexShaderConstantB(LPDIRECT3DDEVICE9EX iface, UINT Register, BOOL* pConstantData, UINT BoolCount) { IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, BoolCount); wined3d_mutex_lock(); hr = IWineD3DDevice_GetVertexShaderConstantB(This->WineD3DDevice, Register, pConstantData, BoolCount); diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 9dbb313695c..0d83ce1655a 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(LPDIRECT3DVOLUME9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVolume9)) { IDirect3DVolume9_AddRef(iface); @@ -43,7 +45,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(LPDIRECT3DVOLUME9 ifac static ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward refcounting */ @@ -52,7 +54,8 @@ static ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -68,7 +71,7 @@ static ULONG WINAPI IDirect3DVolume9Impl_AddRef(LPDIRECT3DVOLUME9 iface) { static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward refcounting */ @@ -77,7 +80,8 @@ static ULONG WINAPI IDirect3DVolume9Impl_Release(LPDIRECT3DVOLUME9 iface) { } else { /* No container, handle our own refcounting */ ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { wined3d_mutex_lock(); @@ -94,7 +98,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(LPDIRECT3DVOLUME9 iface, ID IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; IWineD3DDevice *myDevice = NULL; - TRACE("iface %p, ppDevice %p\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); @@ -111,7 +115,8 @@ static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(LPDIRECT3DVOLUME9 ifac IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); @@ -126,7 +131,8 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(LPDIRECT3DVOLUME9 ifac IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); @@ -141,7 +147,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_FreePrivateData(LPDIRECT3DVOLUME9 ifa IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); @@ -156,7 +162,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface, IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; HRESULT res; - TRACE("(This %p, riid %s, ppContainer %p)\n", This, debugstr_guid(riid), ppContainer); + TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer); if (!This->container) return E_NOINTERFACE; @@ -176,7 +182,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DV WINED3DVOLUME_DESC wined3ddesc; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); @@ -202,7 +208,8 @@ static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DL IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; HRESULT hr; - TRACE("(%p) relay %p %p %p %d\n", This, This->wineD3DVolume, pLockedVolume, pBox, Flags); + TRACE("iface %p, locked_box %p, box %p, flags %#x.\n", + iface, pLockedVolume, pBox, Flags); wined3d_mutex_lock(); @@ -218,7 +225,7 @@ static HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) { IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface; HRESULT hr; - TRACE("(%p) relay %p\n", This, This->wineD3DVolume); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 7a47e4ade6d..ccfc427c460 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DVolumeTexture9Impl_QueryInterface(LPDIRECT3DVOLUMETEXTURE9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) @@ -46,7 +48,7 @@ static ULONG WINAPI IDirect3DVolumeTexture9Impl_AddRef(LPDIRECT3DVOLUMETEXTURE9 IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -63,7 +65,7 @@ static ULONG WINAPI IDirect3DVolumeTexture9Impl_Release(LPDIRECT3DVOLUMETEXTURE9 IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { IDirect3DDevice9Ex *parentDevice = This->parentDevice; @@ -84,7 +86,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetDevice(LPDIRECT3DVOLUMETEXT IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DStateBlock_GetDevice(This->wineD3DVolumeTexture, &wined3d_device); @@ -102,7 +104,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_SetPrivateData(LPDIRECT3DVOLUM IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); @@ -117,7 +120,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetPrivateData(LPDIRECT3DVOLUM IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); @@ -132,7 +136,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_FreePrivateData(LPDIRECT3DVOLU IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); @@ -147,7 +151,7 @@ static DWORD WINAPI IDirect3DVolumeTexture9Impl_SetPriority(LPDIRECT3DVOLUMETEXT IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; DWORD priority; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); @@ -162,7 +166,7 @@ static DWORD WINAPI IDirect3DVolumeTexture9Impl_GetPriority(LPDIRECT3DVOLUMETEXT IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; DWORD priority; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); @@ -176,7 +180,7 @@ static DWORD WINAPI IDirect3DVolumeTexture9Impl_GetPriority(LPDIRECT3DVOLUMETEXT static void WINAPI IDirect3DVolumeTexture9Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE9 iface) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); @@ -189,7 +193,7 @@ static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture9Impl_GetType(LPDIRECT3DVOLU IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; D3DRESOURCETYPE type; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); @@ -205,7 +209,7 @@ static DWORD WINAPI IDirect3DVolumeTexture9Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE9 IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; DWORD lod; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, lod %u.\n", iface, LODNew); wined3d_mutex_lock(); @@ -220,7 +224,7 @@ static DWORD WINAPI IDirect3DVolumeTexture9Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE9 IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; DWORD lod; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); @@ -235,7 +239,7 @@ static DWORD WINAPI IDirect3DVolumeTexture9Impl_GetLevelCount(LPDIRECT3DVOLUMETE IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; DWORD level_count; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); @@ -250,7 +254,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_SetAutoGenFilterType(LPDIRECT3 IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, filter_type %#x.\n", iface, FilterType); wined3d_mutex_lock(); @@ -265,7 +269,7 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DVolumeTexture9Impl_GetAutoGenFilterT IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; D3DTEXTUREFILTERTYPE filter_type; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); @@ -279,7 +283,7 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DVolumeTexture9Impl_GetAutoGenFilterT static void WINAPI IDirect3DVolumeTexture9Impl_GenerateMipSubLevels(LPDIRECT3DVOLUMETEXTURE9 iface) { IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); @@ -294,7 +298,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetLevelDesc(LPDIRECT3DVOLUMET WINED3DVOLUME_DESC wined3ddesc; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, level %u, desc %p.\n", iface, Level, pDesc); wined3d_mutex_lock(); @@ -321,7 +325,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_GetVolumeLevel(LPDIRECT3DVOLUM HRESULT hrc = D3D_OK; IWineD3DVolume *myVolume = NULL; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, level %u, volume %p.\n", iface, Level, ppVolumeLevel); wined3d_mutex_lock(); @@ -340,7 +344,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_LockBox(LPDIRECT3DVOLUMETEXTUR IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay %p %p %p %d\n", This, This->wineD3DVolumeTexture, pLockedVolume, pBox,Flags); + TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", + iface, Level, pLockedVolume, pBox, Flags); wined3d_mutex_lock(); @@ -356,7 +361,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_UnlockBox(LPDIRECT3DVOLUMETEXT IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay %p %d\n", This, This->wineD3DVolumeTexture, Level); + TRACE("iface %p, level %u.\n", iface, Level); wined3d_mutex_lock(); @@ -371,7 +376,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3DVOLUMETE IDirect3DVolumeTexture9Impl *This = (IDirect3DVolumeTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, dirty_box %p.\n", iface, pDirtyBox); wined3d_mutex_lock();