Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXEffectPoolImpl_QueryInterface ().
Alexandre Julliard
julliard at winehq.org
Wed Apr 11 12:56:46 CDT 2012
Module: wine
Branch: master
Commit: 6e05c1415409d2daf12306de7150358ca1121f08
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e05c1415409d2daf12306de7150358ca1121f08
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Apr 10 22:06:23 2012 +0200
d3dx9: Don't return a pointer to the implementation in ID3DXEffectPoolImpl_QueryInterface().
---
dlls/d3dx9_36/effect.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index fa28ae0..0a07ddf 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -5917,15 +5917,13 @@ static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectP
/*** IUnknown methods ***/
static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object)
{
- struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface);
-
- TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object);
+ TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_IUnknown) ||
IsEqualGUID(riid, &IID_ID3DXEffectPool))
{
- This->ID3DXEffectPool_iface.lpVtbl->AddRef(iface);
- *object = This;
+ iface->lpVtbl->AddRef(iface);
+ *object = iface;
return S_OK;
}
More information about the wine-cvs
mailing list