Commit c4b67760 authored by Damien Fouilleul's avatar Damien Fouilleul

- activex: misc fixes for properties and events sinks

parent 9a7e66f8
...@@ -36,6 +36,8 @@ struct VLCEnumConnectionsDereference ...@@ -36,6 +36,8 @@ struct VLCEnumConnectionsDereference
{ {
CONNECTDATA cd; CONNECTDATA cd;
i->second->AddRef();
cd.dwCookie = i->first; cd.dwCookie = i->first;
cd.pUnk = i->second; cd.pUnk = i->second;
return cd; return cd;
...@@ -115,12 +117,13 @@ STDMETHODIMP VLCConnectionPoint::Advise(IUnknown *pUnk, DWORD *pdwCookie) ...@@ -115,12 +117,13 @@ STDMETHODIMP VLCConnectionPoint::Advise(IUnknown *pUnk, DWORD *pdwCookie)
if( (NULL == pUnk) || (NULL == pdwCookie) ) if( (NULL == pUnk) || (NULL == pdwCookie) )
return E_POINTER; return E_POINTER;
pUnk->AddRef(); if( SUCCEEDED(pUnk->QueryInterface(_iid, (LPVOID *)&pUnk)) )
{
*pdwCookie = ++dwCookieCounter; *pdwCookie = ++dwCookieCounter;
_connections[*pdwCookie] = pUnk; _connections[*pdwCookie] = pUnk;
return S_OK;
return S_OK; }
return CONNECT_E_CANNOTCONNECT;
}; };
STDMETHODIMP VLCConnectionPoint::Unadvise(DWORD pdwCookie) STDMETHODIMP VLCConnectionPoint::Unadvise(DWORD pdwCookie)
...@@ -157,7 +160,7 @@ void VLCConnectionPoint::fireEvent(DISPID dispId, DISPPARAMS *pDispParams) ...@@ -157,7 +160,7 @@ void VLCConnectionPoint::fireEvent(DISPID dispId, DISPPARAMS *pDispParams)
if( NULL != pUnk ) if( NULL != pUnk )
{ {
IDispatch *pDisp; IDispatch *pDisp;
if( SUCCEEDED(pUnk->QueryInterface(IID_IDispatch, (LPVOID *)&pDisp)) ) if( SUCCEEDED(pUnk->QueryInterface(_iid, (LPVOID *)&pDisp)) )
{ {
pDisp->Invoke(dispId, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, pDispParams, NULL, NULL, NULL); pDisp->Invoke(dispId, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, pDispParams, NULL, NULL, NULL);
pDisp->Release(); pDisp->Release();
......
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