Zebediah Figura : qedit: Fix return code for requesting aggregation with an interface other than IUnknown.

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Apr 15 23:20:52 2019 -0500

qedit: Fix return code for requesting aggregation with an interface other than IUnknown.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/qedit/main.c                | 2 +-
 dlls/qedit/tests/mediadet.c      | 2 +-
 dlls/qedit/tests/samplegrabber.c | 2 +-
 dlls/qedit/tests/timeline.c      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c
index a46f3f0..578e9df 100644
--- a/dlls/qedit/main.c
+++ b/dlls/qedit/main.c
@@ -106,7 +106,7 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter
 
     *ppobj = NULL;
     if (pOuter && !IsEqualGUID(&IID_IUnknown, riid))
-        return E_INVALIDARG;
+        return E_NOINTERFACE;
 
     hres = This->pfnCreateInstance(pOuter, (LPVOID *) &punk);
     if (SUCCEEDED(hres)) {
diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c
index 62685af..34c43fd 100644
--- a/dlls/qedit/tests/mediadet.c
+++ b/dlls/qedit/tests/mediadet.c
@@ -82,7 +82,7 @@ static void test_aggregation(void)
     detector = (IMediaDet *)0xdeadbeef;
     hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER,
             &IID_IMediaDet, (void **)&detector);
-    todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
+    ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
     ok(!detector, "Got interface %p.\n", detector);
 
     hr = CoCreateInstance(&CLSID_MediaDet, &test_outer, CLSCTX_INPROC_SERVER,
diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c
index 76fdfbb..22f6ddb 100644
--- a/dlls/qedit/tests/samplegrabber.c
+++ b/dlls/qedit/tests/samplegrabber.c
@@ -400,7 +400,7 @@ static void test_aggregation(void)
     filter = (IBaseFilter *)0xdeadbeef;
     hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER,
             &IID_IBaseFilter, (void **)&filter);
-    todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
+    ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
     ok(!filter, "Got interface %p.\n", filter);
 
     hr = CoCreateInstance(&CLSID_SampleGrabber, &test_outer, CLSCTX_INPROC_SERVER,
diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c
index a1e38e0..9e24062 100644
--- a/dlls/qedit/tests/timeline.c
+++ b/dlls/qedit/tests/timeline.c
@@ -74,7 +74,7 @@ static void test_aggregation(void)
     timeline = (IAMTimeline *)0xdeadbeef;
     hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,
             &IID_IAMTimeline, (void **)&timeline);
-    todo_wine ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
+    ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr);
     ok(!timeline, "Got interface %p.\n", timeline);
 
     hr = CoCreateInstance(&CLSID_AMTimeline, &test_outer, CLSCTX_INPROC_SERVER,