From c860b8aec498f2dcaec2bb61ea3d3de93a651c6d Mon Sep 17 00:00:00 2001
From: Robert Shearman <rob@codeweavers.com>
Date: Mon, 7 Aug 2006 12:59:04 +0100
Subject: [PATCH] ole32: Finish off delegate notifications in the data advise
 holder.

Advise the data delegate object when new advises come in on the data
advise holder, not just when connecting.
Unadvise the data delegate object when unadvising a connection on the
data advise holder, when destructing the data advise holder and when
disconnecting.
---
 dlls/ole32/oleobj.c | 46 +++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index 473d7c2ffd7..f9c8668ba87 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -555,6 +555,7 @@ typedef struct DataAdviseHolder
   LONG                  ref;
   DWORD                 maxCons;
   DataAdviseConnection* Connections;
+  IDataObject*          delegate;
 } DataAdviseHolder;
 
 /* this connection has also has been advised to the delegate data object */
@@ -572,6 +573,11 @@ static void DataAdviseHolder_Destructor(DataAdviseHolder* ptrToDestroy)
   {
     if (ptrToDestroy->Connections[index].sink != NULL)
     {
+      if (ptrToDestroy->delegate && 
+          (ptrToDestroy->Connections[index].advf & WINE_ADVF_REMOTE))
+        IDataObject_DUnadvise(ptrToDestroy->delegate,
+          ptrToDestroy->Connections[index].remote_connection);
+
       IAdviseSink_Release(ptrToDestroy->Connections[index].sink);
       ptrToDestroy->Connections[index].sink = NULL;
     }
@@ -725,6 +731,23 @@ static HRESULT WINAPI DataAdviseHolder_Advise(
     if(advf & ADVF_PRIMEFIRST) {
       IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf);
     }
+
+    /* if we are already connected advise the remote object */
+    if (This->delegate)
+    {
+        HRESULT hr;
+
+        hr = IDataObject_DAdvise(This->delegate, &This->Connections[index].fmat,
+                                 This->Connections[index].advf,
+                                 This->Connections[index].sink,
+                                 &This->Connections[index].remote_connection);
+        if (FAILED(hr))
+        {
+            IDataAdviseHolder_Unadvise(iface, index + 1);
+            return hr;
+        }
+        This->Connections[index].advf |= WINE_ADVF_REMOTE;
+    }
   }
   /*
    * Return the index as the cookie.
@@ -763,11 +786,16 @@ static HRESULT WINAPI     DataAdviseHolder_Unadvise(
   if (This->Connections[dwConnection].sink == NULL)
     return OLE_E_NOCONNECTION;
 
+  if (This->delegate && This->Connections[dwConnection].advf & WINE_ADVF_REMOTE)
+    IDataObject_DUnadvise(This->delegate,
+      This->Connections[dwConnection].remote_connection);
+
   /*
    * Release the sink and mark the spot in the list as free.
    */
   IAdviseSink_Release(This->Connections[dwConnection].sink);
   memset(&(This->Connections[dwConnection]), 0, sizeof(DataAdviseConnection));
+
   return S_OK;
 }
 
@@ -852,13 +880,26 @@ HRESULT DataAdviseHolder_OnConnect(IDataAdviseHolder *iface, IDataObject *pDeleg
       This->Connections[index].advf |= WINE_ADVF_REMOTE;
     }
   }
-  /* FIXME: store pDelegate somewhere */
+  This->delegate = pDelegate;
   return hr;
 }
 
 void DataAdviseHolder_OnDisconnect(IDataAdviseHolder *iface)
 {
-    /* FIXME: Unadvise all remote interfaces */
+  DataAdviseHolder *This = (DataAdviseHolder *)iface;
+  DWORD index;
+
+  for(index = 0; index < This->maxCons; index++)
+  {
+    if((This->Connections[index].sink != NULL) &&
+       (This->Connections[index].advf & WINE_ADVF_REMOTE))
+    {
+      IDataObject_DUnadvise(This->delegate,
+        This->Connections[index].remote_connection);
+      This->Connections[index].advf &= ~WINE_ADVF_REMOTE;
+    }
+  }
+  This->delegate = NULL;
 }
 
 /******************************************************************************
@@ -877,6 +918,7 @@ static IDataAdviseHolder* DataAdviseHolder_Constructor(void)
 				     HEAP_ZERO_MEMORY,
 				     newHolder->maxCons *
 				     sizeof(DataAdviseConnection));
+  newHolder->delegate = NULL;
 
   TRACE("returning %p\n", newHolder);
   return (IDataAdviseHolder*)newHolder;