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

dwrite: Enable DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME for GetInformationalStrings().

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-01-24 11:17:38 +03:00 committed by Alexandre Julliard
parent 6b0e68f2fa
commit 57a34227c2
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/dwrite/dwrite_private.h
View File

@ -231,7 +231,7 @@ struct dwrite_fontface
FONTSIGNATURE fontsig; FONTSIGNATURE fontsig;
UINT32 glyph_image_formats; UINT32 glyph_image_formats;
IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1];
IDWriteLocalizedStrings *family_names; IDWriteLocalizedStrings *family_names;
IDWriteLocalizedStrings *names; IDWriteLocalizedStrings *names;

9
dlls/dwrite/font.c
View File

@ -82,7 +82,7 @@ struct dwrite_font_data
struct dwrite_font_propvec propvec; struct dwrite_font_propvec propvec;
DWRITE_FONT_METRICS1 metrics; DWRITE_FONT_METRICS1 metrics;
IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1]; IDWriteLocalizedStrings *info_strings[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1];
IDWriteLocalizedStrings *family_names; IDWriteLocalizedStrings *family_names;
IDWriteLocalizedStrings *names; IDWriteLocalizedStrings *names;
@ -1291,8 +1291,11 @@ static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc,
*exists = FALSE; *exists = FALSE;
*ret = NULL; *ret = NULL;
if (stringid > DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME || stringid == DWRITE_INFORMATIONAL_STRING_NONE) if (stringid > DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME
|| stringid == DWRITE_INFORMATIONAL_STRING_NONE)
{
return S_OK; return S_OK;
}
if (!strings_cache[stringid]) if (!strings_cache[stringid])
{ {
@ -1301,7 +1304,7 @@ static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc,
if (!desc.stream) if (!desc.stream)
hr = get_filestream_from_file(file, &desc.stream); hr = get_filestream_from_file(file, &desc.stream);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
hr = opentype_get_font_info_strings(&desc, stringid, &strings_cache[stringid]); opentype_get_font_info_strings(&desc, stringid, &strings_cache[stringid]);
if (!stream_desc->stream && desc.stream) if (!stream_desc->stream && desc.stream)
IDWriteFontFileStream_Release(desc.stream); IDWriteFontFileStream_Release(desc.stream);

5
dlls/dwrite/opentype.c
View File

@ -1098,7 +1098,7 @@ enum OPENTYPE_STRING_ID
OPENTYPE_STRING_WWS_SUBFAMILY_NAME OPENTYPE_STRING_WWS_SUBFAMILY_NAME
}; };
static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME+1] = static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME + 1] =
{ {
(UINT16)-1, /* DWRITE_INFORMATIONAL_STRING_NONE is not used */ (UINT16)-1, /* DWRITE_INFORMATIONAL_STRING_NONE is not used */
OPENTYPE_STRING_COPYRIGHT_NOTICE, OPENTYPE_STRING_COPYRIGHT_NOTICE,
@ -1118,7 +1118,8 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP
OPENTYPE_STRING_SAMPLE_TEXT, OPENTYPE_STRING_SAMPLE_TEXT,
OPENTYPE_STRING_FULL_FONTNAME, OPENTYPE_STRING_FULL_FONTNAME,
OPENTYPE_STRING_POSTSCRIPT_FONTNAME, OPENTYPE_STRING_POSTSCRIPT_FONTNAME,
OPENTYPE_STRING_POSTSCRIPT_CID_NAME OPENTYPE_STRING_POSTSCRIPT_CID_NAME,
OPENTYPE_STRING_WWS_FAMILY_NAME,
}; };
/* CPAL table */ /* CPAL table */