From 5ca94b9b0be2dce34f6743f0173d47ba9f735edb Mon Sep 17 00:00:00 2001
From: Fedor <fedor@mail.ru>
Date: Wed, 12 Aug 2020 09:59:33 +0300
Subject: [PATCH] Improve dll loading on Windows.

---
 gfx/2d/DrawTargetD2D1.cpp   | 3 ++-
 toolkit/xre/nsAppRunner.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gfx/2d/DrawTargetD2D1.cpp b/gfx/2d/DrawTargetD2D1.cpp
index d9deb4c10..a2e854107 100644
--- a/gfx/2d/DrawTargetD2D1.cpp
+++ b/gfx/2d/DrawTargetD2D1.cpp
@@ -14,6 +14,7 @@
 #include "FilterNodeD2D1.h"
 #include "ExtendInputEffectD2D1.h"
 #include "Tools.h"
+#include "nsWindowsHelpers.h"
 
 using namespace std;
 
@@ -1177,7 +1178,7 @@ DrawTargetD2D1::GetDWriteFactory()
   }
 
   decltype(DWriteCreateFactory)* createDWriteFactory;
-  HMODULE dwriteModule = LoadLibraryW(L"dwrite.dll");
+  HMODULE dwriteModule = LoadLibrarySystem32(L"dwrite.dll");
   createDWriteFactory = (decltype(DWriteCreateFactory)*)
     GetProcAddress(dwriteModule, "DWriteCreateFactory");
 
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index e2d05255e..8597e7471 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -2652,6 +2652,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
 
@@ -2680,7 +2681,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");