Nikolay Sivov : dwrite: Handle higher planes when setting DWRITE_SCRIPT_SHAPES_NO_VISUAL.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d8584a16edef716b2f2690d8043e5b60d5d08da4
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d8584a16edef716b2f2690d8043e5b6...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Sat Sep  3 11:13:32 2022 +0300

dwrite: Handle higher planes when setting DWRITE_SCRIPT_SHAPES_NO_VISUAL.

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

---

 dlls/dwrite/analyzer.c       | 27 ++++++++++++++++-----------
 dlls/dwrite/tests/analyzer.c | 10 ++++++++++
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
index 72d3aada285..8d7053a066e 100644
--- a/dlls/dwrite/analyzer.c
+++ b/dlls/dwrite/analyzer.c
@@ -654,17 +654,22 @@ static DWRITE_SCRIPT_ANALYSIS get_char_sa(UINT32 c)
 
     sa.script = get_char_script(c);
     sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT;
-    if ((c >= 0x0001 && c <= 0x001f) ||
-            (c >= 0x007f && c <= 0x009f) ||
-            (c == 0x00ad) /* SOFT HYPHEN */ ||
-            (c >= 0x200b && c <= 0x200f) ||
-            (c >= 0x2028 && c <= 0x202e) ||
-            (c >= 0x2060 && c <= 0x2064) ||
-            (c >= 0x2066 && c <= 0x206f) ||
-            (c == 0xfeff) ||
-            (c == 0xfff9) ||
-            (c == 0xfffa) ||
-            (c == 0xfffb))
+    if ((c >= 0x0001 && c <= 0x001f)           /* C0 controls */
+            || (c >= 0x007f && c <= 0x009f)    /* DELETE, C1 controls */
+            || (c == 0x00ad)                   /* SOFT HYPHEN */
+            || (c >= 0x200b && c <= 0x200f)    /* ZWSP, ZWNJ, ZWJ, LRM, RLM */
+            || (c >= 0x2028 && c <= 0x202e)    /* Line/paragraph separators, LRE, RLE, PDF, LRO, RLO */
+            || (c >= 0x2060 && c <= 0x2064)    /* WJ, invisible operators */
+            || (c >= 0x2066 && c <= 0x2069)    /* LRI, RLI, FSI, PDI */
+            || (c >= 0x206a && c <= 0x206f)    /* Deprecated control characters */
+            || (c == 0xfeff)                   /* ZWBNSP */
+            || (c == 0xfff9)                   /* Interlinear annotation */
+            || (c == 0xfffa)
+            || (c == 0xfffb)
+            || (c >= 0x1bca0 && c <= 0x1bca3)  /* Shorthand format controls */
+            || (c >= 0x1d173 && c <= 0x1d17a)  /* Musical symbols: beams and slurs */
+            || (c == 0xe0001)                  /* Language tag, deprecated */
+            || (c >= 0xe0020 && c <= 0xe007f)) /* Tag components */
     {
         sa.shapes = DWRITE_SCRIPT_SHAPES_NO_VISUAL;
     }
diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c
index aac0fcc0e01..0363293197e 100644
--- a/dlls/dwrite/tests/analyzer.c
+++ b/dlls/dwrite/tests/analyzer.c
@@ -1026,6 +1026,16 @@ static struct sa_test sa_tests[] = {
       {0xd805,0xde80,0}, 1,
           { { 0, 2, DWRITE_SCRIPT_SHAPES_DEFAULT } }
     },
+    {
+      /* Musical symbols, U+1D173 */
+      {0xd834,0xdd73,0}, 1,
+          { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } }
+    },
+    {
+      /* Tags, U+E0020 */
+      {0xdb40,0xdc20,0}, 1,
+          { { 0, 2, DWRITE_SCRIPT_SHAPES_NO_VISUAL } }
+    },
     /* keep this as end test data marker */
     { {0} }
 };