Henri Verbeet : wined3d: IWineD3DVolume_GetDesc() should never fail.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 955858e97d215016d8a865a17aa1f246903eacdd
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=955858e97d215016d8a865a17a...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Wed Sep  8 11:24:48 2010 +0200

wined3d: IWineD3DVolume_GetDesc() should never fail.

---

 dlls/d3d8/volume.c           |   26 +++++++++++---------------
 dlls/d3d9/volume.c           |   24 ++++++++++--------------
 dlls/wined3d/volume.c        |    4 +---
 dlls/wined3d/volumetexture.c |    4 +++-
 include/wine/wined3d.idl     |    2 +-
 5 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c
index c2b7417..1705822 100644
--- a/dlls/d3d8/volume.c
+++ b/dlls/d3d8/volume.c
@@ -177,28 +177,24 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(LPDIRECT3DVOLUME8 iface,
 
 static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(LPDIRECT3DVOLUME8 iface, D3DVOLUME_DESC *pDesc) {
     IDirect3DVolume8Impl *This = (IDirect3DVolume8Impl *)iface;
-    HRESULT hr;
-    WINED3DVOLUME_DESC     wined3ddesc;
+    WINED3DVOLUME_DESC wined3ddesc;
 
     TRACE("iface %p, desc %p.\n", iface, pDesc);
 
     wined3d_mutex_lock();
-    hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc);
+    IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc);
     wined3d_mutex_unlock();
 
-    if (SUCCEEDED(hr))
-    {
-        pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format);
-        pDesc->Type = wined3ddesc.Type;
-        pDesc->Usage = wined3ddesc.Usage;
-        pDesc->Pool = wined3ddesc.Pool;
-        pDesc->Size = wined3ddesc.Size;
-        pDesc->Width = wined3ddesc.Width;
-        pDesc->Height = wined3ddesc.Height;
-        pDesc->Depth = wined3ddesc.Depth;
-    }
+    pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format);
+    pDesc->Type = wined3ddesc.Type;
+    pDesc->Usage = wined3ddesc.Usage;
+    pDesc->Pool = wined3ddesc.Pool;
+    pDesc->Size = wined3ddesc.Size;
+    pDesc->Width = wined3ddesc.Width;
+    pDesc->Height = wined3ddesc.Height;
+    pDesc->Depth = wined3ddesc.Depth;
 
-    return hr;
+    return D3D_OK;
 }
 
 static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(LPDIRECT3DVOLUME8 iface, D3DLOCKED_BOX *pLockedVolume, CONST D3DBOX *pBox, DWORD Flags) {
diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c
index 0d87b86..1ecd2b2 100644
--- a/dlls/d3d9/volume.c
+++ b/dlls/d3d9/volume.c
@@ -182,29 +182,25 @@ static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(LPDIRECT3DVOLUME9 iface,
 
 static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(LPDIRECT3DVOLUME9 iface, D3DVOLUME_DESC* pDesc) {
     IDirect3DVolume9Impl *This = (IDirect3DVolume9Impl *)iface;
-    WINED3DVOLUME_DESC     wined3ddesc;
-    HRESULT hr;
+    WINED3DVOLUME_DESC wined3ddesc;
 
     TRACE("iface %p, desc %p.\n", iface, pDesc);
 
     wined3d_mutex_lock();
 
-    hr = IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc);
+    IWineD3DVolume_GetDesc(This->wineD3DVolume, &wined3ddesc);
 
     wined3d_mutex_unlock();
 
-    if (SUCCEEDED(hr))
-    {
-        pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format);
-        pDesc->Type = wined3ddesc.Type;
-        pDesc->Usage = wined3ddesc.Usage;
-        pDesc->Pool = wined3ddesc.Pool;
-        pDesc->Width = wined3ddesc.Width;
-        pDesc->Height = wined3ddesc.Height;
-        pDesc->Depth = wined3ddesc.Depth;
-    }
+    pDesc->Format = d3dformat_from_wined3dformat(wined3ddesc.Format);
+    pDesc->Type = wined3ddesc.Type;
+    pDesc->Usage = wined3ddesc.Usage;
+    pDesc->Pool = wined3ddesc.Pool;
+    pDesc->Width = wined3ddesc.Width;
+    pDesc->Height = wined3ddesc.Height;
+    pDesc->Depth = wined3ddesc.Depth;
 
-    return hr;
+    return D3D_OK;
 }
 
 static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(LPDIRECT3DVOLUME9 iface, D3DLOCKED_BOX* pLockedVolume, CONST D3DBOX* pBox, DWORD Flags) {
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 94ea319..8c596fb 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -187,7 +187,7 @@ static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeImpl_GetType(IWineD3DVolume *ifa
     return resource_get_type((IWineD3DResource *)iface);
 }
 
-static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc)
+static void WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC *desc)
 {
     IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)iface;
 
@@ -201,8 +201,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DV
     desc->Width = volume->currentDesc.Width;
     desc->Height = volume->currentDesc.Height;
     desc->Depth = volume->currentDesc.Depth;
-
-    return WINED3D_OK;
 }
 
 static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DLOCKED_BOX* pLockedVolume, CONST WINED3DBOX* pBox, DWORD Flags) {
diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c
index 6abba41..2e9fec9 100644
--- a/dlls/wined3d/volumetexture.c
+++ b/dlls/wined3d/volumetexture.c
@@ -273,7 +273,9 @@ static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetLevelDesc(IWineD3DVolumeTextu
         return WINED3DERR_INVALIDCALL;
     }
 
-    return IWineD3DVolume_GetDesc(volume, desc);
+    IWineD3DVolume_GetDesc(volume, desc);
+
+    return WINED3D_OK;
 }
 
 static HRESULT WINAPI IWineD3DVolumeTextureImpl_GetVolumeLevel(IWineD3DVolumeTexture *iface,
diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl
index 36a82a5..80dabac 100644
--- a/include/wine/wined3d.idl
+++ b/include/wine/wined3d.idl
@@ -2486,7 +2486,7 @@ interface IWineD3DSurface : IWineD3DResource
 ]
 interface IWineD3DVolume : IWineD3DResource
 {
-    HRESULT GetDesc(
+    void GetDesc(
         [out] WINED3DVOLUME_DESC *desc
     );
     HRESULT LockBox(