Nikolay Sivov : dwrite: Update DWRITE_SHAPING_TEXT_PROPERTIES definition.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7e02e2e993e576eb955d111d06c56a1b44e6d2af
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7e02e2e993e576eb955d111d06c56a1b44e6d2af

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed May  6 15:44:44 2020 +0300

dwrite: Update DWRITE_SHAPING_TEXT_PROPERTIES definition.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dwrite/analyzer.c | 7 +++----
 include/dwrite.idl     | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
index c2fd5c54d3..2cbac7700c 100644
--- a/dlls/dwrite/analyzer.c
+++ b/dlls/dwrite/analyzer.c
@@ -1178,6 +1178,9 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface,
 
     method = get_number_substitutes(substitution, digits);
 
+    /* FIXME: have the shaping engine set this */
+    memset(text_props, 0, length * sizeof(*text_props));
+
     for (i = 0; i < length; i++) {
         /* FIXME: set to better values */
         glyph_props[i].justification = text[i] == ' ' ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER;
@@ -1186,10 +1189,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface,
         glyph_props[i].isZeroWidthSpace = 0;
         glyph_props[i].reserved = 0;
 
-        /* FIXME: have the shaping engine set this */
-        text_props[i].isShapedAlone = 0;
-        text_props[i].reserved = 0;
-
         clustermap[i] = i;
 
         string[i] = text[i];
diff --git a/include/dwrite.idl b/include/dwrite.idl
index b92b1544e0..a8c523edda 100644
--- a/include/dwrite.idl
+++ b/include/dwrite.idl
@@ -546,7 +546,9 @@ typedef struct DWRITE_TYPOGRAPHIC_FEATURES
 typedef struct DWRITE_SHAPING_TEXT_PROPERTIES
 {
     UINT16 isShapedAlone : 1;
-    UINT16 reserved : 15;
+    UINT16 reserved1 : 1;
+    UINT16 canBreakShapingAfter : 1;
+    UINT16 reserved : 13;
 } DWRITE_SHAPING_TEXT_PROPERTIES;
 
 typedef struct DWRITE_SHAPING_GLYPH_PROPERTIES