summaryrefslogtreecommitdiffstats
path: root/dom
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-09-17 15:24:50 +0000
committerMoonchild <moonchild@palemoon.org>2020-09-21 11:04:52 +0000
commit892a2d9655650616c361750a4d1a49f7d7914ad2 (patch)
tree7cedb1b8e368543f56d755781f4ed33d5c2e6adf /dom
parent075fa012868017c9cb49f1b92960bf02f4bf27ca (diff)
downloadUXP-892a2d9655650616c361750a4d1a49f7d7914ad2.tar
UXP-892a2d9655650616c361750a4d1a49f7d7914ad2.tar.gz
UXP-892a2d9655650616c361750a4d1a49f7d7914ad2.tar.lz
UXP-892a2d9655650616c361750a4d1a49f7d7914ad2.tar.xz
UXP-892a2d9655650616c361750a4d1a49f7d7914ad2.zip
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.
Diffstat (limited to 'dom')
-rw-r--r--dom/plugins/ipc/PluginModuleChild.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/dom/plugins/ipc/PluginModuleChild.cpp b/dom/plugins/ipc/PluginModuleChild.cpp
index f943dfc42..98c9cd494 100644
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -40,8 +40,8 @@
#ifdef XP_WIN
#include "nsWindowsDllInterceptor.h"
#include "mozilla/widget/AudioSession.h"
-#include "WinUtils.h"
#include <knownfolders.h>
+#include <shlobj.h>
#endif
#ifdef MOZ_WIDGET_COCOA
@@ -1918,8 +1918,8 @@ GetLocalLowTempPath(size_t aLen, LPWSTR aPath)
{
NS_NAMED_LITERAL_STRING(tempname, "\\Temp");
LPWSTR path;
- if (SUCCEEDED(WinUtils::SHGetKnownFolderPath(FOLDERID_LocalAppDataLow, 0,
- nullptr, &path))) {
+ if (SUCCEEDED(SHGetKnownFolderPath(FOLDERID_LocalAppDataLow, 0,
+ nullptr, &path))) {
if (wcslen(path) + tempname.Length() < aLen) {
wcscpy(aPath, path);
wcscat(aPath, tempname.get());