X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=activex%2Fconnectioncontainer.cpp;h=6fd504a6980bc8ab5af4af94cc737233bfd6c794;hb=b089955150613b8fc638928790d2a60fc1a45b6f;hp=9908f944bf73f5dc29afe487cf5e09fb121609b9;hpb=03e30a851a1df1a06e1dc02d877b636f6adeac1d;p=vlc diff --git a/activex/connectioncontainer.cpp b/activex/connectioncontainer.cpp index 9908f944bf..6fd504a698 100644 --- a/activex/connectioncontainer.cpp +++ b/activex/connectioncontainer.cpp @@ -133,7 +133,7 @@ STDMETHODIMP VLCConnectionPoint::EnumConnections(IEnumConnections **ppEnum) return (NULL != *ppEnum ) ? S_OK : E_OUTOFMEMORY; }; -void VLCConnectionPoint::fireEvent(DISPID dispId, LCID lcid, DISPPARAMS* pDispParams) +void VLCConnectionPoint::fireEvent(DISPID dispId, DISPPARAMS* pDispParams) { vector::iterator end = _connections.end(); vector::iterator iter = _connections.begin(); @@ -146,13 +146,7 @@ void VLCConnectionPoint::fireEvent(DISPID dispId, LCID lcid, DISPPARAMS* pDispPa IDispatch *pDisp; if( SUCCEEDED(cd.pUnk->QueryInterface(IID_IDispatch, (LPVOID *)&pDisp)) ) { - unsigned int puArgErr; - VARIANT vRes; - - if( SUCCEEDED(pDisp->Invoke(dispId, IID_NULL, lcid, DISPATCH_METHOD, pDispParams, &vRes, NULL, &puArgErr)) ) - { - VariantClear(&vRes); - } + pDisp->Invoke(dispId, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, pDispParams, NULL, NULL, NULL); pDisp->Release(); } } @@ -281,9 +275,9 @@ STDMETHODIMP VLCConnectionPointContainer::FindConnectionPoint(REFIID riid, IConn return NOERROR; }; -void VLCConnectionPointContainer::fireEvent(DISPID dispId, LCID lcid, DISPPARAMS* pDispParams) +void VLCConnectionPointContainer::fireEvent(DISPID dispId, DISPPARAMS* pDispParams) { - _p_events->fireEvent(dispId,lcid, pDispParams); + _p_events->fireEvent(dispId, pDispParams); }; void VLCConnectionPointContainer::firePropChangedEvent(DISPID dispId)