Nikolay Sivov : include: Update DWRITE_FONT_PROPERTY_ID enum.

Alexandre Julliard julliard at winehq.org
Mon Dec 23 17:42:12 CST 2019


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Dec 24 00:15:53 2019 +0300

include: Update DWRITE_FONT_PROPERTY_ID enum.

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

---

 include/dwrite_3.idl | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl
index f7cb97dff6..54d204f39f 100644
--- a/include/dwrite_3.idl
+++ b/include/dwrite_3.idl
@@ -53,9 +53,9 @@ typedef enum DWRITE_RENDERING_MODE1
 typedef enum DWRITE_FONT_PROPERTY_ID
 {
     DWRITE_FONT_PROPERTY_ID_NONE,
-    DWRITE_FONT_PROPERTY_ID_FAMILY_NAME,
-    DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME,
-    DWRITE_FONT_PROPERTY_ID_FACE_NAME,
+    DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME,
+    DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME,
+    DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME,
     DWRITE_FONT_PROPERTY_ID_FULL_NAME,
     DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME,
     DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME,
@@ -65,7 +65,12 @@ typedef enum DWRITE_FONT_PROPERTY_ID
     DWRITE_FONT_PROPERTY_ID_WEIGHT,
     DWRITE_FONT_PROPERTY_ID_STRETCH,
     DWRITE_FONT_PROPERTY_ID_STYLE,
-    DWRITE_FONT_PROPERTY_ID_TOTAL
+    DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME,
+    DWRITE_FONT_PROPERTY_ID_TOTAL = DWRITE_FONT_PROPERTY_ID_STYLE + 1,
+    DWRITE_FONT_PROPERTY_ID_TOTAL_RS3 = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME + 1,
+    DWRITE_FONT_PROPERTY_ID_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME,
+    DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME,
+    DWRITE_FONT_PROPERTY_ID_FACE_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME,
 } DWRITE_FONT_PROPERTY_ID;
 
 typedef struct DWRITE_FONT_PROPERTY




More information about the wine-cvs mailing list