diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-07-29 14:13:33 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-29 14:13:33 +0000 |
| commit | 0a8c53ff3d2513199f73b5f995ce9e812548f3a7 (patch) | |
| tree | 0bcfa39ff4dc6dc7a31cc7a50e4a6123f5bd63fe /toolkit | |
| parent | 9d155b45c7b95e99777278a22d91817f034ae5d9 (diff) | |
| download | UXP-0a8c53ff3d2513199f73b5f995ce9e812548f3a7.tar UXP-0a8c53ff3d2513199f73b5f995ce9e812548f3a7.tar.gz UXP-0a8c53ff3d2513199f73b5f995ce9e812548f3a7.tar.lz UXP-0a8c53ff3d2513199f73b5f995ce9e812548f3a7.tar.xz UXP-0a8c53ff3d2513199f73b5f995ce9e812548f3a7.zip | |
Improve dll loading on Windows.
Diffstat (limited to 'toolkit')
| -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"); |