loplugin:typedefparam (clang-cl)

Change-Id: I07604028845c49cc084927e21db7f21c5d053bab
Reviewed-on: https://gerrit.libreoffice.org/69796
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

48 files changed, 209 insertions, 195 deletions

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
index cd292c7db8b0..385f5f5cb9ed 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx
@@ -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 ();
diff --git a/canvas/source/directx/dx_gdiplususer.cxx b/canvas/source/directx/dx_gdiplususer.cxx
index a7b0703915f2..85c143cff468 100644
--- a/canvas/source/directx/dx_gdiplususer.cxx
+++ b/canvas/source/directx/dx_gdiplususer.cxx
@@ -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() );
     }
diff --git a/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 392d0ddf7adb..55bf94919cb3 100644
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.cxx
@@ -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,
diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index a1ee370b0d85..a0bef084a639 100644
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx
@@ -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,
diff --git a/compilerplugins/clang/typedefparam.cxx b/compilerplugins/clang/typedefparam.cxx
index d5b3a76103c9..28e0a2d09469 100644
--- a/compilerplugins/clang/typedefparam.cxx
+++ b/compilerplugins/clang/typedefparam.cxx
@@ -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",
diff --git a/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index f511c48c3894..9759e78ee8bf 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.cxx
@@ -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);
 
diff --git a/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index 534bead593b3..f7a712e84e5b 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.hxx
@@ -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*( );
 
diff --git a/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index 29569230bc8a..a38c6204ef25 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.cxx
@@ -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;
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index 9a181d197bcb..46f563f9497c 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
@@ -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 );
 }
diff --git a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index b6439f0641af..0d72c760f4c2 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
@@ -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*( );
 
diff --git a/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 50d84c5da619..d6291b526498 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.cxx
@@ -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 )) ||
diff --git a/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index d9979e7cfebb..4fdd1149e9c2 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.hxx
@@ -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;
diff --git a/embeddedobj/source/msole/advisesink.cxx b/embeddedobj/source/msole/advisesink.cxx
index 2b899aa6b002..5601c8d9eb34 100644
--- a/embeddedobj/source/msole/advisesink.cxx
+++ b/embeddedobj/source/msole/advisesink.cxx
@@ -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
 }
diff --git a/embeddedobj/source/msole/advisesink.hxx b/embeddedobj/source/msole/advisesink.hxx
index 1f43048959ec..87c89e93328e 100644
--- a/embeddedobj/source/msole/advisesink.hxx
+++ b/embeddedobj/source/msole/advisesink.hxx
@@ -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;
 };
diff --git a/embeddedobj/source/msole/olewrapclient.cxx b/embeddedobj/source/msole/olewrapclient.cxx
index 7abff29ac853..15d5f16632fa 100644
--- a/embeddedobj/source/msole/olewrapclient.cxx
+++ b/embeddedobj/source/msole/olewrapclient.cxx
@@ -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;
diff --git a/embeddedobj/source/msole/olewrapclient.hxx b/embeddedobj/source/msole/olewrapclient.hxx
index ad8fe0cfa1f8..66ad4ebfde7a 100644
--- a/embeddedobj/source/msole/olewrapclient.hxx
+++ b/embeddedobj/source/msole/olewrapclient.hxx
@@ -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;
diff --git a/embedserv/source/inprocserv/advisesink.cxx b/embedserv/source/inprocserv/advisesink.cxx
index dd3b38194e68..faf37e20e4fd 100644
--- a/embedserv/source/inprocserv/advisesink.cxx
+++ b/embedserv/source/inprocserv/advisesink.cxx
@@ -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 )
     {
diff --git a/embedserv/source/inprocserv/advisesink.hxx b/embedserv/source/inprocserv/advisesink.hxx
index f19c61c7778d..4d3862c9a460 100644
--- a/embedserv/source/inprocserv/advisesink.hxx
+++ b/embedserv/source/inprocserv/advisesink.hxx
@@ -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;
 };
diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx
index 5c8c4f6bdd2d..71da14597305 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -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++;
diff --git a/embedserv/source/inprocserv/inprocembobj.h b/embedserv/source/inprocserv/inprocembobj.h
index 3f5c5ce6e5e1..8b0b8bd89e92 100644
--- a/embedserv/source/inprocserv/inprocembobj.h
+++ b/embedserv/source/inprocserv/inprocembobj.h
@@ -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;
 
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index b5ec6b886a22..c09f99be7141 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -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;
 }
