system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 19:47:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

dwrite: Let freetype face cache manage lifetime of requested file fragments.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-01-18 23:02:41 +03:00 committed by Alexandre Julliard
parent 4712f24060
commit 274a82b33c
1 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dlls/dwrite/freetype.c
View file

@ -93,6 +93,22 @@ MAKE_FUNCPTR(FTC_Manager_LookupSize);
MAKE_FUNCPTR(FTC_Manager_RemoveFaceID);
#undef MAKE_FUNCPTR
struct face_finalizer_data
{
IDWriteFontFileStream *stream;
void *context;
};
static void face_finalizer(void *object)
{
FT_Face face = object;
struct face_finalizer_data *data = (struct face_finalizer_data *)face->generic.data;
IDWriteFontFileStream_ReleaseFileFragment(data->stream, data->context);
IDWriteFontFileStream_Release(data->stream);
heap_free(data);
}
static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointer request_data, FT_Face *face)
{
IDWriteFontFace *fontface = (IDWriteFontFace*)face_id;
@ -136,7 +152,19 @@ static FT_Error face_requester(FTC_FaceID face_id, FT_Library library, FT_Pointe
index = IDWriteFontFace_GetIndex(fontface);
fterror = pFT_New_Memory_Face(library, data_ptr, data_size, index, face);
IDWriteFontFileStream_ReleaseFileFragment(stream, context);
if (fterror == FT_Err_Ok) {
struct face_finalizer_data *data;
data = heap_alloc(sizeof(*data));
data->stream = stream;
data->context = context;
(*face)->generic.data = data;
(*face)->generic.finalizer = face_finalizer;
return fterror;
}
else
IDWriteFontFileStream_ReleaseFileFragment(stream, context);
fail:
IDWriteFontFileStream_Release(stream);