marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Forward the volume's GetDevice() to the texture instead of the wined3d volume.

oldstable
Henri Verbeet 2009-12-09 11:51:16 +01:00 committed by Alexandre Julliard
parent d2ad2df637
commit 789fed5095
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dlls/d3d8/volume.c
View File

@ -94,19 +94,24 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(LPDIRECT3DVOLUME8 iface) {
} }
/* IDirect3DVolume8 Interface follow: */ /* IDirect3DVolume8 Interface follow: */
static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(LPDIRECT3DVOLUME8 iface, IDirect3DDevice8 **ppDevice) { static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device)
{
IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface; IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface;
IWineD3DDevice *myDevice = NULL; IDirect3DResource8 *resource;
HRESULT hr;
TRACE("iface %p, device %p.\n", iface, ppDevice); TRACE("iface %p, device %p.\n", iface, device);
wined3d_mutex_lock(); hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource8, (void **)&resource);
IWineD3DVolume_GetDevice(This->wineD3DVolume, &myDevice); if (SUCCEEDED(hr))
IWineD3DDevice_GetParent(myDevice, (IUnknown **)ppDevice); {
IWineD3DDevice_Release(myDevice); hr = IDirect3DResource8_GetDevice(resource, device);
wined3d_mutex_unlock(); IDirect3DResource8_Release(resource);
return D3D_OK; TRACE("Returning device %p.\n", *device);
}
return hr;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(LPDIRECT3DVOLUME8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) {