d3drm/tests: Modify all QI tests to compare vtables.

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/tests: Modify all QI tests to compare vtables.
88f6c2aa · Aaryaman Vasishta · Alexandre Julliard · f585faff · 88f6c2aa · 88f6c2aa
Commit 88f6c2aa authored Jun 19, 2016 by Aaryaman Vasishta Committed by Alexandre Julliard Jun 21, 2016
Expand all Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 9 deletions

device.c dlls/d3drm/device.c +4 -4

d3drm.c dlls/d3drm/tests/d3drm.c +0 -0

texture.c dlls/d3drm/texture.c +5 -5

No files found.
--- a/dlls/d3drm/device.c
+++ b/dlls/d3drm/device.c
@@ -996,19 +996,19 @@ static HRESULT WINAPI d3drm_device3_QueryInterface(IDirect3DRMDevice3 *iface, RE

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

-    if (IsEqualGUID(riid, &IID_IDirect3DRMDevice3)
+    if (IsEqualGUID(riid, &IID_IDirect3DRMDevice)
            || IsEqualGUID(riid, &IID_IDirect3DRMObject)
            || IsEqualGUID(riid, &IID_IUnknown))
    {
-        *out = &device->IDirect3DRMDevice3_iface;
+        *out = &device->IDirect3DRMDevice_iface;
    }
    else if (IsEqualGUID(riid, &IID_IDirect3DRMDevice2))
    {
        *out = &device->IDirect3DRMDevice2_iface;
    }
-    else if (IsEqualGUID(riid, &IID_IDirect3DRMDevice))
+    else if (IsEqualGUID(riid, &IID_IDirect3DRMDevice3))
    {
-        *out = &device->IDirect3DRMDevice_iface;
+        *out = &device->IDirect3DRMDevice3_iface;
    }
    else if (IsEqualGUID(riid, &IID_IDirect3DRMWinDevice))
    {

--- a/dlls/d3drm/tests/d3drm.c
+++ b/dlls/d3drm/tests/d3drm.c
--- a/dlls/d3drm/texture.c
+++ b/dlls/d3drm/texture.c
@@ -48,7 +48,7 @@ static void d3drm_texture_destroy(struct d3drm_texture *texture)
 {
    TRACE("texture %p is being destroyed.\n", texture);

-    d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj);
+    d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture_iface, &texture->obj);
    if (texture->image)
        IDirect3DRM_Release(texture->d3drm);
    HeapFree(GetProcessHeap(), 0, texture);
@@ -705,20 +705,20 @@ 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_IDirect3DRMTexture3)
+    if (IsEqualGUID(riid, &IID_IDirect3DRMTexture)
            || IsEqualGUID(riid, &IID_IDirect3DRMVisual)
            || IsEqualGUID(riid, &IID_IDirect3DRMObject)
            || IsEqualGUID(riid, &IID_IUnknown))
    {
-        *out = &texture->IDirect3DRMTexture3_iface;
+        *out = &texture->IDirect3DRMTexture_iface;
    }
    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture2))
    {
        *out = &texture->IDirect3DRMTexture2_iface;
    }
-    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture))
+    else if (IsEqualGUID(riid, &IID_IDirect3DRMTexture3))
    {
-        *out = &texture->IDirect3DRMTexture_iface;
+        *out = &texture->IDirect3DRMTexture3_iface;
    }
    else
    {