wined3d: Return the result of QueryInterface in GetContainer.

26978a4d · H. Verbeet · Alexandre Julliard · 7b8bf46f · 26978a4d · 26978a4d
Commit 26978a4d authored Jun 06, 2006 by H. Verbeet Committed by Alexandre Julliard Jun 07, 2006
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

surface.c dlls/wined3d/surface.c +1 -4

volume.c dlls/wined3d/volume.c +1 -4

No files found.
--- 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) {

--- 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) {