Kaydet (Commit) b07a990e authored tarafından Stephan Bergmann's avatar Stephan Bergmann

loplugin:typedefparam (clang-cl)

Change-Id: I07604028845c49cc084927e21db7f21c5d053bab
Reviewed-on: https://gerrit.libreoffice.org/69796
Tested-by: Jenkins
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 89a95f5f
......@@ -324,7 +324,7 @@ class type_info_
{
friend type_info * RTTInfos::getRTTI( OUString const & ) throw ();
friend int mscx_filterCppException(
LPEXCEPTION_POINTERS, uno_Any *, uno_Mapping * );
EXCEPTION_POINTERS *, uno_Any *, uno_Mapping * );
public:
virtual ~type_info_() throw ();
......
......@@ -35,7 +35,7 @@ namespace dxcanvas
ULONG_PTR a_GdiPlusToken; // GDI+ handle. Owned by this object
}
GDIPlusUserSharedPtr GDIPlusUser::createInstance()
GDIPlusUser::GDIPlusUserSharedPtr GDIPlusUser::createInstance()
{
return GDIPlusUserSharedPtr( new GDIPlusUser() );
}
......
......@@ -480,7 +480,7 @@ namespace dxcanvas
aPoint ) );
}
bool drawDIBits( const GraphicsSharedPtr& rGraphics,
bool drawDIBits( const std::shared_ptr<Gdiplus::Graphics>& rGraphics,
const BITMAPINFO& rBI,
const void* pBits )
{
......@@ -492,7 +492,7 @@ namespace dxcanvas
pBitmap );
}
bool drawRGBABits( const GraphicsSharedPtr& rGraphics,
bool drawRGBABits( const std::shared_ptr<Gdiplus::Graphics>& rGraphics,
const RawRGBABitmap& rRawRGBAData )
{
BitmapSharedPtr pBitmap( new Gdiplus::Bitmap( rRawRGBAData.mnWidth,
......
......@@ -59,7 +59,7 @@ namespace dxcanvas
}
void TextLayoutDrawHelper::drawText(
const GraphicsSharedPtr& rGraphics,
const std::shared_ptr<Gdiplus::Graphics>& rGraphics,
const css::rendering::ViewState& rViewState,
const css::rendering::RenderState& rRenderState,
const ::basegfx::B2ISize& rOutputOffset,
......
......@@ -12,6 +12,8 @@
#include <iostream>
#include <fstream>
#include <set>
#include "check.hxx"
#include "plugin.hxx"
/**
......@@ -53,6 +55,18 @@ bool TypedefParam::VisitFunctionDecl(FunctionDecl const* functionDecl)
ParmVarDecl const* canonicalParam = canonicalDecl->getParamDecl(i);
if (!areTypesEqual(thisParam->getType(), canonicalParam->getType()))
{
#if defined _WIN32
// SAL_IMPLEMENT_MAIN (include/sal/main.h) declares the third parameter of WinMain to be
// of type 'char *' rather than 'LPSTR', but using that typedef there would require
// including windows.h, which would require including include/prewin.h and
// include/postwin.h (to undo macros like Yield defined in windows.h) but which (unlike
// include/sal/main.h) are not part of the stable URE interface; so just ignore that
// here:
if (loplugin::DeclCheck(functionDecl).Function("WinMain").GlobalNamespace())
{
continue;
}
#endif
report(DiagnosticsEngine::Warning,
"function param %0 at definition site does not match function param at "
"declaration site, %1 vs %2",
......
......@@ -98,7 +98,7 @@ CAPNDataObject::~CAPNDataObject( )
// IUnknown->QueryInterface
STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
STDMETHODIMP CAPNDataObject::QueryInterface( REFIID iid, void** ppvObject )
{
OSL_ASSERT( nullptr != ppvObject );
......@@ -141,7 +141,7 @@ STDMETHODIMP_(ULONG) CAPNDataObject::Release( )
// IDataObject->GetData
STDMETHODIMP CAPNDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
STDMETHODIMP CAPNDataObject::GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium )
{
HRESULT hr = m_rIDataObjectOrg->GetData( pFormatetc, pmedium );
......@@ -175,7 +175,7 @@ STDMETHODIMP CAPNDataObject::EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC**
// IDataObject->QueryGetData
STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc )
STDMETHODIMP CAPNDataObject::QueryGetData( FORMATETC * pFormatetc )
{
HRESULT hr = m_rIDataObjectOrg->QueryGetData( pFormatetc );
......@@ -192,7 +192,7 @@ STDMETHODIMP CAPNDataObject::QueryGetData( LPFORMATETC pFormatetc )
// IDataObject->GetDataHere
STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
STDMETHODIMP CAPNDataObject::GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium )
{
HRESULT hr = m_rIDataObjectOrg->GetDataHere(pFormatetc, pmedium);
......@@ -209,7 +209,7 @@ STDMETHODIMP CAPNDataObject::GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pm
// IDataObject->GetCanonicalFormatEtc
STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut)
STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut)
{
HRESULT hr = m_rIDataObjectOrg->GetCanonicalFormatEtc( pFormatectIn, pFormatetcOut );
......@@ -226,7 +226,7 @@ STDMETHODIMP CAPNDataObject::GetCanonicalFormatEtc(LPFORMATETC pFormatectIn, LPF
// IDataObject->SetData
STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease )
STDMETHODIMP CAPNDataObject::SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease )
{
HRESULT hr = m_rIDataObjectOrg->SetData( pFormatetc, pmedium, fRelease );
......@@ -243,7 +243,7 @@ STDMETHODIMP CAPNDataObject::SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmediu
// IDataObject->DAdvise
STDMETHODIMP CAPNDataObject::DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD * pdwConnection )
STDMETHODIMP CAPNDataObject::DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD * pdwConnection )
{
HRESULT hr = m_rIDataObjectOrg->DAdvise(pFormatetc, advf, pAdvSink, pdwConnection);
......@@ -277,7 +277,7 @@ STDMETHODIMP CAPNDataObject::DUnadvise( DWORD dwConnection )
// IDataObject->EnumDAdvise
STDMETHODIMP CAPNDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
STDMETHODIMP CAPNDataObject::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )
{
HRESULT hr = m_rIDataObjectOrg->EnumDAdvise(ppenumAdvise);
......
......@@ -37,21 +37,21 @@ public:
//IUnknown interface methods
STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject) override;
STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) override;
STDMETHODIMP_( ULONG ) AddRef( ) override;
STDMETHODIMP_( ULONG ) Release( ) override;
// IDataObject interface methods
STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override;
STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override;
STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ) override;
STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ) override;
STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ) override;
STDMETHODIMP GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override;
STDMETHODIMP GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override;
STDMETHODIMP QueryGetData( FORMATETC * pFormatetc ) override;
STDMETHODIMP GetCanonicalFormatEtc( FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut ) override;
STDMETHODIMP SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease ) override;
STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) override;
STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection ) override;
STDMETHODIMP DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD* pdwConnection ) override;
STDMETHODIMP DUnadvise( DWORD dwConnection ) override;
STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise ) override;
STDMETHODIMP EnumDAdvise( IEnumSTATDATA** ppenumAdvise ) override;
operator IDataObject*( );
......
......@@ -372,7 +372,7 @@ static ByteSequence_t FileListToByteSequence(const std::vector<std::wstring>& fi
return bseq;
}
ByteSequence_t CF_HDROPToFileList(HGLOBAL hGlobal)
css::uno::Sequence<sal_Int8> CF_HDROPToFileList(HGLOBAL hGlobal)
{
UINT nFiles = DragQueryFileW(static_cast<HDROP>(hGlobal), 0xFFFFFFFF, nullptr, 0);
std::vector<std::wstring> files;
......
......@@ -40,7 +40,7 @@ CXNotifyingDataObject::CXNotifyingDataObject(
{
}
STDMETHODIMP CXNotifyingDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
STDMETHODIMP CXNotifyingDataObject::QueryInterface( REFIID iid, void** ppvObject )
{
if ( nullptr == ppvObject )
return E_INVALIDARG;
......@@ -80,7 +80,7 @@ STDMETHODIMP_(ULONG) CXNotifyingDataObject::Release( )
return nRefCnt;
}
STDMETHODIMP CXNotifyingDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
STDMETHODIMP CXNotifyingDataObject::GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium )
{
return m_aIDataObject->GetData(pFormatetc, pmedium);
}
......@@ -91,28 +91,28 @@ STDMETHODIMP CXNotifyingDataObject::EnumFormatEtc(
return m_aIDataObject->EnumFormatEtc(dwDirection, ppenumFormatetc);
}
STDMETHODIMP CXNotifyingDataObject::QueryGetData( LPFORMATETC pFormatetc )
STDMETHODIMP CXNotifyingDataObject::QueryGetData( FORMATETC * pFormatetc )
{
return m_aIDataObject->QueryGetData(pFormatetc);
}
STDMETHODIMP CXNotifyingDataObject::GetDataHere( LPFORMATETC lpFetc, LPSTGMEDIUM lpStgMedium )
STDMETHODIMP CXNotifyingDataObject::GetDataHere( FORMATETC * lpFetc, STGMEDIUM * lpStgMedium )
{
return m_aIDataObject->GetDataHere(lpFetc, lpStgMedium);
}
STDMETHODIMP CXNotifyingDataObject::GetCanonicalFormatEtc( LPFORMATETC lpFetc, LPFORMATETC lpCanonicalFetc )
STDMETHODIMP CXNotifyingDataObject::GetCanonicalFormatEtc( FORMATETC * lpFetc, FORMATETC * lpCanonicalFetc )
{
return m_aIDataObject->GetCanonicalFormatEtc(lpFetc, lpCanonicalFetc);
}
STDMETHODIMP CXNotifyingDataObject::SetData( LPFORMATETC lpFetc, LPSTGMEDIUM lpStgMedium, BOOL bRelease )
STDMETHODIMP CXNotifyingDataObject::SetData( FORMATETC * lpFetc, STGMEDIUM * lpStgMedium, BOOL bRelease )
{
return m_aIDataObject->SetData( lpFetc, lpStgMedium, bRelease );
}
STDMETHODIMP CXNotifyingDataObject::DAdvise(
LPFORMATETC lpFetc, DWORD advf, LPADVISESINK lpAdvSink, DWORD* pdwConnection )
FORMATETC * lpFetc, DWORD advf, IAdviseSink * lpAdvSink, DWORD* pdwConnection )
{
return m_aIDataObject->DAdvise( lpFetc, advf, lpAdvSink, pdwConnection );
}
......@@ -122,7 +122,7 @@ STDMETHODIMP CXNotifyingDataObject::DUnadvise( DWORD dwConnection )
return m_aIDataObject->DUnadvise( dwConnection );
}
STDMETHODIMP CXNotifyingDataObject::EnumDAdvise( LPENUMSTATDATA * ppenumAdvise )
STDMETHODIMP CXNotifyingDataObject::EnumDAdvise( IEnumSTATDATA ** ppenumAdvise )
{
return m_aIDataObject->EnumDAdvise( ppenumAdvise );
}
......
......@@ -53,20 +53,20 @@ public:
// ole interface implementation
//IUnknown interface methods
STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject) override;
STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) override;
STDMETHODIMP_( ULONG ) AddRef( ) override;
STDMETHODIMP_( ULONG ) Release( ) override;
// IDataObject interface methods
STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override;
STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override;
STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ) override;
STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ) override;
STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ) override;
STDMETHODIMP GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override;
STDMETHODIMP GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override;
STDMETHODIMP QueryGetData( FORMATETC * pFormatetc ) override;
STDMETHODIMP GetCanonicalFormatEtc( FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut ) override;
STDMETHODIMP SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease ) override;
STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) override;
STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection ) override;
STDMETHODIMP DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD* pdwConnection ) override;
STDMETHODIMP DUnadvise( DWORD dwConnection ) override;
STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise ) override;
STDMETHODIMP EnumDAdvise( IEnumSTATDATA** ppenumAdvise ) override;
operator IDataObject*( );
......
......@@ -201,7 +201,7 @@ CXTDataObject::~CXTDataObject()
// IUnknown->QueryInterface
STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, LPVOID* ppvObject )
STDMETHODIMP CXTDataObject::QueryInterface( REFIID iid, void** ppvObject )
{
if ( nullptr == ppvObject )
return E_INVALIDARG;
......@@ -240,7 +240,7 @@ STDMETHODIMP_(ULONG) CXTDataObject::Release( )
return nRefCnt;
}
STDMETHODIMP CXTDataObject::GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium )
STDMETHODIMP CXTDataObject::GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium )
{
if ( !(pFormatetc && pmedium) )
return E_INVALIDARG;
......@@ -569,7 +569,7 @@ STDMETHODIMP CXTDataObject::EnumFormatEtc(
// IDataObject->QueryGetData
STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc )
STDMETHODIMP CXTDataObject::QueryGetData( FORMATETC * pFormatetc )
{
if ( (nullptr == pFormatetc) || IsBadReadPtr( pFormatetc, sizeof( FORMATETC ) ) )
return E_INVALIDARG;
......@@ -582,28 +582,28 @@ STDMETHODIMP CXTDataObject::QueryGetData( LPFORMATETC pFormatetc )
// IDataObject->GetDataHere
STDMETHODIMP CXTDataObject::GetDataHere( LPFORMATETC, LPSTGMEDIUM )
STDMETHODIMP CXTDataObject::GetDataHere( FORMATETC *, STGMEDIUM * )
{
return E_NOTIMPL;
}
// IDataObject->GetCanonicalFormatEtc
STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( LPFORMATETC, LPFORMATETC )
STDMETHODIMP CXTDataObject::GetCanonicalFormatEtc( FORMATETC *, FORMATETC * )
{
return E_NOTIMPL;
}
// IDataObject->SetData
STDMETHODIMP CXTDataObject::SetData( LPFORMATETC, LPSTGMEDIUM, BOOL )
STDMETHODIMP CXTDataObject::SetData( FORMATETC *, STGMEDIUM *, BOOL )
{
return E_NOTIMPL;
}
// IDataObject->DAdvise
STDMETHODIMP CXTDataObject::DAdvise( LPFORMATETC, DWORD, LPADVISESINK, DWORD * )
STDMETHODIMP CXTDataObject::DAdvise( FORMATETC *, DWORD, IAdviseSink *, DWORD * )
{
return E_NOTIMPL;
}
......@@ -617,7 +617,7 @@ STDMETHODIMP CXTDataObject::DUnadvise( DWORD )
// IDataObject->EnumDAdvise
STDMETHODIMP CXTDataObject::EnumDAdvise( LPENUMSTATDATA * )
STDMETHODIMP CXTDataObject::EnumDAdvise( IEnumSTATDATA ** )
{
return E_NOTIMPL;
}
......@@ -665,7 +665,7 @@ CEnumFormatEtc::CEnumFormatEtc( LPUNKNOWN lpUnkOuter, const CFormatEtcContainer&
// IUnknown->QueryInterface
STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, LPVOID* ppvObject )
STDMETHODIMP CEnumFormatEtc::QueryInterface( REFIID iid, void** ppvObject )
{
if ( nullptr == ppvObject )
return E_INVALIDARG;
......@@ -710,7 +710,7 @@ STDMETHODIMP_(ULONG) CEnumFormatEtc::Release( )
// IEnumFORMATETC->Next
STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, LPFORMATETC lpDest, ULONG* lpFetched )
STDMETHODIMP CEnumFormatEtc::Next( ULONG nRequested, FORMATETC * lpDest, ULONG* lpFetched )
{
if ( ( nRequested < 1 ) ||
(( nRequested > 1 ) && ( nullptr == lpFetched )) ||
......
......@@ -66,20 +66,20 @@ public:
// ole interface implementation
//IUnknown interface methods
STDMETHODIMP QueryInterface(REFIID iid, LPVOID* ppvObject) override;
STDMETHODIMP QueryInterface(REFIID iid, void** ppvObject) override;
STDMETHODIMP_( ULONG ) AddRef( ) override;
STDMETHODIMP_( ULONG ) Release( ) override;
// IDataObject interface methods
STDMETHODIMP GetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override;
STDMETHODIMP GetDataHere( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium ) override;
STDMETHODIMP QueryGetData( LPFORMATETC pFormatetc ) override;
STDMETHODIMP GetCanonicalFormatEtc( LPFORMATETC pFormatectIn, LPFORMATETC pFormatetcOut ) override;
STDMETHODIMP SetData( LPFORMATETC pFormatetc, LPSTGMEDIUM pmedium, BOOL fRelease ) override;
STDMETHODIMP GetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override;
STDMETHODIMP GetDataHere( FORMATETC * pFormatetc, STGMEDIUM * pmedium ) override;
STDMETHODIMP QueryGetData( FORMATETC * pFormatetc ) override;
STDMETHODIMP GetCanonicalFormatEtc( FORMATETC * pFormatectIn, FORMATETC * pFormatetcOut ) override;
STDMETHODIMP SetData( FORMATETC * pFormatetc, STGMEDIUM * pmedium, BOOL fRelease ) override;
STDMETHODIMP EnumFormatEtc( DWORD dwDirection, IEnumFORMATETC** ppenumFormatetc ) override;
STDMETHODIMP DAdvise( LPFORMATETC pFormatetc, DWORD advf, LPADVISESINK pAdvSink, DWORD* pdwConnection ) override;
STDMETHODIMP DAdvise( FORMATETC * pFormatetc, DWORD advf, IAdviseSink * pAdvSink, DWORD* pdwConnection ) override;
STDMETHODIMP DUnadvise( DWORD dwConnection ) override;
STDMETHODIMP EnumDAdvise( LPENUMSTATDATA* ppenumAdvise ) override;
STDMETHODIMP EnumDAdvise( IEnumSTATDATA** ppenumAdvise ) override;
operator IDataObject*( );
......@@ -114,12 +114,12 @@ public:
virtual ~CEnumFormatEtc() {}
// IUnknown
STDMETHODIMP QueryInterface( REFIID iid, LPVOID* ppvObject ) override;
STDMETHODIMP QueryInterface( REFIID iid, void** ppvObject ) override;
STDMETHODIMP_( ULONG ) AddRef( ) override;
STDMETHODIMP_( ULONG ) Release( ) override;
//IEnumFORMATETC
STDMETHODIMP Next( ULONG nRequested, LPFORMATETC lpDest, ULONG* lpFetched ) override;
STDMETHODIMP Next( ULONG nRequested, FORMATETC * lpDest, ULONG* lpFetched ) override;
STDMETHODIMP Skip( ULONG celt ) override;
STDMETHODIMP Reset( ) override;
STDMETHODIMP Clone( IEnumFORMATETC** ppenum ) override;
......
......@@ -74,7 +74,7 @@ void OleWrapperAdviseSink::disconnectOleComponent()
m_pOleComp = nullptr;
}
STDMETHODIMP_(void) OleWrapperAdviseSink::OnDataChange(LPFORMATETC, LPSTGMEDIUM)
STDMETHODIMP_(void) OleWrapperAdviseSink::OnDataChange(FORMATETC *, STGMEDIUM *)
{
// Unused for now ( no registration for IDataObject events )
}
......@@ -93,7 +93,7 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnViewChange(DWORD dwAspect, LONG)
xLockComponent->OnViewChange_Impl( dwAspect );
}
STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename(LPMONIKER)
STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename(IMoniker *)
{
// handled by default inprocess handler
}
......
......@@ -42,9 +42,9 @@ public:
STDMETHODIMP_(ULONG) AddRef() override;
STDMETHODIMP_(ULONG) Release() override;
STDMETHODIMP_(void) OnDataChange(LPFORMATETC, LPSTGMEDIUM) override;
STDMETHODIMP_(void) OnDataChange(FORMATETC *, STGMEDIUM *) override;
STDMETHODIMP_(void) OnViewChange(DWORD, LONG) override;
STDMETHODIMP_(void) OnRename(LPMONIKER) override;
STDMETHODIMP_(void) OnRename(IMoniker *) override;
STDMETHODIMP_(void) OnSave() override;
STDMETHODIMP_(void) OnClose() override;
};
......
......@@ -100,13 +100,13 @@ STDMETHODIMP OleWrapperClientSite::SaveObject()
return hResult;
}
STDMETHODIMP OleWrapperClientSite::GetMoniker( DWORD, DWORD, LPMONIKER *ppmk )
STDMETHODIMP OleWrapperClientSite::GetMoniker( DWORD, DWORD, IMoniker **ppmk )
{
*ppmk = nullptr;
return E_NOTIMPL;
}
STDMETHODIMP OleWrapperClientSite::GetContainer( LPOLECONTAINER* ppContainer )
STDMETHODIMP OleWrapperClientSite::GetContainer( IOleContainer** ppContainer )
{
*ppContainer = nullptr;
return E_NOTIMPL;
......
......@@ -42,8 +42,8 @@ public:
STDMETHODIMP_(ULONG) Release() override;
STDMETHODIMP SaveObject() override;
STDMETHODIMP GetMoniker(DWORD, DWORD, LPMONIKER *) override;
STDMETHODIMP GetContainer(LPOLECONTAINER *) override;
STDMETHODIMP GetMoniker(DWORD, DWORD, IMoniker **) override;
STDMETHODIMP GetContainer(IOleContainer **) override;
STDMETHODIMP ShowObject() override;
STDMETHODIMP OnShowWindow(BOOL) override;
STDMETHODIMP RequestNewObjectLayout() override;
......
......@@ -120,7 +120,7 @@ STDMETHODIMP_(ULONG) OleWrapperAdviseSink::Release()
return nReturn;
}
STDMETHODIMP_(void) OleWrapperAdviseSink::OnDataChange( LPFORMATETC pFetc, LPSTGMEDIUM pMedium )
STDMETHODIMP_(void) OleWrapperAdviseSink::OnDataChange( FORMATETC * pFetc, STGMEDIUM * pMedium )
{
if ( m_pListener )
{
......@@ -136,7 +136,7 @@ STDMETHODIMP_(void) OleWrapperAdviseSink::OnViewChange( DWORD dwAspect, LONG lin
}
}
STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename( LPMONIKER pMoniker )
STDMETHODIMP_(void) OleWrapperAdviseSink::OnRename( IMoniker * pMoniker )
{
if ( m_pListener )
{
......
......@@ -87,9 +87,9 @@ public:
STDMETHODIMP_(ULONG) AddRef() override;
STDMETHODIMP_(ULONG) Release() override;
STDMETHODIMP_(void) OnDataChange(LPFORMATETC, LPSTGMEDIUM) override;
STDMETHODIMP_(void) OnDataChange(FORMATETC *, STGMEDIUM *) override;
STDMETHODIMP_(void) OnViewChange(DWORD, LONG) override;
STDMETHODIMP_(void) OnRename(LPMONIKER) override;
STDMETHODIMP_(void) OnRename(IMoniker *) override;
STDMETHODIMP_(void) OnSave() override;
STDMETHODIMP_(void) OnClose() override;
};
......
......@@ -140,13 +140,13 @@ public:
virtual ~InprocEmbedProvider_Impl();
/* IUnknown methods */
STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
/* IClassFactory methods */
STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv) override;
STDMETHOD(LockServer)(int fLock) override;
STDMETHOD(LockServer)(BOOL fLock) override;
protected:
......@@ -258,7 +258,7 @@ InprocEmbedProvider_Impl::~InprocEmbedProvider_Impl()
// IUnknown
STDMETHODIMP InprocEmbedProvider_Impl::QueryInterface( REFIID riid, void FAR* FAR* ppv )
STDMETHODIMP InprocEmbedProvider_Impl::QueryInterface( REFIID riid, void ** ppv )
{
if(IsEqualIID(riid, IID_IUnknown))
{
......@@ -315,7 +315,7 @@ STDMETHODIMP InprocEmbedProvider_Impl::CreateInstance(IUnknown FAR* punkOuter,
}
STDMETHODIMP InprocEmbedProvider_Impl::LockServer( int fLock )
STDMETHODIMP InprocEmbedProvider_Impl::LockServer( BOOL fLock )
{
if ( fLock )
g_nLock++;
......
......@@ -100,7 +100,7 @@ class InprocEmbedDocument_Impl : public InprocCountedObject_Impl
virtual ~InternalCacheWrapper() {}
/* IUnknown methods */
STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
......@@ -137,7 +137,7 @@ public:
ComSmart< IUnknown >& GetDefHandler() { return m_pDefHandler; }
/* IUnknown methods */
STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
......
......@@ -101,7 +101,7 @@ bool OneInstanceOleWrapper::deregisterClass()
return CoRevokeClassObject(m_factoryHandle) == NOERROR;
}
STDMETHODIMP OneInstanceOleWrapper::QueryInterface(REFIID riid, void FAR* FAR* ppv)
STDMETHODIMP OneInstanceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
{
if(IsEqualIID(riid, IID_IUnknown))
{
......@@ -178,7 +178,7 @@ STDMETHODIMP OneInstanceOleWrapper::CreateInstance(IUnknown FAR* punkOuter,
return ret;
}
STDMETHODIMP OneInstanceOleWrapper::LockServer(int /*fLock*/)
STDMETHODIMP OneInstanceOleWrapper::LockServer(BOOL /*fLock*/)
{
return NOERROR;
}
......
......@@ -65,13 +65,13 @@ public:
bool deregisterClass();
/* IUnknown methods */
STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
/* IClassFactory methods */
STDMETHOD(CreateInstance)(IUnknown FAR* punkOuter, REFIID riid, void FAR* FAR* ppv) override;
STDMETHOD(LockServer)(int fLock) override;
STDMETHOD(LockServer)(BOOL fLock) override;
protected:
oslInterlockedCount m_refCount;
......
......@@ -139,7 +139,7 @@ InterfaceOleWrapper::~InterfaceOleWrapper()
UnoObjToWrapperMap.erase(it);
}
STDMETHODIMP InterfaceOleWrapper::QueryInterface(REFIID riid, LPVOID FAR * ppv)
STDMETHODIMP InterfaceOleWrapper::QueryInterface(REFIID riid, void ** ppv)
{
comphelper::Automation::AutomationInvokedZone aAutomationActive;
......@@ -238,7 +238,7 @@ STDMETHODIMP InterfaceOleWrapper::getOriginalUnoStruct( Any * pStruct)
return ret;
}
STDMETHODIMP InterfaceOleWrapper::GetTypeInfoCount( unsigned int *pctinfo )
STDMETHODIMP InterfaceOleWrapper::GetTypeInfoCount( UINT *pctinfo )
{
SAL_INFO("extensions.olebridge", this << "@InterfaceOleWrapper::GetTypeInfoCount");
......@@ -1027,7 +1027,7 @@ void STDMETHODCALLTYPE CXTypeInfo::ReleaseVarDesc(VARDESC *)
SAL_WARN("extensions.olebridge", this << "@CXTypeInfo::ReleaseVarDesc: E_NOTIMPL");
}
STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(unsigned int iTInfo, LCID, ITypeInfo ** ppTInfo)
STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(UINT iTInfo, LCID, ITypeInfo ** ppTInfo)
{
comphelper::Automation::AutomationInvokedZone aAutomationActive;
......@@ -1070,8 +1070,8 @@ STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(unsigned int iTInfo, LCID, ITypeIn
}
STDMETHODIMP InterfaceOleWrapper::GetIDsOfNames(REFIID /*riid*/,
OLECHAR ** rgszNames,
unsigned int cNames,
LPOLESTR * rgszNames,
UINT cNames,
LCID /*lcid*/,
DISPID * rgdispid )
{
......@@ -1800,11 +1800,11 @@ static bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource)
STDMETHODIMP InterfaceOleWrapper::Invoke(DISPID dispidMember,
REFIID /*riid*/,
LCID /*lcid*/,
unsigned short wFlags,
WORD wFlags,
DISPPARAMS * pdispparams,
VARIANT * pvarResult,
EXCEPINFO * pexcepinfo,
unsigned int * puArgErr )
UINT * puArgErr )
{
comphelper::Automation::AutomationInvokedZone aAutomationActive;
......@@ -3063,7 +3063,7 @@ Reference< XInterface > UnoObjectWrapperRemoteOpt::createUnoWrapperInstance()
return Reference<XInterface>( xWeak, UNO_QUERY);
}
STDMETHODIMP UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, OLECHAR ** rgszNames, unsigned int cNames,
STDMETHODIMP UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, LPOLESTR * rgszNames, UINT cNames,
LCID /*lcid*/, DISPID * rgdispid )
{
MutexGuard guard( getBridgeMutex());
......@@ -3110,9 +3110,9 @@ STDMETHODIMP UnoObjectWrapperRemoteOpt::GetIDsOfNames ( REFIID /*riid*/, OLECHA
return ret;
}
STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*riid*/, LCID /*lcid*/, unsigned short wFlags,
STDMETHODIMP UnoObjectWrapperRemoteOpt::Invoke ( DISPID dispidMember, REFIID /*riid*/, LCID /*lcid*/, WORD wFlags,
DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
unsigned int * puArgErr )
UINT * puArgErr )
{
comphelper::Automation::AutomationInvokedZone aAutomationActive;
......
......@@ -88,18 +88,18 @@ public:
~InterfaceOleWrapper() override;
// IUnknown
STDMETHOD(QueryInterface)(REFIID riid, LPVOID FAR * ppvObj) override;
STDMETHOD(QueryInterface)(REFIID riid, void ** ppvObj) override;
STDMETHOD_(ULONG, AddRef)() override;
STDMETHOD_(ULONG, Release)() override;
// IDispatch
STDMETHOD( GetTypeInfoCount )( unsigned int * pctinfo ) override;
STDMETHOD( GetTypeInfo )( unsigned int itinfo, LCID lcid, ITypeInfo ** pptinfo ) override;
STDMETHOD( GetIDsOfNames )( REFIID riid