From 8151bb2b05f71c7fac9aefc94b97d7b703c8d803 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Thu, 17 Sep 2020 15:24:50 +0000 Subject: Issue #1653 - Part 1: Remove WinUtils::SHGetKnownFolderPath Instead of doing the whole dll-load, replace function dance, we can just use the shlobj.h version of Windows. --- widget/windows/WinUtils.h | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'widget/windows/WinUtils.h') diff --git a/widget/windows/WinUtils.h b/widget/windows/WinUtils.h index 37469ce07..9aa2c1c8a 100644 --- a/widget/windows/WinUtils.h +++ b/widget/windows/WinUtils.h @@ -398,14 +398,6 @@ public: static HRESULT SHCreateItemFromParsingName(PCWSTR pszPath, IBindCtx *pbc, REFIID riid, void **ppv); - /** - * SHGetKnownFolderPath() calls native SHGetKnownFolderPath() - * API which is available on Vista and up. - */ - static HRESULT SHGetKnownFolderPath(REFKNOWNFOLDERID rfid, - DWORD dwFlags, - HANDLE hToken, - PWSTR *ppszPath); /** * GetShellItemPath return the file or directory path of a shell item. * Internally calls IShellItem's GetDisplayName. @@ -529,12 +521,6 @@ private: REFIID riid, void **ppv); static SHCreateItemFromParsingNamePtr sCreateItemFromParsingName; - typedef HRESULT (WINAPI * SHGetKnownFolderPathPtr)(REFKNOWNFOLDERID rfid, - DWORD dwFlags, - HANDLE hToken, - PWSTR *ppszPath); - static SHGetKnownFolderPathPtr sGetKnownFolderPath; - static void GetWhitelistedPaths( nsTArray>& aOutput); }; -- cgit v1.2.3