diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-07-29 14:30:24 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-07-29 14:30:24 +0000 |
| commit | a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57 (patch) | |
| tree | 9df45decf2d7d940ff19641adea50fe7122805f7 /toolkit | |
| parent | 86b184b957ea2ce31e5ffc376e90cbc537963367 (diff) | |
| parent | 2ee2ca7dfb0913eef79708dc4100f87b9557e128 (diff) | |
| download | UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar.gz UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar.lz UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.tar.xz UXP-a1ca8ca9bd1f4442dcbe613efa04f37a2c7b9f57.zip | |
Merge branch 'redwood' into release
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/mozapps/extensions/internal/XPIProvider.jsm | 8 | ||||
| -rw-r--r-- | toolkit/xre/nsAppRunner.cpp | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/toolkit/mozapps/extensions/internal/XPIProvider.jsm b/toolkit/mozapps/extensions/internal/XPIProvider.jsm index d12e1de59..58d412d9c 100644 --- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm +++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm @@ -6477,8 +6477,12 @@ AddonInternal.prototype = { return false; #endif } - else if (app.id == TOOLKIT_ID) - version = aPlatformVersion + else if (app.id == TOOLKIT_ID) { +#ifdef MOZ_PHOENIX_EXTENSIONS + this.native = true; +#endif + version = aPlatformVersion; + } // Only extensions and dictionaries can be compatible by default; themes // and language packs always use strict compatibility checking. 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"); |