From 18c350ae224af6fafe15b92036fca77fdb4371da Mon Sep 17 00:00:00 2001 From: Nikolay Sivov Date: Wed, 19 Mar 2014 10:21:10 +0400 Subject: [PATCH] idl: Remove 'optional' for 'defaultvalue' non-VARIANT arguments. --- dlls/scrrun/scrrun.idl | 38 +++++++++++++++---------------- dlls/wshom.ocx/wshom.idl | 20 ++++++++--------- include/msinkaut.idl | 48 ++++++++++++++++++++-------------------- 3 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dlls/scrrun/scrrun.idl b/dlls/scrrun/scrrun.idl index 9cb9dafdaea..5571e77ef0a 100644 --- a/dlls/scrrun/scrrun.idl +++ b/dlls/scrrun/scrrun.idl @@ -256,7 +256,7 @@ library Scripting HRESULT Write([in] BSTR Text); [id(0x00002718)] - HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + HRESULT WriteLine([in, defaultvalue("")] BSTR Text); [id(0x00002719)] HRESULT WriteBlankLines([in] long Lines); @@ -324,17 +324,17 @@ library Scripting HRESULT Type([out, retval] BSTR* pbstrType); [id(0x000004b0)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL Force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force); [id(0x000004b2)] - HRESULT Copy([in] BSTR Destination, [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + HRESULT Copy([in] BSTR Destination, [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x000004b4)] HRESULT Move([in] BSTR Destination); [id(0x0000044c)] - HRESULT OpenAsTextStream([in, optional, defaultvalue(1)] IOMode IOMode, - [in, optional, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts); + HRESULT OpenAsTextStream([in, defaultvalue(1)] IOMode IOMode, + [in, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts); } [ @@ -396,10 +396,10 @@ library Scripting HRESULT GetSpecialFolder([in] SpecialFolderConst SpecialFolder, [out, retval] IFolder** ppfolder); [id(0x000004b0)] - HRESULT DeleteFile([in] BSTR FileSpec, [in, optional, defaultvalue(0)] VARIANT_BOOL Force); + HRESULT DeleteFile([in] BSTR FileSpec, [in, defaultvalue(0)] VARIANT_BOOL Force); [id(0x000004b1)] - HRESULT DeleteFolder([in] BSTR FolderSpec, [in, optional, defaultvalue(0)] VARIANT_BOOL Force); + HRESULT DeleteFolder([in] BSTR FolderSpec, [in, defaultvalue(0)] VARIANT_BOOL Force); [id(0x000004b4), helpstring("Move a file"), helpcontext(0x00214bab)] HRESULT MoveFile([in] BSTR Source, [in] BSTR Destination); @@ -409,23 +409,23 @@ library Scripting [id(0x000004b2)] HRESULT CopyFile([in] BSTR Source, [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x000004b3)] HRESULT CopyFolder([in] BSTR Source, [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x00000460)] HRESULT CreateFolder([in] BSTR Path, [out, retval] IFolder** ppfolder); [id(0x0000044d)] - HRESULT CreateTextFile([in] BSTR FileName, [in, optional, defaultvalue(-1)] VARIANT_BOOL Overwrite, - [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); + HRESULT CreateTextFile([in] BSTR FileName, [in, defaultvalue(-1)] VARIANT_BOOL Overwrite, + [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); [id(0x0000044c)] - HRESULT OpenTextFile([in] BSTR FileName, [in, optional, defaultvalue(1)] IOMode IOMode, - [in, optional, defaultvalue(0)] VARIANT_BOOL Create, - [in, optional, defaultvalue(0)] Tristate Format, + HRESULT OpenTextFile([in] BSTR FileName, [in, defaultvalue(1)] IOMode IOMode, + [in, defaultvalue(0)] VARIANT_BOOL Create, + [in, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts); } @@ -522,10 +522,10 @@ library Scripting HRESULT Type([out, retval] BSTR* pbstrType); [id(0x000004b1)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL Force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force); [id(0x000004b3)] - HRESULT Copy([in] BSTR Destination, [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + HRESULT Copy([in] BSTR Destination, [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x000004b5)] HRESULT Move([in] BSTR Destination); @@ -543,8 +543,8 @@ library Scripting HRESULT Files([out, retval] IFileCollection** ppfiles); [id(0x0000044d)] - HRESULT CreateTextFile([in] BSTR FileName, [in, optional, defaultvalue(-1)] VARIANT_BOOL Overwrite, - [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); + HRESULT CreateTextFile([in] BSTR FileName, [in, defaultvalue(-1)] VARIANT_BOOL Overwrite, + [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); } [ @@ -558,7 +558,7 @@ library Scripting { [id(0x00004e20)] HRESULT GetStandardStream([in] StandardStreamTypes StandardStreamType, - [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); + [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); [id(0x00004e2a)] HRESULT GetFileVersion([in] BSTR FileName, [out, retval] BSTR* FileVersion); diff --git a/dlls/wshom.ocx/wshom.idl b/dlls/wshom.ocx/wshom.idl index 30fb2c2d943..b6bfb1ce9b5 100644 --- a/dlls/wshom.ocx/wshom.idl +++ b/dlls/wshom.ocx/wshom.idl @@ -107,7 +107,7 @@ library IWshRuntimeLibrary HRESULT Write([in] BSTR Text); [id(0x2718)] - HRESULT WriteLine([in, optional, defaultvalue("")] BSTR Text); + HRESULT WriteLine([in, defaultvalue("")] BSTR Text); [id(0x2719)] HRESULT WriteBlankLines([in] long Lines); @@ -223,20 +223,20 @@ library IWshRuntimeLibrary HRESULT Type([out, retval] BSTR* Type); [id(0x04b0)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL Force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL Force); [id(0x04b2)] HRESULT Copy( [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x04b4)] HRESULT Move([in] BSTR Destination); [id(0x044c)] HRESULT OpenAsTextStream( - [in, optional, defaultvalue(1)] IOMode IOMode, - [in, optional, defaultvalue(0)] Tristate Format, + [in, defaultvalue(1)] IOMode IOMode, + [in, defaultvalue(0)] Tristate Format, [out, retval] ITextStream** ppts); }; @@ -308,12 +308,12 @@ library IWshRuntimeLibrary HRESULT Type([out, retval] BSTR* type); [id(0x04b1)] - HRESULT Delete([in, optional, defaultvalue(0)] VARIANT_BOOL force); + HRESULT Delete([in, defaultvalue(0)] VARIANT_BOOL force); [id(0x04b3)] HRESULT Copy( [in] BSTR Destination, - [in, optional, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); + [in, defaultvalue(-1)] VARIANT_BOOL OverWriteFiles); [id(0x04b5)] HRESULT Move([in] BSTR Destination); @@ -333,8 +333,8 @@ library IWshRuntimeLibrary [id(0x044d)] HRESULT CreateTextFile( [in] BSTR FileName, - [in, optional, defaultvalue(-1)] VARIANT_BOOL Overwrite, - [in, optional, defaultvalue(0)] VARIANT_BOOL Unicode, + [in, defaultvalue(-1)] VARIANT_BOOL Overwrite, + [in, defaultvalue(0)] VARIANT_BOOL Unicode, [out, retval] ITextStream** ppts); }; @@ -575,7 +575,7 @@ library IWshRuntimeLibrary HRESULT LogEvent( [in] VARIANT* Type, [in] BSTR Message, - [in, optional, defaultvalue("")] BSTR Target, + [in, defaultvalue("")] BSTR Target, [out, retval] VARIANT_BOOL* out_Success); [id(0x0bc2)] diff --git a/include/msinkaut.idl b/include/msinkaut.idl index 12dc1076ca1..58ae86c811a 100644 --- a/include/msinkaut.idl +++ b/include/msinkaut.idl @@ -211,8 +211,8 @@ cpp_quote("#endif /* _WINGDI_ */") [in] single VerticalComponent); [id(0x00000003)] HRESULT Rotate( [in] single Degrees, - [in, optional, defaultvalue(0)] single x, - [in, optional, defaultvalue(0)] single y); + [in, defaultvalue(0)] single x, + [in, defaultvalue(0)] single y); [id(0x00000004)] HRESULT Reflect( [in] VARIANT_BOOL Horizontally, [in] VARIANT_BOOL Vertically); @@ -336,7 +336,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x00000014), propget] HRESULT Deleted( [out, retval] VARIANT_BOOL* Deleted); [id(0x00000003)] HRESULT GetBoundingBox( - [in, optional, defaultvalue(0)] InkBoundingBoxMode BoundingBoxMode, + [in, defaultvalue(0)] InkBoundingBoxMode BoundingBoxMode, [out, retval] IInkRectangle** Rectangle); [id(0x00000005)] HRESULT FindIntersections( [in] IInkStrokes* Strokes, @@ -354,7 +354,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x00000009)] HRESULT NearestPoint( [in] long x, [in] long y, - [in, out, optional, defaultvalue(0)] single* Distance, + [in, out, defaultvalue(0)] single* Distance, [out, retval] single* Point); [id(0x0000000a)] HRESULT Split( [in] single SplitAt, @@ -366,35 +366,35 @@ cpp_quote("#endif /* _WINGDI_ */") [out] TabletPropertyMetricUnit* Units, [out] single* Resolution); [id(0x00000016)] HRESULT GetPoints( - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] VARIANT* Points); [id(0x00000017)] HRESULT SetPoints( [in] VARIANT Points, - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] long* NumberOfPointsSet); [id(0x00000018)] HRESULT GetPacketData( - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] VARIANT* PacketData); [id(0x00000019)] HRESULT GetPacketValuesByProperty( [in] BSTR propertyName, - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] VARIANT* PacketValues); [id(0x0000001a)] HRESULT SetPacketValuesByProperty( [in] BSTR bstrPropertyName, [in] VARIANT PacketValues, - [in, optional, defaultvalue(0)] long Index, - [in, optional, defaultvalue(-1)] long Count, + [in, defaultvalue(0)] long Index, + [in, defaultvalue(-1)] long Count, [out, retval] long* NumberOfPacketsSet); [id(0x0000001b)] HRESULT GetFlattenedBezierPoints( - [in, optional, defaultvalue(0)] long FittingError, + [in, defaultvalue(0)] long FittingError, [out, retval] VARIANT* FlattenedBezierPoints); [id(0x0000001d)] HRESULT Transform( [in] IInkTransform* Transform, - [in, optional, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth); + [in, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth); [id(0x0000001c)] HRESULT ScaleToRectangle( [in] IInkRectangle* Rectangle); [id(0x0000001e)] HRESULT Move( @@ -402,8 +402,8 @@ cpp_quote("#endif /* _WINGDI_ */") [in] single VerticalComponent); [id(0x0000001f)] HRESULT Rotate( [in] single Degrees, - [in, optional, defaultvalue(0)] single x, - [in, optional, defaultvalue(0)] single y); + [in, defaultvalue(0)] single x, + [in, defaultvalue(0)] single y); [id(0x00000020)] HRESULT Shear( [in] single HorizontalMultiplier, [in] single VerticalMultiplier); @@ -693,7 +693,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT DrawStroke( [in] long hDC, [in] IInkStrokeDisp* Stroke, - [in, optional, defaultvalue(0)] + [in, defaultvalue(0)] IInkDrawingAttributes* DrawingAttributes); HRESULT PixelToInkSpace( [in] long hDC, @@ -714,19 +714,19 @@ cpp_quote("#endif /* _WINGDI_ */") [out, retval] IInkRectangle** Rectangle); HRESULT MeasureStroke( [in] IInkStrokeDisp* Stroke, - [in, optional, defaultvalue(0)] IInkDrawingAttributes* DrawingAttributes, + [in, defaultvalue(0)] IInkDrawingAttributes* DrawingAttributes, [out, retval] IInkRectangle** Rectangle); HRESULT Move( [in] single HorizontalComponent, [in] single VerticalComponent); HRESULT Rotate( [in] single Degrees, - [in, optional, defaultvalue(0)] single x, - [in, optional, defaultvalue(0)] single y); + [in, defaultvalue(0)] single x, + [in, defaultvalue(0)] single y); HRESULT ScaleTransform( [in] single HorizontalMultiplier, [in] single VerticalMultiplier, - [in, optional, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth); + [in, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth); }; typedef enum { @@ -996,7 +996,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x00000017)] HRESULT SetWindowInputRectangle( [in] IInkRectangle* WindowInputRectangle); [id(0x0000001a)] HRESULT SetAllTabletsMode( - [in, optional, defaultvalue(-1)] VARIANT_BOOL UseMouseForInput); + [in, defaultvalue(-1)] VARIANT_BOOL UseMouseForInput); [id(0x0000001b)] HRESULT SetSingleTabletIntegratedMode( [in] IInkTablet* Tablet); [id(0x0000000b)] HRESULT GetEventInterest(