loplugin:typedefparam (clang-cl)

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

18 files changed, 86 insertions, 86 deletions

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)
 {