Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXMeshImpl_QueryInterface().

Alexandre Julliard julliard at winehq.org
Mon Apr 9 13:09:15 CDT 2012


Module: wine
Branch: master
Commit: 531818846ad6a5edc8700197970ed4e8be7bf705
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=531818846ad6a5edc8700197970ed4e8be7bf705

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Sun Apr  8 19:13:26 2012 +0200

d3dx9: Don't return a pointer to the implementation in ID3DXMeshImpl_QueryInterface().

---

 dlls/d3dx9_36/mesh.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index 84856b3..be8ca60 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -96,16 +96,14 @@ static inline ID3DXMeshImpl *impl_from_ID3DXMesh(ID3DXMesh *iface)
 
 static HRESULT WINAPI ID3DXMeshImpl_QueryInterface(ID3DXMesh *iface, REFIID riid, LPVOID *object)
 {
-    ID3DXMeshImpl *This = impl_from_ID3DXMesh(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_ID3DXBaseMesh) ||
         IsEqualGUID(riid, &IID_ID3DXMesh))
     {
         iface->lpVtbl->AddRef(iface);
-        *object = This;
+        *object = iface;
         return S_OK;
     }
 




More information about the wine-cvs mailing list