Qian Hong : quartz: Fix error code when checking circular connection.

[Alexandre Julliard]

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

Author: Qian Hong 
Date:   Mon Nov  9 16:45:03 2015 +0800

quartz: Fix error code when checking circular connection.

Signed-off-by: Qian Hong 
Signed-off-by: Alexandre Julliard

---

dlls/quartz/filtergraph.c       | 4 ++--
 dlls/quartz/tests/filtergraph.c | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c
index e0474fc..0b25259 100644
--- a/dlls/quartz/filtergraph.c
+++ b/dlls/quartz/filtergraph.c
@@ -611,7 +611,7 @@ static HRESULT CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin *
     if (info_out.dir != PINDIR_OUTPUT)
     {
         IBaseFilter_Release(info_out.pFilter);
-        return E_UNEXPECTED;
+        return VFW_E_CANNOT_CONNECT;
     }

hr = IPin_QueryPinInfo(in, &info_in);
@@ -621,7 +621,7 @@ static HRESULT CheckCircularConnection(IFilterGraphImpl *This, IPin *out, IPin *
         goto out;
     if (info_in.dir != PINDIR_INPUT)
     {
-        hr = E_UNEXPECTED;
+        hr = VFW_E_CANNOT_CONNECT;
         goto out;
     }

diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index 80b468c..b42aea8 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -214,7 +214,6 @@ static void test_graph_builder(void)
     ok(hr == E_POINTER, "IGraphBuilder_Connect returned %x\n", hr);

hr = IGraphBuilder_Connect(pgraph, pIn, pIn);
-todo_wine
     ok(hr == VFW_E_CANNOT_CONNECT, "IGraphBuilder_Connect returned %x\n", hr);

if (pIn) IPin_Release(pIn);