[vlc-commits] ActiveX: more warnings fixes

[Jean-Baptiste Kempf]

npapi-vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jan 24 18:12:57 2012 +0100| [634ea3968c6e34c38327b1e0ddaa33f9a021d521] | committer: Jean-Baptiste Kempf

ActiveX: more warnings fixes

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=634ea3968c6e34c38327b1e0ddaa33f9a021d521
---

 activex/persiststreaminit.cpp |    2 +-
 activex/plugin.cpp            |    6 +++---
 activex/vlccontrol.cpp        |   14 +++++++-------
 activex/vlccontrol2.cpp       |   10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/activex/persiststreaminit.cpp b/activex/persiststreaminit.cpp
index d120d66..03cf339 100644
--- a/activex/persiststreaminit.cpp
+++ b/activex/persiststreaminit.cpp
@@ -408,8 +408,8 @@ private:
     HRESULT ReadProperty(LPSTREAM pStm, AxVLCPropertyPair **prop)
     {
         HRESULT result;
-
         ULONG len;
+        *prop = NULL;
 
         result = pStm->Read(&len, sizeof(len), NULL);
         if( FAILED(result) )
diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index c22d6f7..e055cbf 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -677,7 +677,7 @@ HRESULT VLCPlugin::onAmbientChanged(LPUNKNOWN pContainer, DISPID dispID)
     return S_OK;
 };
 
-HRESULT VLCPlugin::onClose(DWORD dwSaveOption)
+HRESULT VLCPlugin::onClose(DWORD)
 {
     if( isInPlaceActive() )
     {
@@ -701,7 +701,7 @@ BOOL VLCPlugin::isInPlaceActive(void)
     return (NULL != _inplacewnd);
 };
 
-HRESULT VLCPlugin::onActivateInPlace(LPMSG lpMesg, HWND hwndParent, LPCRECT lprcPosRect, LPCRECT lprcClipRect)
+HRESULT VLCPlugin::onActivateInPlace(LPMSG, HWND hwndParent, LPCRECT lprcPosRect, LPCRECT lprcClipRect)
 {
     RECT clipRect = *lprcClipRect;
 
@@ -946,7 +946,7 @@ void VLCPlugin::onDraw(DVTARGETDEVICE * ptd, HDC hicTargetDev,
     }
 };
 
-void VLCPlugin::onPaint(HDC hdc, const RECT &bounds, const RECT &clipRect)
+void VLCPlugin::onPaint(HDC hdc, const RECT &bounds, const RECT &)
 {
     if( isVisible() )
     {
diff --git a/activex/vlccontrol.cpp b/activex/vlccontrol.cpp
index 7ebc248..7145f4a 100644
--- a/activex/vlccontrol.cpp
+++ b/activex/vlccontrol.cpp
@@ -68,7 +68,7 @@ STDMETHODIMP VLCControl::GetTypeInfoCount(UINT* pctInfo)
     return NOERROR;
 };
 
-STDMETHODIMP VLCControl::GetTypeInfo(UINT iTInfo, LCID lcid, LPTYPEINFO* ppTInfo)
+STDMETHODIMP VLCControl::GetTypeInfo(UINT, LCID, LPTYPEINFO* ppTInfo)
 {
     if( NULL == ppTInfo )
         return E_INVALIDARG;
@@ -83,8 +83,8 @@ STDMETHODIMP VLCControl::GetTypeInfo(UINT iTInfo, LCID lcid, LPTYPEINFO* ppTInfo
     return E_NOTIMPL;
 };
 
-STDMETHODIMP VLCControl::GetIDsOfNames(REFIID riid, LPOLESTR* rgszNames,
-        UINT cNames, LCID lcid, DISPID* rgDispID)
+STDMETHODIMP VLCControl::GetIDsOfNames(REFIID, LPOLESTR* rgszNames,
+        UINT cNames, LCID, DISPID* rgDispID)
 {
     if( SUCCEEDED(getTypeInfo()) )
     {
@@ -93,8 +93,8 @@ STDMETHODIMP VLCControl::GetIDsOfNames(REFIID riid, LPOLESTR* rgszNames,
     return E_NOTIMPL;
 };
 
-STDMETHODIMP VLCControl::Invoke(DISPID dispIdMember, REFIID riid,
-        LCID lcid, WORD wFlags, DISPPARAMS* pDispParams,
+STDMETHODIMP VLCControl::Invoke(DISPID dispIdMember, REFIID,
+        LCID, WORD wFlags, DISPPARAMS* pDispParams,
         VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr)
 {
     if( SUCCEEDED(getTypeInfo()) )
@@ -307,7 +307,7 @@ STDMETHODIMP VLCControl::toggleMute(void)
     return result;
 };
 
-STDMETHODIMP VLCControl::setVariable(BSTR name, VARIANT value)
+STDMETHODIMP VLCControl::setVariable(BSTR, VARIANT)
 {
     libvlc_instance_t* p_libvlc;
     HRESULT result = _p_instance->getVLC(&p_libvlc);
@@ -320,7 +320,7 @@ STDMETHODIMP VLCControl::setVariable(BSTR name, VARIANT value)
     return E_FAIL;
 };
 
-STDMETHODIMP VLCControl::getVariable(BSTR name, VARIANT *value)
+STDMETHODIMP VLCControl::getVariable(BSTR, VARIANT *)
 {
     libvlc_instance_t* p_libvlc;
     HRESULT result = _p_instance->getVLC(&p_libvlc);
diff --git a/activex/vlccontrol2.cpp b/activex/vlccontrol2.cpp
index b80980f..5f623f6 100644
--- a/activex/vlccontrol2.cpp
+++ b/activex/vlccontrol2.cpp
@@ -1262,7 +1262,7 @@ STDMETHODIMP VLCControl2::GetTypeInfoCount(UINT* pctInfo)
     return NOERROR;
 };
 
-STDMETHODIMP VLCControl2::GetTypeInfo(UINT iTInfo, LCID lcid, LPTYPEINFO* ppTInfo)
+STDMETHODIMP VLCControl2::GetTypeInfo(UINT, LCID, LPTYPEINFO* ppTInfo)
 {
     if( NULL == ppTInfo )
         return E_INVALIDARG;
@@ -1277,8 +1277,8 @@ STDMETHODIMP VLCControl2::GetTypeInfo(UINT iTInfo, LCID lcid, LPTYPEINFO* ppTInf
     return E_NOTIMPL;
 };
 
-STDMETHODIMP VLCControl2::GetIDsOfNames(REFIID riid, LPOLESTR* rgszNames,
-        UINT cNames, LCID lcid, DISPID* rgDispID)
+STDMETHODIMP VLCControl2::GetIDsOfNames(REFIID, LPOLESTR* rgszNames,
+        UINT cNames, LCID, DISPID* rgDispID)
 {
     if( SUCCEEDED(loadTypeInfo()) )
     {
@@ -1287,8 +1287,8 @@ STDMETHODIMP VLCControl2::GetIDsOfNames(REFIID riid, LPOLESTR* rgszNames,
     return E_NOTIMPL;
 };
 
-STDMETHODIMP VLCControl2::Invoke(DISPID dispIdMember, REFIID riid,
-        LCID lcid, WORD wFlags, DISPPARAMS* pDispParams,
+STDMETHODIMP VLCControl2::Invoke(DISPID dispIdMember, REFIID,
+        LCID, WORD wFlags, DISPPARAMS* pDispParams,
         VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr)
 {
     if( SUCCEEDED(loadTypeInfo()) )