ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dwrite: Use common structure to pass stream/facetype/index data around. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2016-05-03 21:26:48 +03:00 committed by Alexandre Julliard
parent 5dc5bb7580
commit 2b96276183
4 changed files with 82 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/dwrite/dwrite_private.h
View File

@ -188,20 +188,26 @@ struct dwrite_font_props {
DWRITE_PANOSE panose; DWRITE_PANOSE panose;
}; };
struct file_stream_desc {
IDWriteFontFileStream *stream;
DWRITE_FONT_FACE_TYPE face_type;
UINT32 face_index;
};
extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN;
extern HRESULT opentype_get_font_table(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_table(struct file_stream_desc*,UINT32,const void**,void**,UINT32*,BOOL*) DECLSPEC_HIDDEN;
extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN; extern HRESULT opentype_cmap_get_unicode_ranges(void*,UINT32,DWRITE_UNICODE_RANGE*,UINT32*) DECLSPEC_HIDDEN;
extern void opentype_get_font_properties(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,struct dwrite_font_props*) DECLSPEC_HIDDEN; extern void opentype_get_font_properties(struct file_stream_desc*,struct dwrite_font_props*) DECLSPEC_HIDDEN;
extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN; extern void opentype_get_font_metrics(struct file_stream_desc*,DWRITE_FONT_METRICS1*,DWRITE_CARET_METRICS*) DECLSPEC_HIDDEN;
extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_info_strings(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN;
extern HRESULT opentype_get_font_familyname(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_familyname(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN;
extern HRESULT opentype_get_font_facename(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_facename(struct file_stream_desc*,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN;
extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN;
extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN;
extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN;
extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN;
extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN;
extern HRESULT opentype_get_font_signature(IDWriteFontFileStream*,DWRITE_FONT_FACE_TYPE,UINT32,FONTSIGNATURE*) DECLSPEC_HIDDEN; extern HRESULT opentype_get_font_signature(struct file_stream_desc*,FONTSIGNATURE*) DECLSPEC_HIDDEN;
struct dwrite_colorglyph { struct dwrite_colorglyph {
USHORT layer; /* [0, num_layers) index indicating current layer */ USHORT layer; /* [0, num_layers) index indicating current layer */

24
dlls/dwrite/font.c
View File

@ -612,10 +612,14 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace3 *iface, UI
const void **table_data, UINT32 *table_size, void **context, BOOL *exists) const void **table_data, UINT32 *table_size, void **context, BOOL *exists)
{ {
struct dwrite_fontface *This = impl_from_IDWriteFontFace3(iface); struct dwrite_fontface *This = impl_from_IDWriteFontFace3(iface);
struct file_stream_desc stream_desc;
TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_tag(table_tag), table_data, table_size, context, exists); TRACE("(%p)->(%s %p %p %p %p)\n", This, debugstr_tag(table_tag), table_data, table_size, context, exists);
return opentype_get_font_table(This->streams[0], This->type, This->index, table_tag, table_data, context, table_size, exists); stream_desc.stream = This->streams[0];
stream_desc.face_type = This->type;
stream_desc.face_index = This->index;
return opentype_get_font_table(&stream_desc, table_tag, table_data, context, table_size, exists);
} }
static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace3 *iface, void *table_context) static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace3 *iface, void *table_context)
@ -3054,6 +3058,7 @@ static BOOL font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA
static HRESULT init_font_data(IDWriteFactory3 *factory, IDWriteFontFile *file, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index, static HRESULT init_font_data(IDWriteFactory3 *factory, IDWriteFontFile *file, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index,
IDWriteLocalizedStrings **family_name, struct dwrite_font_data **ret) IDWriteLocalizedStrings **family_name, struct dwrite_font_data **ret)
{ {
struct file_stream_desc stream_desc;
struct dwrite_font_props props; struct dwrite_font_props props;
struct dwrite_font_data *data; struct dwrite_font_data *data;
IDWriteFontFileStream *stream; IDWriteFontFileStream *stream;
@ -3082,12 +3087,15 @@ static HRESULT init_font_data(IDWriteFactory3 *factory, IDWriteFontFile *file, D
IDWriteFontFile_AddRef(file); IDWriteFontFile_AddRef(file);
IDWriteFactory3_AddRef(factory); IDWriteFactory3_AddRef(factory);
opentype_get_font_properties(stream, face_type, face_index, &props); stream_desc.stream = stream;
opentype_get_font_metrics(stream, face_type, face_index, &data->metrics, NULL); stream_desc.face_type = face_type;
opentype_get_font_facename(stream, face_type, face_index, &data->names); stream_desc.face_index = face_index;
opentype_get_font_properties(&stream_desc, &props);
opentype_get_font_metrics(&stream_desc, &data->metrics, NULL);
opentype_get_font_facename(&stream_desc, &data->names);
/* get family name from font file */ /* get family name from font file */
hr = opentype_get_font_familyname(stream, face_type, face_index, family_name); hr = opentype_get_font_familyname(&stream_desc, family_name);
IDWriteFontFileStream_Release(stream); IDWriteFontFileStream_Release(stream);
if (FAILED(hr)) { if (FAILED(hr)) {
WARN("unable to get family name from font\n"); WARN("unable to get family name from font\n");
@ -4006,6 +4014,7 @@ static HRESULT get_stream_from_file(IDWriteFontFile *file, IDWriteFontFileStream
HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index, HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDWriteFontFile* const* font_files, UINT32 index,
DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace3 **ret) DWRITE_FONT_SIMULATIONS simulations, IDWriteFontFace3 **ret)
{ {
struct file_stream_desc stream_desc;
struct dwrite_fontface *fontface; struct dwrite_fontface *fontface;
HRESULT hr = S_OK; HRESULT hr = S_OK;
int i; int i;
@ -4055,7 +4064,10 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW
IDWriteFontFile_AddRef(font_files[i]); IDWriteFontFile_AddRef(font_files[i]);
} }
opentype_get_font_metrics(fontface->streams[0], facetype, index, &fontface->metrics, &fontface->caret); stream_desc.stream = fontface->streams[0];
stream_desc.face_type = facetype;
stream_desc.face_index = index;
opentype_get_font_metrics(&stream_desc, &fontface->metrics, &fontface->caret);
if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) { if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) {
/* TODO: test what happens if caret is already slanted */ /* TODO: test what happens if caret is already slanted */
if (fontface->caret.slopeRise == 1) { if (fontface->caret.slopeRise == 1) {

18
dlls/dwrite/gdiinterop.c
View File

@ -682,7 +682,7 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop1 *if
struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface);
IDWriteLocalizedStrings *familynames; IDWriteLocalizedStrings *familynames;
DWRITE_FONT_SIMULATIONS simulations; DWRITE_FONT_SIMULATIONS simulations;
DWRITE_FONT_FACE_TYPE face_type; struct file_stream_desc stream_desc;
struct dwrite_font_props props; struct dwrite_font_props props;
IDWriteFontFileStream *stream; IDWriteFontFileStream *stream;
IDWriteFontFile *file = NULL; IDWriteFontFile *file = NULL;
@ -705,10 +705,11 @@ static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop1 *if
return hr; return hr;
} }
index = IDWriteFontFace_GetIndex(fontface); stream_desc.stream = stream;
face_type = IDWriteFontFace_GetType(fontface); stream_desc.face_type = IDWriteFontFace_GetType(fontface);
opentype_get_font_properties(stream, face_type, index, &props); stream_desc.face_index = IDWriteFontFace_GetIndex(fontface);
hr = opentype_get_font_familyname(stream, index, face_type, &familynames); opentype_get_font_properties(&stream_desc, &props);
hr = opentype_get_font_familyname(&stream_desc, &familynames);
IDWriteFontFile_Release(file); IDWriteFontFile_Release(file);
IDWriteFontFileStream_Release(stream); IDWriteFontFileStream_Release(stream);
if (FAILED(hr)) if (FAILED(hr))
@ -884,6 +885,7 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, I
FONTSIGNATURE *fontsig) FONTSIGNATURE *fontsig)
{ {
struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface);
struct file_stream_desc stream_desc;
IDWriteFontFileStream *stream; IDWriteFontFileStream *stream;
IDWriteFontFile *file; IDWriteFontFile *file;
UINT32 count; UINT32 count;
@ -900,8 +902,10 @@ static HRESULT WINAPI gdiinterop1_GetFontSignature_(IDWriteGdiInterop1 *iface, I
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
hr = opentype_get_font_signature(stream, IDWriteFontFace_GetType(fontface), stream_desc.stream = stream;
IDWriteFontFace_GetIndex(fontface), fontsig); stream_desc.face_type = IDWriteFontFace_GetType(fontface);
stream_desc.face_index = IDWriteFontFace_GetIndex(fontface);
hr = opentype_get_font_signature(&stream_desc, fontsig);
IDWriteFontFileStream_Release(stream); IDWriteFontFileStream_Release(stream);
return hr; return hr;
} }

87
dlls/dwrite/opentype.c
View File

@ -953,8 +953,8 @@ HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, UINT32* font_count,
return S_OK; return S_OK;
} }
HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE type, UINT32 font_index, UINT32 tag, HRESULT opentype_get_font_table(struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data,
const void **table_data, void **table_context, UINT32 *table_size, BOOL *found) void **table_context, UINT32 *table_size, BOOL *found)
{ {
HRESULT hr; HRESULT hr;
TTC_SFNT_V1 *font_header = NULL; TTC_SFNT_V1 *font_header = NULL;
@ -970,22 +970,22 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_
*table_data = NULL; *table_data = NULL;
*table_context = NULL; *table_context = NULL;
if (type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) { if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION) {
const TTC_Header_V1 *ttc_header; const TTC_Header_V1 *ttc_header;
void * ttc_context; void * ttc_context;
hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) if (stream_desc->face_index >= GET_BE_DWORD(ttc_header->numFonts))
hr = E_INVALIDARG; hr = E_INVALIDARG;
else { else {
table_offset = GET_BE_DWORD(ttc_header->OffsetTable[font_index]); table_offset = GET_BE_DWORD(ttc_header->OffsetTable[stream_desc->face_index]);
hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context);
} }
IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, ttc_context);
} }
} }
else else
hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
@ -994,25 +994,25 @@ HRESULT opentype_get_font_table(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_
table_offset += sizeof(*font_header); table_offset += sizeof(*font_header);
for (i = 0; i < table_count; i++) for (i = 0; i < table_count; i++)
{ {
hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&table_record, table_offset, sizeof(*table_record), &table_record_context); hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void**)&table_record, table_offset, sizeof(*table_record), &table_record_context);
if (FAILED(hr)) if (FAILED(hr))
break; break;
if (DWRITE_MAKE_OPENTYPE_TAG(table_record->tag[0], table_record->tag[1], table_record->tag[2], table_record->tag[3]) == tag) if (DWRITE_MAKE_OPENTYPE_TAG(table_record->tag[0], table_record->tag[1], table_record->tag[2], table_record->tag[3]) == tag)
break; break;
IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, table_record_context);
table_offset += sizeof(*table_record); table_offset += sizeof(*table_record);
} }
IDWriteFontFileStream_ReleaseFileFragment(stream, sfnt_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, sfnt_context);
if (SUCCEEDED(hr) && i < table_count) if (SUCCEEDED(hr) && i < table_count)
{ {
int offset = GET_BE_DWORD(table_record->offset); int offset = GET_BE_DWORD(table_record->offset);
int length = GET_BE_DWORD(table_record->length); int length = GET_BE_DWORD(table_record->length);
IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, table_record_context);
if (found) *found = TRUE; if (found) *found = TRUE;
if (table_size) *table_size = length; if (table_size) *table_size = length;
hr = IDWriteFontFileStream_ReadFileFragment(stream, table_data, offset, length, table_context); hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, table_data, offset, length, table_context);
} }
return hr; return hr;
@ -1114,8 +1114,7 @@ HRESULT opentype_cmap_get_unicode_ranges(void *data, UINT32 max_count, DWRITE_UN
return *count > max_count ? E_NOT_SUFFICIENT_BUFFER : S_OK; return *count > max_count ? E_NOT_SUFFICIENT_BUFFER : S_OK;
} }
void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index, void opentype_get_font_metrics(struct file_stream_desc *stream_desc, DWRITE_FONT_METRICS1 *metrics, DWRITE_CARET_METRICS *caret)
DWRITE_FONT_METRICS1 *metrics, DWRITE_CARET_METRICS *caret)
{ {
void *os2_context, *head_context, *post_context, *hhea_context; void *os2_context, *head_context, *post_context, *hhea_context;
const TT_OS2_V2 *tt_os2; const TT_OS2_V2 *tt_os2;
@ -1125,10 +1124,10 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T
memset(metrics, 0, sizeof(*metrics)); memset(metrics, 0, sizeof(*metrics));
opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL);
opentype_get_font_table(stream, face_type, face_index, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL);
opentype_get_font_table(stream, face_type, face_index, MS_POST_TAG, (const void**)&tt_post, &post_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_POST_TAG, (const void**)&tt_post, &post_context, NULL, NULL);
opentype_get_font_table(stream, face_type, face_index, MS_HHEA_TAG, (const void**)&tt_hhea, &hhea_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_HHEA_TAG, (const void**)&tt_hhea, &hhea_context, NULL, NULL);
if (tt_head) { if (tt_head) {
metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm); metrics->designUnitsPerEm = GET_BE_WORD(tt_head->unitsPerEm);
@ -1220,24 +1219,23 @@ void opentype_get_font_metrics(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_T
metrics->capHeight = metrics->designUnitsPerEm * 7 / 10; metrics->capHeight = metrics->designUnitsPerEm * 7 / 10;
if (tt_os2) if (tt_os2)
IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context);
if (tt_head) if (tt_head)
IDWriteFontFileStream_ReleaseFileFragment(stream, head_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head_context);
if (tt_post) if (tt_post)
IDWriteFontFileStream_ReleaseFileFragment(stream, post_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, post_context);
if (tt_hhea) if (tt_hhea)
IDWriteFontFileStream_ReleaseFileFragment(stream, hhea_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, hhea_context);
} }
void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE type, UINT32 index, void opentype_get_font_properties(struct file_stream_desc *stream_desc, struct dwrite_font_props *props)
struct dwrite_font_props *props)
{ {
void *os2_context, *head_context; void *os2_context, *head_context;
const TT_OS2_V2 *tt_os2; const TT_OS2_V2 *tt_os2;
const TT_HEAD *tt_head; const TT_HEAD *tt_head;
opentype_get_font_table(stream, type, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL);
opentype_get_font_table(stream, type, index, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_HEAD_TAG, (const void**)&tt_head, &head_context, NULL, NULL);
/* default stretch, weight and style to normal */ /* default stretch, weight and style to normal */
props->stretch = DWRITE_FONT_STRETCH_NORMAL; props->stretch = DWRITE_FONT_STRETCH_NORMAL;
@ -1286,9 +1284,9 @@ void opentype_get_font_properties(IDWriteFontFileStream *stream, DWRITE_FONT_FAC
TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style); TRACE("stretch=%d, weight=%d, style %d\n", props->stretch, props->weight, props->style);
if (tt_os2) if (tt_os2)
IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context);
if (tt_head) if (tt_head)
IDWriteFontFileStream_ReleaseFileFragment(stream, head_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, head_context);
} }
static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT encoding) static UINT get_name_record_codepage(enum OPENTYPE_PLATFORM_ID platform, USHORT encoding)
@ -1532,16 +1530,15 @@ HRESULT opentype_get_font_info_strings(const void *table_data, DWRITE_INFORMATIO
/* FamilyName locating order is WWS Family Name -> Preferred Family Name -> Family Name. If font claims to /* FamilyName locating order is WWS Family Name -> Preferred Family Name -> Family Name. If font claims to
have 'Preferred Family Name' in WWS format, then WWS name is not used. */ have 'Preferred Family Name' in WWS format, then WWS name is not used. */
HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE facetype, UINT32 index, HRESULT opentype_get_font_familyname(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names)
IDWriteLocalizedStrings **names)
{ {
const TT_OS2_V2 *tt_os2; const TT_OS2_V2 *tt_os2;
void *os2_context, *name_context; void *os2_context, *name_context;
const void *name_table; const void *name_table;
HRESULT hr; HRESULT hr;
opentype_get_font_table(stream, facetype, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL);
opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_NAME_TAG, &name_table, &name_context, NULL, NULL);
*names = NULL; *names = NULL;
@ -1557,25 +1554,24 @@ HRESULT opentype_get_font_familyname(IDWriteFontFileStream *stream, DWRITE_FONT_
hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names); hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_FAMILY_NAME, names);
if (tt_os2) if (tt_os2)
IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context);
if (name_context) if (name_context)
IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name_context);
return hr; return hr;
} }
/* FaceName locating order is WWS Face Name -> Preferred Face Name -> Face Name. If font claims to /* FaceName locating order is WWS Face Name -> Preferred Face Name -> Face Name. If font claims to
have 'Preferred Face Name' in WWS format, then WWS name is not used. */ have 'Preferred Face Name' in WWS format, then WWS name is not used. */
HRESULT opentype_get_font_facename(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE facetype, UINT32 index, HRESULT opentype_get_font_facename(struct file_stream_desc *stream_desc, IDWriteLocalizedStrings **names)
IDWriteLocalizedStrings **names)
{ {
const TT_OS2_V2 *tt_os2; const TT_OS2_V2 *tt_os2;
void *os2_context, *name_context; void *os2_context, *name_context;
const void *name_table; const void *name_table;
HRESULT hr; HRESULT hr;
opentype_get_font_table(stream, facetype, index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL);
opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); opentype_get_font_table(stream_desc, MS_NAME_TAG, &name_table, &name_context, NULL, NULL);
*names = NULL; *names = NULL;
@ -1591,9 +1587,9 @@ HRESULT opentype_get_font_facename(IDWriteFontFileStream *stream, DWRITE_FONT_FA
hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_SUBFAMILY_NAME, names); hr = opentype_get_font_strings_from_id(name_table, OPENTYPE_STRING_SUBFAMILY_NAME, names);
if (tt_os2) if (tt_os2)
IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context);
if (name_context) if (name_context)
IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, name_context);
return hr; return hr;
} }
@ -1870,14 +1866,13 @@ void opentype_colr_next_glyph(const void *colr, struct dwrite_colorglyph *glyph)
glyph->palette_index = GET_BE_WORD(layer->paletteIndex); glyph->palette_index = GET_BE_WORD(layer->paletteIndex);
} }
HRESULT opentype_get_font_signature(IDWriteFontFileStream *stream, DWRITE_FONT_FACE_TYPE face_type, UINT32 face_index, HRESULT opentype_get_font_signature(struct file_stream_desc *stream_desc, FONTSIGNATURE *fontsig)
FONTSIGNATURE *fontsig)
{ {
const TT_OS2_V2 *tt_os2; const TT_OS2_V2 *tt_os2;
void *os2_context; void *os2_context;
HRESULT hr; HRESULT hr;
hr = opentype_get_font_table(stream, face_type, face_index, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL); hr = opentype_get_font_table(stream_desc, MS_OS2_TAG, (const void**)&tt_os2, &os2_context, NULL, NULL);
if (tt_os2) { if (tt_os2) {
fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1); fontsig->fsUsb[0] = GET_BE_DWORD(tt_os2->ulUnicodeRange1);
fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2); fontsig->fsUsb[1] = GET_BE_DWORD(tt_os2->ulUnicodeRange2);
@ -1887,7 +1882,7 @@ HRESULT opentype_get_font_signature(IDWriteFontFileStream *stream, DWRITE_FONT_F
fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1); fontsig->fsCsb[0] = GET_BE_DWORD(tt_os2->ulCodePageRange1);
fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2); fontsig->fsCsb[1] = GET_BE_DWORD(tt_os2->ulCodePageRange2);
IDWriteFontFileStream_ReleaseFileFragment(stream, os2_context); IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, os2_context);
} }
return hr; return hr;