[PATCH] include: Avoid using parameter names equal to the method names in IDLs.

[Zebediah Figura]

This causes compilation failures when COBJMACROS is used.

Signed-off-by: Zebediah Figura 
---
 include/amvideo.idl  |  6 +++---
 include/control.idl  |  2 +-
 include/msinkaut.idl | 22 +++++++++++-----------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/amvideo.idl b/include/amvideo.idl
index f3dc45f..7bbed3a 100644
--- a/include/amvideo.idl
+++ b/include/amvideo.idl
@@ -77,11 +77,11 @@ interface IDirectDrawVideo : IUnknown
     HRESULT GetDirectDraw([out] IDirectDraw **ddraw);
     HRESULT GetSurfaceType([out] DWORD * pSurfaceType);
     HRESULT SetDefault();
-    HRESULT UseScanLine([in] long UseScanLine);
+    HRESULT UseScanLine([in] long use);
     HRESULT CanUseScanLine([out] long * UseScanLine);
-    HRESULT UseOverlayStretch([in] long UseOverlayStretch);
+    HRESULT UseOverlayStretch([in] long use);
     HRESULT CanUseOverlayStretch([out] long * UseOverlayStretch);
-    HRESULT UseWhenFullScreen([in] long UseWhenFullScreen);
+    HRESULT UseWhenFullScreen([in] long use);
     HRESULT WillUseFullScreen([out] long * UseWhenFullScreen);
 }

diff --git a/include/control.idl b/include/control.idl
index 529d435..2d32161 100644
--- a/include/control.idl
+++ b/include/control.idl
@@ -122,7 +122,7 @@ library QuartzTypeLib
         HRESULT GetMinIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight );
         HRESULT GetMaxIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight );
         HRESULT GetRestorePosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight );
-        HRESULT HideCursor( [in] LONG HideCursor );
+        HRESULT HideCursor( [in] LONG hide );
         HRESULT IsCursorHidden( [out] LONG *CursorHidden );
     }

diff --git a/include/msinkaut.idl b/include/msinkaut.idl
index 743dec8..4c30481 100644
--- a/include/msinkaut.idl
+++ b/include/msinkaut.idl
@@ -127,11 +127,11 @@ library MSINKAUTLib
         oleautomation
     ]
     interface IInkExtendedProperties : IDispatch {
-        HRESULT Count([out, retval] long* Count);
-        HRESULT _NewEnum([out, retval] IUnknown** _NewEnum);
+        HRESULT Count([out, retval] long* count);
+        HRESULT _NewEnum([out, retval] IUnknown** new_enum);
         HRESULT Item(
             [in] VARIANT Identifier,
-            [out, retval] IInkExtendedProperty** Item);
+            [out, retval] IInkExtendedProperty** item);
         HRESULT Add(
             [in] BSTR Guid,
             [in] VARIANT Data,
@@ -140,7 +140,7 @@ library MSINKAUTLib
         HRESULT Clear();
         HRESULT DoesPropertyExist(
             [in] BSTR Guid,
-            [out, retval] VARIANT_BOOL* DoesPropertyExist);
+            [out, retval] VARIANT_BOOL* exists);
     }

[
@@ -393,7 +393,7 @@ cpp_quote("#endif /* _WINGDI_ */")
             [in, defaultvalue(0)] long FittingError,
             [out, retval] VARIANT* FlattenedBezierPoints);
         [id(0x0000001d)]             HRESULT Transform(
-            [in] IInkTransform* Transform,
+            [in] IInkTransform* transform,
             [in, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth);
         [id(0x0000001c)]             HRESULT ScaleToRectangle(
             [in] IInkRectangle* Rectangle);
@@ -430,7 +430,7 @@ cpp_quote("#endif /* _WINGDI_ */")
         [propget]                   HRESULT RecognitionResult(
             [out, retval] IInkRecognitionResult **RecognitionResult);
         HRESULT ToString(
-            [out, retval] BSTR *ToString);
+            [out, retval] BSTR *str);
         HRESULT Item(
             [in] long Index,
             [out, retval] IInkStrokeDisp **Stroke);
