Skip to content

W
wine-cw
Commit 5e9df71e authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

ole32: Don't send data changes in DataAdviseHolder_Advise for

ADVF_PRIMEFIRST connections if we are connected to a data object, since it will send the data change for us.
parent 53d01d27
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
dlls/ole32/oleobj.c
View file @ 5e9df71e
...@@ -728,9 +728,6 @@ static HRESULT WINAPI DataAdviseHolder_Advise( ...@@ -728,9 +728,6 @@ static HRESULT WINAPI DataAdviseHolder_Advise(
if (This->Connections[index].sink != NULL) { if (This->Connections[index].sink != NULL) {
IAdviseSink_AddRef(This->Connections[index].sink); IAdviseSink_AddRef(This->Connections[index].sink);
if(advf & ADVF_PRIMEFIRST) {
IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf);
}
/* if we are already connected advise the remote object */ /* if we are already connected advise the remote object */
if (This->delegate) if (This->delegate)
...@@ -748,6 +745,10 @@ static HRESULT WINAPI DataAdviseHolder_Advise( ...@@ -748,6 +745,10 @@ static HRESULT WINAPI DataAdviseHolder_Advise(
} }
This->Connections[index].advf |= WINE_ADVF_REMOTE; This->Connections[index].advf |= WINE_ADVF_REMOTE;
} }
else if(advf & ADVF_PRIMEFIRST)
/* only do this if we have no delegate, since in the above case the
* delegate will do the priming for us */
IDataAdviseHolder_SendOnDataChange(iface, pDataObject, 0, advf);
} }
/* /*
* Return the index as the cookie. * Return the index as the cookie.
......
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