Skip to content

W
wine-cw
Commit e46047e4 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

Don't disconnect proxies flagged with SORFP_NOLIFETIMEMGMT. It makes

no sense and only causes trouble for proxies that depend on these proxies being available.
parent a8108022
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
dlls/ole32/marshal.c
View file @ e46047e4
...@@ -601,6 +601,12 @@ static void proxy_manager_disconnect(struct proxy_manager * This) ...@@ -601,6 +601,12 @@ static void proxy_manager_disconnect(struct proxy_manager * This)
TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid), TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid),
wine_dbgstr_longlong(This->oid)); wine_dbgstr_longlong(This->oid));
/* SORFP_NOLIFTIMEMGMT proxies (for IRemUnknown) shouldn't be
* disconnected - it won't do anything anyway, except cause
* problems for other objects that depend on this proxy always
* working */
if (This->sorflags & SORFP_NOLIFETIMEMGMT) return;
EnterCriticalSection(&This->cs); EnterCriticalSection(&This->cs);
LIST_FOR_EACH(cursor, &This->interfaces) LIST_FOR_EACH(cursor, &This->interfaces)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment