summaryrefslogtreecommitdiffstats
path: root/toolkit/xre
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-07-29 14:13:33 +0000
committerMoonchild <moonchild@palemoon.org>2020-07-29 14:29:33 +0000
commit2ee2ca7dfb0913eef79708dc4100f87b9557e128 (patch)
tree9df45decf2d7d940ff19641adea50fe7122805f7 /toolkit/xre
parent0d7b7b74c6015a068c410238295e0e7304af6a29 (diff)
downloadUXP-2ee2ca7dfb0913eef79708dc4100f87b9557e128.tar
UXP-2ee2ca7dfb0913eef79708dc4100f87b9557e128.tar.gz
UXP-2ee2ca7dfb0913eef79708dc4100f87b9557e128.tar.lz
UXP-2ee2ca7dfb0913eef79708dc4100f87b9557e128.tar.xz
UXP-2ee2ca7dfb0913eef79708dc4100f87b9557e128.zip
Improve dll loading on Windows.
Diffstat (limited to 'toolkit/xre')
-rw-r--r--toolkit/xre/nsAppRunner.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 55072c474..a2f7b89b2 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2615,6 +2615,7 @@ NS_VISIBILITY_DEFAULT PRBool nspr_use_zone_allocator = PR_FALSE;
#ifdef CAIRO_HAS_DWRITE_FONT
#include <dwrite.h>
+#include "nsWindowsHelpers.h"
#ifdef DEBUG_DWRITE_STARTUP
@@ -2643,7 +2644,7 @@ static DWORD WINAPI InitDwriteBG(LPVOID lpdwThreadParam)
{
SetThreadPriority(GetCurrentThread(), THREAD_MODE_BACKGROUND_BEGIN);
LOGREGISTRY(L"loading dwrite.dll");
- HMODULE dwdll = LoadLibraryW(L"dwrite.dll");
+ HMODULE dwdll = LoadLibrarySystem32(L"dwrite.dll");
if (dwdll) {
decltype(DWriteCreateFactory)* createDWriteFactory = (decltype(DWriteCreateFactory)*)
GetProcAddress(dwdll, "DWriteCreateFactory");