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

[Alexandre Julliard]

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

Author: Henri Verbeet 
Date:   Sun Apr  8 19:13:25 2012 +0200

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

---

dlls/d3dx9_36/shader.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c
index 29b4f6e..e0229f6 100644
--- a/dlls/d3dx9_36/shader.c
+++ b/dlls/d3dx9_36/shader.c
@@ -658,18 +658,16 @@ static DWORD calc_bytes(D3DXCONSTANT_DESC *desc)
 }

/*** IUnknown methods ***/
-static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **ppvObject)
+static HRESULT WINAPI ID3DXConstantTableImpl_QueryInterface(ID3DXConstantTable *iface, REFIID riid, void **out)
 {
-    struct ID3DXConstantTableImpl *This = impl_from_ID3DXConstantTable(iface);
-
-    TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
+    TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);

if (IsEqualGUID(riid, &IID_IUnknown) ||
         IsEqualGUID(riid, &IID_ID3DXBuffer) ||
         IsEqualGUID(riid, &IID_ID3DXConstantTable))
     {
         ID3DXConstantTable_AddRef(iface);
-        *ppvObject = This;
+        *out = iface;
         return S_OK;
     }