diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-08-13 12:10:54 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-08-13 12:10:54 +0000 |
| commit | 11285cd0d6ef7de80d22187b99376602ed547214 (patch) | |
| tree | 034c72eea2e7838b08abd00f37acf8e3c9e97949 /toolkit/xre | |
| parent | e1e535c1c6372f95b4a14b6a00b6d6e7be400c3b (diff) | |
| parent | d3383327a749ddb5c0626146c6f83bdfa3ea9936 (diff) | |
| download | UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar.gz UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar.lz UXP-11285cd0d6ef7de80d22187b99376602ed547214.tar.xz UXP-11285cd0d6ef7de80d22187b99376602ed547214.zip | |
Merge branch 'master' into es-modules-work
Diffstat (limited to 'toolkit/xre')
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 3 |
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"); |