dwrite: Enable DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME for…

dwrite: Enable DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME for GetInformationalStrings(). Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dwrite: Enable DWRITE_INFORMATIONAL_STRING_WEIGHT_STRETCH_STYLE_FAMILY_NAME for…
57a34227 · Nikolay Sivov · Alexandre Julliard · 6b0e68f2 · 57a34227 · 57a34227
Commit 57a34227 authored Jan 24, 2020 by Nikolay Sivov Committed by Alexandre Julliard Jan 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

dwrite_private.h dlls/dwrite/dwrite_private.h +1 -1

font.c dlls/dwrite/font.c +6 -3

opentype.c dlls/dwrite/opentype.c +3 -2

No files found.
--- a/dlls/dwrite/dwrite_private.h
+++ b/dlls/dwrite/dwrite_private.h
@@ -231,7 +231,7 @@ struct dwrite_fontface
    FONTSIGNATURE fontsig;
    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 *names;


--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -82,7 +82,7 @@ struct dwrite_font_data
    struct dwrite_font_propvec propvec;

    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 *names;

@@ -1291,8 +1291,11 @@ static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc,
    *exists = FALSE;
    *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;
+    }

    if (!strings_cache[stringid])
    {
@@ -1301,7 +1304,7 @@ static HRESULT get_font_info_strings(const struct file_stream_desc *stream_desc,
        if (!desc.stream)
            hr = get_filestream_from_file(file, &desc.stream);
        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)
            IDWriteFontFileStream_Release(desc.stream);

--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -1098,7 +1098,7 @@ enum OPENTYPE_STRING_ID
    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 */
    OPENTYPE_STRING_COPYRIGHT_NOTICE,
@@ -1118,7 +1118,8 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP
    OPENTYPE_STRING_SAMPLE_TEXT,
    OPENTYPE_STRING_FULL_FONTNAME,
    OPENTYPE_STRING_POSTSCRIPT_FONTNAME,
-    OPENTYPE_STRING_POSTSCRIPT_CID_NAME
+    OPENTYPE_STRING_POSTSCRIPT_CID_NAME,
+    OPENTYPE_STRING_WWS_FAMILY_NAME,
 };

 /* CPAL table */