diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c
index f092f35bfa6..c28eeb6f841 100644
--- a/dlls/d3d8/cubetexture.c
+++ b/dlls/d3d8/cubetexture.c
@@ -31,20 +31,20 @@ static inline IDirect3DCubeTexture8Impl *impl_from_IDirect3DCubeTexture8(IDirect
 static HRESULT WINAPI IDirect3DCubeTexture8Impl_QueryInterface(IDirect3DCubeTexture8 *iface,
         REFIID riid, void **ppobj)
 {
-    IDirect3DCubeTexture8Impl *This = impl_from_IDirect3DCubeTexture8(iface);
-
     TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
 
-    if (IsEqualGUID(riid, &IID_IUnknown)
-        || IsEqualGUID(riid, &IID_IDirect3DResource8)
-        || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8)
-        || IsEqualGUID(riid, &IID_IDirect3DCubeTexture8)) {
+    if (IsEqualGUID(riid, &IID_IDirect3DCubeTexture8)
+            || IsEqualGUID(riid, &IID_IDirect3DBaseTexture8)
+            || IsEqualGUID(riid, &IID_IDirect3DResource8)
+            || IsEqualGUID(riid, &IID_IUnknown))
+    {
         IUnknown_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;
 }