Huw Davies : ole32: Call IExternalConnection_ReleaseConnection with the correct final parameter .

Alexandre Julliard julliard at winehq.org
Thu Oct 24 13:18:56 CDT 2013


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

Author: Huw Davies <huw at codeweavers.com>
Date:   Thu Oct 24 16:16:51 2013 +0100

ole32: Call IExternalConnection_ReleaseConnection with the correct final parameter.

---

 dlls/ole32/stubmanager.c   |    2 +-
 dlls/ole32/tests/marshal.c |    5 -----
 2 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c
index 9f33056..6e59581 100644
--- a/dlls/ole32/stubmanager.c
+++ b/dlls/ole32/stubmanager.c
@@ -437,7 +437,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea
     TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
 
     if (last_extern_ref && m->extern_conn)
-        IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, TRUE /* FIXME: Use last_unlock releases? */);
+        IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases);
 
     if (rc == 0)
         stub_manager_int_release(m);
diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index cd49a7c..105e644 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -430,7 +430,6 @@ static void test_normal_marshal_and_unmarshal(void)
 
     ok_more_than_one_lock();
     ok_zero_external_conn();
-todo_wine
     ok_last_release_closes(FALSE);
 
     IUnknown_Release(pProxy);
@@ -512,7 +511,6 @@ static void test_same_apartment_unmarshal_failure(void)
 
     ok_no_locks();
     ok_zero_external_conn();
-todo_wine
     ok_last_release_closes(FALSE);
 
     IStream_Release(pStream);
@@ -1582,7 +1580,6 @@ static void test_lock_object_external(void)
 
     ok_no_locks();
     ok_zero_external_conn();
-todo_wine
     ok_last_release_closes(FALSE);
 
     /* test CoLockObjectExternal doesn't release the last reference to an
@@ -1603,7 +1600,6 @@ todo_wine
 
     ok_more_than_one_lock();
     ok_zero_external_conn();
-todo_wine
     ok_last_release_closes(FALSE);
 
     CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0);
@@ -1676,7 +1672,6 @@ static void test_normal_marshal_and_unmarshal_twice(void)
 
     ok_more_than_one_lock();
     ok_zero_external_conn();
-todo_wine
     ok_last_release_closes(FALSE);
 
     IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL);




More information about the wine-cvs mailing list