diff --git a/extensions/source/ole/servprov.hxx b/extensions/source/ole/servprov.hxx
index 873c5e62146c..4bd762cc3c54 100644
--- a/extensions/source/ole/servprov.hxx
+++ b/extensions/source/ole/servprov.hxx
@@ -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;
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 4f25051ce2af..e6730d75eee9 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -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;
 
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 2457694d4e3d..6bf708e4a8a6 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -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, OLECHAR ** rgszNames, unsigned int cNames,
+    STDMETHOD( GetTypeInfoCount )( UINT * pctinfo ) override;
+    STDMETHOD( GetTypeInfo )( UINT itinfo, LCID lcid, ITypeInfo ** pptinfo ) override;
+    STDMETHOD( GetIDsOfNames )( REFIID riid, LPOLESTR * rgszNames, UINT cNames,
                                 LCID lcid, DISPID * rgdispid ) override;
-    STDMETHOD( Invoke )( DISPID dispidMember, REFIID riid, LCID lcid, unsigned short wFlags,
+    STDMETHOD( Invoke )( DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags,
                          DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
-                         unsigned int * puArgErr ) override;
+                         UINT * puArgErr ) override;
 
     // IDispatchEx
     virtual HRESULT STDMETHODCALLTYPE GetDispID(
@@ -231,11 +231,11 @@ public:
     UnoObjectWrapperRemoteOpt( Reference<XMultiServiceFactory> const & aFactory, sal_uInt8 unoWrapperClass, sal_uInt8 comWrapperClass);
     ~UnoObjectWrapperRemoteOpt() override;
 
-    STDMETHOD( GetIDsOfNames )( REFIID riid, OLECHAR ** rgszNames, unsigned int cNames,
+    STDMETHOD( GetIDsOfNames )( REFIID riid, LPOLESTR * rgszNames, UINT cNames,
                                 LCID lcid, DISPID * rgdispid ) override;
-    STDMETHOD( Invoke )( DISPID dispidMember, REFIID riid, LCID lcid, unsigned short wFlags,
+    STDMETHOD( Invoke )( DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags,
                          DISPPARAMS * pdispparams, VARIANT * pvarResult, EXCEPINFO * pexcepinfo,
-                         unsigned int * puArgErr ) override;
+                         UINT * puArgErr ) override;
 
     // UnoConversionUtility
     // If UNO interfaces are converted in methods of this class then
diff --git a/include/comphelper/windowsStart.hxx b/include/comphelper/windowsStart.hxx
index 90e1ff1bb0da..a727733d92a3 100644
--- a/include/comphelper/windowsStart.hxx
+++ b/include/comphelper/windowsStart.hxx
@@ -22,6 +22,6 @@ WinLaunchChild(const wchar_t *exePath, int argc,
                wchar_t **argv, HANDLE userToken = nullptr,
                HANDLE *hProcess = nullptr);
 
-wchar_t* MakeCommandLine(int argc, WCHAR **argv);
+wchar_t* MakeCommandLine(int argc, wchar_t **argv);
 
 #endif
diff --git a/sal/osl/w32/profile.cxx b/sal/osl/w32/profile.cxx
index 69fe2b4b94da..8fc6ee9d076f 100644
--- a/sal/osl/w32/profile.cxx
+++ b/sal/osl/w32/profile.cxx
@@ -158,7 +158,7 @@ static rtl_uString* osl_ProfileGenerateExtension(rtl_uString* ustrFileName, rtl_
 
 static bool osl_getProfileName(rtl_uString* strPath, rtl_uString* strName, rtl_uString** strProfileName);
 
-oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, sal_uInt32 Flags)
+oslProfile SAL_CALL osl_openProfile(rtl_uString *strProfileName, oslProfileOption Flags)
 {
     osl_TFile*        pFile = nullptr;
     osl_TProfileImpl* pProfile;
diff --git a/sal/qa/systools/test_comtools.cxx b/sal/qa/systools/test_comtools.cxx
index 284a28b1f407..096851c9e989 100644
--- a/sal/qa/systools/test_comtools.cxx
+++ b/sal/qa/systools/test_comtools.cxx
@@ -46,7 +46,7 @@ public:
         return cnt;
     }
 
-    HRESULT __stdcall QueryInterface(REFIID riid, LPVOID* ppv) override
+    HRESULT __stdcall QueryInterface(REFIID riid, void** ppv) override
     {
         if (riid == IID_IUnknown)
         {
diff --git a/shell/inc/basereader.hxx b/shell/inc/basereader.hxx
index 8ccb1a5f1490..1f09f9bc2039 100644
--- a/shell/inc/basereader.hxx
+++ b/shell/inc/basereader.hxx
@@ -45,21 +45,21 @@ protected: // protected because its only an implementation relevant class
     virtual void end_document();
 
     virtual void start_element(
-        const std::wstring& raw_name,
-        const std::wstring& local_name,
-        const XmlTagAttributes_t& attributes) override = 0;
+        const string_t& raw_name,
+        const string_t& local_name,
+        const xml_tag_attribute_container_t& attributes) override = 0;
 
     virtual void end_element(
-        const std::wstring& raw_name, const std::wstring& local_name) override = 0;
+        const string_t& raw_name, const string_t& local_name) override = 0;
 
-    virtual void characters(const std::wstring& character) override = 0;
+    virtual void characters(const string_t& character) override = 0;
 
-    virtual void ignore_whitespace(const std::wstring& /*whitespaces*/) override {};
+    virtual void ignore_whitespace(const string_t& /*whitespaces*/) override {};
 
     virtual void processing_instruction(
         const std::wstring& /*target*/, const std::wstring& /*data*/){};
 
-    virtual void comment(const std::wstring& /*comment*/) override {};
+    virtual void comment(const string_t& /*comment*/) override {};
 
     void Initialize( const std::string& /*ContentName*/);
 
diff --git a/shell/inc/contentreader.hxx b/shell/inc/contentreader.hxx
index 55a943b6dd1a..a8af703dd982 100644
--- a/shell/inc/contentreader.hxx
+++ b/shell/inc/contentreader.hxx
@@ -56,9 +56,9 @@ protected: // protected because its only an implementation relevant class
         attribute structure.
     */
     virtual void start_element(
-        const std::wstring& raw_name,
-        const std::wstring& local_name,
-        const XmlTagAttributes_t& attributes) override;
+        const string_t& raw_name,
+        const string_t& local_name,
+        const xml_tag_attribute_container_t& attributes) override;
 
     /** end_element occurs when a tag is closed
 
@@ -68,14 +68,14 @@ protected: // protected because its only an implementation relevant class
         local name of the tag.
     */
     virtual void end_element(
-        const std::wstring& raw_name, const std::wstring& local_name) override;
+        const string_t& raw_name, const string_t& local_name) override;
 
     /** characters occurs when receiving characters
 
         @param character
         content of the information received.
     */
