H. Verbeet : wined3d: Return the result of QueryInterface in
GetContainer.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Jun 7 07:49:00 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 26978a4d2db3a8f318d10e13ba49563cfed4781c
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=26978a4d2db3a8f318d10e13ba49563cfed4781c
Author: H. Verbeet <hverbeet at gmail.com>
Date: Tue Jun 6 23:42:33 2006 +0200
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 e270701..4651010 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -236,10 +236,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetCo
}
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 a8a9c1e..3c7c66b 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -142,10 +142,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_GetCon
}
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) {
More information about the wine-cvs
mailing list