@@ -89,39 +89,42 @@ typedef struct DWRITE_COLOR_GLYPH_RUN
8989]
9090interface IDWriteTextRenderer1 : IDWriteTextRenderer
9191{
92- HRESULT DrawGlyphRun(void *context,
93- FLOAT originX,
94- FLOAT originY,
95- DWRITE_GLYPH_ORIENTATION_ANGLE angle,
96- DWRITE_MEASURING_MODE mode,
97- DWRITE_GLYPH_RUN const *run,
98- DWRITE_GLYPH_RUN_DESCRIPTION const *rundescr,
99- IUnknown *effect);
100-
101- HRESULT DrawUnderline(void *context,
102- FLOAT originX,
103- FLOAT originY,
104- DWRITE_GLYPH_ORIENTATION_ANGLE angle,
105- DWRITE_UNDERLINE const *underline,
106- IUnknown *effect);
107-
108- HRESULT DrawStrikethrough(void *context,
109- FLOAT originX,
110- FLOAT originY,
111- DWRITE_GLYPH_ORIENTATION_ANGLE angle,
112- DWRITE_STRIKETHROUGH const *strikethrough,
113- IUnknown *effect
114- );
115-
116- HRESULT DrawInlineObject(void *context,
117- FLOAT originX,
118- FLOAT originY,
119- DWRITE_GLYPH_ORIENTATION_ANGLE angle,
120- IDWriteInlineObject *inlineObject,
121- BOOL is_sideways,
122- BOOL is_rtl,
123- IUnknown *effect
124- );
92+ HRESULT DrawGlyphRun(
93+ [in] void *context,
94+ [in] FLOAT originX,
95+ [in] FLOAT originY,
96+ [in] DWRITE_GLYPH_ORIENTATION_ANGLE angle,
97+ [in] DWRITE_MEASURING_MODE mode,
98+ [in] DWRITE_GLYPH_RUN const *run,
99+ [in] DWRITE_GLYPH_RUN_DESCRIPTION const *rundescr,
100+ [in] IUnknown *effect
101+ );
102+ HRESULT DrawUnderline(
103+ [in] void *context,
104+ [in] FLOAT originX,
105+ [in] FLOAT originY,
106+ [in] DWRITE_GLYPH_ORIENTATION_ANGLE angle,
107+ [in] DWRITE_UNDERLINE const *underline,
108+ [in] IUnknown *effect
109+ );
110+ HRESULT DrawStrikethrough(
111+ [in] void *context,
112+ [in] FLOAT originX,
113+ [in] FLOAT originY,
114+ [in] DWRITE_GLYPH_ORIENTATION_ANGLE angle,
115+ [in] DWRITE_STRIKETHROUGH const *strikethrough,
116+ [in] IUnknown *effect
117+ );
118+ HRESULT DrawInlineObject(
119+ [in] void *context,
120+ [in] FLOAT originX,
121+ [in] FLOAT originY,
122+ [in] DWRITE_GLYPH_ORIENTATION_ANGLE angle,
123+ [in] IDWriteInlineObject *inlineObject,
124+ [in] BOOL is_sideways,
125+ [in] BOOL is_rtl,
126+ [in] IUnknown *effect
127+ );
125128}
126129
127130[
@@ -131,18 +134,19 @@ interface IDWriteTextRenderer1 : IDWriteTextRenderer
131134]
132135interface IDWriteFontFallback : IUnknown
133136{
134- HRESULT MapCharacters(IDWriteTextAnalysisSource *source,
135- UINT32 position,
136- UINT32 length,
137- IDWriteFontCollection *basecollection,
138- const WCHAR *baseFamilyName,
139- DWRITE_FONT_WEIGHT baseWeight,
140- DWRITE_FONT_STYLE baseStyle,
141- DWRITE_FONT_STRETCH baseStretch,
142- UINT32 *mappedLength,
143- IDWriteFont **mappedFont,
144- FLOAT *scale
145- );
137+ HRESULT MapCharacters(
138+ [in] IDWriteTextAnalysisSource *source,
139+ [in] UINT32 position,
140+ [in] UINT32 length,
141+ [in] IDWriteFontCollection *basecollection,
142+ [in] const WCHAR *baseFamilyName,
143+ [in] DWRITE_FONT_WEIGHT baseWeight,
144+ [in] DWRITE_FONT_STYLE baseStyle,
145+ [in] DWRITE_FONT_STRETCH baseStretch,
146+ [out] UINT32 *mappedLength,
147+ [out] IDWriteFont **mappedFont,
148+ [out] FLOAT *scale
149+ );
146150}
147151
148152[
@@ -152,14 +156,23 @@ interface IDWriteFontFallback : IUnknown
152156]
153157interface IDWriteTextFormat1 : IDWriteTextFormat
154158{
155- HRESULT SetVerticalGlyphOrientation(DWRITE_VERTICAL_GLYPH_ORIENTATION orientation);
159+ HRESULT SetVerticalGlyphOrientation(
160+ [in] DWRITE_VERTICAL_GLYPH_ORIENTATION orientation);
156161 DWRITE_VERTICAL_GLYPH_ORIENTATION GetVerticalGlyphOrientation();
157- HRESULT SetLastLineWrapping(BOOL lastline_wrapping_enabled);
162+ HRESULT SetLastLineWrapping(
163+ [in] BOOL lastline_wrapping_enabled
164+ );
158165 BOOL GetLastLineWrapping();
159- HRESULT SetOpticalAlignment(DWRITE_OPTICAL_ALIGNMENT alignment);
166+ HRESULT SetOpticalAlignment(
167+ [in] DWRITE_OPTICAL_ALIGNMENT alignment
168+ );
160169 DWRITE_OPTICAL_ALIGNMENT GetOpticalAlignment();
161- HRESULT SetFontFallback(IDWriteFontFallback *fallback);
162- HRESULT GetFontFallback(IDWriteFontFallback **fallback);
170+ HRESULT SetFontFallback(
171+ [in] IDWriteFontFallback *fallback
172+ );
173+ HRESULT GetFontFallback(
174+ [in] IDWriteFontFallback **fallback
175+ );
163176}
164177
165178[
@@ -169,15 +182,27 @@ interface IDWriteTextFormat1 : IDWriteTextFormat
169182]
170183interface IDWriteTextLayout2 : IDWriteTextLayout1
171184{
172- HRESULT GetMetrics(DWRITE_TEXT_METRICS1 *metrics);
173- HRESULT SetVerticalGlyphOrientation(DWRITE_VERTICAL_GLYPH_ORIENTATION orientation);
185+ HRESULT GetMetrics(
186+ [out] DWRITE_TEXT_METRICS1 *metrics
187+ );
188+ HRESULT SetVerticalGlyphOrientation(
189+ [in] DWRITE_VERTICAL_GLYPH_ORIENTATION orientation
190+ );
174191 DWRITE_VERTICAL_GLYPH_ORIENTATION GetVerticalGlyphOrientation();
175- HRESULT SetLastLineWrapping(BOOL lastline_wrapping_enabled);
192+ HRESULT SetLastLineWrapping(
193+ [in] BOOL lastline_wrapping_enabled
194+ );
176195 BOOL GetLastLineWrapping();
177- HRESULT SetOpticalAlignment(DWRITE_OPTICAL_ALIGNMENT alignment);
196+ HRESULT SetOpticalAlignment(
197+ [in] DWRITE_OPTICAL_ALIGNMENT alignment
198+ );
178199 DWRITE_OPTICAL_ALIGNMENT GetOpticalAlignment();
179- HRESULT SetFontFallback(IDWriteFontFallback *fallback);
180- HRESULT GetFontFallback(IDWriteFontFallback **fallback);
200+ HRESULT SetFontFallback(
201+ [in] IDWriteFontFallback *fallback
202+ );
203+ HRESULT GetFontFallback(
204+ [out] IDWriteFontFallback **fallback
205+ );
181206}
182207
183208[
@@ -187,28 +212,30 @@ interface IDWriteTextLayout2 : IDWriteTextLayout1
187212]
188213interface IDWriteTextAnalyzer2 : IDWriteTextAnalyzer1
189214{
190- HRESULT GetGlyphOrientationTransform(DWRITE_GLYPH_ORIENTATION_ANGLE angle,
191- BOOL is_sideways,
192- FLOAT originX,
193- FLOAT originY,
194- DWRITE_MATRIX *transform
195- );
196- HRESULT GetTypographicFeatures(IDWriteFontFace *fontface,
197- DWRITE_SCRIPT_ANALYSIS analysis,
198- const WCHAR *localeName,
199- UINT32 max_tagcount,
200- UINT32 *actual_tagcount,
201- DWRITE_FONT_FEATURE_TAG *tags
202- );
203-
204- HRESULT CheckTypographicFeature(IDWriteFontFace *fontface,
205- DWRITE_SCRIPT_ANALYSIS analysis,
206- const WCHAR *localeName,
207- DWRITE_FONT_FEATURE_TAG feature,
208- UINT32 glyph_count,
209- const UINT16 *indices,
210- UINT8 *feature_applies
211- );
215+ HRESULT GetGlyphOrientationTransform(
216+ [in] DWRITE_GLYPH_ORIENTATION_ANGLE angle,
217+ [in] BOOL is_sideways,
218+ [in] FLOAT originX,
219+ [in] FLOAT originY,
220+ [out] DWRITE_MATRIX *transform
221+ );
222+ HRESULT GetTypographicFeatures(
223+ [in] IDWriteFontFace *fontface,
224+ [in] DWRITE_SCRIPT_ANALYSIS analysis,
225+ [in] const WCHAR *localeName,
226+ [in] UINT32 max_tagcount,
227+ [out] UINT32 *actual_tagcount,
228+ [out] DWRITE_FONT_FEATURE_TAG *tags
229+ );
230+ HRESULT CheckTypographicFeature(
231+ [in] IDWriteFontFace *fontface,
232+ [in] DWRITE_SCRIPT_ANALYSIS analysis,
233+ [in] const WCHAR *localeName,
234+ [in] DWRITE_FONT_FEATURE_TAG feature,
235+ [in] UINT32 glyph_count,
236+ [in] const UINT16 *indices,
237+ [out] UINT8 *feature_applies
238+ );
212239}
213240
214241[
@@ -218,17 +245,22 @@ interface IDWriteTextAnalyzer2 : IDWriteTextAnalyzer1
218245]
219246interface IDWriteFontFallbackBuilder : IUnknown
220247{
221- HRESULT AddMapping(const DWRITE_UNICODE_RANGE *ranges,
222- UINT32 rangesCount,
223- WCHAR const **targetFamilyNames,
224- UINT32 targetFamilyNamesCount,
225- [defaultvalue(NULL)] IDWriteFontCollection *collection,
226- [defaultvalue(NULL)] WCHAR const *localeName,
227- [defaultvalue(NULL)] WCHAR const *baseFamilyName,
228- [defaultvalue(1)] FLOAT scale
229- );
230- HRESULT AddMappings(IDWriteFontFallback *fallback);
231- HRESULT CreateFontFallback(IDWriteFontFallback **fallback);
248+ HRESULT AddMapping(
249+ [in] const DWRITE_UNICODE_RANGE *ranges,
250+ [in] UINT32 rangesCount,
251+ [in] WCHAR const **targetFamilyNames,
252+ [in] UINT32 targetFamilyNamesCount,
253+ [in, defaultvalue(NULL)] IDWriteFontCollection *collection,
254+ [in, defaultvalue(NULL)] WCHAR const *localeName,
255+ [in, defaultvalue(NULL)] WCHAR const *baseFamilyName,
256+ [in, defaultvalue(1)] FLOAT scale
257+ );
258+ HRESULT AddMappings(
259+ [in] IDWriteFontFallback *fallback
260+ );
261+ HRESULT CreateFontFallback(
262+ [out] IDWriteFontFallback **fallback
263+ );
232264}
233265
234266[
@@ -251,22 +283,24 @@ interface IDWriteFontFace2 : IDWriteFontFace1
251283 BOOL IsColorFont();
252284 UINT32 GetColorPaletteCount();
253285 UINT32 GetPaletteEntryCount();
254- HRESULT GetPaletteEntries(UINT32 palette_index,
255- UINT32 first_entry_index,
256- UINT32 entry_count,
257- DWRITE_COLOR_F *entries
258- );
259- HRESULT GetRecommendedRenderingMode(FLOAT fontEmSize,
260- FLOAT dpiX,
261- FLOAT dpiY,
262- DWRITE_MATRIX const *transform,
263- BOOL is_sideways,
264- DWRITE_OUTLINE_THRESHOLD threshold,
265- DWRITE_MEASURING_MODE measuringmode,
266- IDWriteRenderingParams *params,
267- DWRITE_RENDERING_MODE *renderingmode,
268- DWRITE_GRID_FIT_MODE *gridfitmode
269- );
286+ HRESULT GetPaletteEntries(
287+ [in] UINT32 palette_index,
288+ [in] UINT32 first_entry_index,
289+ [in] UINT32 entry_count,
290+ [out] DWRITE_COLOR_F *entries
291+ );
292+ HRESULT GetRecommendedRenderingMode(
293+ [in] FLOAT fontEmSize,
294+ [in] FLOAT dpiX,
295+ [in] FLOAT dpiY,
296+ [in] DWRITE_MATRIX const *transform,
297+ [in] BOOL is_sideways,
298+ [in] DWRITE_OUTLINE_THRESHOLD threshold,
299+ [in] DWRITE_MEASURING_MODE measuringmode,
300+ [in] IDWriteRenderingParams *params,
301+ [out] DWRITE_RENDERING_MODE *renderingmode,
302+ [out] DWRITE_GRID_FIT_MODE *gridfitmode
303+ );
270304}
271305
272306[
@@ -276,8 +310,12 @@ interface IDWriteFontFace2 : IDWriteFontFace1
276310]
277311interface IDWriteColorGlyphRunEnumerator : IUnknown
278312{
279- HRESULT MoveNext(BOOL *hasRun);
280- HRESULT GetCurrentRun(DWRITE_COLOR_GLYPH_RUN const **run);
313+ HRESULT MoveNext(
314+ [out] BOOL *hasRun
315+ );
316+ HRESULT GetCurrentRun(
317+ [out] DWRITE_COLOR_GLYPH_RUN const **run
318+ );
281319}
282320
283321[
@@ -297,36 +335,41 @@ interface IDWriteRenderingParams2 : IDWriteRenderingParams1
297335]
298336interface IDWriteFactory2 : IDWriteFactory1
299337{
300- HRESULT GetSystemFontFallback(IDWriteFontFallback **fallback);
301- HRESULT CreateFontFallbackBuilder(IDWriteFontFallbackBuilder **fallbackbuilder);
302- HRESULT TranslateColorGlyphRun(FLOAT originX,
303- FLOAT originY,
304- const DWRITE_GLYPH_RUN *run,
305- const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr,
306- DWRITE_MEASURING_MODE mode,
307- const DWRITE_MATRIX *transform,
308- UINT32 palette_index,
309- IDWriteColorGlyphRunEnumerator **colorlayers
310- );
311-
312- HRESULT CreateCustomRenderingParams(FLOAT gamma,
313- FLOAT contrast,
314- FLOAT grayscalecontrast,
315- FLOAT cleartypeLevel,
316- DWRITE_PIXEL_GEOMETRY pixelGeometry,
317- DWRITE_RENDERING_MODE renderingMode,
318- DWRITE_GRID_FIT_MODE gridFitMode,
319- IDWriteRenderingParams2 **params
320- );
321-
322- HRESULT CreateGlyphRunAnalysis(const DWRITE_GLYPH_RUN *run,
323- const DWRITE_MATRIX *transform,
324- DWRITE_RENDERING_MODE renderingMode,
325- DWRITE_MEASURING_MODE measuringMode,
326- DWRITE_GRID_FIT_MODE gridFitMode,
327- DWRITE_TEXT_ANTIALIAS_MODE antialiasMode,
328- FLOAT originX,
329- FLOAT originY,
330- IDWriteGlyphRunAnalysis **analysis
331- );
338+ HRESULT GetSystemFontFallback(
339+ [out] IDWriteFontFallback **fallback
340+ );
341+ HRESULT CreateFontFallbackBuilder(
342+ [out] IDWriteFontFallbackBuilder **fallbackbuilder
343+ );
344+ HRESULT TranslateColorGlyphRun(
345+ [in] FLOAT originX,
346+ [in] FLOAT originY,
347+ [in] const DWRITE_GLYPH_RUN *run,
348+ [in] const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr,
349+ [in] DWRITE_MEASURING_MODE mode,
350+ [in] const DWRITE_MATRIX *transform,
351+ [in] UINT32 palette_index,
352+ [out] IDWriteColorGlyphRunEnumerator **colorlayers
353+ );
354+ HRESULT CreateCustomRenderingParams(
355+ [in] FLOAT gamma,
356+ [in] FLOAT contrast,
357+ [in] FLOAT grayscalecontrast,
358+ [in] FLOAT cleartypeLevel,
359+ [in] DWRITE_PIXEL_GEOMETRY pixelGeometry,
360+ [in] DWRITE_RENDERING_MODE renderingMode,
361+ [in] DWRITE_GRID_FIT_MODE gridFitMode,
362+ [out] IDWriteRenderingParams2 **params
363+ );
364+ HRESULT CreateGlyphRunAnalysis(
365+ [in] const DWRITE_GLYPH_RUN *run,
366+ [in] const DWRITE_MATRIX *transform,
367+ [in] DWRITE_RENDERING_MODE renderingMode,
368+ [in] DWRITE_MEASURING_MODE measuringMode,
369+ [in] DWRITE_GRID_FIT_MODE gridFitMode,
370+ [in] DWRITE_TEXT_ANTIALIAS_MODE antialiasMode,
371+ [in] FLOAT originX,
372+ [in] FLOAT originY,
373+ [out] IDWriteGlyphRunAnalysis **analysis
374+ );
332375}
0 commit comments