Nikolay Sivov : mfplat: Print warning instead of fixme for unsupported interfaces in attributes object.

Alexandre Julliard julliard at winehq.org
Fri Mar 22 16:06:18 CDT 2019


Module: wine
Branch: master
Commit: 71bf156e1bc658c77814eb90ac8a8e2f39e38755
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=71bf156e1bc658c77814eb90ac8a8e2f39e38755

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Fri Mar 22 09:15:13 2019 +0300

mfplat: Print warning instead of fixme for unsupported interfaces in attributes object.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mfplat/main.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c
index 899aca7..8e9cb66 100644
--- a/dlls/mfplat/main.c
+++ b/dlls/mfplat/main.c
@@ -651,24 +651,19 @@ static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface)
 
 static HRESULT WINAPI mfattributes_QueryInterface(IMFAttributes *iface, REFIID riid, void **out)
 {
-    mfattributes *This = impl_from_IMFAttributes(iface);
-
-    TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out);
+    TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out);
 
-    if(IsEqualGUID(riid, &IID_IUnknown) ||
-       IsEqualGUID(riid, &IID_IMFAttributes))
+    if (IsEqualIID(riid, &IID_IMFAttributes) ||
+            IsEqualGUID(riid, &IID_IUnknown))
     {
-        *out = &This->IMFAttributes_iface;
-    }
-    else
-    {
-        FIXME("(%s, %p)\n", debugstr_guid(riid), out);
-        *out = NULL;
-        return E_NOINTERFACE;
+        *out = iface;
+        IMFAttributes_AddRef(iface);
+        return S_OK;
     }
 
-    IUnknown_AddRef((IUnknown*)*out);
-    return S_OK;
+    WARN("Unsupported %s.\n", debugstr_guid(riid));
+    *out = NULL;
+    return E_NOINTERFACE;
 }
 
 static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface)




More information about the wine-cvs mailing list