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

Dynamically load DWRITE

Browse Source 
Also checks if DWriteCreateFactory() has been executed successfully.
This commit is contained in:
Carlo Bramini 2019-06-30 15:03:44 +02:00 committed by GitHub
parent ad341d5f16
commit 601b6825b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/hb-directwrite.cc
View File

@ -33,6 +33,13 @@
#include "hb-directwrite.h" #include "hb-directwrite.h"
/* Declare object creator for dynamic support of DWRITE */
typedef HRESULT (* WINAPI t_DWriteCreateFactory)(
DWRITE_FACTORY_TYPE factoryType,
REFIID iid,
IUnknown **factory
);
/* /*
* hb-directwrite uses new/delete syntatically but as we let users * hb-directwrite uses new/delete syntatically but as we let users
* to override malloc/free, we will redefine new/delete so users * to override malloc/free, we will redefine new/delete so users
@ -138,6 +145,7 @@ 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;
@ -153,12 +161,33 @@ _hb_directwrite_shaper_face_data_create (hb_face_t *face)
if (unlikely (!data)) if (unlikely (!data))
return nullptr; return nullptr;
// TODO: factory and fontFileLoader should be cached separately #define FAIL(...) \
IDWriteFactory* dwriteFactory; HB_STMT_START { \
DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED, __uuidof (IDWriteFactory), DEBUG_MSG (DIRECTWRITE, nullptr, __VA_ARGS__); \
(IUnknown**) &dwriteFactory); return nullptr; \
} HB_STMT_END
data->dwrite_dll = LoadLibrary(TEXT("DWRITE"));
if (data->dwrite_dll == NULL)
FAIL ("Cannot find DWrite.DLL");
t_DWriteCreateFactory p_DWriteCreateFactory;
p_DWriteCreateFactory = (t_DWriteCreateFactory)
GetProcAddress(data->dwrite_dll, "DWriteCreateFactory");
if (p_DWriteCreateFactory == NULL)
FAIL ("Cannot find DWriteCreateFactory().");
HRESULT hr; HRESULT hr;
// TODO: factory and fontFileLoader should be cached separately
IDWriteFactory* dwriteFactory;
hr = p_DWriteCreateFactory (DWRITE_FACTORY_TYPE_SHARED, __uuidof (IDWriteFactory),
(IUnknown**) &dwriteFactory);
if (hr != S_OK)
FAIL ("Failed to run DWriteCreateFactory().");
hb_blob_t *blob = hb_face_reference_blob (face); hb_blob_t *blob = hb_face_reference_blob (face);
DWriteFontFileStream *fontFileStream; DWriteFontFileStream *fontFileStream;
fontFileStream = new DWriteFontFileStream ((uint8_t *) hb_blob_get_data (blob, nullptr), fontFileStream = new DWriteFontFileStream ((uint8_t *) hb_blob_get_data (blob, nullptr),
@ -172,12 +201,6 @@ _hb_directwrite_shaper_face_data_create (hb_face_t *face)
hr = dwriteFactory->CreateCustomFontFileReference (&fontFileKey, sizeof (fontFileKey), hr = dwriteFactory->CreateCustomFontFileReference (&fontFileKey, sizeof (fontFileKey),
fontFileLoader, &fontFile); fontFileLoader, &fontFile);
#define FAIL(...) \
HB_STMT_START { \
DEBUG_MSG (DIRECTWRITE, nullptr, __VA_ARGS__); \
return nullptr; \
} HB_STMT_END
if (FAILED (hr)) if (FAILED (hr))
FAIL ("Failed to load font file from data!"); FAIL ("Failed to load font file from data!");
@ -224,6 +247,8 @@ _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 != NULL)
FreeLibrary(data->dwrite_dll);
if (data) if (data)
delete data; delete data;
} }