X-Git-Url: https://git.reactos.org/?p=reactos.git;a=blobdiff_plain;f=dll%2Fdirectx%2Fwine%2Fd3d9%2Ftexture.c;h=564057f33f1544485c000b0cd5f7f808d1b8e13f;hp=9818c2698b9faf6637cf3e3f746e25891f06e5d3;hb=e4a060ead45b9dc87a64408b6d791ea4a5fef55e;hpb=2597cfe258b768473a744df30227f4067252d9b7 diff --git a/dll/directx/wine/d3d9/texture.c b/dll/directx/wine/d3d9/texture.c index 9818c2698b9..564057f33f1 100644 --- a/dll/directx/wine/d3d9/texture.c +++ b/dll/directx/wine/d3d9/texture.c @@ -29,6 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static HRESULT WINAPI IDirect3DTexture9Impl_QueryInterface(LPDIRECT3DTEXTURE9 iface, REFIID riid, LPVOID* ppobj) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDirect3DResource9) || IsEqualGUID(riid, &IID_IDirect3DBaseTexture9) @@ -47,7 +49,7 @@ static ULONG WINAPI IDirect3DTexture9Impl_AddRef(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) : AddRef from %d\n", This, ref - 1); + TRACE("%p increasing refcount to %u.\n", iface, ref); if (ref == 1) { @@ -64,40 +66,42 @@ static ULONG WINAPI IDirect3DTexture9Impl_Release(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) : ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, ref); if (ref == 0) { - IDirect3DDevice9Ex_Release(This->parentDevice); + IDirect3DDevice9Ex *parentDevice = This->parentDevice; + wined3d_mutex_lock(); IWineD3DTexture_Release(This->wineD3DTexture); wined3d_mutex_unlock(); + + /* Release the device last, as it may cause the device to be destroyed. */ + IDirect3DDevice9Ex_Release(parentDevice); } return ref; } /* IDirect3DTexture9 IDirect3DResource9 Interface follow: */ -static HRESULT WINAPI IDirect3DTexture9Impl_GetDevice(LPDIRECT3DTEXTURE9 iface, IDirect3DDevice9** ppDevice) { +static HRESULT WINAPI IDirect3DTexture9Impl_GetDevice(IDirect3DTexture9 *iface, IDirect3DDevice9 **device) +{ IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("(%p) Relay\n", This); - wined3d_mutex_lock(); - hr = IWineD3DTexture_GetDevice(This->wineD3DTexture, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + TRACE("iface %p, device %p.\n", iface, device); - return hr; + *device = (IDirect3DDevice9 *)This->parentDevice; + IDirect3DDevice9_AddRef(*device); + + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", + iface, debugstr_guid(refguid), pData, SizeOfData, Flags); wined3d_mutex_lock(); hr = IWineD3DTexture_SetPrivateData(This->wineD3DTexture, refguid, pData, SizeOfData, Flags); @@ -109,7 +113,9 @@ static HRESULT WINAPI IDirect3DTexture9Impl_SetPrivateData(LPDIRECT3DTEXTURE9 if static HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid, void* pData, DWORD* pSizeOfData) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s, data %p, data_size %p.\n", + iface, debugstr_guid(refguid), pData, pSizeOfData); wined3d_mutex_lock(); hr = IWineD3DTexture_GetPrivateData(This->wineD3DTexture, refguid, pData, pSizeOfData); @@ -121,7 +127,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetPrivateData(LPDIRECT3DTEXTURE9 if static HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(LPDIRECT3DTEXTURE9 iface, REFGUID refguid) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); wined3d_mutex_lock(); hr = IWineD3DTexture_FreePrivateData(This->wineD3DTexture, refguid); @@ -133,7 +140,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_FreePrivateData(LPDIRECT3DTEXTURE9 i static DWORD WINAPI IDirect3DTexture9Impl_SetPriority(LPDIRECT3DTEXTURE9 iface, DWORD PriorityNew) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, priority %u.\n", iface, PriorityNew); wined3d_mutex_lock(); ret = IWineD3DTexture_SetPriority(This->wineD3DTexture, PriorityNew); @@ -145,7 +153,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_SetPriority(LPDIRECT3DTEXTURE9 iface, static DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetPriority(This->wineD3DTexture); @@ -156,7 +165,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_GetPriority(LPDIRECT3DTEXTURE9 iface) static void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DTexture_PreLoad(This->wineD3DTexture); @@ -166,7 +176,8 @@ static void WINAPI IDirect3DTexture9Impl_PreLoad(LPDIRECT3DTEXTURE9 iface) { static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetType(This->wineD3DTexture); @@ -179,7 +190,8 @@ static D3DRESOURCETYPE WINAPI IDirect3DTexture9Impl_GetType(LPDIRECT3DTEXTURE9 i static DWORD WINAPI IDirect3DTexture9Impl_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD LODNew) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, lod %u.\n", iface, LODNew); wined3d_mutex_lock(); ret = IWineD3DTexture_SetLOD(This->wineD3DTexture, LODNew); @@ -191,7 +203,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_SetLOD(LPDIRECT3DTEXTURE9 iface, DWORD static DWORD WINAPI IDirect3DTexture9Impl_GetLOD(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetLOD(This->wineD3DTexture); @@ -203,7 +216,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_GetLOD(LPDIRECT3DTEXTURE9 iface) { static DWORD WINAPI IDirect3DTexture9Impl_GetLevelCount(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; DWORD ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = IWineD3DTexture_GetLevelCount(This->wineD3DTexture); @@ -215,7 +229,8 @@ static DWORD WINAPI IDirect3DTexture9Impl_GetLevelCount(LPDIRECT3DTEXTURE9 iface static HRESULT WINAPI IDirect3DTexture9Impl_SetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface, D3DTEXTUREFILTERTYPE FilterType) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, filter_type %#x.\n", iface, FilterType); wined3d_mutex_lock(); hr = IWineD3DTexture_SetAutoGenFilterType(This->wineD3DTexture, (WINED3DTEXTUREFILTERTYPE) FilterType); @@ -227,7 +242,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_SetAutoGenFilterType(LPDIRECT3DTEXTU static D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; D3DTEXTUREFILTERTYPE ret; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); ret = (D3DTEXTUREFILTERTYPE) IWineD3DTexture_GetAutoGenFilterType(This->wineD3DTexture); @@ -238,7 +254,8 @@ static D3DTEXTUREFILTERTYPE WINAPI IDirect3DTexture9Impl_GetAutoGenFilterType(LP static void WINAPI IDirect3DTexture9Impl_GenerateMipSubLevels(LPDIRECT3DTEXTURE9 iface) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p.\n", iface); wined3d_mutex_lock(); IWineD3DTexture_GenerateMipSubLevels(This->wineD3DTexture); @@ -251,7 +268,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetLevelDesc(LPDIRECT3DTEXTURE9 ifac WINED3DSURFACE_DESC wined3ddesc; HRESULT hr; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, level %u, desc %p.\n", iface, Level, pDesc); wined3d_mutex_lock(); hr = IWineD3DTexture_GetLevelDesc(This->wineD3DTexture, Level, &wined3ddesc); @@ -277,7 +294,7 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 i HRESULT hrc = D3D_OK; IWineD3DSurface *mySurface = NULL; - TRACE("(%p) Relay\n", This); + TRACE("iface %p, level %u, surface %p.\n", iface, Level, ppSurfaceLevel); wined3d_mutex_lock(); hrc = IWineD3DTexture_GetSurfaceLevel(This->wineD3DTexture, Level, &mySurface); @@ -293,7 +310,9 @@ static HRESULT WINAPI IDirect3DTexture9Impl_GetSurfaceLevel(LPDIRECT3DTEXTURE9 i static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, UINT Level, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", + iface, Level, pLockedRect, pRect, Flags); wined3d_mutex_lock(); hr = IWineD3DTexture_LockRect(This->wineD3DTexture, Level, (WINED3DLOCKED_RECT *) pLockedRect, pRect, Flags); @@ -305,7 +324,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_LockRect(LPDIRECT3DTEXTURE9 iface, U static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, UINT Level) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, level %u.\n", iface, Level); wined3d_mutex_lock(); hr = IWineD3DTexture_UnlockRect(This->wineD3DTexture, Level); @@ -317,7 +337,8 @@ static HRESULT WINAPI IDirect3DTexture9Impl_UnlockRect(LPDIRECT3DTEXTURE9 iface, static HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONST RECT* pDirtyRect) { IDirect3DTexture9Impl *This = (IDirect3DTexture9Impl *)iface; HRESULT hr; - TRACE("(%p) Relay\n", This); + + TRACE("iface %p, dirty_rect %p.\n", iface, pDirtyRect); wined3d_mutex_lock(); hr = IWineD3DTexture_AddDirtyRect(This->wineD3DTexture, pDirtyRect);