diff options
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"); |