[PATCH 0/2] MR5349: netprofm: Fix error returned from connection_point_Advise().

[PATCH 1/2] netprofm: Fix error returned from connection_point_Advise().

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/netprofm/list.c       | 2 +-
 dlls/netprofm/tests/list.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c
index 31534c7f4b9..e8a22f77624 100644
--- a/dlls/netprofm/list.c
+++ b/dlls/netprofm/list.c
@@ -194,7 +194,7 @@ static HRESULT WINAPI connection_point_Advise(
     if (FAILED(hr))
     {
         WARN( "iface %s not implemented by sink\n", debugstr_guid(&cp->iid) );
-        return CO_E_FAILEDTOOPENTHREADTOKEN;
+        return CONNECT_E_CANNOTCONNECT;
     }

sink_entry = malloc( sizeof(*sink_entry) );
diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c
index 4c0c87cab8b..fec27ac8330 100644
--- a/dlls/netprofm/tests/list.c
+++ b/dlls/netprofm/tests/list.c
@@ -22,6 +22,7 @@
 #include "initguid.h"
 #include "objbase.h"
 #include "ocidl.h"
+#include "olectl.h"
 #include "netlistmgr.h"
 #include "wine/test.h"

@@ -348,7 +349,7 @@ static void test_INetworkListManager( void )
         "Expected iid to be IID_INetworkListManagerEvents\n" );

hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink_unk, &cookie);
-    ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08lx\n", hr );
+    ok( hr == CONNECT_E_CANNOTCONNECT, "Advise failed: %08lx\n", hr );

hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink, &cookie);
     ok( hr == S_OK, "Advise failed: %08lx\n", hr );

[PATCH 2/2] netprofm/tests: Fix a test failure on Windows 7.

[Hans Leidekker]

From: Hans Leidekker

---
 dlls/netprofm/tests/list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c
index fec27ac8330..5fd43fd17a4 100644
--- a/dlls/netprofm/tests/list.c
+++ b/dlls/netprofm/tests/list.c
@@ -366,7 +366,7 @@ static void test_INetworkListManager( void )
     IConnectionPoint_Release( pt2 );

hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt );
-    ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE, "got %08lx\n", hr );
+    ok( hr == S_OK || hr == CO_E_FAILEDTOIMPERSONATE || hr == CONNECT_E_NOCONNECTION /* win7 */, "got %08lx\n", hr );
     if (hr == S_OK) IConnectionPoint_Release( pt );

hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkConnectionEvents, &pt );

[Alexandre Julliard (＠julliard)]

Superseded by 5cf558935d38aaffc1773201d804189a81163e3a.

[PATCH 0/2] MR5349: netprofm: Fix error returned from connection_point_Advise(). - closed

[Alexandre Julliard (＠julliard)]

This merge request was closed by Alexandre Julliard.