d2d1: Get rid of "optional" attributes.

This commit is contained in:
Henri Verbeet 2014-05-15 10:15:31 +02:00 committed by Alexandre Julliard
parent 8e52466757
commit 71a27809f1
1 changed files with 18 additions and 18 deletions

View File

@ -291,80 +291,80 @@ interface ID2D1TessellationSink : IUnknown
interface ID2D1Geometry : ID2D1Resource interface ID2D1Geometry : ID2D1Resource
{ {
HRESULT GetBounds( HRESULT GetBounds(
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[out] D2D1_RECT_F *bounds [out] D2D1_RECT_F *bounds
); );
HRESULT GetWidenedBounds( HRESULT GetWidenedBounds(
[in] float stroke_width, [in] float stroke_width,
[in, optional] ID2D1StrokeStyle *stroke_style, [in] ID2D1StrokeStyle *stroke_style,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[out] D2D1_RECT_F *bounds [out] D2D1_RECT_F *bounds
); );
HRESULT StrokeContainsPoint( HRESULT StrokeContainsPoint(
[in] D2D1_POINT_2F point, [in] D2D1_POINT_2F point,
[in] float stroke_width, [in] float stroke_width,
[in, optional] ID2D1StrokeStyle *stroke_style, [in] ID2D1StrokeStyle *stroke_style,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[out] BOOL *contains [out] BOOL *contains
); );
HRESULT FillContainsPoint( HRESULT FillContainsPoint(
[in] D2D1_POINT_2F point, [in] D2D1_POINT_2F point,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[out] BOOL *contains [out] BOOL *contains
); );
HRESULT CompareWithGeometry( HRESULT CompareWithGeometry(
[in] ID2D1Geometry *geometry, [in] ID2D1Geometry *geometry,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[out] D2D1_GEOMETRY_RELATION *relation [out] D2D1_GEOMETRY_RELATION *relation
); );
HRESULT Simplify( HRESULT Simplify(
[in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option, [in] D2D1_GEOMETRY_SIMPLIFICATION_OPTION option,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[in] ID2D1SimplifiedGeometrySink *sink [in] ID2D1SimplifiedGeometrySink *sink
); );
HRESULT Tessellate( HRESULT Tessellate(
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[in] ID2D1TessellationSink *sink [in] ID2D1TessellationSink *sink
); );
HRESULT CombineWithGeometry( HRESULT CombineWithGeometry(
[in] ID2D1Geometry *geometry, [in] ID2D1Geometry *geometry,
[in] D2D1_COMBINE_MODE combine_mode, [in] D2D1_COMBINE_MODE combine_mode,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[in] ID2D1SimplifiedGeometrySink *sink [in] ID2D1SimplifiedGeometrySink *sink
); );
HRESULT Outline( HRESULT Outline(
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[in] ID2D1SimplifiedGeometrySink *sink [in] ID2D1SimplifiedGeometrySink *sink
); );
HRESULT ComputeArea( HRESULT ComputeArea(
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[out] float *area [out] float *area
); );
HRESULT ComputeLength( HRESULT ComputeLength(
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[out] float *length [out] float *length
); );
HRESULT ComputePointAtLength( HRESULT ComputePointAtLength(
[in] float length, [in] float length,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[out, optional] D2D1_POINT_2F *point, [out] D2D1_POINT_2F *point,
[out, optional] D2D1_POINT_2F *tangent [out] D2D1_POINT_2F *tangent
); );
HRESULT Widen( HRESULT Widen(
[in] float stroke_width, [in] float stroke_width,
[in, optional] ID2D1StrokeStyle *stroke_style, [in] ID2D1StrokeStyle *stroke_style,
[in, optional] const D2D1_MATRIX_3X2_F *transform, [in] const D2D1_MATRIX_3X2_F *transform,
[in] float tolerance, [in] float tolerance,
[in] ID2D1SimplifiedGeometrySink *sink [in] ID2D1SimplifiedGeometrySink *sink
); );