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

Delete the stub manager outside of the apartment critical section 

because the deletion may require the object to re-enter the
apartment.
This commit is contained in:
Robert Shearman 2005-07-19 19:12:24 +00:00 committed by Alexandre Julliard
parent 48a52d0959
commit e874408d65
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/ole32/stubmanager.c
View File

@ -96,15 +96,13 @@ struct stub_manager *new_stub_manager(APARTMENT *apt, IUnknown *object, MSHLFLAG
return sm; return sm;
} }
/* m->apt->cs must be held on entry to this function */ /* caller must remove stub manager from apartment prior to calling this function */
static void stub_manager_delete(struct stub_manager *m) static void stub_manager_delete(struct stub_manager *m)
{ {
struct list *cursor; struct list *cursor;
TRACE("destroying %p (oid=%s)\n", m, wine_dbgstr_longlong(m->oid)); TRACE("destroying %p (oid=%s)\n", m, wine_dbgstr_longlong(m->oid));
list_remove(&m->entry);
/* release every ifstub */ /* release every ifstub */
while ((cursor = list_head(&m->ifstubs))) while ((cursor = list_head(&m->ifstubs)))
{ {
@ -230,9 +228,15 @@ ULONG stub_manager_int_release(struct stub_manager *This)
TRACE("after %ld\n", refs); TRACE("after %ld\n", refs);
/* remove from apartment so no other thread can access it... */
if (!refs)
list_remove(&This->entry);
LeaveCriticalSection(&apt->cs);
/* ... so now we can delete it without being inside the apartment critsec */
if (!refs) if (!refs)
stub_manager_delete(This); stub_manager_delete(This);
LeaveCriticalSection(&apt->cs);
return refs; return refs;
} }
@ -505,9 +509,9 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs)
break; break;
} }
stub_manager_ext_release(m, refs);
LeaveCriticalSection(&m->lock); LeaveCriticalSection(&m->lock);
stub_manager_ext_release(m, refs);
} }
/* is an ifstub table marshaled? */ /* is an ifstub table marshaled? */