-    virtual void characters(const std::wstring& character) override;
+    virtual void characters(const string_t& character) override;
 
 protected:
     /** choose an appropriate tag reader to handle the tag.
diff --git a/shell/inc/infotips.hxx b/shell/inc/infotips.hxx
index a50276b04351..0155559752ce 100644
--- a/shell/inc/infotips.hxx
+++ b/shell/inc/infotips.hxx
@@ -47,7 +47,7 @@ public:
     // IQueryInfo methods
 
 
-    virtual HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, wchar_t** ppwszTip) override;
+    virtual HRESULT STDMETHODCALLTYPE GetInfoTip(DWORD dwFlags, PWSTR* ppwszTip) override;
 
     virtual HRESULT STDMETHODCALLTYPE GetInfoFlags(DWORD *pdwFlags) override;
 
diff --git a/shell/inc/metainforeader.hxx b/shell/inc/metainforeader.hxx
index 33e82a532806..7ff0a734fc3f 100644
--- a/shell/inc/metainforeader.hxx
+++ b/shell/inc/metainforeader.hxx
@@ -88,9 +88,9 @@ protected: // protected because its only an implementation relevant class
         attribute structure.
     */
     virtual void start_element(
-        const std::wstring& raw_name,
-        const std::wstring& local_name,
-        const XmlTagAttributes_t& attributes) override;
+        const string_t& raw_name,
+        const string_t& local_name,
+        const xml_tag_attribute_container_t& attributes) override;
 
     /** end_element occurs when a tag is closed
 
@@ -100,14 +100,14 @@ protected: // protected because its only an implementation relevant class
         local name of the tag.
     */
     virtual void end_element(
-        const std::wstring& raw_name, const std::wstring& local_name) override;
+        const string_t& raw_name, const string_t& local_name) override;
 
     /** characters occurs when receiving characters
 
         @param character
         content of the information received.
     */
-    virtual void characters(const std::wstring& character) override;
+    virtual void characters(const string_t& character) override;
 
 protected:
     /** choose an appropriate tag reader to handle the tag.
diff --git a/shell/inc/propsheets.hxx b/shell/inc/propsheets.hxx
index 20aa1e9e37a4..9a95ed169adb 100644
--- a/shell/inc/propsheets.hxx
+++ b/shell/inc/propsheets.hxx
@@ -51,16 +51,16 @@ public:
 
 
     virtual HRESULT STDMETHODCALLTYPE Initialize(
-        LPCITEMIDLIST pidlFolder, LPDATAOBJECT lpdobj, HKEY hkeyProgID) override;
+        LPCITEMIDLIST pidlFolder, IDataObject * lpdobj, HKEY hkeyProgID) override;
 
 
     // IShellPropSheetExt
 
 
-    virtual HRESULT STDMETHODCALLTYPE AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) override;
+    virtual HRESULT STDMETHODCALLTYPE AddPages(LPFNSVADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam) override;
 
     virtual HRESULT STDMETHODCALLTYPE ReplacePage(
-        UINT uPageID, LPFNADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam) override;
+        EXPPS uPageID, LPFNSVADDPROPSHEETPAGE lpfnReplaceWith, LPARAM lParam) override;
 
 private:
     // Windows callback functions
diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx
index 23a594f1df8e..e0b1558c1c7b 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -26,7 +26,7 @@
 
 /**  constructor of CBaseReader.
 */
