From 3cedef2ffea3a72d9717470f01a3a046db923e4b Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Fri, 4 Dec 2009 11:50:46 +0100 Subject: [PATCH] d3d8: Simplify GetDevice(). We already store "parentDevice", so we might as well use it. --- dlls/d3d8/cubetexture.c | 21 ++++++++------------- dlls/d3d8/indexbuffer.c | 21 ++++++++------------- dlls/d3d8/surface.c | 21 ++++++++------------- dlls/d3d8/texture.c | 21 ++++++++------------- dlls/d3d8/vertexbuffer.c | 21 ++++++++------------- dlls/d3d8/volumetexture.c | 21 ++++++++------------- 6 files changed, 48 insertions(+), 78 deletions(-) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 02d2bca74e6..7e48dab1d79 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -82,23 +82,18 @@ static ULONG WINAPI IDirect3DCubeTexture8Impl_Release(LPDIRECT3DCUBETEXTURE8 ifa } /* IDirect3DCubeTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(LPDIRECT3DCUBETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DCubeTexture8Impl_GetDevice(IDirect3DCubeTexture8 *iface, IDirect3DDevice8 **device) +{ IDirect3DCubeTexture8Impl *This = (IDirect3DCubeTexture8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DCubeTexture_GetDevice(This->wineD3DCubeTexture, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DCubeTexture8Impl_SetPrivateData(LPDIRECT3DCUBETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 3369a0c43e4..b98c2d3edbb 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -79,23 +79,18 @@ static ULONG WINAPI IDirect3DIndexBuffer8Impl_Release(LPDIRECT3DINDEXBUFFER8 ifa } /* IDirect3DIndexBuffer8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(LPDIRECT3DINDEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDevice(IDirect3DIndexBuffer8 *iface, IDirect3DDevice8 **device) +{ IDirect3DIndexBuffer8Impl *This = (IDirect3DIndexBuffer8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDevice(This->wineD3DIndexBuffer, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DIndexBuffer8Impl_SetPrivateData(LPDIRECT3DINDEXBUFFER8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 51c79663003..1d4b1dca0b6 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -100,23 +100,18 @@ static ULONG WINAPI IDirect3DSurface8Impl_Release(LPDIRECT3DSURFACE8 iface) { } /* IDirect3DSurface8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(LPDIRECT3DSURFACE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DSurface8Impl_GetDevice(IDirect3DSurface8 *iface, IDirect3DDevice8 **device) +{ IDirect3DSurface8Impl *This = (IDirect3DSurface8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DSurface_GetDevice(This->wineD3DSurface, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DSurface8Impl_SetPrivateData(LPDIRECT3DSURFACE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 57cec4df9f9..67a60b4ee96 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -80,23 +80,18 @@ static ULONG WINAPI IDirect3DTexture8Impl_Release(LPDIRECT3DTEXTURE8 iface) { } /* IDirect3DTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(LPDIRECT3DTEXTURE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DTexture8Impl_GetDevice(IDirect3DTexture8 *iface, IDirect3DDevice8 **device) +{ IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - 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(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DTexture8Impl_SetPrivateData(LPDIRECT3DTEXTURE8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index ae5307a8bd7..9a984f22dce 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -81,23 +81,18 @@ static ULONG WINAPI IDirect3DVertexBuffer8Impl_Release(LPDIRECT3DVERTEXBUFFER8 i } /* IDirect3DVertexBuffer8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(LPDIRECT3DVERTEXBUFFER8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDevice(IDirect3DVertexBuffer8 *iface, IDirect3DDevice8 **device) +{ IDirect3DVertexBuffer8Impl *This = (IDirect3DVertexBuffer8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DBuffer_GetDevice(This->wineD3DVertexBuffer, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DVertexBuffer8Impl_SetPrivateData(LPDIRECT3DVERTEXBUFFER8 iface, REFGUID refguid, CONST void *pData, DWORD SizeOfData, DWORD Flags) { diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index cb01540c618..bc5c5b84d2e 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -80,23 +80,18 @@ static ULONG WINAPI IDirect3DVolumeTexture8Impl_Release(LPDIRECT3DVOLUMETEXTURE8 } /* IDirect3DVolumeTexture8 IDirect3DResource8 Interface follow: */ -static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(LPDIRECT3DVOLUMETEXTURE8 iface, IDirect3DDevice8 **ppDevice) { +static HRESULT WINAPI IDirect3DVolumeTexture8Impl_GetDevice(IDirect3DVolumeTexture8 *iface, IDirect3DDevice8 **device) +{ IDirect3DVolumeTexture8Impl *This = (IDirect3DVolumeTexture8Impl *)iface; - IWineD3DDevice *wined3d_device; - HRESULT hr; - TRACE("iface %p, device %p.\n", iface, ppDevice); + TRACE("iface %p, device %p.\n", iface, device); - wined3d_mutex_lock(); - hr = IWineD3DVolumeTexture_GetDevice(This->wineD3DVolumeTexture, &wined3d_device); - if (SUCCEEDED(hr)) - { - IWineD3DDevice_GetParent(wined3d_device, (IUnknown **)ppDevice); - IWineD3DDevice_Release(wined3d_device); - } - wined3d_mutex_unlock(); + *device = (IDirect3DDevice8 *)This->parentDevice; + IDirect3DDevice8_AddRef(*device); - return hr; + TRACE("Returning device %p.\n", *device); + + return D3D_OK; } static HRESULT WINAPI IDirect3DVolumeTexture8Impl_SetPrivateData(LPDIRECT3DVOLUMETEXTURE8 iface, REFGUID refguid, CONST void* pData, DWORD SizeOfData, DWORD Flags) {