From 26978a4d2db3a8f318d10e13ba49563cfed4781c Mon Sep 17 00:00:00 2001
From: "H. Verbeet" <hverbeet@gmail.com>
Date: Tue, 6 Jun 2006 23:42:33 +0200
Subject: [PATCH] wined3d: Return the result of QueryInterface in GetContainer.

---
 dlls/wined3d/surface.c | 5 +----
 dlls/wined3d/volume.c  | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index e270701a1ab..46510103c4e 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -236,10 +236,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetContainer(IWineD3DSurface* iface, REFIID r
     }
 
     TRACE("Relaying to QueryInterface\n");
-    if (IUnknown_QueryInterface(container, riid, ppContainer) != S_OK)
-        return WINED3DERR_INVALIDCALL;
-
-    return WINED3D_OK;
+    return IUnknown_QueryInterface(container, riid, ppContainer);
 }
 
 HRESULT WINAPI IWineD3DSurfaceImpl_GetDesc(IWineD3DSurface *iface, WINED3DSURFACE_DESC *pDesc) {
diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index a8a9c1e07cb..3c7c66b23f5 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -142,10 +142,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REFIID rii
     }
 
     TRACE("Relaying to QueryInterface\n");
-    if (IUnknown_QueryInterface(This->container, riid, ppContainer) != S_OK)
-        return WINED3DERR_INVALIDCALL;
-
-    return WINED3D_OK;
+    return IUnknown_QueryInterface(This->container, riid, ppContainer);
 }
 
 HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) {