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.

Don't disconnect proxies flagged with SORFP_NOLIFETIMEMGMT. It makes
e46047e4 · Rob Shearman · Alexandre Julliard · a8108022 · e46047e4
Commit e46047e4 authored Jun 05, 2005 by Rob Shearman Committed by Alexandre Julliard Jun 05, 2005
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

marshal.c dlls/ole32/marshal.c +6 -0

No files found.
--- a/dlls/ole32/marshal.c
+++ b/dlls/ole32/marshal.c
@@ -601,6 +601,12 @@ static void proxy_manager_disconnect(struct proxy_manager * This)
    TRACE("oxid = %s, oid = %s\n", wine_dbgstr_longlong(This->oxid),
        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);

    LIST_FOR_EACH(cursor, &This->interfaces)