Nikolay Sivov : d3drm: Fix IDirect3DRMMesh:: QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Mon Jun  5 02:07:31 2017 +0300

d3drm: Fix IDirect3DRMMesh::QueryInterface to support IDirect3DRMObject and IDirect3DRMVisual.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d3drm/meshbuilder.c | 2 ++
 dlls/d3drm/tests/d3drm.c | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c
index 4d5a2a7..82f809e 100644
--- a/dlls/d3drm/meshbuilder.c
+++ b/dlls/d3drm/meshbuilder.c
@@ -2322,6 +2322,8 @@ static HRESULT WINAPI d3drm_mesh_QueryInterface(IDirect3DRMMesh *iface, REFIID r
     TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
 
     if (IsEqualGUID(riid, &IID_IDirect3DRMMesh)
+            || IsEqualGUID(riid, &IID_IDirect3DRMVisual)
+            || IsEqualGUID(riid, &IID_IDirect3DRMObject)
             || IsEqualGUID(riid, &IID_IUnknown))
     {
         IDirect3DRMMesh_AddRef(iface);
diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c
index 411cd83..9985d03 100644
--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
@@ -615,6 +615,7 @@ static void test_Mesh(void)
     IDirect3DRMMesh *mesh;
     DWORD size;
     CHAR cname[64] = {0};
+    IUnknown *unk;
 
     hr = Direct3DRMCreate(&d3drm);
     ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr);
@@ -635,6 +636,14 @@ static void test_Mesh(void)
     ok(size == sizeof("Mesh"), "wrong size: %u\n", size);
     ok(!strcmp(cname, "Mesh"), "Expected cname to be \"Mesh\", but got \"%s\"\n", cname);
 
+    hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMObject, (void **)&unk);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMObject, %#x.\n", hr);
+    IUnknown_Release(unk);
+
+    hr = IDirect3DRMMesh_QueryInterface(mesh, &IID_IDirect3DRMVisual, (void **)&unk);
+    ok(SUCCEEDED(hr), "Failed to get IDirect3DRMVisual, %#x.\n", hr);
+    IUnknown_Release(unk);
+
     IDirect3DRMMesh_Release(mesh);
 
     IDirect3DRM_Release(d3drm);