[PATCH 2/4] wined3d: Get rid of IWineD3DVolume::GetDesc().

[Henri Verbeet]

---
 dlls/d3d8/volume.c       |    4 +++-
 dlls/d3d9/volume.c       |    6 +++---
 dlls/wined3d/volume.c    |   10 ++++------
 include/wine/wined3d.idl |    3 +--
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
index 0e96722..6859884 100644
--- a/dlls/d3d8/volume.c
+++ b/dlls/d3d8/volume.c
@@ -190,11 +190,13 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DV
 {
     IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface);
     struct wined3d_resource_desc wined3d_desc;
+    struct wined3d_resource *wined3d_resource;
 
     TRACE("iface %p, desc %p.\n", iface, desc);
 
     wined3d_mutex_lock();
-    IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3d_desc);
+    wined3d_resource = IWineD3DVolume_GetResource(This->wineD3DVolume);
+    wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
     wined3d_mutex_unlock();
 
     desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index c80b533..ebfbbbb 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -180,13 +180,13 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(IDirect3DVolume9 *iface, D3DV
 {
     IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
     struct wined3d_resource_desc wined3d_desc;
+    struct wined3d_resource *wined3d_resource;
 
     TRACE("iface %p, desc %p.\n", iface, desc);
 
     wined3d_mutex_lock();
-
-    IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3d_desc);
-
+    wined3d_resource = IWineD3DVolume_GetResource(This->wineD3DVolume);
+    wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
     wined3d_mutex_unlock();
 
     desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 6fb337f..d05a9f2 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -220,13 +220,11 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa
     return resource_get_type(&((IWineD3DVolumeImpl *)iface)->resource);
 }
 
-static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, struct wined3d_resource_desc *desc)
+struct wined3d_resource * WINAPI IWineD3DVolumeImpl_GetResource(IWineD3DVolume *iface)
 {
-    IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface;
-
-    TRACE("iface %p, desc %p.\n", iface, desc);
+    TRACE("iface %p.\n", iface);
 
-    wined3d_resource_get_desc(&volume->resource, desc);
+    return &((IWineD3DVolumeImpl *)iface)->resource;
 }
 
 static HRESULT WINAPI IWineD3DVolumeImpl_Map(IWineD3DVolume *iface,
@@ -309,7 +307,7 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl =
     IWineD3DVolumeImpl_PreLoad,
     IWineD3DVolumeImpl_GetType,
     /* IWineD3DVolume */
-    IWineD3DVolumeImpl_GetDesc,
+    IWineD3DVolumeImpl_GetResource,
     IWineD3DVolumeImpl_Map,
     IWineD3DVolumeImpl_Unmap,
 };
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index f6cad6a..bc556f5 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2324,8 +2324,7 @@ interface IWineD3DSurface : IWineD3DResource
 ]
 interface IWineD3DVolume : IWineD3DResource
 {
-    void GetDesc(
-        [out] struct wined3d_resource_desc *desc
+    struct wined3d_resource *GetResource(
     );
     HRESULT Map(
         [out] WINED3DLOCKED_BOX *locked_box,
-- 
1.7.3.4