walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "Revert "[hb-directwrite] Don't load dwrit.dll dynamically"" 

This reverts commit ecbe224743.

It was causing directwrite shaper to crash in MSVC builds.
This commit is contained in:
Khaled Hosny 2021-12-01 03:16:46 +02:00
parent 549e2b7038
commit 361a438658
1 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/hb-directwrite.cc
View File

@ -43,14 +43,6 @@
* Functions for using HarfBuzz with DirectWrite fonts. * Functions for using HarfBuzz with DirectWrite fonts.
**/ **/
/* Declare object creator for dynamic support of DWRITE */
typedef HRESULT (* WINAPI t_DWriteCreateFactory)(
DWRITE_FACTORY_TYPE factoryType,
REFIID iid,
IUnknown **factory
);
/* /*
* DirectWrite font stream helpers * DirectWrite font stream helpers
*/ */
@ -145,7 +137,6 @@ public:
struct hb_directwrite_face_data_t struct hb_directwrite_face_data_t
{ {
HMODULE dwrite_dll;
IDWriteFactory *dwriteFactory; IDWriteFactory *dwriteFactory;
IDWriteFontFile *fontFile; IDWriteFontFile *fontFile;
DWriteFontFileStream *fontFileStream; DWriteFontFileStream *fontFileStream;
@ -167,33 +158,12 @@ _hb_directwrite_shaper_face_data_create (hb_face_t *face)
return nullptr; \ return nullptr; \
} HB_STMT_END } HB_STMT_END
data->dwrite_dll = LoadLibrary (TEXT ("DWRITE"));
if (unlikely (!data->dwrite_dll))
FAIL ("Cannot find DWrite.DLL");
t_DWriteCreateFactory p_DWriteCreateFactory;
#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-function-type"
#endif
p_DWriteCreateFactory = (t_DWriteCreateFactory)
GetProcAddress (data->dwrite_dll, "DWriteCreateFactory");
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif
if (unlikely (!p_DWriteCreateFactory))
FAIL ("Cannot find DWriteCreateFactory().");
HRESULT hr; HRESULT hr;
// TODO: factory and fontFileLoader should be cached separately // TODO: factory and fontFileLoader should be cached separately
IDWriteFactory* dwriteFactory; IDWriteFactory* dwriteFactory;
hr = p_DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED, __uuidof (IDWriteFactory), hr = DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED, __uuidof (IDWriteFactory),
(IUnknown**) &dwriteFactory); (IUnknown**) &dwriteFactory);
if (unlikely (hr != S_OK)) if (unlikely (hr != S_OK))
FAIL ("Failed to run DWriteCreateFactory()."); FAIL ("Failed to run DWriteCreateFactory().");
@ -257,8 +227,6 @@ _hb_directwrite_shaper_face_data_destroy (hb_directwrite_face_data_t *data)
delete data->fontFileStream; delete data->fontFileStream;
if (data->faceBlob) if (data->faceBlob)
hb_blob_destroy (data->faceBlob); hb_blob_destroy (data->faceBlob);
if (data->dwrite_dll)
FreeLibrary (data->dwrite_dll);
if (data) if (data)
delete data; delete data;
} }