From b8b7a72f26d731498a22c05c79b81d25b8d58108 Mon Sep 17 00:00:00 2001 From: Aaryaman Vasishta Date: Sun, 26 Apr 2015 16:48:59 +0530 Subject: [PATCH] d3drm: Move QueryInterface from frame2->frame3. --- dlls/d3drm/frame.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 39c2e7b8258..6737cc4b5c1 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -470,27 +470,7 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) - || IsEqualGUID(riid, &IID_IDirect3DRMFrame) - || IsEqualGUID(riid, &IID_IDirect3DRMObject) - || IsEqualGUID(riid, &IID_IDirect3DRMVisual) - || IsEqualGUID(riid, &IID_IUnknown)) - { - *out = &frame->IDirect3DRMFrame2_iface; - } - else if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) - { - *out = &frame->IDirect3DRMFrame3_iface; - } - else - { - *out = NULL; - WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); - return CLASS_E_CLASSNOTAVAILABLE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; + return IDirect3DRMFrame3_QueryInterface(&frame->IDirect3DRMFrame3_iface, riid, out); } static ULONG WINAPI d3drm_frame2_AddRef(IDirect3DRMFrame2 *iface) @@ -1233,7 +1213,27 @@ static HRESULT WINAPI d3drm_frame3_QueryInterface(IDirect3DRMFrame3 *iface, REFI TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - return d3drm_frame2_QueryInterface(&frame->IDirect3DRMFrame2_iface, riid, out); + if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) + || IsEqualGUID(riid, &IID_IDirect3DRMFrame) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IUnknown)) + { + *out = &frame->IDirect3DRMFrame2_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) + { + *out = &frame->IDirect3DRMFrame3_iface; + } + else + { + *out = NULL; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface)