From: Henri Verbeet Date: Mon, 19 Oct 2009 08:12:20 +0000 (+0200) Subject: d3d8: Add traces. X-Git-Tag: wine-1.1.32~232 X-Git-Url: http://git.etersoft.ru/projects/?a=commitdiff_plain;h=f8bd01a315f4f38e6267cf3c9aaf853094da27cd;p=wine%2Feterwine.git d3d8: Add traces. --- diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 24417df6cf..02d2bca74e 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -26,6 +26,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); /* IDirect3DCubeTexture8 IUnknown parts follow: */ static HRESULT WINAPI IDirect3DCubeTexture8Impl_QueryInterface(LPDIRECT3DCUBETEXTURE8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) @@ -44,7 +47,7 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_AddRef(LPDIRECT3DCUBETEXTURE8 ifac IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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 +64,7 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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) { IDirect3DDevice8 *parentDevice = This->parentDevice; @@ -83,7 +86,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8 IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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); @@ -100,7 +104,9 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8 static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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); @@ -112,7 +118,9 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(LPDIRECT3DCUBETEX static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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); @@ -124,7 +132,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetPrivateData(LPDIRECT3DCUBETEX static HRESULT WINAPI IDirect3DCubeTexture8Impl_FreePrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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); @@ -136,7 +145,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_FreePrivateData(LPDIRECT3DCUBETE static DWORD WINAPI IDirect3DCubeTexture8Impl_SetPriority(LPDIRECT3DCUBETEXTURE8 iface, DWORD PriorityNew) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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); @@ -148,7 +158,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_SetPriority(LPDIRECT3DCUBETEXTURE8 static DWORD WINAPI IDirect3DCubeTexture8Impl_GetPriority(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DCubeTexture_GetPriority(This->wineD3DCubeTexture); @@ -159,7 +170,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetPriority(LPDIRECT3DCUBETEXTURE8 static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DCubeTexture_PreLoad(This->wineD3DCubeTexture); @@ -169,7 +181,8 @@ static void WINAPI IDirect3DCubeTexture8Impl_PreLoad(LPDIRECT3DCUBETEXTURE8 ifac static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; D3DRESOURCETYPE type; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); type = IWineD3DCubeTexture_GetType(This->wineD3DCubeTexture); @@ -182,7 +195,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DCubeTexture8Impl_GetType(LPDIRECT3DCUBETE static DWORD WINAPI IDirect3DCubeTexture8Impl_SetLOD(LPDIRECT3DCUBETEXTURE8 iface, DWORD LODNew) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; DWORD lod; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, lod %u.\n", iface, LODNew); wined3d_mutex_lock(); lod = IWineD3DCubeTexture_SetLOD(This->wineD3DCubeTexture, LODNew); @@ -194,7 +208,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_SetLOD(LPDIRECT3DCUBETEXTURE8 ifac static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; DWORD lod; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); lod = IWineD3DCubeTexture_GetLOD((LPDIRECT3DBASETEXTURE8) This); @@ -206,7 +221,8 @@ static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLOD(LPDIRECT3DCUBETEXTURE8 ifac static DWORD WINAPI IDirect3DCubeTexture8Impl_GetLevelCount(LPDIRECT3DCUBETEXTURE8 iface) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; DWORD cnt; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); cnt = IWineD3DCubeTexture_GetLevelCount(This->wineD3DCubeTexture); @@ -221,7 +237,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetLevelDesc(LPDIRECT3DCUBETEXTU HRESULT hr; WINED3DSURFACE_DESC wined3ddesc; - 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); @@ -247,7 +263,7 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_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); @@ -263,7 +279,9 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUBE static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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); @@ -275,7 +293,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_LockRect(LPDIRECT3DCUBETEXTURE8 static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, UINT Level) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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); @@ -287,7 +306,8 @@ static HRESULT WINAPI IDirect3DCubeTexture8Impl_UnlockRect(LPDIRECT3DCUBETEXTURE static HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE8 iface, D3DCUBEMAP_FACES FaceType, CONST RECT *pDirtyRect) { IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)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/d3d8/device.c b/dlls/d3d8/device.c index 1dcf98b2eb..606b4444c0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -258,6 +258,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_QueryInterface(LPDIRECT3DDEVICE8 ifac { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", + iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DDevice8)) { IUnknown_AddRef(iface); @@ -281,7 +284,7 @@ static ULONG WINAPI IDirect3DDevice8Impl_AddRef(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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; } @@ -293,7 +296,7 @@ static ULONG WINAPI IDirect3DDevice8Impl_Release(LPDIRECT3DDEVICE8 iface) { 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; @@ -324,7 +327,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_TestCooperativeLevel(LPDIRECT3DDEVICE IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_TestCooperativeLevel(This->WineD3DDevice); @@ -337,7 +340,7 @@ static UINT WINAPI IDirect3DDevice8Impl_GetAvailableTextureMem(LPDIRECT3DDEVICE IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_GetAvailableTextureMem(This->WineD3DDevice); @@ -350,7 +353,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ResourceManagerDiscardBytes(LPDIRECT3 IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay bytes(%d)\n", This, Bytes); + TRACE("iface %p, byte_count %u.\n", iface, Bytes); + FIXME("Byte count ignored.\n"); wined3d_mutex_lock(); hr = IWineD3DDevice_EvictManagedResources(This->WineD3DDevice); @@ -364,7 +368,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDirect3D(LPDIRECT3DDEVICE8 iface, HRESULT hr = D3D_OK; IWineD3D* pWineD3D; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, d3d8 %p.\n", iface, ppD3D8); if (NULL == ppD3D8) { return D3DERR_INVALIDCALL; @@ -392,7 +396,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(LPDIRECT3DDEVICE8 iface 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; } @@ -416,7 +421,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDeviceCaps(LPDIRECT3DDEVICE8 iface static HRESULT WINAPI IDirect3DDevice8Impl_GetDisplayMode(LPDIRECT3DDEVICE8 iface, D3DDISPLAYMODE* pMode) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, mode %p.\n", iface, pMode); wined3d_mutex_lock(); hr = IWineD3DDevice_GetDisplayMode(This->WineD3DDevice, 0, (WINED3DDISPLAYMODE *) pMode); @@ -430,7 +436,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDisplayMode(LPDIRECT3DDEVICE8 ifac static HRESULT WINAPI IDirect3DDevice8Impl_GetCreationParameters(LPDIRECT3DDEVICE8 iface, D3DDEVICE_CREATION_PARAMETERS *pParameters) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -443,7 +450,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DSurface8Impl *pSurface = (IDirect3DSurface8Impl*)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; @@ -458,7 +468,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCursorProperties(LPDIRECT3DDEVICE8 static void WINAPI IDirect3DDevice8Impl_SetCursorPosition(LPDIRECT3DDEVICE8 iface, UINT XScreenSpace, UINT YScreenSpace, DWORD Flags) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -468,7 +480,8 @@ static void WINAPI IDirect3DDevice8Impl_SetCursorPosition(LPDIRECT3DDEVICE8 ifac static BOOL WINAPI IDirect3DDevice8Impl_ShowCursor(LPDIRECT3DDEVICE8 iface, BOOL bShow) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -483,7 +496,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateAdditionalSwapChain(LPDIRECT3DD HRESULT hrc = D3D_OK; WINED3DPRESENT_PARAMETERS localParameters; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, present_parameters %p, swapchain %p.\n", + iface, pPresentationParameters, pSwapChain); /* Fix the back buffer count */ if(pPresentationParameters->BackBufferCount == 0) { @@ -553,7 +567,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRE WINED3DPRESENT_PARAMETERS localParameters; HRESULT hr; - TRACE("(%p) Relay pPresentationParameters(%p)\n", This, pPresentationParameters); + TRACE("iface %p, present_parameters %p.\n", iface, pPresentationParameters); localParameters.BackBufferWidth = pPresentationParameters->BackBufferWidth; localParameters.BackBufferHeight = pPresentationParameters->BackBufferHeight; @@ -595,7 +609,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Reset(LPDIRECT3DDEVICE8 iface, D3DPRE static HRESULT WINAPI IDirect3DDevice8Impl_Present(LPDIRECT3DDEVICE8 iface, CONST RECT* pSourceRect,CONST RECT* pDestRect,HWND hDestWindowOverride,CONST RGNDATA* pDirtyRegion) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -609,7 +625,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(LPDIRECT3DDEVICE8 iface IWineD3DSurface *retSurface = NULL; HRESULT rc = D3D_OK; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, backbuffer_idx %u, backbuffer_type %#x, backbuffer %p.\n", + iface, BackBuffer, Type, ppBackBuffer); wined3d_mutex_lock(); rc = IWineD3DDevice_GetBackBuffer(This->WineD3DDevice, 0, BackBuffer, (WINED3DBACKBUFFER_TYPE) Type, &retSurface); @@ -625,7 +642,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetBackBuffer(LPDIRECT3DDEVICE8 iface static HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(LPDIRECT3DDEVICE8 iface, D3DRASTER_STATUS* pRasterStatus) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, raster_status %p.\n", iface, pRasterStatus); wined3d_mutex_lock(); hr = IWineD3DDevice_GetRasterStatus(This->WineD3DDevice, 0, (WINED3DRASTER_STATUS *) pRasterStatus); @@ -636,7 +654,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRasterStatus(LPDIRECT3DDEVICE8 ifa static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DWORD Flags, CONST D3DGAMMARAMP* pRamp) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, flags %#x, ramp %p.\n", iface, Flags, pRamp); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ wined3d_mutex_lock(); @@ -646,7 +665,8 @@ static void WINAPI IDirect3DDevice8Impl_SetGammaRamp(LPDIRECT3DDEVICE8 iface, DW static void WINAPI IDirect3DDevice8Impl_GetGammaRamp(LPDIRECT3DDEVICE8 iface, D3DGAMMARAMP* pRamp) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, ramp %p.\n", iface, pRamp); /* Note: D3DGAMMARAMP is compatible with WINED3DGAMMARAMP */ wined3d_mutex_lock(); @@ -819,7 +839,10 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT IDirect3DSurface8Impl *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" + "\tusage %#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(IDirect3DSurface8Impl)); if (!object) @@ -845,7 +868,9 @@ static HRESULT IDirect3DDevice8Impl_CreateSurface(LPDIRECT3DDEVICE8 iface, UINT static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, BOOL Lockable, IDirect3DSurface8** ppSurface) { HRESULT hr; - TRACE("Relay\n"); + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, lockable %#x, surface %p.\n", + iface, Width, Height, Format, MultiSample, Lockable, ppSurface); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, Lockable, FALSE /* Discard */, 0 /* Level */, ppSurface, D3DUSAGE_RENDERTARGET, D3DPOOL_DEFAULT, MultiSample, 0); @@ -855,7 +880,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateRenderTarget(LPDIRECT3DDEVICE8 static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, D3DMULTISAMPLE_TYPE MultiSample, IDirect3DSurface8** ppSurface) { HRESULT hr; - TRACE("Relay\n"); + + TRACE("iface %p, width %u, height %u, format %#x, multisample_type %#x, surface %p.\n", + iface, Width, Height, Format, MultiSample, ppSurface); /* TODO: Verify that Discard is false */ hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE, @@ -867,7 +894,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateDepthStencilSurface(LPDIRECT3DD /* IDirect3DDevice8Impl::CreateImageSurface returns surface with pool type SYSTEMMEM */ static HRESULT WINAPI IDirect3DDevice8Impl_CreateImageSurface(LPDIRECT3DDEVICE8 iface, UINT Width, UINT Height, D3DFORMAT Format, IDirect3DSurface8** ppSurface) { HRESULT hr; - TRACE("Relay\n"); + + TRACE("iface %p, width %u, height %u, format %#x, surface %p.\n", + iface, Width, Height, Format, ppSurface); hr = IDirect3DDevice8Impl_CreateSurface(iface, Width, Height, Format, TRUE /* Lockable */, FALSE /* Discard */, 0 /* Level */, ppSurface, 0 /* Usage (undefined/none) */, D3DPOOL_SYSTEMMEM, D3DMULTISAMPLE_NONE, @@ -884,11 +913,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID WINED3DFORMAT srcFormat, destFormat; WINED3DSURFACE_DESC winedesc; - TRACE("(%p) pSrcSur=%p, pSourceRects=%p, cRects=%d, pDstSur=%p, pDestPtsArr=%p\n", iface, - pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints); + TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", + iface, pSourceSurface, pSourceRects, cRects, pDestinationSurface, pDestPoints); - - /* Check that the source texture is in WINED3DPOOL_SYSTEMMEM and the destination texture is in WINED3DPOOL_DEFAULT */ + /* Check that the source texture is in WINED3DPOOL_SYSTEMMEM and the + * destination texture is in WINED3DPOOL_DEFAULT. */ wined3d_mutex_lock(); IWineD3DSurface_GetDesc(Source->wineD3DSurface, &winedesc); @@ -931,7 +960,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CopyRects(LPDIRECT3DDEVICE8 iface, ID static HRESULT WINAPI IDirect3DDevice8Impl_UpdateTexture(LPDIRECT3DDEVICE8 iface, IDirect3DBaseTexture8* pSourceTexture, IDirect3DBaseTexture8* pDestinationTexture) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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, ((IDirect3DBaseTexture8Impl *)pSourceTexture)->wineD3DBaseTexture, ((IDirect3DBaseTexture8Impl *)pDestinationTexture)->wineD3DBaseTexture); @@ -945,7 +975,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetFrontBuffer(LPDIRECT3DDEVICE8 ifac IDirect3DSurface8Impl *destSurface = (IDirect3DSurface8Impl *)pDestSurface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, dst_surface %p.\n", iface, pDestSurface); if (pDestSurface == NULL) { WARN("(%p) : Caller passed NULL as pDestSurface returning D3DERR_INVALIDCALL\n", This); @@ -965,7 +995,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(LPDIRECT3DDEVICE8 ifa IDirect3DSurface8Impl *pZSurface = (IDirect3DSurface8Impl *)pNewZStencil; IWineD3DSurface *original_ds = NULL; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, render_target %p, depth_stencil %p.\n", iface, pRenderTarget, pNewZStencil); wined3d_mutex_lock(); @@ -989,7 +1020,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderTarget(LPDIRECT3DDEVICE8 i HRESULT hr = D3D_OK; IWineD3DSurface *pRenderTarget; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, render_target %p.\n", iface, ppRenderTarget); if (ppRenderTarget == NULL) { return D3DERR_INVALIDCALL; @@ -1015,7 +1046,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_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; } @@ -1038,7 +1070,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDepthStencilSurface(LPDIRECT3DDE static HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_BeginScene(This->WineD3DDevice); @@ -1050,7 +1083,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_BeginScene(LPDIRECT3DDEVICE8 iface) { static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice8Impl_EndScene(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_EndScene(This->WineD3DDevice); @@ -1062,7 +1096,9 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DDevice8Impl_EndScene(LPDIRECT3D static HRESULT WINAPI IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD Count, CONST D3DRECT* pRects, DWORD Flags, D3DCOLOR Color, float Z, DWORD Stencil) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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(); @@ -1075,7 +1111,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_Clear(LPDIRECT3DDEVICE8 iface, DWORD static HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* lpMatrix) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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(); @@ -1088,7 +1125,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetTransform(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_GetTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE State,D3DMATRIX* pMatrix) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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(); @@ -1101,7 +1139,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTransform(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_MultiplyTransform(LPDIRECT3DDEVICE8 iface, D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX* pMatrix) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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(); @@ -1114,7 +1153,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_MultiplyTransform(LPDIRECT3DDEVICE8 i static HRESULT WINAPI IDirect3DDevice8Impl_SetViewport(LPDIRECT3DDEVICE8 iface, CONST D3DVIEWPORT8* pViewport) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, viewport %p.\n", iface, pViewport); /* Note: D3DVIEWPORT8 is compatible with WINED3DVIEWPORT */ wined3d_mutex_lock(); @@ -1127,7 +1167,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetViewport(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_GetViewport(LPDIRECT3DDEVICE8 iface, D3DVIEWPORT8* pViewport) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, viewport %p.\n", iface, pViewport); /* Note: D3DVIEWPORT8 is compatible with WINED3DVIEWPORT */ wined3d_mutex_lock(); @@ -1140,7 +1181,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetViewport(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_SetMaterial(LPDIRECT3DDEVICE8 iface, CONST D3DMATERIAL8* pMaterial) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, material %p.\n", iface, pMaterial); /* Note: D3DMATERIAL8 is compatible with WINED3DMATERIAL */ wined3d_mutex_lock(); @@ -1153,7 +1195,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetMaterial(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_GetMaterial(LPDIRECT3DDEVICE8 iface, D3DMATERIAL8* pMaterial) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, material %p.\n", iface, pMaterial); /* Note: D3DMATERIAL8 is compatible with WINED3DMATERIAL */ wined3d_mutex_lock(); @@ -1166,7 +1209,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetMaterial(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_SetLight(LPDIRECT3DDEVICE8 iface, DWORD Index, CONST D3DLIGHT8* pLight) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, light %p.\n", iface, Index, pLight); /* Note: D3DLIGHT8 is compatible with WINED3DLIGHT */ wined3d_mutex_lock(); @@ -1179,7 +1223,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetLight(LPDIRECT3DDEVICE8 iface, DWO static HRESULT WINAPI IDirect3DDevice8Impl_GetLight(LPDIRECT3DDEVICE8 iface, DWORD Index,D3DLIGHT8* pLight) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, index %u, light %p.\n", iface, Index, pLight); /* Note: D3DLIGHT8 is compatible with WINED3DLIGHT */ wined3d_mutex_lock(); @@ -1192,7 +1237,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetLight(LPDIRECT3DDEVICE8 iface, DWO static HRESULT WINAPI IDirect3DDevice8Impl_LightEnable(LPDIRECT3DDEVICE8 iface, DWORD Index,BOOL Enable) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1204,7 +1250,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_LightEnable(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_GetLightEnable(LPDIRECT3DDEVICE8 iface, DWORD Index,BOOL* pEnable) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1216,7 +1263,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetLightEnable(LPDIRECT3DDEVICE8 ifac static HRESULT WINAPI IDirect3DDevice8Impl_SetClipPlane(LPDIRECT3DDEVICE8 iface, DWORD Index,CONST float* pPlane) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1228,7 +1276,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetClipPlane(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_GetClipPlane(LPDIRECT3DDEVICE8 iface, DWORD Index,float* pPlane) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1240,7 +1289,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetClipPlane(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(LPDIRECT3DDEVICE8 iface, D3DRENDERSTATETYPE State,DWORD Value) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1252,7 +1302,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(LPDIRECT3DDEVICE8 ifac static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(LPDIRECT3DDEVICE8 iface, D3DRENDERSTATETYPE State,DWORD* pValue) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1264,7 +1315,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(LPDIRECT3DDEVICE8 ifac static HRESULT WINAPI IDirect3DDevice8Impl_BeginStateBlock(LPDIRECT3DDEVICE8 iface) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p)\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DDevice_BeginStateBlock(This->WineD3DDevice); @@ -1279,7 +1331,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_EndStateBlock(LPDIRECT3DDEVICE8 iface IWineD3DStateBlock* wineD3DStateBlock; IDirect3DStateBlock8Impl* object; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, token %p.\n", iface, pToken); /* Tell wineD3D to endstateblock before anything else (in case we run out * of memory later and cause locking problems) @@ -1320,7 +1372,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ApplyStateBlock(LPDIRECT3DDEVICE8 ifa IDirect3DStateBlock8Impl *pSB; HRESULT hr; - TRACE("(%p) %#x Relay\n", This, Token); + TRACE("iface %p, token %#x.\n", iface, Token); wined3d_mutex_lock(); pSB = d3d8_get_object(&This->handle_table, Token - 1, D3D8_HANDLE_SB); @@ -1341,7 +1393,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CaptureStateBlock(LPDIRECT3DDEVICE8 i IDirect3DStateBlock8Impl *pSB; HRESULT hr; - TRACE("(%p) %#x Relay\n", This, Token); + TRACE("iface %p, token %#x.\n", iface, Token); wined3d_mutex_lock(); pSB = d3d8_get_object(&This->handle_table, Token - 1, D3D8_HANDLE_SB); @@ -1361,7 +1413,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeleteStateBlock(LPDIRECT3DDEVICE8 if IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IDirect3DStateBlock8Impl *pSB; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, token %#x.\n", iface, Token); wined3d_mutex_lock(); pSB = d3d8_free_handle(&This->handle_table, Token - 1, D3D8_HANDLE_SB); @@ -1388,7 +1440,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(IDirect3DDevice8 *if IDirect3DStateBlock8Impl *object; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, type %#x, handle %p.\n", iface, Type, handle); if (Type != D3DSBT_ALL && Type != D3DSBT_PIXELSTATE @@ -1438,7 +1490,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateStateBlock(IDirect3DDevice8 *if static HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(LPDIRECT3DDEVICE8 iface, CONST D3DCLIPSTATUS8* pClipStatus) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, clip_status %p.\n", iface, pClipStatus); /* FIXME: Verify that D3DCLIPSTATUS8 ~= WINED3DCLIPSTATUS */ wined3d_mutex_lock(); @@ -1451,7 +1504,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetClipStatus(LPDIRECT3DDEVICE8 iface static HRESULT WINAPI IDirect3DDevice8Impl_GetClipStatus(LPDIRECT3DDEVICE8 iface, D3DCLIPSTATUS8* pClipStatus) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1465,7 +1519,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, D IWineD3DBaseTexture *retTexture; HRESULT hr; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, ppTexture); if(ppTexture == NULL){ return D3DERR_INVALIDCALL; @@ -1498,7 +1552,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTexture(LPDIRECT3DDEVICE8 iface, D static HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD Stage, IDirect3DBaseTexture8* pTexture) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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, @@ -1550,7 +1605,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetTextureStageState(LPDIRECT3DDEVI IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; const struct tss_lookup *l = &tss_lookup[Type]; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stage %u, state %#x, value %p.\n", iface, Stage, Type, pValue); wined3d_mutex_lock(); if (l->sampler_state) hr = IWineD3DDevice_GetSamplerState(This->WineD3DDevice, Stage, l->state, pValue); @@ -1564,7 +1620,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; const struct tss_lookup *l = &tss_lookup[Type]; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stage %u, state %#x, value %#x.\n", iface, Stage, Type, Value); wined3d_mutex_lock(); if (l->sampler_state) hr = IWineD3DDevice_SetSamplerState(This->WineD3DDevice, Stage, l->state, Value); @@ -1577,7 +1634,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetTextureStageState(LPDIRECT3DDEVICE static HRESULT WINAPI IDirect3DDevice8Impl_ValidateDevice(LPDIRECT3DDEVICE8 iface, DWORD* pNumPasses) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1586,16 +1644,19 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ValidateDevice(LPDIRECT3DDEVICE8 ifac return hr; } -static HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(LPDIRECT3DDEVICE8 iface, DWORD DevInfoID, void* pDevInfoStruct, DWORD DevInfoStructSize) { - IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; - FIXME("(%p) : stub\n", This); +static HRESULT WINAPI IDirect3DDevice8Impl_GetInfo(IDirect3DDevice8 *iface, + DWORD info_id, void *info, DWORD info_size) +{ + FIXME("iface %p, info_id %#x, info %p, info_size %u stub!\n", iface, info_id, info, info_size); + return D3D_OK; } static HRESULT WINAPI IDirect3DDevice8Impl_SetPaletteEntries(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber, CONST PALETTEENTRY* pEntries) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1607,7 +1668,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetPaletteEntries(LPDIRECT3DDEVICE8 i static HRESULT WINAPI IDirect3DDevice8Impl_GetPaletteEntries(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber, PALETTEENTRY* pEntries) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1619,7 +1681,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPaletteEntries(LPDIRECT3DDEVICE8 i static HRESULT WINAPI IDirect3DDevice8Impl_SetCurrentTexturePalette(LPDIRECT3DDEVICE8 iface, UINT PaletteNumber) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1631,7 +1694,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetCurrentTexturePalette(LPDIRECT3DDE static HRESULT WINAPI IDirect3DDevice8Impl_GetCurrentTexturePalette(LPDIRECT3DDEVICE8 iface, UINT *PaletteNumber) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1645,7 +1709,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitive(IDirect3DDevice8 *iface { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1660,7 +1726,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE UINT MinVertexIndex,UINT NumVertices,UINT startIndex,UINT primCount) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, primitive_type %#x, min_vertex_idx %u, vertex_count %u, start_idx %u, primitive_count %u.\n", + iface, PrimitiveType, MinVertexIndex, NumVertices, startIndex, primCount); wined3d_mutex_lock(); IWineD3DDevice_SetPrimitiveType(This->WineD3DDevice, PrimitiveType); @@ -1674,7 +1742,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE static HRESULT WINAPI IDirect3DDevice8Impl_DrawPrimitiveUP(LPDIRECT3DDEVICE8 iface, D3DPRIMITIVETYPE PrimitiveType,UINT PrimitiveCount,CONST void* pVertexStreamZeroData,UINT VertexStreamZeroStride) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1692,7 +1762,11 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitiveUP(LPDIRECT3DDEVI UINT VertexStreamZeroStride) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -1708,7 +1782,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_ProcessVertices(LPDIRECT3DDEVICE8 ifa IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; IDirect3DVertexBuffer8Impl *dest = (IDirect3DVertexBuffer8Impl *) pDestBuffer; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, src_start_idx %u, dst_idx %u, vertex_count %u, dst_buffer %p, flags %#x.\n", + iface, SrcStartIndex, DestIndex, VertexCount, pDestBuffer, Flags); wined3d_mutex_lock(); hr = IWineD3DDevice_ProcessVertices(This->WineD3DDevice,SrcStartIndex, DestIndex, VertexCount, dest->wineD3DVertexBuffer, NULL, Flags, dest->fvf); @@ -1835,7 +1911,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShader(LPDIRECT3DDEVICE8 ifa IDirect3DVertexShader8Impl *shader; HRESULT hr; - TRACE("(%p) : Relay\n", This); + TRACE("iface %p, shader %#x.\n", iface, pShader); if (VS_HIGHESTFIXEDFXF >= pShader) { TRACE("Setting FVF, %#x\n", pShader); @@ -1877,7 +1953,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShader(LPDIRECT3DDEVICE8 ifa IDirect3DVertexDeclaration8 *d3d8_declaration; HRESULT hrc; - TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice); + TRACE("iface %p, shader %p.\n", iface, ppShader); wined3d_mutex_lock(); hrc = IWineD3DDevice_GetVertexDeclaration(This->WineD3DDevice, &wined3d_declaration); @@ -1915,7 +1991,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE IDirect3DVertexShader8Impl *shader; IWineD3DVertexShader *cur = NULL; - TRACE("(%p) : pShader %#x\n", This, pShader); + TRACE("iface %p, shader %#x.\n", iface, pShader); wined3d_mutex_lock(); shader = d3d8_free_handle(&This->handle_table, pShader - (VS_HIGHESTFIXEDFXF + 1), D3D8_HANDLE_VS); @@ -1948,7 +2024,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeleteVertexShader(LPDIRECT3DDEVICE static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, CONST void* pConstantData, DWORD ConstantCount) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, ConstantCount); if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) { WARN("Trying to access %u constants, but d3d8 only supports %u\n", @@ -1966,7 +2044,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetVertexShaderConstant(LPDIRECT3DDEV static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, void* pConstantData, DWORD ConstantCount) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) : Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, ConstantCount); if(Register + ConstantCount > D3D8_MAX_VERTEX_SHADER_CONSTANTF) { WARN("Trying to access %u constants, but d3d8 only supports %u\n", @@ -1986,7 +2066,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderDeclaration(LPDIRECT3D IDirect3DVertexDeclaration8Impl *declaration; IDirect3DVertexShader8Impl *shader; - TRACE("(%p) : pVertexShader 0x%08x, pData %p, *pSizeOfData %u\n", This, pVertexShader, pData, *pSizeOfData); + TRACE("iface %p, shader %#x, data %p, data_size %p.\n", + iface, pVertexShader, pData, pSizeOfData); wined3d_mutex_lock(); shader = d3d8_get_object(&This->handle_table, pVertexShader - (VS_HIGHESTFIXEDFXF + 1), D3D8_HANDLE_VS); @@ -2022,7 +2103,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderFunction(LPDIRECT3DDEV IDirect3DVertexShader8Impl *shader = NULL; HRESULT hr; - TRACE("(%p) : pVertexShader %#x, pData %p, pSizeOfData %p\n", This, pVertexShader, pData, pSizeOfData); + TRACE("iface %p, shader %#x, data %p, data_size %p.\n", + iface, pVertexShader, pData, pSizeOfData); wined3d_mutex_lock(); shader = d3d8_get_object(&This->handle_table, pVertexShader - (VS_HIGHESTFIXEDFXF + 1), D3D8_HANDLE_VS); @@ -2051,7 +2133,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetIndices(LPDIRECT3DDEVICE8 iface, I IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; IDirect3DIndexBuffer8Impl *ib = (IDirect3DIndexBuffer8Impl *)pIndexData; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, buffer %p, base_vertex_idx %u.\n", iface, pIndexData, baseVertexIndex); /* WineD3D takes an INT(due to d3d9), but d3d8 uses UINTs. Do I have to add a check here that * the UINT doesn't cause an overflow in the INT? It seems rather unlikely because such large @@ -2074,7 +2157,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetIndices(LPDIRECT3DDEVICE8 iface, I IWineD3DBuffer *retIndexData = NULL; HRESULT rc = D3D_OK; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, buffer %p, base_vertex_index %p.\n", iface, ppIndexData, pBaseVertexIndex); if(ppIndexData == NULL){ return D3DERR_INVALIDCALL; @@ -2155,7 +2238,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 ifac IDirect3DPixelShader8Impl *shader; HRESULT hr; - TRACE("(%p) : pShader %#x\n", This, pShader); + TRACE("iface %p, shader %#x.\n", iface, pShader); wined3d_mutex_lock(); @@ -2184,9 +2267,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShader(LPDIRECT3DDEVICE8 ifac static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShader(LPDIRECT3DDEVICE8 iface, DWORD* ppShader) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; IWineD3DPixelShader *object; - HRESULT hrc = D3D_OK; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, shader %p.\n", iface, ppShader); + if (NULL == ppShader) { TRACE("(%p) Invalid call\n", This); return D3DERR_INVALIDCALL; @@ -2215,7 +2299,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i IDirect3DPixelShader8Impl *shader; IWineD3DPixelShader *cur = NULL; - TRACE("(%p) : pShader %#x\n", This, pShader); + TRACE("iface %p, shader %#x.\n", iface, pShader); wined3d_mutex_lock(); @@ -2248,7 +2332,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePixelShader(LPDIRECT3DDEVICE8 i static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, CONST void* pConstantData, DWORD ConstantCount) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, ConstantCount); wined3d_mutex_lock(); hr = IWineD3DDevice_SetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); @@ -2260,7 +2346,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetPixelShaderConstant(LPDIRECT3DDE static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderConstant(LPDIRECT3DDEVICE8 iface, DWORD Register, void* pConstantData, DWORD ConstantCount) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, register %u, data %p, count %u.\n", + iface, Register, pConstantData, ConstantCount); wined3d_mutex_lock(); hr = IWineD3DDevice_GetPixelShaderConstantF(This->WineD3DDevice, Register, pConstantData, ConstantCount); @@ -2274,7 +2362,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderFunction(LPDIRECT3DDEVI IDirect3DPixelShader8Impl *shader = NULL; HRESULT hr; - TRACE("(%p) : pPixelShader %#x, pData %p, pSizeOfData %p\n", This, pPixelShader, pData, pSizeOfData); + TRACE("iface %p, shader %#x, data %p, data_size %p.\n", + iface, pPixelShader, pData, pSizeOfData); wined3d_mutex_lock(); shader = d3d8_get_object(&This->handle_table, pPixelShader - (VS_HIGHESTFIXEDFXF + 1), D3D8_HANDLE_PS); @@ -2295,7 +2384,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetPixelShaderFunction(LPDIRECT3DDEVI static HRESULT WINAPI IDirect3DDevice8Impl_DrawRectPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DRECTPATCH_INFO* pRectPatchInfo) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -2307,7 +2398,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawRectPatch(LPDIRECT3DDEVICE8 iface static HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(LPDIRECT3DDEVICE8 iface, UINT Handle,CONST float* pNumSegs,CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -2319,7 +2412,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DrawTriPatch(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, UINT Handle) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)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); @@ -2331,7 +2425,9 @@ static HRESULT WINAPI IDirect3DDevice8Impl_DeletePatch(LPDIRECT3DDEVICE8 iface, static HRESULT WINAPI IDirect3DDevice8Impl_SetStreamSource(LPDIRECT3DDEVICE8 iface, UINT StreamNumber,IDirect3DVertexBuffer8* pStreamData,UINT Stride) { IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n" , This); + + TRACE("iface %p, stream_idx %u, buffer %p, stride %u.\n", + iface, StreamNumber, pStreamData, Stride); wined3d_mutex_lock(); hr = IWineD3DDevice_SetStreamSource(This->WineD3DDevice, StreamNumber, @@ -2347,7 +2443,8 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(LPDIRECT3DDEVICE8 ifa IWineD3DBuffer *retStream = NULL; HRESULT rc = D3D_OK; - TRACE("(%p) Relay\n" , This); + TRACE("iface %p, stream_idx %u, buffer %p, stride %p.\n", + iface, StreamNumber, pStream, pStride); if(pStream == NULL){ return D3DERR_INVALIDCALL; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 1ad7aef0b3..aedfdc8206 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -42,6 +42,8 @@ static HRESULT WINAPI IDirect3D8Impl_QueryInterface(LPDIRECT3D8 iface, REFIID ri { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3D8)) { IUnknown_AddRef(iface); @@ -58,7 +60,7 @@ static ULONG WINAPI IDirect3D8Impl_AddRef(LPDIRECT3D8 iface) { IDirect3D8Impl *This = (IDirect3D8Impl *)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; } @@ -67,7 +69,7 @@ static ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) { IDirect3D8Impl *This = (IDirect3D8Impl *)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) { TRACE("Releasing wined3d %p\n", This->WineD3D); @@ -86,7 +88,8 @@ static ULONG WINAPI IDirect3D8Impl_Release(LPDIRECT3D8 iface) { static HRESULT WINAPI IDirect3D8Impl_RegisterSoftwareDevice (LPDIRECT3D8 iface, void* pInitializeFunction) { IDirect3D8Impl *This = (IDirect3D8Impl *)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); @@ -98,7 +101,8 @@ static HRESULT WINAPI IDirect3D8Impl_RegisterSoftwareDevice (LPDIRECT3D8 iface, static UINT WINAPI IDirect3D8Impl_GetAdapterCount (LPDIRECT3D8 iface) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; - TRACE("(%p)\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3D_GetAdapterCount(This->WineD3D); @@ -114,7 +118,8 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier(LPDIRECT3D8 iface, WINED3DADAPTER_IDENTIFIER adapter_id; HRESULT hr; - TRACE("(%p)->(%d,%08x, %p\n", This, Adapter, Flags, pIdentifier); + 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); @@ -141,7 +146,8 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterIdentifier(LPDIRECT3D8 iface, static UINT WINAPI IDirect3D8Impl_GetAdapterModeCount (LPDIRECT3D8 iface,UINT Adapter) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; - TRACE("(%p)->(%d)\n", This, Adapter); + + TRACE("iface %p, adapter %u.\n", iface, Adapter); wined3d_mutex_lock(); hr = IWineD3D_GetAdapterModeCount(This->WineD3D, Adapter, 0 /* format */); @@ -153,7 +159,9 @@ static UINT WINAPI IDirect3D8Impl_GetAdapterModeCount (LPDIRECT3D8 iface,UINT Ad static HRESULT WINAPI IDirect3D8Impl_EnumAdapterModes (LPDIRECT3D8 iface, UINT Adapter, UINT Mode, D3DDISPLAYMODE* pMode) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; - TRACE("(%p)->(%d, %d, %p)\n", This, Adapter, Mode, pMode); + + TRACE("iface %p, adapter %u, mode_idx %u, mode %p.\n", + iface, Adapter, Mode, pMode); wined3d_mutex_lock(); hr = IWineD3D_EnumAdapterModes(This->WineD3D, Adapter, WINED3DFMT_UNKNOWN, Mode, (WINED3DDISPLAYMODE *) pMode); @@ -167,7 +175,9 @@ static HRESULT WINAPI IDirect3D8Impl_EnumAdapterModes (LPDIRECT3D8 iface, UINT A static HRESULT WINAPI IDirect3D8Impl_GetAdapterDisplayMode (LPDIRECT3D8 iface, UINT Adapter, D3DDISPLAYMODE* pMode) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; - TRACE("(%p)->(%d,%p)\n", This, Adapter, pMode); + + TRACE("iface %p, adapter %u, mode %p.\n", + iface, Adapter, pMode); wined3d_mutex_lock(); hr = IWineD3D_GetAdapterDisplayMode(This->WineD3D, Adapter, (WINED3DDISPLAYMODE *) pMode); @@ -183,7 +193,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceType (LPDIRECT3D8 i D3DFORMAT BackBufferFormat, BOOL Windowed) { IDirect3D8Impl *This = (IDirect3D8Impl *)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), @@ -199,7 +211,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceFormat (LPDIRECT3D8 i IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; WINED3DRESOURCETYPE WineD3DRType; - TRACE("(%p)->(%d, %d, %d, %08x, %d, %d)\n", This, Adapter, DeviceType, AdapterFormat, Usage, RType, CheckFormat); + + 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); if(CheckFormat == D3DFMT_R8G8B8) { @@ -233,7 +247,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDeviceMultiSampleType(IDirect3D8 *ifac { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; - TRACE("(%p)-<(%d, %d, %d, %s, %d)\n", This, Adapter, DeviceType, SurfaceFormat, Windowed ? "true" : "false", MultiSampleType); + + TRACE("iface %p, adapter %u, device_type %#x, format %#x, windowed %#x, multisample_type %#x.\n", + iface, Adapter, DeviceType, SurfaceFormat, Windowed, MultiSampleType); wined3d_mutex_lock(); hr = IWineD3D_CheckDeviceMultiSampleType(This->WineD3D, Adapter, DeviceType, @@ -248,7 +264,9 @@ static HRESULT WINAPI IDirect3D8Impl_CheckDepthStencilMatch(IDirect3D8 *iface, U { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HRESULT hr; - TRACE("(%p)-<(%d, %d, %d, %d, %d)\n", This, Adapter, DeviceType, AdapterFormat, RenderTargetFormat, DepthStencilFormat); + + 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, @@ -278,7 +296,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 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; @@ -303,7 +321,8 @@ static HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Ada static HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT Adapter) { IDirect3D8Impl *This = (IDirect3D8Impl *)iface; HMONITOR ret; - TRACE("(%p)->(%d)\n", This, Adapter); + + TRACE("iface %p, adapter %u.\n", iface, Adapter); wined3d_mutex_lock(); ret = IWineD3D_GetAdapterMonitor(This->WineD3D, Adapter); @@ -314,7 +333,8 @@ static HMONITOR WINAPI IDirect3D8Impl_GetAdapterMonitor(LPDIRECT3D8 iface, UINT ULONG WINAPI D3D8CB_DestroySwapChain(IWineD3DSwapChain *pSwapChain) { IUnknown* swapChainParent; - TRACE("(%p) call back\n", pSwapChain); + + TRACE("swapchain %p.\n", pSwapChain); IWineD3DSwapChain_GetParent(pSwapChain, &swapChainParent); IUnknown_Release(swapChainParent); @@ -329,7 +349,10 @@ static HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adapte IDirect3DDevice8Impl *object = NULL; WINED3DPRESENT_PARAMETERS localParameters; 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 >= IDirect3D8Impl_GetAdapterCount(iface)) { diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index bb62c39a37..3369a0c43e 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DIndexBuffer8Impl_QueryInterface(LPDIRECT3DINDEXBUFFER8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IDirect3DIndexBuffer8)) { @@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_AddRef(LPDIRECT3DINDEXBUFFER8 ifac IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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 IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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) { IDirect3DDevice8 *parentDevice = This->parentDevice; @@ -81,7 +83,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8 IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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); @@ -98,7 +101,9 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8 static HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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); @@ -110,7 +115,9 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBU static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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); @@ -122,7 +129,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetPrivateData(LPDIRECT3DINDEXBU static HRESULT WINAPI IDirect3DIndexBuffer8Impl_FreePrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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); @@ -134,7 +142,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_FreePrivateData(LPDIRECT3DINDEXB static DWORD WINAPI IDirect3DIndexBuffer8Impl_SetPriority(LPDIRECT3DINDEXBUFFER8 iface, DWORD PriorityNew) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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); @@ -146,7 +155,8 @@ static DWORD WINAPI IDirect3DIndexBuffer8Impl_SetPriority(LPDIRECT3DINDEXBUFFER8 static DWORD WINAPI IDirect3DIndexBuffer8Impl_GetPriority(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DBuffer_GetPriority(This->wineD3DIndexBuffer); @@ -157,16 +167,17 @@ static DWORD WINAPI IDirect3DIndexBuffer8Impl_GetPriority(LPDIRECT3DINDEXBUFFER8 static void WINAPI IDirect3DIndexBuffer8Impl_PreLoad(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DBuffer_PreLoad(This->wineD3DIndexBuffer); wined3d_mutex_unlock(); } -static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(LPDIRECT3DINDEXBUFFER8 iface) { - IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; - TRACE("(%p)\n", This); +static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(IDirect3DIndexBuffer8 *iface) +{ + TRACE("iface %p.\n", iface); return D3DRTYPE_INDEXBUFFER; } @@ -175,7 +186,9 @@ static D3DRESOURCETYPE WINAPI IDirect3DIndexBuffer8Impl_GetType(LPDIRECT3DINDEXB static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Lock(LPDIRECT3DINDEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE **ppbData, DWORD Flags) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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, ppbData, Flags); @@ -187,7 +200,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Lock(LPDIRECT3DINDEXBUFFER8 ifac static HRESULT WINAPI IDirect3DIndexBuffer8Impl_Unlock(LPDIRECT3DINDEXBUFFER8 iface) { IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DBuffer_Unmap(This->wineD3DIndexBuffer); @@ -200,7 +214,8 @@ static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 i IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)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/d3d8/pixelshader.c b/dlls/d3d8/pixelshader.c index f56549522a..7b6d4e580e 100644 --- a/dlls/d3d8/pixelshader.c +++ b/dlls/d3d8/pixelshader.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DPixelShader8Impl_QueryInterface(IDirect3DPixelShader8 *iface, REFIID riid, LPVOID *ppobj) { IDirect3DPixelShader8Impl *This = (IDirect3DPixelShader8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DPixelShader8)) { IUnknown_AddRef(iface); @@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DPixelShader8Impl_AddRef(IDirect3DPixelShader8 *ifac IDirect3DPixelShader8Impl *This = (IDirect3DPixelShader8Impl *)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) { @@ -60,7 +62,7 @@ static ULONG WINAPI IDirect3DPixelShader8Impl_Release(IDirect3DPixelShader8 * if IDirect3DPixelShader8Impl *This = (IDirect3DPixelShader8Impl *)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(); diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c index 04c4e48482..75ab487b80 100644 --- a/dlls/d3d8/stateblock.c +++ b/dlls/d3d8/stateblock.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DStateBlock8Impl_QueryInterface(IDirect3DStateBlock8 *iface, REFIID riid, LPVOID *ppobj) { IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DStateBlock8)) { IUnknown_AddRef(iface); @@ -46,7 +48,7 @@ static ULONG WINAPI IDirect3DStateBlock8Impl_AddRef(IDirect3DStateBlock8 *iface) IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)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; } @@ -55,7 +57,7 @@ static ULONG WINAPI IDirect3DStateBlock8Impl_Release(IDirect3DStateBlock8 *iface IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)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 IDirect3DStateBlock8Impl_GetDevice(IDirect3DStateBlock8 *i 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); @@ -91,7 +93,7 @@ static HRESULT WINAPI IDirect3DStateBlock8Impl_Capture(IDirect3DStateBlock8 *ifa IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DStateBlock_Capture(This->wineD3DStateBlock); @@ -104,7 +106,7 @@ static HRESULT WINAPI IDirect3DStateBlock8Impl_Apply(IDirect3DStateBlock8 *iface IDirect3DStateBlock8Impl *This = (IDirect3DStateBlock8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DStateBlock_Apply(This->wineD3DStateBlock); diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 8923dd8b7e..51c7966300 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IDirect3DSurface8)) { @@ -43,7 +45,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_QueryInterface(LPDIRECT3DSURFACE8 if static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward refcounting */ @@ -52,6 +54,9 @@ static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 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) IUnknown_AddRef(This->parentDevice); @@ -59,7 +64,7 @@ static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) { IUnknown_AddRef(This->wineD3DSurface); wined3d_mutex_unlock(); } - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + return ref; } } @@ -67,7 +72,7 @@ static ULONG WINAPI IDirect3DSurface8Impl_AddRef(LPDIRECT3DSURFACE8 iface) { static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward refcounting */ @@ -76,7 +81,8 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 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) { IDirect3DDevice8 *parentDevice = This->parentDevice; @@ -98,7 +104,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface, IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)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); @@ -115,7 +122,9 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface, static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)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); @@ -127,7 +136,9 @@ static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 if static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)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); @@ -139,7 +150,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetPrivateData(LPDIRECT3DSURFACE8 if static HRESULT WINAPI IDirect3DSurface8Impl_FreePrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)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); @@ -153,7 +165,7 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetContainer(LPDIRECT3DSURFACE8 ifac IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; HRESULT res; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer); if (!This->container) return E_NOINTERFACE; @@ -167,7 +179,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3 IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)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); @@ -191,8 +204,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_GetDesc(LPDIRECT3DSURFACE8 iface, D3 static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); - TRACE("(%p) calling IWineD3DSurface_LockRect %p %p %p %d\n", This, This->wineD3DSurface, pLockedRect, pRect, Flags); + + TRACE("iface %p, locked_rect %p, rect %p, flags %#x.\n", iface, pLockedRect, pRect, Flags); wined3d_mutex_lock(); if (pRect) { @@ -221,7 +234,8 @@ static HRESULT WINAPI IDirect3DSurface8Impl_LockRect(LPDIRECT3DSURFACE8 iface, D static HRESULT WINAPI IDirect3DSurface8Impl_UnlockRect(LPDIRECT3DSURFACE8 iface) { IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DSurface_UnlockRect(This->wineD3DSurface); diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index e85154885d..fe0e1e61de 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -28,6 +28,8 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_QueryInterface(LPDIRECT3DSWAPCHAIN { IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DSwapChain8)) { IUnknown_AddRef(iface); @@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_AddRef(LPDIRECT3DSWAPCHAIN8 iface) { IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)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; } @@ -53,7 +55,7 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)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(); @@ -70,7 +72,9 @@ static ULONG WINAPI IDirect3DSwapChain8Impl_Release(LPDIRECT3DSWAPCHAIN8 iface) static HRESULT WINAPI IDirect3DSwapChain8Impl_Present(LPDIRECT3DSWAPCHAIN8 iface, CONST RECT *pSourceRect, CONST RECT *pDestRect, HWND hDestWindowOverride, CONST RGNDATA *pDirtyRegion) { IDirect3DSwapChain8Impl *This = (IDirect3DSwapChain8Impl *)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 = IWineD3DSwapChain_Present(This->wineD3DSwapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); @@ -84,7 +88,8 @@ static HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8 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); diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 000b07858d..57cec4df9f 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DTexture8Impl_QueryInterface(LPDIRECT3DTEXTURE8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) @@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DTexture8Impl_AddRef(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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 IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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) { IDirect3DDevice8 *parentDevice = This->parentDevice; @@ -82,7 +84,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -99,7 +102,9 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -111,7 +116,9 @@ static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 if static HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -123,7 +130,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetPrivateData(LPDIRECT3DTEXTURE8 if static HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -135,7 +143,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_FreePrivateData(LPDIRECT3DTEXTURE8 i static DWORD WINAPI IDirect3DTexture8Impl_SetPriority(LPDIRECT3DTEXTURE8 iface, DWORD PriorityNew) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -147,7 +156,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_SetPriority(LPDIRECT3DTEXTURE8 iface, static DWORD WINAPI IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetPriority(This->wineD3DTexture); @@ -158,7 +168,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_GetPriority(LPDIRECT3DTEXTURE8 iface) static void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DTexture_PreLoad(This->wineD3DTexture); @@ -168,7 +179,8 @@ static void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; D3DRESOURCETYPE type; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); type = IWineD3DTexture_GetType(This->wineD3DTexture); @@ -181,7 +193,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 i static DWORD WINAPI IDirect3DTexture8Impl_SetLOD(LPDIRECT3DTEXTURE8 iface, DWORD LODNew) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -193,7 +206,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_SetLOD(LPDIRECT3DTEXTURE8 iface, DWORD static DWORD WINAPI IDirect3DTexture8Impl_GetLOD(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetLOD(This->wineD3DTexture); @@ -205,7 +219,8 @@ static DWORD WINAPI IDirect3DTexture8Impl_GetLOD(LPDIRECT3DTEXTURE8 iface) { static DWORD WINAPI IDirect3DTexture8Impl_GetLevelCount(LPDIRECT3DTEXTURE8 iface) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetLevelCount(This->wineD3DTexture); @@ -217,10 +232,10 @@ static DWORD WINAPI IDirect3DTexture8Impl_GetLevelCount(LPDIRECT3DTEXTURE8 iface /* IDirect3DTexture8 Interface follow: */ static HRESULT WINAPI IDirect3DTexture8Impl_GetLevelDesc(LPDIRECT3DTEXTURE8 iface, UINT Level, D3DSURFACE_DESC *pDesc) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; + WINED3DSURFACE_DESC wined3ddesc; HRESULT hr; - WINED3DSURFACE_DESC wined3ddesc; - 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); @@ -246,7 +261,7 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 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); @@ -262,7 +277,9 @@ static HRESULT WINAPI IDirect3DTexture8Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE8 i static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(LPDIRECT3DTEXTURE8 iface, UINT Level, D3DLOCKED_RECT *pLockedRect, CONST RECT *pRect, DWORD Flags) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -274,7 +291,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_LockRect(LPDIRECT3DTEXTURE8 iface, U static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(LPDIRECT3DTEXTURE8 iface, UINT Level) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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); @@ -286,7 +304,8 @@ static HRESULT WINAPI IDirect3DTexture8Impl_UnlockRect(LPDIRECT3DTEXTURE8 iface, static HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTURE8 iface, CONST RECT *pDirtyRect) { IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)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/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index a798afd829..bf1900b2b0 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DVertexBuffer8Impl_QueryInterface(LPDIRECT3DVERTEXBUFFER8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IDirect3DVertexBuffer8)) { @@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_AddRef(LPDIRECT3DVERTEXBUFFER8 if IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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 IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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) { IDirect3DDevice8 *parentDevice = This->parentDevice; @@ -83,7 +85,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFE IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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); @@ -100,7 +103,9 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFE static HRESULT WINAPI IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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); @@ -112,7 +117,9 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEX static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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); @@ -124,7 +131,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetPrivateData(LPDIRECT3DVERTEX static HRESULT WINAPI IDirect3DVertexBuffer8Impl_FreePrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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); @@ -136,7 +144,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_FreePrivateData(LPDIRECT3DVERTE static DWORD WINAPI IDirect3DVertexBuffer8Impl_SetPriority(LPDIRECT3DVERTEXBUFFER8 iface, DWORD PriorityNew) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); ret = IWineD3DBuffer_SetPriority(This->wineD3DVertexBuffer, PriorityNew); @@ -148,7 +157,8 @@ static DWORD WINAPI IDirect3DVertexBuffer8Impl_SetPriority(LPDIRECT3DVERTEXBUFFE static DWORD WINAPI IDirect3DVertexBuffer8Impl_GetPriority(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DBuffer_GetPriority(This->wineD3DVertexBuffer); @@ -159,16 +169,17 @@ static DWORD WINAPI IDirect3DVertexBuffer8Impl_GetPriority(LPDIRECT3DVERTEXBUFFE static void WINAPI IDirect3DVertexBuffer8Impl_PreLoad(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DBuffer_PreLoad(This->wineD3DVertexBuffer); wined3d_mutex_unlock(); } -static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer8Impl_GetType(LPDIRECT3DVERTEXBUFFER8 iface) { - IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; - TRACE("(%p)\n", This); +static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer8Impl_GetType(IDirect3DVertexBuffer8 *iface) +{ + TRACE("iface %p.\n", iface); return D3DRTYPE_VERTEXBUFFER; } @@ -177,7 +188,9 @@ static D3DRESOURCETYPE WINAPI IDirect3DVertexBuffer8Impl_GetType(LPDIRECT3DVERTE static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Lock(LPDIRECT3DVERTEXBUFFER8 iface, UINT OffsetToLock, UINT SizeToLock, BYTE **ppbData, DWORD Flags) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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, ppbData, Flags); @@ -189,7 +202,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Lock(LPDIRECT3DVERTEXBUFFER8 if static HRESULT WINAPI IDirect3DVertexBuffer8Impl_Unlock(LPDIRECT3DVERTEXBUFFER8 iface) { IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DBuffer_Unmap(This->wineD3DVertexBuffer); @@ -202,7 +216,8 @@ static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER8 IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)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/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index a6195fea0d..bcc9991aea 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); /* IUnknown */ static HRESULT WINAPI IDirect3DVertexDeclaration8Impl_QueryInterface(IDirect3DVertexDeclaration8 *iface, REFIID riid, void **obj_ptr) { - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), obj_ptr); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), obj_ptr); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVertexDeclaration8)) @@ -46,9 +46,9 @@ static HRESULT WINAPI IDirect3DVertexDeclaration8Impl_QueryInterface(IDirect3DVe static ULONG WINAPI IDirect3DVertexDeclaration8Impl_AddRef(IDirect3DVertexDeclaration8 *iface) { IDirect3DVertexDeclaration8Impl *This = (IDirect3DVertexDeclaration8Impl *)iface; - ULONG ref_count = InterlockedIncrement(&This->ref_count); - TRACE("(%p) : AddRef increasing to %d\n", This, ref_count); + + TRACE("%p increasing refcount to %u.\n", iface, ref_count); if (ref_count == 1) { @@ -63,9 +63,9 @@ static ULONG WINAPI IDirect3DVertexDeclaration8Impl_AddRef(IDirect3DVertexDeclar static ULONG WINAPI IDirect3DVertexDeclaration8Impl_Release(IDirect3DVertexDeclaration8 *iface) { IDirect3DVertexDeclaration8Impl *This = (IDirect3DVertexDeclaration8Impl *)iface; - ULONG ref_count = InterlockedDecrement(&This->ref_count); - TRACE("(%p) : Releasing to %d\n", This, ref_count); + + TRACE("%p decreasing refcount to %u.\n", iface, ref_count); if (!ref_count) { wined3d_mutex_lock(); diff --git a/dlls/d3d8/vertexshader.c b/dlls/d3d8/vertexshader.c index 92bd1fea04..1f00aa0bd7 100644 --- a/dlls/d3d8/vertexshader.c +++ b/dlls/d3d8/vertexshader.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DVertexShader8Impl_QueryInterface(IDirect3DVertexShader8 *iface, REFIID riid, LPVOID* ppobj) { IDirect3DVertexShader8Impl *This = (IDirect3DVertexShader8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVertexShader8)) { IUnknown_AddRef(iface); @@ -44,7 +46,7 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_AddRef(IDirect3DVertexShader8 *if IDirect3DVertexShader8Impl *This = (IDirect3DVertexShader8Impl *)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->wineD3DVertexShader) { @@ -67,7 +69,7 @@ static ULONG WINAPI IDirect3DVertexShader8Impl_Release(IDirect3DVertexShader8 *i IDirect3DVertexShader8Impl *This = (IDirect3DVertexShader8Impl *)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) { if (This->wineD3DVertexShader) diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 2d29d10f1f..8948997565 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DVolume8)) { IUnknown_AddRef(iface); @@ -42,7 +44,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(LPDIRECT3DVOLUME8 ifac static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward to the containerParent */ @@ -51,7 +53,8 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 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) { @@ -67,7 +70,7 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(LPDIRECT3DVOLUME8 iface) { static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; - TRACE("(%p)\n", This); + TRACE("iface %p.\n", iface); if (This->forwardReference) { /* Forward to the containerParent */ @@ -77,7 +80,8 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 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,6 +98,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, ID IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; IWineD3DDevice *myDevice = NULL; + TRACE("iface %p, device %p.\n", iface, ppDevice); + wined3d_mutex_lock(); IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); @@ -106,7 +112,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, ID static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)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 = IWineD3DVolume_SetPrivateData(This->wineD3DVolume, refguid, pData, SizeOfData, Flags); @@ -118,7 +126,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 ifac static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, void *pData, DWORD* pSizeOfData) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)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 = IWineD3DVolume_GetPrivateData(This->wineD3DVolume, refguid, pData, pSizeOfData); @@ -130,7 +140,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(LPDIRECT3DVOLUME8 ifac static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DVolume_FreePrivateData(This->wineD3DVolume, refguid); @@ -143,7 +154,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface, IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)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; @@ -163,7 +175,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV HRESULT hr; WINED3DVOLUME_DESC wined3ddesc; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, desc %p.\n", iface, pDesc); wined3d_mutex_lock(); hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc); @@ -187,7 +199,9 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DV static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)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(); hr = IWineD3DVolume_LockBox(This->wineD3DVolume, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); @@ -199,7 +213,8 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DL static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; HRESULT hr; - TRACE("(%p) relay %p\n", This, This->wineD3DVolume); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); hr = IWineD3DVolume_UnlockBox(This->wineD3DVolume); diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index d31c1561e0..cb01540c61 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -27,6 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d8); static HRESULT WINAPI IDirect3DVolumeTexture8Impl_QueryInterface(LPDIRECT3DVOLUMETEXTURE8 iface, REFIID riid, LPVOID *ppobj) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource8) || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8) @@ -45,7 +47,7 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_AddRef(LPDIRECT3DVOLUMETEXTURE8 IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)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 IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)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) { IDirect3DDevice8 *parentDevice = This->parentDevice; @@ -82,7 +84,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXT IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; IWineD3DDevice *wined3d_device; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, device %p.\n", iface, ppDevice); wined3d_mutex_lock(); hr = IWineD3DVolumeTexture_GetDevice(This->wineD3DVolumeTexture, &wined3d_device); @@ -99,7 +102,9 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXT static HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)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 = IWineD3DVolumeTexture_SetPrivateData(This->wineD3DVolumeTexture, refguid, pData, SizeOfData, Flags); @@ -111,7 +116,9 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUM static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, void *pData, DWORD *pSizeOfData) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)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 = IWineD3DVolumeTexture_GetPrivateData(This->wineD3DVolumeTexture, refguid, pData, pSizeOfData); @@ -123,7 +130,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetPrivateData(LPDIRECT3DVOLUM static HRESULT WINAPI IDirect3DVolumeTexture8Impl_FreePrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DVolumeTexture_FreePrivateData(This->wineD3DVolumeTexture, refguid); @@ -135,7 +143,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_FreePrivateData(LPDIRECT3DVOLU static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetPriority(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD PriorityNew) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); ret = IWineD3DVolumeTexture_SetPriority(This->wineD3DVolumeTexture, PriorityNew); @@ -147,7 +156,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetPriority(LPDIRECT3DVOLUMETEXT static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DVolumeTexture_GetPriority(This->wineD3DVolumeTexture); @@ -158,7 +168,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetPriority(LPDIRECT3DVOLUMETEXT static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DVolumeTexture_PreLoad(This->wineD3DVolumeTexture); @@ -168,7 +179,8 @@ static void WINAPI IDirect3DVolumeTexture8Impl_PreLoad(LPDIRECT3DVOLUMETEXTURE8 static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; D3DRESOURCETYPE type; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); type = IWineD3DVolumeTexture_GetType(This->wineD3DVolumeTexture); @@ -181,7 +193,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DVolumeTexture8Impl_GetType(LPDIRECT3DVOLU static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE8 iface, DWORD LODNew) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, lod %u.\n", iface, LODNew); wined3d_mutex_lock(); ret = IWineD3DVolumeTexture_SetLOD(This->wineD3DVolumeTexture, LODNew); @@ -193,7 +206,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_SetLOD(LPDIRECT3DVOLUMETEXTURE8 static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DVolumeTexture_GetLOD(This->wineD3DVolumeTexture); @@ -205,7 +219,8 @@ static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLOD(LPDIRECT3DVOLUMETEXTURE8 static DWORD WINAPI IDirect3DVolumeTexture8Impl_GetLevelCount(LPDIRECT3DVOLUMETEXTURE8 iface) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DVolumeTexture_GetLevelCount(This->wineD3DVolumeTexture); @@ -220,7 +235,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_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(); hr = IWineD3DVolumeTexture_GetLevelDesc(This->wineD3DVolumeTexture, Level, &wined3ddesc); @@ -246,7 +261,7 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_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(); hrc = IWineD3DVolumeTexture_GetVolumeLevel(This->wineD3DVolumeTexture, Level, &myVolume); @@ -262,7 +277,9 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetVolumeLevel(LPDIRECT3DVOLUM static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)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(); hr = IWineD3DVolumeTexture_LockBox(This->wineD3DVolumeTexture, Level, (WINED3DLOCKED_BOX *) pLockedVolume, (CONST WINED3DBOX *) pBox, Flags); @@ -274,7 +291,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_LockBox(LPDIRECT3DVOLUMETEXTUR static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXTURE8 iface, UINT Level) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay %p %d\n", This, This->wineD3DVolumeTexture, Level); + + TRACE("iface %p, level %u.\n", iface, Level); wined3d_mutex_lock(); hr = IWineD3DVolumeTexture_UnlockBox(This->wineD3DVolumeTexture, Level); @@ -286,7 +304,8 @@ static HRESULT WINAPI IDirect3DVolumeTexture8Impl_UnlockBox(LPDIRECT3DVOLUMETEXT static HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE8 iface, CONST D3DBOX *pDirtyBox) { IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, dirty_box %p.\n", iface, pDirtyBox); wined3d_mutex_lock(); hr = IWineD3DVolumeTexture_AddDirtyBox(This->wineD3DVolumeTexture, (CONST WINED3DBOX *) pDirtyBox);