[PATCH v2 0/3] MR10388: dwrite: Fail loading unsupported COLRv1 fonts.

[Paul Gofman (＠gofman)]

--
  v2: dwrite: Fail loading unsupported COLRv1 fonts.
      dwrite: Move opentype_get_font_table() up.
      dwrite: Fix second chance fonts handling in fallback_map_characters().
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10388

[PATCH v2 1/3] dwrite: Fix second chance fonts handling in fallback_map_characters().

[Paul Gofman]

From: Paul Gofman <[e-mail]>

---
 dlls/dwrite/analyzer.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
index db8e7f8ffd8..f6c2fe8146e 100644
--- a/dlls/dwrite/analyzer.c
+++ b/dlls/dwrite/analyzer.c
@@ -2553,14 +2553,13 @@ static HRESULT fallback_map_characters(const struct dwrite_fontfallback *fallbac
         if (SUCCEEDED(create_matching_font(mapping->collection ? mapping->collection : fallback->systemcollection,
                 mapping->families[i], weight, style, stretch, &IID_IDWriteFont3, (void **)&font)))
         {
-            if (!(mapped = fallback_font_get_supported_length(font, source, position, mapped)))
+            if (!(*ret_length = fallback_font_get_supported_length(font, source, position, mapped)))
             {
                 IDWriteFont3_Release(font);
                 continue;
             }
 
             *ret_font = (IDWriteFont *)font;
-            *ret_length = mapped;
             *scale = mapping->scale;
 
             return S_OK;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10388

[PATCH v2 2/3] dwrite: Move opentype_get_font_table() up.

[Paul Gofman]

From: Paul Gofman <[e-mail]>

---
 dlls/dwrite/opentype.c | 168 ++++++++++++++++++++---------------------
 1 file changed, 84 insertions(+), 84 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 7b95ead9f55..23f8792b437 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -1335,6 +1335,90 @@ static DWORD table_read_dword(const struct dwrite_fonttable *table, unsigned int
     return ptr ? *ptr : 0;
 }
 
+HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data,
+    void **table_context, UINT32 *table_size, BOOL *found)
+{
+    void *table_directory_context, *sfnt_context;
+    const struct ot_table_record *table_record = NULL;
+    const struct ot_table_dir *table_dir = NULL;
+    UINT32 table_offset = 0;
+    UINT16 table_count;
+    HRESULT hr;
+
+    if (found) *found = FALSE;
+    if (table_size) *table_size = 0;
+
+    *table_data = NULL;
+    *table_context = NULL;
+
+    if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION)
+    {
+        const struct ttc_header *ttc_header;
+        void * ttc_context;
+
+        hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&ttc_header, 0,
+                sizeof(*ttc_header), &ttc_context);
+        if (SUCCEEDED(hr))
+        {
+            if (stream_desc->face_index >= GET_BE_DWORD(ttc_header->num_fonts))
+                hr = E_INVALIDARG;
+            else
+            {
+                table_offset = GET_BE_DWORD(ttc_header->offsets[stream_desc->face_index]);
+                hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, table_offset,
+                        sizeof(*table_dir), &sfnt_context);
+            }
+            IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, ttc_context);
+        }
+    }
+    else
+        hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, 0,
+                sizeof(*table_dir), &sfnt_context);
+
+    if (FAILED(hr))
+        return hr;
+
+    table_count = GET_BE_WORD(table_dir->numTables);
+    table_offset += sizeof(*table_dir);
+
+    IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, sfnt_context);
+
+    hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_record, table_offset,
+            table_count * sizeof(*table_record), &table_directory_context);
+    if (hr == S_OK)
+    {
+        UINT16 i;
+
+        for (i = 0; i < table_count; ++i)
+        {
+            if (table_record->tag == tag)
+            {
+                UINT32 offset = GET_BE_DWORD(table_record->offset);
+                UINT32 length = GET_BE_DWORD(table_record->length);
+
+                if (found)
+                    *found = TRUE;
+                if (table_size)
+                    *table_size = length;
+                hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, table_data, offset,
+                        length, table_context);
+                break;
+            }
+            table_record++;
+        }
+
+        IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, table_directory_context);
+    }
+
+    return hr;
+}
+
+static HRESULT opentype_get_font_table(const struct file_stream_desc *stream_desc, UINT32 tag,
+        struct dwrite_fonttable *table)
+{
+    return opentype_try_get_font_table(stream_desc, tag, (const void **)&table->data, &table->context, &table->size, &table->exists);
+}
+
 BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE type)
 {
     return (type == DWRITE_FONT_FACE_TYPE_CFF) ||
@@ -1526,90 +1610,6 @@ HRESULT opentype_analyze_font(IDWriteFontFileStream *stream, BOOL *supported, DW
     return S_OK;
 }
 
-HRESULT opentype_try_get_font_table(const struct file_stream_desc *stream_desc, UINT32 tag, const void **table_data,
-    void **table_context, UINT32 *table_size, BOOL *found)
-{
-    void *table_directory_context, *sfnt_context;
-    const struct ot_table_record *table_record = NULL;
-    const struct ot_table_dir *table_dir = NULL;
-    UINT32 table_offset = 0;
-    UINT16 table_count;
-    HRESULT hr;
-
-    if (found) *found = FALSE;
-    if (table_size) *table_size = 0;
-
-    *table_data = NULL;
-    *table_context = NULL;
-
-    if (stream_desc->face_type == DWRITE_FONT_FACE_TYPE_OPENTYPE_COLLECTION)
-    {
-        const struct ttc_header *ttc_header;
-        void * ttc_context;
-
-        hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&ttc_header, 0,
-                sizeof(*ttc_header), &ttc_context);
-        if (SUCCEEDED(hr))
-        {
-            if (stream_desc->face_index >= GET_BE_DWORD(ttc_header->num_fonts))
-                hr = E_INVALIDARG;
-            else
-            {
-                table_offset = GET_BE_DWORD(ttc_header->offsets[stream_desc->face_index]);
-                hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, table_offset,
-                        sizeof(*table_dir), &sfnt_context);
-            }
-            IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, ttc_context);
-        }
-    }
-    else
-        hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_dir, 0,
-                sizeof(*table_dir), &sfnt_context);
-
-    if (FAILED(hr))
-        return hr;
-
-    table_count = GET_BE_WORD(table_dir->numTables);
-    table_offset += sizeof(*table_dir);
-
-    IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, sfnt_context);
-
-    hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, (const void **)&table_record, table_offset,
-            table_count * sizeof(*table_record), &table_directory_context);
-    if (hr == S_OK)
-    {
-        UINT16 i;
-
-        for (i = 0; i < table_count; ++i)
-        {
-            if (table_record->tag == tag)
-            {
-                UINT32 offset = GET_BE_DWORD(table_record->offset);
-                UINT32 length = GET_BE_DWORD(table_record->length);
-
-                if (found)
-                    *found = TRUE;
-                if (table_size)
-                    *table_size = length;
-                hr = IDWriteFontFileStream_ReadFileFragment(stream_desc->stream, table_data, offset,
-                        length, table_context);
-                break;
-            }
-            table_record++;
-        }
-
-        IDWriteFontFileStream_ReleaseFileFragment(stream_desc->stream, table_directory_context);
-    }
-
-    return hr;
-}
-
-static HRESULT opentype_get_font_table(const struct file_stream_desc *stream_desc, UINT32 tag,
-        struct dwrite_fonttable *table)
-{
-    return opentype_try_get_font_table(stream_desc, tag, (const void **)&table->data, &table->context, &table->size, &table->exists);
-}
-
 /**********
  * CMAP
  **********/
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/10388