-CBaseReader::CBaseReader(const std::wstring& DocumentName):
+CBaseReader::CBaseReader(const Filepath_t& DocumentName):
 m_ZipFile( DocumentName )
 {
 }
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index 2093c837fcba..f6ad69eebef5 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -26,7 +26,7 @@
 
 /** constructor.
 */
-CContentReader::CContentReader( const std::wstring& DocumentName, LocaleSet_t const & DocumentLocale ):
+CContentReader::CContentReader( const Filepath_t& DocumentName, LocaleSet_t const & DocumentLocale ):
 CBaseReader( DocumentName )
 {
     try
@@ -159,9 +159,9 @@ LocaleSet_t const & CContentReader::getLocale( const StyleName_t& Style )
 
 
 void CContentReader::start_element(
-    const std::wstring& /*raw_name*/,
-    const std::wstring& local_name,
-    const XmlTagAttributes_t& attributes)
+    const string_t& /*raw_name*/,
+    const string_t& local_name,
+    const xml_tag_attribute_container_t& attributes)
 {
     //get appropriate Xml Tag Builder using MetaInfoBuilderFactory;
     ITag* pTagBuilder = chooseTagReader( local_name,attributes );
@@ -175,7 +175,7 @@ void CContentReader::start_element(
 // end_element occurs when a tag is closed
 
 
-void CContentReader::end_element(const std::wstring& /*raw_name*/, const std::wstring& local_name)
+void CContentReader::end_element(const string_t& /*raw_name*/, const string_t& local_name)
 {
     assert( !m_TagBuilderStack.empty() );
     ITag* pTagBuilder = m_TagBuilderStack.top();
@@ -204,7 +204,7 @@ void CContentReader::end_element(const std::wstring& /*raw_name*/, const std::ws
 // characters occurs when receiving characters
 
 
-void CContentReader::characters( const std::wstring& character )
+void CContentReader::characters( const string_t& character )
 {
     if ( character.length() > 0 && !HasOnlySpaces( character ) )
     {
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
index 1f87bba8dccb..9eab4d5e01d2 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -26,7 +26,7 @@
 
 /** constructor.
 */
-CMetaInfoReader::CMetaInfoReader( const std::wstring& DocumentName ):
+CMetaInfoReader::CMetaInfoReader( const Filepath_t& DocumentName ):
 CBaseReader( DocumentName )
 {
     try
@@ -242,9 +242,9 @@ void CMetaInfoReader::saveTagContent( const std::wstring& tag_name )
 
 
 void CMetaInfoReader::start_element(
-    const std::wstring& /*raw_name*/,
-    const std::wstring& local_name,
-    const XmlTagAttributes_t& attributes)
+    const string_t& /*raw_name*/,
+    const string_t& local_name,
+    const xml_tag_attribute_container_t& attributes)
 {
     //get appropriate Xml Tag Builder using MetaInfoBuilderFactory;
     ITag* pTagBuilder = chooseTagReader( local_name,attributes );
@@ -258,7 +258,7 @@ void CMetaInfoReader::start_element(
 // end_element occurs when a tag is closed
 
 
-void CMetaInfoReader::end_element(const std::wstring& /*raw_name*/, const std::wstring& local_name)
+void CMetaInfoReader::end_element(const string_t& /*raw_name*/, const string_t& local_name)
 {
     assert( !m_TagBuilderStack.empty() );
     ITag* pTagBuilder = m_TagBuilderStack.top();
@@ -273,7 +273,7 @@ void CMetaInfoReader::end_element(const std::wstring& /*raw_name*/, const std::w
 // characters occurs when receiving characters
 
 
-void CMetaInfoReader::characters( const std::wstring& character )
+void CMetaInfoReader::characters( const string_t& character )
 {
     if ( character.length() > 0 &&  !HasOnlySpaces( character ) )
     {
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 3a18895bf189..e87e42997099 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -191,7 +191,7 @@ static std::wstring getFileSizeInfo(wchar_t const * FileName)
 // IQueryInfo methods
 
 
-HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, wchar_t** ppwszTip)
+HRESULT STDMETHODCALLTYPE CInfoTip::GetInfoTip(DWORD /*dwFlags*/, PWSTR* ppwszTip)
 {
     std::wstring msg;
     const std::wstring CONST_SPACE(SPACE);
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index dadc08d1edfb..0903124dee01 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -121,7 +121,7 @@ COooFilter::~COooFilter()
 //              E_NOINTERFACE
 //              Interface is not supported
 
-SCODE STDMETHODCALLTYPE COooFilter::QueryInterface(
+HRESULT STDMETHODCALLTYPE COooFilter::QueryInterface(
     REFIID riid,
     void  ** ppvObject)
 {
@@ -520,7 +520,7 @@ SCODE STDMETHODCALLTYPE COooFilter::BindRegion(
 //              E_FAIL
 //                  (not implemented)
 
-SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID)
+HRESULT STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID)
 {
     *pClassID = CLSID_COooFilter;
     return S_OK;
@@ -534,7 +534,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetClassID(CLSID * pClassID)
 //              S_OK
 //                  (not implemented)
 
-SCODE STDMETHODCALLTYPE COooFilter::IsDirty()
+HRESULT STDMETHODCALLTYPE COooFilter::IsDirty()
 {
     // File is opened read-only and never changes
     return S_FALSE;
@@ -554,7 +554,7 @@ SCODE STDMETHODCALLTYPE COooFilter::IsDirty()
 //              E_FAIL
 //                  (not implemented)
 
-SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/)
+HRESULT STDMETHODCALLTYPE COooFilter::Load(LPCOLESTR pszFileName, DWORD /*dwMode*/)
 {
     // Load just sets the filename for GetChunk to read and ignores the mode
     m_pwszFileName = getShortPathName( pszFileName );
@@ -587,7 +587,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(LPCWSTR pszFileName, DWORD /*dwMode*/)
 //              S_OK
 //                  (not implemented)
 
-SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRemember*/)
+HRESULT STDMETHODCALLTYPE COooFilter::Save(LPCOLESTR /*pszFileName*/, BOOL /*fRemember*/)
 {
     // File is opened read-only; saving it is an error
     return E_FAIL;
@@ -601,7 +601,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(LPCWSTR /*pszFileName*/, BOOL /*fRememb
 //  Returns:    S_OK
 //                  Always
 
-SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/)
+HRESULT STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCOLESTR /*pszFileName*/)
 {
     // File is opened read-only, so "save" is always finished
     return S_OK;
@@ -616,7 +616,7 @@ SCODE STDMETHODCALLTYPE COooFilter::SaveCompleted(LPCWSTR /*pszFileName*/)
 //              E_OUTOFMEMORY
 //              E_FAIL
 
-SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)
+HRESULT STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)
 {
     m_pStream = new BufferStream(pStm);
     try
@@ -641,7 +641,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Load(IStream *pStm)
 //                  [out] Pointer to a 64 bit unsigned int indicating the size needed
 //  Returns:    E_NOTIMPL
 
-SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)
+HRESULT STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)
 {
     return E_NOTIMPL;
 }
@@ -655,7 +655,7 @@ SCODE STDMETHODCALLTYPE COooFilter::GetSizeMax(ULARGE_INTEGER * /*pcbSize*/)
 //                  [in] Indicates whether to clear dirty flag
 //  Returns:    E_NOTIMPL
 
-SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )
+HRESULT STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )
 {
     return E_NOTIMPL;
 }
@@ -676,7 +676,7 @@ SCODE STDMETHODCALLTYPE COooFilter::Save(IStream * /*pStm*/, BOOL )
 //                  Operation failed due to some reason
 //                  other than insufficient memory
 
-SCODE STDMETHODCALLTYPE COooFilter::GetCurFile(LPWSTR * ppszFileName)
+HRESULT STDMETHODCALLTYPE COooFilter::GetCurFile(LPOLESTR * ppszFileName)
 {
     if ( EMPTY_STRING == m_pwszFileName )
         return E_FAIL;
@@ -718,7 +718,7 @@ COooFilterCF::~COooFilterCF()
 //              E_NOINTERFACE
 //                  Interface is not supported
 
-SCODE STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void  ** ppvObject)
+HRESULT STDMETHODCALLTYPE COooFilterCF::QueryInterface(REFIID riid, void  ** ppvObject)
 {
     IUnknown *pUnkTemp;
 
@@ -780,7 +780,7 @@ ULONG STDMETHODCALLTYPE COooFilterCF::Release()
 //              E_UNEXPECTED
 //                  Unsuccessful due to an unexpected condition
 
-SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance(
+HRESULT STDMETHODCALLTYPE COooFilterCF::CreateInstance(
     IUnknown * pUnkOuter,
     REFIID riid,
     void  * * ppvObject)
@@ -816,7 +816,7 @@ SCODE STDMETHODCALLTYPE COooFilterCF::CreateInstance(
 //              E_UNEXPECTED
 //                  (not implemented)
 
-SCODE STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock)
+HRESULT STDMETHODCALLTYPE COooFilterCF::LockServer(BOOL fLock)
 {
     if( fLock )
         InterlockedIncrement( &g_lInstances );
@@ -870,10 +870,10 @@ extern "C" BOOL WINAPI DllMain(
 //              E_UNEXPECTED
 //                  Unsuccessful due to an unexpected condition
 
-extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
+extern "C" HRESULT STDMETHODCALLTYPE DllGetClassObject(
     REFCLSID   cid,
     REFIID     iid,
-    void **    ppvObj
+    LPVOID *   ppvObj
 )
 {
     COooFilterCF* pImpl = nullptr;
@@ -905,7 +905,7 @@ extern "C" SCODE STDMETHODCALLTYPE DllGetClassObject(
 //              S_FALSE
 //                  DLL must remain loaded
 
-extern "C" SCODE STDMETHODCALLTYPE DllCanUnloadNow()
+extern "C" HRESULT STDMETHODCALLTYPE DllCanUnloadNow()
 {
     if ( 0 >= g_lInstances )
         return S_OK;
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index 6a793d759f5e..d0a927daaacc 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -73,7 +73,7 @@ class COooFilter : public IFilter, public IPersistFile, public IPersistStream
 {
 public:
     // From IUnknown
-    virtual  SCODE STDMETHODCALLTYPE  QueryInterface(
+    virtual  HRESULT STDMETHODCALLTYPE  QueryInterface(
         REFIID riid,
         void  ** ppvObject) override;
     virtual  ULONG STDMETHODCALLTYPE  AddRef() override;
@@ -100,31 +100,31 @@ public:
         void ** ppunk) override;
 
     // From IPersistFile
-    virtual  SCODE STDMETHODCALLTYPE  GetClassID(
+    virtual  HRESULT STDMETHODCALLTYPE  GetClassID(
         CLSID * pClassID) override;
-    virtual  SCODE STDMETHODCALLTYPE  IsDirty() override;
-    virtual  SCODE STDMETHODCALLTYPE  Load(
-        LPCWSTR pszFileName,
+    virtual  HRESULT STDMETHODCALLTYPE  IsDirty() override;
+    virtual  HRESULT STDMETHODCALLTYPE  Load(
+        LPCOLESTR pszFileName,
         DWORD dwMode) override;
-    virtual  SCODE STDMETHODCALLTYPE  Save(
-        LPCWSTR pszFileName,
+    virtual  HRESULT STDMETHODCALLTYPE  Save(
+        LPCOLESTR pszFileName,
         BOOL fRemember) override;
 
-    virtual  SCODE STDMETHODCALLTYPE  SaveCompleted(
-        LPCWSTR pszFileName) override;
+    virtual  HRESULT STDMETHODCALLTYPE  SaveCompleted(
+        LPCOLESTR pszFileName) override;
 
-    virtual  SCODE STDMETHODCALLTYPE  GetCurFile(
-        LPWSTR  * ppszFileName) override;
+    virtual  HRESULT STDMETHODCALLTYPE  GetCurFile(
+        LPOLESTR  * ppszFileName) override;
 
     // From IPersistStream
-    virtual SCODE STDMETHODCALLTYPE  Load(
+    virtual HRESULT STDMETHODCALLTYPE  Load(
         IStream *pStm) override;
 
-    virtual SCODE STDMETHODCALLTYPE Save(
+    virtual HRESULT STDMETHODCALLTYPE Save(
         IStream *pStm,
         BOOL fClearDirty) override;
 
-    virtual SCODE STDMETHODCALLTYPE  GetSizeMax(
+    virtual HRESULT STDMETHODCALLTYPE  GetSizeMax(
         ULARGE_INTEGER *pcbSize) override;
 
 
@@ -163,7 +163,7 @@ class COooFilterCF : public IClassFactory
 {
 public:
     // From IUnknown
-    virtual  SCODE STDMETHODCALLTYPE  QueryInterface(
+    virtual  HRESULT STDMETHODCALLTYPE  QueryInterface(
         REFIID riid,
         void  ** ppvObject) override;
 
@@ -171,18 +171,18 @@ public:
     virtual  ULONG STDMETHODCALLTYPE  Release() override;
 
     // From IClassFactory
-    virtual  SCODE STDMETHODCALLTYPE  CreateInstance(
+    virtual  HRESULT STDMETHODCALLTYPE  CreateInstance(
         IUnknown * pUnkOuter,
         REFIID riid, void  ** ppvObject) override;
 
-    virtual  SCODE STDMETHODCALLTYPE  LockServer(
+    virtual  HRESULT STDMETHODCALLTYPE  LockServer(
         BOOL fLock) override;
 
 private:
-    friend SCODE STDMETHODCALLTYPE DllGetClassObject(
+    friend HRESULT STDMETHODCALLTYPE DllGetClassObject(
         REFCLSID   cid,
         REFIID     iid,
-        void **    ppvObj);
+        LPVOID *   ppvObj);
 
     COooFilterCF();
     virtual  ~COooFilterCF();
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index 2e4bff29995f..76578ba70d25 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -100,7 +100,7 @@ long BufferStream::sseek (long offset, int origin)
         return -1;
 }
 
-FileStream::FileStream(const wchar_t *filename) :
+FileStream::FileStream(const Filepath_char_t *filename) :
     file(nullptr)
 {
     // fdo#67534: avoid locking to not interfere with soffice opening the file
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 655f1c6cadde..80f1d3bc2555 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -403,7 +403,7 @@ bool CClassFactory::IsLocked()
 }
 
 
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 {
     OutputDebugStringFormatW( L"DllGetClassObject.\n" );
     *ppv = nullptr;
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 627452ea7da5..bea4566fdba6 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -111,7 +111,7 @@ ULONG STDMETHODCALLTYPE CPropertySheet::Release()
 
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize(
-    LPCITEMIDLIST /*pidlFolder*/, LPDATAOBJECT lpdobj, HKEY /*hkeyProgID*/)
+    LPCITEMIDLIST /*pidlFolder*/, IDataObject * lpdobj, HKEY /*hkeyProgID*/)
 {
     InitCommonControls();
 
@@ -159,7 +159,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize(
 // IShellPropSheetExt
 
 
-HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
+HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNSVADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
 {
     std::wstring proppage_header;
 
@@ -198,7 +198,7 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddP
 
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::ReplacePage(
-    UINT /*uPageID*/, LPFNADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/)
+    EXPPS /*uPageID*/, LPFNSVADDPROPSHEETPAGE /*lpfnReplaceWith*/, LPARAM /*lParam*/)
 {
     return E_NOTIMPL;
 }
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 6ca91f0d98ed..24ca14a44c4b 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -365,7 +365,7 @@ STDAPI DllUnregisterServer()
     return hr;
 }
 
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv)
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
 {
     *ppv = nullptr;
 
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index f76ac53d5387..57c8068ef0e8 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -63,7 +63,7 @@ const size_t OOFileExtensionTableSize = SAL_N_ELEMENTS(OOFileExtensionTable);
 /** Return the extension of a file
     name without the '.'
 */
-std::wstring get_file_name_extension(const std::wstring& file_name)
+Filepath_t get_file_name_extension(const Filepath_t& file_name)
 {
     std::wstring::size_type idx = file_name.find_last_of(L".");
 
@@ -77,7 +77,7 @@ std::wstring get_file_name_extension(const std::wstring& file_name)
 /** Return the type of a file
 */
 
-File_Type_t get_file_type(const std::wstring& file_name)
+File_Type_t get_file_type(const Filepath_t& file_name)
 {
     std::wstring fext = get_file_name_extension(file_name);
     std::transform(
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index 928fb4643f3a..cc42c092e9c8 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -28,7 +28,7 @@
 
 #include <objbase.h>
 
-bool SetRegistryKey(HKEY RootKey, const wchar_t* KeyName, const wchar_t* ValueName, const wchar_t* Value)
+bool SetRegistryKey(HKEY RootKey, const Filepath_char_t* KeyName, const Filepath_char_t* ValueName, const Filepath_char_t* Value)
 {
     HKEY hSubKey;
 
@@ -50,7 +50,7 @@ bool SetRegistryKey(HKEY RootKey, const wchar_t* KeyName, const wchar_t* ValueNa
 }
 
 
-bool DeleteRegistryKey(HKEY RootKey, const wchar_t* KeyName)
+bool DeleteRegistryKey(HKEY RootKey, const Filepath_char_t* KeyName)
 {
     HKEY hKey;
 
@@ -112,7 +112,7 @@ bool DeleteRegistryKey(HKEY RootKey, const wchar_t* KeyName)
 /** May be used to determine if the specified registry key has subkeys
     The function returns true on success else if an error occurs false
 */
-bool HasSubkeysRegistryKey(HKEY RootKey, const wchar_t* KeyName, /* out */ bool& bResult)
+bool HasSubkeysRegistryKey(HKEY RootKey, const Filepath_char_t* KeyName, /* out */ bool& bResult)
 {
     HKEY hKey;
 
@@ -132,7 +132,7 @@ bool HasSubkeysRegistryKey(HKEY RootKey, const wchar_t* KeyName, /* out */ bool&
 }
 
 // Convert a CLSID to a char string.
-std::wstring ClsidToString(const CLSID& clsid)
+Filepath_t ClsidToString(const CLSID& clsid)
 {
     // Get CLSID
     LPOLESTR wszCLSID = nullptr;
@@ -147,7 +147,7 @@ std::wstring ClsidToString(const CLSID& clsid)
 }
 
 
-bool QueryRegistryKey(HKEY RootKey, const wchar_t* KeyName, const wchar_t* ValueName, wchar_t *pszData, DWORD dwBufLen)
+bool QueryRegistryKey(HKEY RootKey, const Filepath_char_t* KeyName, const Filepath_char_t* ValueName, Filepath_char_t *pszData, DWORD dwBufLen)
 {
     HKEY hKey;
 
diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx
index 6ab62d5f94ce..05856e1c8198 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -351,7 +351,7 @@ struct stricmp
             IOException if the specified file doesn't exist
             AccessViolationException if read access to the file is denied
 */
-bool ZipFile::IsZipFile(const std::wstring& /*FileName*/)
+bool ZipFile::IsZipFile(const Filepath_t& /*FileName*/)
 {
     return true;
 }
@@ -377,7 +377,7 @@ bool ZipFile::IsZipFile(void* /*stream*/)
             IOException if the specified file doesn't exist or is no zip file
             AccessViolationException if read access to the file is denied
 */
-bool ZipFile::IsValidZipFileVersionNumber(const std::wstring& /*FileName*/)
+bool ZipFile::IsValidZipFileVersionNumber(const Filepath_t& /*FileName*/)
 {
     return true;
 }
@@ -400,7 +400,7 @@ bool ZipFile::IsValidZipFileVersionNumber(void* /* stream*/)
             WrongZipVersionException if the zip file cannot be uncompressed
             with the used zlib version
 */
-ZipFile::ZipFile(const std::wstring &FileName) :
+ZipFile::ZipFile(const Filepath_t &FileName) :
     m_pStream(nullptr),
     m_bShouldFree(true)
 {
diff --git a/winaccessibility/inc/AccObjectWinManager.hxx b/winaccessibility/inc/AccObjectWinManager.hxx
index f57c1ac924de..1529bc40ec7f 100644
--- a/winaccessibility/inc/AccObjectWinManager.hxx
+++ b/winaccessibility/inc/AccObjectWinManager.hxx
@@ -107,7 +107,7 @@ public:
 
     bool NotifyAccEvent( css::accessibility::XAccessible* pXAcc,short state = 0 );
 
-    LPARAM Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
+    LRESULT Get_ToATInterface(HWND hWnd, long lParam, WPARAM wParam);
 
     void  DecreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
     void  IncreaseState( css::accessibility::XAccessible* pXAcc,unsigned short pState );
diff --git a/winaccessibility/source/UAccCOM/AccTable.cxx b/winaccessibility/source/UAccCOM/AccTable.cxx
index 429258fee0d5..08b230c11193 100644
--- a/winaccessibility/source/UAccCOM/AccTable.cxx
+++ b/winaccessibility/source/UAccCOM/AccTable.cxx
@@ -567,7 +567,7 @@ STDMETHODIMP CAccTable::get_summary(IUnknown * * accessible)
   * @param    column        the column index.
   * @param    isSelected    the result.
   */
-STDMETHODIMP CAccTable::get_isColumnSelected(long column, unsigned char * isSelected)
+STDMETHODIMP CAccTable::get_isColumnSelected(long column, boolean * isSelected)
 {
     SolarMutexGuard g;
 
@@ -593,7 +593,7 @@ STDMETHODIMP CAccTable::get_isColumnSelected(long column, unsigned char * isSele
   * @param    row           the row index.
   * @param    isSelected    the result.
   */
-STDMETHODIMP CAccTable::get_isRowSelected(long row, unsigned char * isSelected)
+STDMETHODIMP CAccTable::get_isRowSelected(long row, boolean * isSelected)
 {
     SolarMutexGuard g;
 
@@ -621,7 +621,7 @@ STDMETHODIMP CAccTable::get_isRowSelected(long row, unsigned char * isSelected)
   * @param    column         the column index.
   * @param    isSelected     the result.
   */
-STDMETHODIMP CAccTable::get_isSelected(long row, long column, unsigned char * isSelected)
+STDMETHODIMP CAccTable::get_isSelected(long row, long column, boolean * isSelected)
 {
     SolarMutexGuard g;
 
diff --git a/winaccessibility/source/UAccCOM/AccTable.h b/winaccessibility/source/UAccCOM/AccTable.h
index 6bc8b64d9569..56d9ae338d67 100644
--- a/winaccessibility/source/UAccCOM/AccTable.h
+++ b/winaccessibility/source/UAccCOM/AccTable.h
@@ -121,13 +121,13 @@ public:
     STDMETHOD(get_summary)(IUnknown * * accessible) override;
 
     // Determines if table column is selected.
-    STDMETHOD(get_isColumnSelected)(long column, unsigned char * isSelected) override;
+    STDMETHOD(get_isColumnSelected)(long column, boolean * isSelected) override;
 
     // Determines if table row is selected.
-    STDMETHOD(get_isRowSelected)(long row, unsigned char * isSelected) override;
+    STDMETHOD(get_isRowSelected)(long row, boolean * isSelected) override;
 
     // Determines if table cell is selected.
-    STDMETHOD(get_isSelected)(long row, long column, unsigned char * isSelected) override;
+    STDMETHOD(get_isSelected)(long row, long column, boolean * isSelected) override;
 
     // Selects a row and unselect all previously selected rows.
     STDMETHOD(selectRow)(long row ) override;