npapi-vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Tue Jan 24 18:04:39 2012 +0100| [501d7879cb8b866799a6e8f3b572384652275eed] | committer: Jean-Baptiste Kempf
ActiveX: multiple warning killing > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=501d7879cb8b866799a6e8f3b572384652275eed --- activex/dataobject.cpp | 8 ++++---- activex/main.cpp | 1 + activex/objectsafety.h | 2 +- activex/olecontrol.cpp | 2 +- activex/oleinplaceactiveobject.cpp | 10 +++++----- activex/oleinplaceobject.cpp | 2 +- activex/oleobject.cpp | 12 ++++++------ activex/persistpropbag.cpp | 2 +- activex/persiststorage.cpp | 4 ++-- activex/persiststreaminit.cpp | 2 +- activex/viewobject.cpp | 20 ++++++++++---------- 11 files changed, 33 insertions(+), 32 deletions(-) diff --git a/activex/dataobject.cpp b/activex/dataobject.cpp index e784096..1727de4 100644 --- a/activex/dataobject.cpp +++ b/activex/dataobject.cpp @@ -93,7 +93,7 @@ STDMETHODIMP VLCDataObject::EnumDAdvise(IEnumSTATDATA **ppenumAdvise) return _p_adviseHolder->EnumAdvise(ppenumAdvise); }; -STDMETHODIMP VLCDataObject::EnumFormatEtc(DWORD dwDirection, +STDMETHODIMP VLCDataObject::EnumFormatEtc(DWORD, IEnumFORMATETC **ppEnum) { if( NULL == ppEnum ) @@ -149,7 +149,7 @@ STDMETHODIMP VLCDataObject::GetData(LPFORMATETC pFormatEtc, LPSTGMEDIUM pMedium) return result; }; -STDMETHODIMP VLCDataObject::GetDataHere(LPFORMATETC pFormatEtc, +STDMETHODIMP VLCDataObject::GetDataHere(LPFORMATETC, LPSTGMEDIUM pMedium) { if( NULL == pMedium ) @@ -259,8 +259,8 @@ STDMETHODIMP VLCDataObject::QueryGetData(LPFORMATETC pFormatEtc) return S_OK; }; -STDMETHODIMP VLCDataObject::SetData(LPFORMATETC pFormatEtc, - LPSTGMEDIUM pMedium, BOOL fRelease) +STDMETHODIMP VLCDataObject::SetData(LPFORMATETC, + LPSTGMEDIUM, BOOL) { return E_NOTIMPL; }; diff --git a/activex/main.cpp b/activex/main.cpp index 30344ae..9457c07 100644 --- a/activex/main.cpp +++ b/activex/main.cpp @@ -439,6 +439,7 @@ STDAPI_(int) WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR szCmdLine, int sw) STDAPI_(BOOL) DllMain(HANDLE hModule, DWORD fdwReason, LPVOID lpReserved ) { + (void)lpReserved; switch( fdwReason ) { case DLL_PROCESS_ATTACH: diff --git a/activex/objectsafety.h b/activex/objectsafety.h index 14ad340..87cbbd9 100644 --- a/activex/objectsafety.h +++ b/activex/objectsafety.h @@ -23,7 +23,7 @@ #ifndef __OBJECTSAFETY_H__ #define __OBJECTSAFETY_H__ -#if HAVE_OBJSAFE_HEADER +#ifdef HAVE_OBJSAFE_HEADER /* ** at last, a version of mingw that supports this header */ diff --git a/activex/olecontrol.cpp b/activex/olecontrol.cpp index 797e00c..1fd0a1d 100644 --- a/activex/olecontrol.cpp +++ b/activex/olecontrol.cpp @@ -36,7 +36,7 @@ STDMETHODIMP VLCOleControl::GetControlInfo(CONTROLINFO *pCI) return S_OK; }; -STDMETHODIMP VLCOleControl::OnMnemonic(LPMSG pMsg) +STDMETHODIMP VLCOleControl::OnMnemonic(LPMSG) { return S_OK; }; diff --git a/activex/oleinplaceactiveobject.cpp b/activex/oleinplaceactiveobject.cpp index 9aeb25b..af5db25 100644 --- a/activex/oleinplaceactiveobject.cpp +++ b/activex/oleinplaceactiveobject.cpp @@ -37,12 +37,12 @@ STDMETHODIMP VLCOleInPlaceActiveObject::GetWindow(HWND *pHwnd) return E_FAIL; }; -STDMETHODIMP VLCOleInPlaceActiveObject::EnableModeless(BOOL fEnable) +STDMETHODIMP VLCOleInPlaceActiveObject::EnableModeless(BOOL) { return S_OK; }; -STDMETHODIMP VLCOleInPlaceActiveObject::ContextSensitiveHelp(BOOL fEnterMode) +STDMETHODIMP VLCOleInPlaceActiveObject::ContextSensitiveHelp(BOOL) { return E_NOTIMPL; }; @@ -72,17 +72,17 @@ STDMETHODIMP VLCOleInPlaceActiveObject::TranslateAccelerator(LPMSG lpmsg) return hr; }; -STDMETHODIMP VLCOleInPlaceActiveObject::OnFrameWindowActivate(BOOL fActivate) +STDMETHODIMP VLCOleInPlaceActiveObject::OnFrameWindowActivate(BOOL) { return S_OK; }; -STDMETHODIMP VLCOleInPlaceActiveObject::OnDocWindowActivate(BOOL fActivate) +STDMETHODIMP VLCOleInPlaceActiveObject::OnDocWindowActivate(BOOL) { return S_OK; }; -STDMETHODIMP VLCOleInPlaceActiveObject::ResizeBorder(LPCRECT prcBorder, LPOLEINPLACEUIWINDOW pUIWindow, BOOL fFrameWindow) +STDMETHODIMP VLCOleInPlaceActiveObject::ResizeBorder(LPCRECT, LPOLEINPLACEUIWINDOW, BOOL) { return S_OK; }; diff --git a/activex/oleinplaceobject.cpp b/activex/oleinplaceobject.cpp index 5bc9a8a..2eb5ccc 100644 --- a/activex/oleinplaceobject.cpp +++ b/activex/oleinplaceobject.cpp @@ -39,7 +39,7 @@ STDMETHODIMP VLCOleInPlaceObject::GetWindow(HWND *pHwnd) return E_FAIL; }; -STDMETHODIMP VLCOleInPlaceObject::ContextSensitiveHelp(BOOL fEnterMode) +STDMETHODIMP VLCOleInPlaceObject::ContextSensitiveHelp(BOOL) { return E_NOTIMPL; }; diff --git a/activex/oleobject.cpp b/activex/oleobject.cpp index ba988a5..d0c3806 100644 --- a/activex/oleobject.cpp +++ b/activex/oleobject.cpp @@ -58,7 +58,7 @@ STDMETHODIMP VLCOleObject::Close(DWORD dwSaveOption) }; STDMETHODIMP VLCOleObject::DoVerb(LONG iVerb, LPMSG lpMsg, LPOLECLIENTSITE pActiveSite, - LONG lIndex, HWND hwndParent, LPCRECT lprcPosRect) + LONG, HWND hwndParent, LPCRECT lprcPosRect) { switch( iVerb ) { @@ -250,7 +250,7 @@ STDMETHODIMP VLCOleObject::GetClientSite(LPOLECLIENTSITE *ppClientSite) return S_OK; }; -STDMETHODIMP VLCOleObject::GetClipboardData(DWORD dwReserved, LPDATAOBJECT *ppDataObject) +STDMETHODIMP VLCOleObject::GetClipboardData(DWORD, LPDATAOBJECT *ppDataObject) { return _p_instance->pUnkOuter->QueryInterface(IID_IDataObject, (void **)ppDataObject); }; @@ -314,7 +314,7 @@ STDMETHODIMP VLCOleObject::GetUserType(DWORD dwFormOfType, LPOLESTR *pszUserType dwFormOfType, pszUserType); }; -STDMETHODIMP VLCOleObject::InitFromData(LPDATAOBJECT pDataObject, BOOL fCreation, DWORD dwReserved) +STDMETHODIMP VLCOleObject::InitFromData(LPDATAOBJECT, BOOL, DWORD) { return E_NOTIMPL; }; @@ -339,7 +339,7 @@ STDMETHODIMP VLCOleObject::SetClientSite(LPOLECLIENTSITE pClientSite) return S_OK; }; -STDMETHODIMP VLCOleObject::SetColorScheme(LOGPALETTE *pLogpal) +STDMETHODIMP VLCOleObject::SetColorScheme(LOGPALETTE *) { return E_NOTIMPL; }; @@ -379,12 +379,12 @@ STDMETHODIMP VLCOleObject::SetExtent(DWORD dwDrawAspect, SIZEL *pSizel) return E_NOTIMPL; }; -STDMETHODIMP VLCOleObject::SetHostNames(LPCOLESTR szContainerApp, LPCOLESTR szContainerObj) +STDMETHODIMP VLCOleObject::SetHostNames(LPCOLESTR, LPCOLESTR) { return S_OK; }; -STDMETHODIMP VLCOleObject::SetMoniker(DWORD dwWhichMoniker, LPMONIKER pMoniker) +STDMETHODIMP VLCOleObject::SetMoniker(DWORD, LPMONIKER pMoniker) { return _p_advise_holder->SendOnRename(pMoniker); }; diff --git a/activex/persistpropbag.cpp b/activex/persistpropbag.cpp index 85a31be..5b0331b 100644 --- a/activex/persistpropbag.cpp +++ b/activex/persistpropbag.cpp @@ -215,7 +215,7 @@ STDMETHODIMP VLCPersistPropertyBag::Load(LPPROPERTYBAG pPropBag, LPERRORLOG pErr return _p_instance->onLoad(); }; -STDMETHODIMP VLCPersistPropertyBag::Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, BOOL fSaveAllProperties) +STDMETHODIMP VLCPersistPropertyBag::Save(LPPROPERTYBAG pPropBag, BOOL fClearDirty, BOOL) { if( NULL == pPropBag ) return E_INVALIDARG; diff --git a/activex/persiststorage.cpp b/activex/persiststorage.cpp index 3b156b4..69fa5e9 100644 --- a/activex/persiststorage.cpp +++ b/activex/persiststorage.cpp @@ -38,7 +38,7 @@ STDMETHODIMP VLCPersistStorage::IsDirty(void) return _p_instance->isDirty() ? S_OK : S_FALSE; }; -STDMETHODIMP VLCPersistStorage::InitNew(LPSTORAGE pStg) +STDMETHODIMP VLCPersistStorage::InitNew(LPSTORAGE) { return _p_instance->onInit(); }; @@ -94,7 +94,7 @@ STDMETHODIMP VLCPersistStorage::Save(LPSTORAGE pStg, BOOL fSameAsLoad) return result; }; -STDMETHODIMP VLCPersistStorage::SaveCompleted(IStorage *pStg) +STDMETHODIMP VLCPersistStorage::SaveCompleted(IStorage *) { return S_OK; }; diff --git a/activex/persiststreaminit.cpp b/activex/persiststreaminit.cpp index fe302a1..d120d66 100644 --- a/activex/persiststreaminit.cpp +++ b/activex/persiststreaminit.cpp @@ -239,7 +239,7 @@ public: // IPropertyBag methods - STDMETHODIMP Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog) + STDMETHODIMP Read(LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *) { if( (NULL == pszPropName) || (NULL == pVar) ) return E_POINTER; diff --git a/activex/viewobject.cpp b/activex/viewobject.cpp index 7bb9200..3c7d17e 100644 --- a/activex/viewobject.cpp +++ b/activex/viewobject.cpp @@ -27,9 +27,9 @@ using namespace std; -STDMETHODIMP VLCViewObject::Draw(DWORD dwAspect, LONG lindex, PVOID pvAspect, - DVTARGETDEVICE *ptd, HDC hicTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, - LPCRECTL lprcWBounds, BOOL(CALLBACK *pfnContinue)(ULONG_PTR), ULONG_PTR dwContinue) +STDMETHODIMP VLCViewObject::Draw(DWORD dwAspect, LONG, PVOID, + DVTARGETDEVICE *ptd, HDC hicTargetDev, HDC hdcDraw, LPCRECTL lprcBounds, + LPCRECTL lprcWBounds, BOOL(CALLBACK *)(ULONG_PTR), ULONG_PTR ) { if( dwAspect & DVASPECT_CONTENT ) { @@ -67,8 +67,8 @@ STDMETHODIMP VLCViewObject::Draw(DWORD dwAspect, LONG lindex, PVOID pvAspect, return E_NOTIMPL; }; -STDMETHODIMP VLCViewObject::Freeze(DWORD dwAspect, LONG lindex, - PVOID pvAspect, LPDWORD pdwFreeze) +STDMETHODIMP VLCViewObject::Freeze(DWORD, LONG, + PVOID, LPDWORD) { return E_NOTIMPL; }; @@ -92,8 +92,8 @@ STDMETHODIMP VLCViewObject::GetAdvise(LPDWORD pdwAspect, LPDWORD padvf, return S_OK; }; -STDMETHODIMP VLCViewObject::GetColorSet(DWORD dwAspect, LONG lindex, - PVOID pvAspect, DVTARGETDEVICE *ptd, HDC hicTargetDev, LPLOGPALETTE *ppColorSet) +STDMETHODIMP VLCViewObject::GetColorSet(DWORD, LONG, + PVOID, DVTARGETDEVICE *, HDC, LPLOGPALETTE *) { return S_FALSE; }; @@ -119,13 +119,13 @@ STDMETHODIMP VLCViewObject::SetAdvise(DWORD dwAspect, DWORD advf, return S_OK; }; -STDMETHODIMP VLCViewObject::Unfreeze(DWORD dwFreeze) +STDMETHODIMP VLCViewObject::Unfreeze(DWORD) { return E_NOTIMPL; }; -STDMETHODIMP VLCViewObject::GetExtent(DWORD dwAspect, LONG lindex, - DVTARGETDEVICE *ptd, LPSIZEL lpSizel) +STDMETHODIMP VLCViewObject::GetExtent(DWORD dwAspect, LONG, + DVTARGETDEVICE *, LPSIZEL lpSizel) { if( dwAspect & DVASPECT_CONTENT ) { _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits