ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Destroy stubs on apartment shutdown.

This commit is contained in:
Robert Shearman 2005-01-14 15:11:55 +00:00 committed by Alexandre Julliard
parent 7cf104aa52
commit a84e7d7b75
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/ole32/compobj.c
View File

@ -305,17 +305,30 @@ DWORD COM_ApartmentRelease(struct apartment *apt)
if (ret == 0) if (ret == 0)
{ {
struct list *cursor, *cursor2;
TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid)); TRACE("destroying apartment %p, oxid %s\n", apt, wine_dbgstr_longlong(apt->oxid));
MARSHAL_Disconnect_Proxies(apt); MARSHAL_Disconnect_Proxies(apt);
if (apt->win) DestroyWindow(apt->win); if (apt->win) DestroyWindow(apt->win);
if (!list_empty(&apt->stubmgrs)) LIST_FOR_EACH_SAFE(cursor, cursor2, &apt->stubmgrs)
{ {
FIXME("Destroy outstanding stubs\n"); struct stub_manager *stubmgr = LIST_ENTRY(cursor, struct stub_manager, entry);
/* release the implicit reference given by the fact that the
* stub has external references (it must do since it is in the
* stub manager list in the apartment and all non-apartment users
* must have a ref on the apartment and so it cannot be destroyed).
*/
stub_manager_int_release(stubmgr);
} }
/* if this assert fires, then another thread took a reference to a
* stub manager without taking a reference to the containing
* apartment, which it must do. */
assert(list_empty(&apt->stubmgrs));
if (apt->filter) IUnknown_Release(apt->filter); if (apt->filter) IUnknown_Release(apt->filter);
DeleteCriticalSection(&apt->cs); DeleteCriticalSection(&apt->cs);