d3drm: Fix QueryInterface for IDirect3DRMTexture*.

Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3drm: Fix QueryInterface for IDirect3DRMTexture*.
47913f1c · Aaryaman Vasishta · Alexandre Julliard · 924cad5f · 47913f1c
Commit 47913f1c authored Jan 20, 2016 by Aaryaman Vasishta Committed by Alexandre Julliard Jan 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 6 deletions

texture.c dlls/d3drm/texture.c +11 -6

No files found.
--- a/dlls/d3drm/texture.c
+++ b/dlls/d3drm/texture.c
@@ -679,21 +679,26 @@ static HRESULT WINAPI d3drm_texture3_QueryInterface(IDirect3DRMTexture3 *iface, 

    TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);

-    if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2)
-            || IsEqualGUID(riid, &IID_IDirect3DRMTexture)
+    if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3)
+            || IsEqualGUID(riid, &IID_IDirect3DRMVisual)
+            || IsEqualGUID(riid, &IID_IDirect3DRMObject)
            || IsEqualGUID(riid, &IID_IUnknown))
    {
+        *out = &texture->IDirect3DRMTexture3_iface;
+    }
+    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2))
+    {
        *out = &texture->IDirect3DRMTexture2_iface;
    }
-    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3))
+    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture))
    {
-        *out = &texture->IDirect3DRMTexture3_iface;
+        *out = &texture->IDirect3DRMTexture_iface;
    }
    else
    {
        *out = NULL;
-        WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
-        return E_NOINTERFACE;
+        WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid));
+        return CLASS_E_CLASSNOTAVAILABLE;
    }

    IUnknown_AddRef((IUnknown *)*out);