@@ -448,7 +448,7 @@ cpp_quote("#endif /* _WINGDI_ */")
             [in] InkBoundingBoxMode BoundingBoxMode,
             [out, retval] IInkRectangle **BoundingBox);
         HRESULT Transform(
-            [in] IInkTransform *Transform,
+            [in] IInkTransform *transform,
             [in] VARIANT_BOOL ApplyOnPenWidth);
         HRESULT ScaleToRectangle(
             [in] IInkRectangle *Rectangle);
@@ -514,7 +514,7 @@ cpp_quote("#endif /* _WINGDI_ */")
             [in] long selectionStart,
             [in] long selectionLength,
             [in] long maximumAlternates,
-            [out, retval] IInkRecognitionAlternates **AlternatesFromSelection);
+            [out, retval] IInkRecognitionAlternates **alternates);
         HRESULT ModifyTopAlternate(
             [in] IInkRecognitionAlternate *Alternate);
         HRESULT SetResultOnStrokes();
@@ -553,14 +553,14 @@ cpp_quote("#endif /* _WINGDI_ */")
         HRESULT GetStrokesFromTextRange(
             [in, out] long *selectionStart,
             [in, out] long *selectionLength,
-            [out, retval] IInkStrokes **GetStrokesFromTextRange);
+            [out, retval] IInkStrokes **strokes);
         HRESULT GetTextRangeFromStrokes(
             [in] IInkStrokes *Strokes,
             [in, out] long *selectionStart,
             [in, out] long *selectionLength);
         HRESULT AlternatesWithConstantPropertyValues(
             [in] BSTR PropertyType,
-            [out, retval] IInkRecognitionAlternates **AlternatesWithConstantPropertyValues);
+            [out, retval] IInkRecognitionAlternates **alternates);
         HRESULT GetPropertyValue(
             [in] BSTR PropertyType,
             [out, retval] VARIANT *PropertyValue);
@@ -668,7 +668,7 @@ cpp_quote("#endif /* _WINGDI_ */")
             [out, retval] IDataObject **DataObject);
         HRESULT CanPaste(
             [in] IDataObject *DataObject,
-            [out, retval] VARIANT_BOOL *CanPaste);
+            [out, retval] VARIANT_BOOL *can_paste);
         HRESULT ClipboardPaste(
             [in] long x,
             [in] long y,

[Huw Davies]

On 19 Jan 2018, at 23:56, Zebediah Figura  wrote:
> diff --git a/include/control.idl b/include/control.idl
> index 529d435..2d32161 100644
> --- a/include/control.idl
> +++ b/include/control.idl
> @@ -122,7 +122,7 @@ library QuartzTypeLib
>         HRESULT GetMinIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight );
>         HRESULT GetMaxIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight );
>         HRESULT GetRestorePosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight );
> -
>    HRESULT HideCursor( [in] LONG HideCursor );
> -
>    HRESULT HideCursor( [in] LONG hide );
>   HRESULT IsCursorHidden( [out] LONG *CursorHidden );
> }

This will change the parameter names in the typelib too though.
Same with the msinkaut.idl changes.

Huw.

On 01/22/2018 02:29 AM, Huw Davies wrote:
> On 19 Jan 2018, at 23:56, Zebediah Figura  wrote:
> > diff --git a/include/control.idl b/include/control.idl
> > index 529d435..2d32161 100644
> > --- a/include/control.idl
> > +++ b/include/control.idl
> > @@ -122,7 +122,7 @@ library QuartzTypeLib
> >          HRESULT GetMinIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight );
> >          HRESULT GetMaxIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight );
> >          HRESULT GetRestorePosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight );
> > -
> >    HRESULT HideCursor( [in] LONG HideCursor );
> > -
> >    HRESULT HideCursor( [in] LONG hide );
> >    HRESULT IsCursorHidden( [out] LONG *CursorHidden );
> > }
>
> This will change the parameter names in the typelib too though.
> Same with the msinkaut.idl changes.
>
> Huw.

Ah, I didn't realize this was important. I'll send a change to widl 
instead, thanks.