Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- include/dwrite_3.idl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index 5958e6fb1b..dc8bf0e959 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -84,6 +84,15 @@ typedef enum DWRITE_FONT_AXIS_TAG DWRITE_FONT_AXIS_TAG_ITALIC = 0x6c617469, /* 'ital' */ } DWRITE_FONT_AXIS_TAG;
+typedef enum DWRITE_FONT_SOURCE_TYPE +{ + DWRITE_FONT_SOURCE_TYPE_UNKNOWN, + DWRITE_FONT_SOURCE_TYPE_PER_MACHINE, + DWRITE_FONT_SOURCE_TYPE_PER_USER, + DWRITE_FONT_SOURCE_TYPE_APPX_PACKAGE, + DWRITE_FONT_SOURCE_TYPE_REMOTE_FONT_PROVIDER +} DWRITE_FONT_SOURCE_TYPE; + typedef struct DWRITE_FONT_AXIS_VALUE { DWRITE_FONT_AXIS_TAG axisTag; @@ -441,6 +450,18 @@ interface IDWriteFontSet2 : IDWriteFontSet1 HANDLE GetExpirationEvent(); }
+[ + local, + object, + uuid(7c073ef2-a7f4-4045-8c32-8ab8ae640f90) +] +interface IDWriteFontSet3 : IDWriteFontSet2 +{ + DWRITE_FONT_SOURCE_TYPE GetFontSourceType(UINT32 index); + UINT32 GetFontSourceNameLength(UINT32 index); + HRESULT GetFontSourceName(UINT32 index, WCHAR *buffer, UINT32 buffer_size); +} + [ local, object,
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- include/dcommon.idl | 13 +++++++++++++ include/dwrite_3.idl | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/dcommon.idl b/include/dcommon.idl index 88f97c56a4..53281bd487 100644 --- a/include/dcommon.idl +++ b/include/dcommon.idl @@ -33,6 +33,19 @@ typedef enum DWRITE_MEASURING_MODE DWRITE_MEASURING_MODE_GDI_NATURAL } DWRITE_MEASURING_MODE;
+typedef enum DWRITE_GLYPH_IMAGE_FORMATS +{ + DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, + DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, + DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, + DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, + DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, + DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, + DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, + DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, + DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 +} DWRITE_GLYPH_IMAGE_FORMATS; + typedef enum D2D1_ALPHA_MODE { D2D1_ALPHA_MODE_UNKNOWN = 0, diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index dc8bf0e959..b148bd725b 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -733,19 +733,6 @@ interface IDWriteFactory3 : IDWriteFactory2 HRESULT GetFontDownloadQueue(IDWriteFontDownloadQueue **queue); }
-typedef enum DWRITE_GLYPH_IMAGE_FORMATS -{ - DWRITE_GLYPH_IMAGE_FORMATS_NONE = 0, - DWRITE_GLYPH_IMAGE_FORMATS_TRUETYPE = 1 << 0, - DWRITE_GLYPH_IMAGE_FORMATS_CFF = 1 << 1, - DWRITE_GLYPH_IMAGE_FORMATS_COLR = 1 << 2, - DWRITE_GLYPH_IMAGE_FORMATS_SVG = 1 << 3, - DWRITE_GLYPH_IMAGE_FORMATS_PNG = 1 << 4, - DWRITE_GLYPH_IMAGE_FORMATS_JPEG = 1 << 5, - DWRITE_GLYPH_IMAGE_FORMATS_TIFF = 1 << 6, - DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8 = 1 << 7 -} DWRITE_GLYPH_IMAGE_FORMATS; - typedef struct DWRITE_GLYPH_IMAGE_DATA { void const *imageData;
-
Nikolay Sivov