Headers diff for dwrite.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.494-Windows 10 1511 10586.494 versions



 dwrite.h (6.3.9600.17415-Windows 8.1)   dwrite.h (10.0.10586.494-Windows 10 1511 10586.494) 
skipping to change at line 437 skipping to change at line 437
DWRITE_INFORMATIONAL_STRING_FULL_NAME, DWRITE_INFORMATIONAL_STRING_FULL_NAME,
/// <summary> /// <summary>
/// The postscript name of the font, e.g. "GillSans-Bold" from name id 6 in the name table. /// The postscript name of the font, e.g. "GillSans-Bold" from name id 6 in the name table.
/// </summary> /// </summary>
DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME, DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_NAME,
/// <summary> /// <summary>
/// The postscript CID findfont name, from name id 20 in the name table. /// The postscript CID findfont name, from name id 20 in the name table.
/// </summary> /// </summary>
DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME DWRITE_INFORMATIONAL_STRING_POSTSCRIPT_CID_NAME,
/// <summary>
/// Family name for the weight-width-slope model.
/// </summary>
DWRITE_INFORMATIONAL_STRING_WWS_FAMILY_NAME,
/// <summary>
/// Script/language tag to identify the scripts or languages that the font w
as
/// primarily designed to support. See DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT
_LANGUAGE_TAG
/// for a longer description.
/// </summary>
DWRITE_INFORMATIONAL_STRING_DESIGN_SCRIPT_LANGUAGE_TAG,
/// <summary>
/// Script/language tag to identify the scripts or languages that the font d
eclares
/// it is able to support.
/// </summary>
DWRITE_INFORMATIONAL_STRING_SUPPORTED_SCRIPT_LANGUAGE_TAG,
}; };
/// <summary> /// <summary>
/// The DWRITE_FONT_METRICS structure specifies the metrics of a font face that /// The DWRITE_FONT_METRICS structure specifies the metrics of a font face that
/// are applicable to all glyphs within the font face. /// are applicable to all glyphs within the font face.
/// </summary> /// </summary>
struct DWRITE_FONT_METRICS struct DWRITE_FONT_METRICS
{ {
/// <summary> /// <summary>
/// The number of font design units per em unit. /// The number of font design units per em unit.
skipping to change at line 1617 skipping to change at line 1635
/// </summary> /// </summary>
/// <param name="informationalStringID">Identifies the string to get.</param > /// <param name="informationalStringID">Identifies the string to get.</param >
/// <param name="informationalStrings">Receives a pointer to the newly creat ed localized strings object.</param> /// <param name="informationalStrings">Receives a pointer to the newly creat ed localized strings object.</param>
/// <param name="exists">Receives the value TRUE if the font contains the sp ecified string ID or FALSE if not.</param> /// <param name="exists">Receives the value TRUE if the font contains the sp ecified string ID or FALSE if not.</param>
/// <returns> /// <returns>
/// Standard HRESULT error code. If the font does not contain the specified string, the return value is S_OK but /// Standard HRESULT error code. If the font does not contain the specified string, the return value is S_OK but
/// informationalStrings receives a NULL pointer and exists receives the val ue FALSE. /// informationalStrings receives a NULL pointer and exists receives the val ue FALSE.
/// </returns> /// </returns>
STDMETHOD(GetInformationalStrings)( STDMETHOD(GetInformationalStrings)(
DWRITE_INFORMATIONAL_STRING_ID informationalStringID, DWRITE_INFORMATIONAL_STRING_ID informationalStringID,
_COM_Outptr_ IDWriteLocalizedStrings** informationalStrings, _COM_Outptr_result_maybenull_ IDWriteLocalizedStrings** informationalStr ings,
_Out_ BOOL* exists _Out_ BOOL* exists
) PURE; ) PURE;
/// <summary> /// <summary>
/// Gets a value that indicates what simulation are applied to the specified font. /// Gets a value that indicates what simulation are applied to the specified font.
/// </summary> /// </summary>
STDMETHOD_(DWRITE_FONT_SIMULATIONS, GetSimulations)() PURE; STDMETHOD_(DWRITE_FONT_SIMULATIONS, GetSimulations)() PURE;
/// <summary> /// <summary>
/// Gets the metrics for the font. /// Gets the metrics for the font.
skipping to change at line 1808 skipping to change at line 1826
{ {
/// <summary> /// <summary>
/// Line spacing depends solely on the content, growing to accommodate the s ize of fonts and inline objects. /// Line spacing depends solely on the content, growing to accommodate the s ize of fonts and inline objects.
/// </summary> /// </summary>
DWRITE_LINE_SPACING_METHOD_DEFAULT, DWRITE_LINE_SPACING_METHOD_DEFAULT,
/// <summary> /// <summary>
/// Lines are explicitly set to uniform spacing, regardless of contained fon t sizes. /// Lines are explicitly set to uniform spacing, regardless of contained fon t sizes.
/// This can be useful to avoid the uneven appearance that can occur from fo nt fallback. /// This can be useful to avoid the uneven appearance that can occur from fo nt fallback.
/// </summary> /// </summary>
DWRITE_LINE_SPACING_METHOD_UNIFORM DWRITE_LINE_SPACING_METHOD_UNIFORM,
/// <summary>
/// Line spacing and baseline distances are proportional to the computed val
ues based on the content, the size of the fonts and inline objects.
/// </summary>
DWRITE_LINE_SPACING_METHOD_PROPORTIONAL
}; };
/// <summary> /// <summary>
/// Text granularity used to trim text overflowing the layout box. /// Text granularity used to trim text overflowing the layout box.
/// </summary> /// </summary>
enum DWRITE_TRIMMING_GRANULARITY enum DWRITE_TRIMMING_GRANULARITY
{ {
/// <summary> /// <summary>
/// No trimming occurs. Text flows beyond the layout width. /// No trimming occurs. Text flows beyond the layout width.
/// </summary> /// </summary>
skipping to change at line 1986 skipping to change at line 2009
/// </summary> /// </summary>
struct DWRITE_TRIMMING struct DWRITE_TRIMMING
{ {
/// <summary> /// <summary>
/// Text granularity of which trimming applies. /// Text granularity of which trimming applies.
/// </summary> /// </summary>
DWRITE_TRIMMING_GRANULARITY granularity; DWRITE_TRIMMING_GRANULARITY granularity;
/// <summary> /// <summary>
/// Character code used as the delimiter signaling the beginning of the port ion of text to be preserved, /// Character code used as the delimiter signaling the beginning of the port ion of text to be preserved,
/// most useful for path ellipsis, where the delimiter would be a slash. /// most useful for path ellipsis, where the delimiter would be a slash. Lea
ve this zero if there is no
/// delimiter.
/// </summary> /// </summary>
UINT32 delimiter; UINT32 delimiter;
/// <summary> /// <summary>
/// How many occurrences of the delimiter to step back. /// How many occurrences of the delimiter to step back. Leave this zero if t here is no delimiter.
/// </summary> /// </summary>
UINT32 delimiterCount; UINT32 delimiterCount;
}; };
interface IDWriteTypography; interface IDWriteTypography;
interface IDWriteInlineObject; interface IDWriteInlineObject;
/// <summary> /// <summary>
/// The format of text used for text layout. /// The format of text used for text layout.
/// </summary> /// </summary>
skipping to change at line 2421 skipping to change at line 2445
/// NativeNational. However, NativeNational results in Latin number /// NativeNational. However, NativeNational results in Latin number
/// for some Arabic cultures, whereas this value results in Arabic /// for some Arabic cultures, whereas this value results in Arabic
/// number for all Arabic cultures. /// number for all Arabic cultures.
/// </summary> /// </summary>
DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL DWRITE_NUMBER_SUBSTITUTION_METHOD_TRADITIONAL
}; };
/// <summary> /// <summary>
/// Holds the appropriate digits and numeric punctuation for a given locale. /// Holds the appropriate digits and numeric punctuation for a given locale.
/// </summary> /// </summary>
interface DECLSPEC_UUID("14885CC9-BAB0-4f90-B6ED-5C366A2CD03D") DECLSPEC_NOVTABL E IDWriteNumberSubstitution : public IUnknown interface DWRITE_DECLARE_INTERFACE("14885CC9-BAB0-4f90-B6ED-5C366A2CD03D") IDWri teNumberSubstitution : public IUnknown
{ {
}; };
/// <summary> /// <summary>
/// Shaping output properties per input character. /// Shaping output properties per input character.
/// </summary> /// </summary>
struct DWRITE_SHAPING_TEXT_PROPERTIES struct DWRITE_SHAPING_TEXT_PROPERTIES
{ {
/// <summary> /// <summary>
/// This character can be shaped independently from the others /// This character can be shaped independently from the others
skipping to change at line 2486 skipping to change at line 2510
/// The interface implemented by the text analyzer's client to provide text to /// The interface implemented by the text analyzer's client to provide text to
/// the analyzer. It allows the separation between the logical view of text as /// the analyzer. It allows the separation between the logical view of text as
/// a continuous stream of characters identifiable by unique text positions, /// a continuous stream of characters identifiable by unique text positions,
/// and the actual memory layout of potentially discrete blocks of text in the /// and the actual memory layout of potentially discrete blocks of text in the
/// client's backing store. /// client's backing store.
/// ///
/// If any of these callbacks returns an error, the analysis functions will /// If any of these callbacks returns an error, the analysis functions will
/// stop prematurely and return a callback error. Rather than return E_NOTIMPL, /// stop prematurely and return a callback error. Rather than return E_NOTIMPL,
/// an application should stub the method and return a constant/null and S_OK. /// an application should stub the method and return a constant/null and S_OK.
/// </summary> /// </summary>
interface DECLSPEC_UUID("688e1a58-5094-47c8-adc8-fbcea60ae92b") DECLSPEC_NOVTABL E IDWriteTextAnalysisSource : public IUnknown interface DWRITE_DECLARE_INTERFACE("688e1a58-5094-47c8-adc8-fbcea60ae92b") IDWri teTextAnalysisSource : public IUnknown
{ {
/// <summary> /// <summary>
/// Get a block of text starting at the specified text position. /// Get a block of text starting at the specified text position.
/// Returning NULL indicates the end of text - the position is after /// Returning NULL indicates the end of text - the position is after
/// the last character. This function is called iteratively for /// the last character. This function is called iteratively for
/// each consecutive block, tying together several fragmented blocks /// each consecutive block, tying together several fragmented blocks
/// in the backing store into a virtual contiguous string. /// in the backing store into a virtual contiguous string.
/// </summary> /// </summary>
/// <param name="textPosition">First position of the piece to obtain. All /// <param name="textPosition">First position of the piece to obtain. All
/// positions are in UTF16 code-units, not whole characters, which /// positions are in UTF16 code-units, not whole characters, which
skipping to change at line 2585 skipping to change at line 2609
/// at the specified position.</param> /// at the specified position.</param>
/// <remarks> /// <remarks>
/// Any implementation should return the number substitution with an /// Any implementation should return the number substitution with an
/// incremented ref count, and the analysis will release when finished /// incremented ref count, and the analysis will release when finished
/// with it (either before the next call or before it returns). However, /// with it (either before the next call or before it returns). However,
/// the sink callback may hold onto it after that. /// the sink callback may hold onto it after that.
/// </remarks> /// </remarks>
STDMETHOD(GetNumberSubstitution)( STDMETHOD(GetNumberSubstitution)(
UINT32 textPosition, UINT32 textPosition,
_Out_ UINT32* textLength, _Out_ UINT32* textLength,
_Outptr_ IDWriteNumberSubstitution** numberSubstitution _COM_Outptr_ IDWriteNumberSubstitution** numberSubstitution
) PURE; ) PURE;
}; };
/// <summary> /// <summary>
/// The interface implemented by the text analyzer's client to receive the /// The interface implemented by the text analyzer's client to receive the
/// output of a given text analysis. The Text analyzer disregards any current /// output of a given text analysis. The Text analyzer disregards any current
/// state of the analysis sink, therefore a Set method call on a range /// state of the analysis sink, therefore a Set method call on a range
/// overwrites the previously set analysis result of the same range. /// overwrites the previously set analysis result of the same range.
/// </summary> /// </summary>
interface DECLSPEC_UUID("5810cd44-0ca0-4701-b3fa-bec5182ae4f6") DECLSPEC_NOVTABL E IDWriteTextAnalysisSink : public IUnknown interface DWRITE_DECLARE_INTERFACE("5810cd44-0ca0-4701-b3fa-bec5182ae4f6") IDWri teTextAnalysisSink : public IUnknown
{ {
/// <summary> /// <summary>
/// Report script analysis for the text range. /// Report script analysis for the text range.
/// </summary> /// </summary>
/// <param name="textPosition">Starting position to report from.</param> /// <param name="textPosition">Starting position to report from.</param>
/// <param name="textLength">Number of UTF16 units of the reported range.</p aram> /// <param name="textLength">Number of UTF16 units of the reported range.</p aram>
/// <param name="scriptAnalysis">Script analysis of characters in range.</pa ram> /// <param name="scriptAnalysis">Script analysis of characters in range.</pa ram>
/// <returns> /// <returns>
/// A successful code or error code to abort analysis. /// A successful code or error code to abort analysis.
/// </returns> /// </returns>
skipping to change at line 4467 skipping to change at line 4491
UINT32 height UINT32 height
) PURE; ) PURE;
}; };
/// <summary> /// <summary>
/// The GDI interop interface provides interoperability with GDI. /// The GDI interop interface provides interoperability with GDI.
/// </summary> /// </summary>
interface DWRITE_DECLARE_INTERFACE("1edd9491-9853-4299-898f-6432983b6f3a") IDWri teGdiInterop : public IUnknown interface DWRITE_DECLARE_INTERFACE("1edd9491-9853-4299-898f-6432983b6f3a") IDWri teGdiInterop : public IUnknown
{ {
/// <summary> /// <summary>
/// Creates a font object that matches the properties specified by the LOGFO /// Creates a font object that matches the properties specified by the LOGFO
NT structure. NT structure
/// in the system font collection (GetSystemFontCollection).
/// </summary> /// </summary>
/// <param name="logFont">Structure containing a GDI-compatible font descrip tion.</param> /// <param name="logFont">Structure containing a GDI-compatible font descrip tion.</param>
/// <param name="font">Receives a newly created font object if successful, o r NULL in case of error.</param> /// <param name="font">Receives a newly created font object if successful, o r NULL in case of error.</param>
/// <returns> /// <returns>
/// Standard HRESULT error code. /// Standard HRESULT error code.
/// </returns> /// </returns>
STDMETHOD(CreateFontFromLOGFONT)( STDMETHOD(CreateFontFromLOGFONT)(
_In_ LOGFONTW const* logFont, _In_ LOGFONTW const* logFont,
_COM_Outptr_ IDWriteFont** font _COM_Outptr_ IDWriteFont** font
) PURE; ) PURE;
/// <summary> /// <summary>
/// Initializes a LOGFONT structure based on the GDI-compatible properties o f the specified font. /// Initializes a LOGFONT structure based on the GDI-compatible properties o f the specified font.
/// </summary> /// </summary>
/// <param name="font">Specifies a font in the system font collection.</para m> /// <param name="font">Specifies a font.</param>
/// <param name="logFont">Structure that receives a GDI-compatible font desc ription.</param> /// <param name="logFont">Structure that receives a GDI-compatible font desc ription.</param>
/// <param name="isSystemFont">Contains TRUE if the specified font object is part of the system font collection /// <param name="isSystemFont">Contains TRUE if the specified font object is part of the system font collection
/// or FALSE otherwise.</param> /// or FALSE otherwise.</param>
/// <returns> /// <returns>
/// Standard HRESULT error code. /// Standard HRESULT error code.
/// </returns> /// </returns>
STDMETHOD(ConvertFontToLOGFONT)( STDMETHOD(ConvertFontToLOGFONT)(
_In_ IDWriteFont* font, _In_ IDWriteFont* font,
_Out_ LOGFONTW* logFont, _Out_ LOGFONTW* logFont,
_Out_ BOOL* isSystemFont _Out_ BOOL* isSystemFont
skipping to change at line 4995 skipping to change at line 5020
) PURE; ) PURE;
/// <summary> /// <summary>
/// Creates a glyph run analysis object, which encapsulates information /// Creates a glyph run analysis object, which encapsulates information
/// used to render a glyph run. /// used to render a glyph run.
/// </summary> /// </summary>
/// <param name="glyphRun">Structure specifying the properties of the glyph run.</param> /// <param name="glyphRun">Structure specifying the properties of the glyph run.</param>
/// <param name="pixelsPerDip">Number of physical pixels per DIP. For exampl e, if rendering onto a 96 DPI bitmap then pixelsPerDip /// <param name="pixelsPerDip">Number of physical pixels per DIP. For exampl e, if rendering onto a 96 DPI bitmap then pixelsPerDip
/// is 1. If rendering onto a 120 DPI bitmap then pixelsPerDip is 120/96.</p aram> /// is 1. If rendering onto a 120 DPI bitmap then pixelsPerDip is 120/96.</p aram>
/// <param name="transform">Optional transform applied to the glyphs and the ir positions. This transform is applied after the /// <param name="transform">Optional transform applied to the glyphs and the ir positions. This transform is applied after the
/// scaling specified the emSize and pixelsPerDip.</param> /// scaling specified by the emSize and pixelsPerDip.</param>
/// <param name="renderingMode">Specifies the rendering mode, which must be one of the raster rendering modes (i.e., not default /// <param name="renderingMode">Specifies the rendering mode, which must be one of the raster rendering modes (i.e., not default
/// and not outline).</param> /// and not outline).</param>
/// <param name="measuringMode">Specifies the method to measure glyphs.</par am> /// <param name="measuringMode">Specifies the method to measure glyphs.</par am>
/// <param name="baselineOriginX">Horizontal position of the baseline origin , in DIPs.</param> /// <param name="baselineOriginX">Horizontal position of the baseline origin , in DIPs.</param>
/// <param name="baselineOriginY">Vertical position of the baseline origin, in DIPs.</param> /// <param name="baselineOriginY">Vertical position of the baseline origin, in DIPs.</param>
/// <param name="glyphRunAnalysis">Receives a pointer to the newly created o bject.</param> /// <param name="glyphRunAnalysis">Receives a pointer to the newly created o bject.</param>
/// <returns> /// <returns>
/// Standard HRESULT error code. /// Standard HRESULT error code.
/// </returns> /// </returns>
STDMETHOD(CreateGlyphRunAnalysis)( STDMETHOD(CreateGlyphRunAnalysis)(
 End of changes. 12 change blocks. 
13 lines changed or deleted 43 lines changed or added

This html diff was produced by rfcdiff 1.41.