* modules/access/dvdnav.c: fixed typo.

[vlc] / activex / connectioncontainer.cpp

diff --git a/activex/connectioncontainer.cpp b/activex/connectioncontainer.cpp
index 9908f944bf73f5dc29afe487cf5e09fb121609b9..6fd504a6980bc8ab5af4af94cc737233bfd6c794 100644 (file)
--- a/activex/connectioncontainer.cpp
+++ b/activex/connectioncontainer.cpp
@@ -133,7 +133,7 @@ STDMETHODIMP VLCConnectionPoint::EnumConnections(IEnumConnections **ppEnum)
     return (NULL != *ppEnum ) ? S_OK : E_OUTOFMEMORY;\r
 };\r
 \r
-void VLCConnectionPoint::fireEvent(DISPID dispId, LCID lcid, DISPPARAMS* pDispParams)\r
+void VLCConnectionPoint::fireEvent(DISPID dispId, DISPPARAMS* pDispParams)\r
 {\r
     vector<CONNECTDATA>::iterator end = _connections.end();\r
     vector<CONNECTDATA>::iterator iter = _connections.begin();\r
@@ -146,13 +146,7 @@ void VLCConnectionPoint::fireEvent(DISPID dispId, LCID lcid, DISPPARAMS* pDispPa
             IDispatch *pDisp;\r
             if( SUCCEEDED(cd.pUnk->QueryInterface(IID_IDispatch, (LPVOID *)&pDisp)) )\r
             {\r
-                unsigned int puArgErr;\r
-                VARIANT vRes;\r
-\r
-                if( SUCCEEDED(pDisp->Invoke(dispId, IID_NULL, lcid, DISPATCH_METHOD, pDispParams, &vRes, NULL, &puArgErr)) )\r
-                {\r
-                    VariantClear(&vRes);\r
-                }\r
+                pDisp->Invoke(dispId, IID_NULL, LOCALE_USER_DEFAULT, DISPATCH_METHOD, pDispParams, NULL, NULL, NULL);\r
                 pDisp->Release();\r
             }\r
         }\r
@@ -281,9 +275,9 @@ STDMETHODIMP VLCConnectionPointContainer::FindConnectionPoint(REFIID riid, IConn
     return NOERROR;\r
 };\r
 \r
-void VLCConnectionPointContainer::fireEvent(DISPID dispId, LCID lcid, DISPPARAMS* pDispParams)\r
+void VLCConnectionPointContainer::fireEvent(DISPID dispId, DISPPARAMS* pDispParams)\r
 {\r
-    _p_events->fireEvent(dispId,lcid, pDispParams);\r
+    _p_events->fireEvent(dispId, pDispParams);\r
 };\r
 \r
 void VLCConnectionPointContainer::firePropChangedEvent(DISPID dispId)\r