Henri Verbeet : d3d9: Don' t return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface ().
Alexandre Julliard
julliard at winehq.org
Fri Mar 30 11:27:05 CDT 2012
Module: wine
Branch: master
Commit: fa3838e9deb0495a667f9306b84c1fdeca7ab24e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa3838e9deb0495a667f9306b84c1fdeca7ab24e
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Mar 30 01:08:38 2012 +0200
d3d9: Don't return a pointer to the implementation in IDirect3DSurface9Impl_QueryInterface().
---
dlls/d3d9/surface.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c
index eb78a01..e453ed8 100644
--- a/dlls/d3d9/surface.c
+++ b/dlls/d3d9/surface.c
@@ -34,19 +34,19 @@ static inline IDirect3DSurface9Impl *impl_from_IDirect3DSurface9(IDirect3DSurfac
static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(IDirect3DSurface9 *iface, REFIID riid,
void **ppobj)
{
- IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface);
-
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
- if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IDirect3DResource9)
- || IsEqualGUID(riid, &IID_IDirect3DSurface9)) {
+ if (IsEqualGUID(riid, &IID_IDirect3DSurface9)
+ || IsEqualGUID(riid, &IID_IDirect3DResource9)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
IDirect3DSurface9_AddRef(iface);
- *ppobj = This;
+ *ppobj = iface;
return S_OK;
}
- WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj);
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
*ppobj = NULL;
return E_NOINTERFACE;
}
More information about the wine-cvs
mailing list