[PATCH v2 3/3] dwrite: Fail loading unsupported COLRv1 fonts.

[Paul Gofman]

From: Paul Gofman <[e-mail]>

---
 dlls/dwrite/opentype.c | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c
index 23f8792b437..9adeeb64ebf 100644
--- a/dlls/dwrite/opentype.c
+++ b/dlls/dwrite/opentype.c
@@ -1456,6 +1456,9 @@ static HRESULT opentype_ttc_analyzer(IDWriteFontFileStream *stream, UINT32 *font
 static HRESULT opentype_ttf_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type,
     DWRITE_FONT_FACE_TYPE *face_type)
 {
+    struct file_stream_desc stream_desc = { .stream = stream };
+    const struct colr_header *colr_header;
+    struct dwrite_fonttable colr;
     const DWORD *header;
     void *context;
     HRESULT hr;
@@ -1464,15 +1467,25 @@ static HRESULT opentype_ttf_analyzer(IDWriteFontFileStream *stream, UINT32 *font
     if (FAILED(hr))
         return hr;
 
-    if (GET_BE_DWORD(*header) == 0x10000) {
-        *font_count = 1;
-        *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE;
-        *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE;
-    }
+    if (GET_BE_DWORD(*header) == 0x10000)
+        stream_desc.face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE;
 
     IDWriteFontFileStream_ReleaseFileFragment(stream, context);
 
-    return *file_type != DWRITE_FONT_FILE_TYPE_UNKNOWN ? S_OK : S_FALSE;
+    if (stream_desc.face_type != DWRITE_FONT_FACE_TYPE_TRUETYPE)
+        return S_FALSE;
+
+    opentype_get_font_table(&stream_desc, MS_COLR_TAG, &colr);
+    if (colr.data && (colr_header = table_read_ensure(&colr, 0, sizeof(*header)))
+            && colr_header->version && !colr_header->num_baseglyph_records)
+    {
+        FIXME("COLR version %d, skipping font.\n", GET_BE_WORD(colr_header->version));
+        return S_FALSE;
+    }
+    *font_count = 1;
+    *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE;
+    *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE;
+    return S_OK;
 }
 
 static HRESULT opentype_otf_analyzer(IDWriteFontFileStream *stream, UINT32 *font_count, DWRITE_FONT_FILE_TYPE *file_type,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10388

[Paul Gofman (＠gofman)]

v2:

 - Move the check to opentype_ttf_analyzer().

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10388#note_133081

[PATCH v2 0/3] MR10388: dwrite: Fail loading unsupported COLRv1 fonts. - approved

[Nikolay Sivov (＠nsivov)]

This merge request was approved by Nikolay Sivov.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10388