[PATCH 4/7] widl: Check eventadd method parameters.

[Hans Leidekker]

From: Hans Leidekker

---
 tools/widl/parser.y | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tools/widl/parser.y b/tools/widl/parser.y
index 9861e4f2423..baf4dddb503 100644
--- a/tools/widl/parser.y
+++ b/tools/widl/parser.y
@@ -2562,6 +2562,33 @@ static void check_remoting_fields(const var_t *var, type_t *type)
         if (field->declspec.type) check_field_common(type, type->name, field);
 }

+static void check_eventadd_args(const var_t *func)
+{
+    const var_t *arg;
+    const var_list_t *arg_list = type_function_get_args(func->declspec.type);
+    unsigned int count = 0;
+
+    if (!is_attr(func->attrs, ATTR_EVENTADD)) return;
+
+    LIST_FOR_EACH_ENTRY(arg, arg_list, const var_t, entry)
+    {
+        const type_t *type = arg->declspec.type;
+        const type_t *ref_type = is_ptr(type) ? type_pointer_get_ref_type(type) : NULL;
+
+        count++;
+        if (count == 1 && (!ref_type || ref_type->type_type != TYPE_DELEGATE))
+            error_at( &arg->where, "first parameter '%s' of function '%s' must be a delegate pointer\n",
+                      arg->name, func->name );
+
+        if (count == 2 && (!ref_type || !ref_type->name || strcmp(ref_type->name, "EventRegistrationToken") ||
+            !is_attr(arg->attrs, ATTR_RETVAL)))
+            error_at( &arg->where, "second parameter '%s' of function '%s' must be an [out, retval] EventRegistrationToken pointer\n",
+                      arg->name, func->name );
+
+        if (count > 2) error_at( &arg->where, "eventadd function '%s' has too many parameters\n", func->name );
+    }
+}
+
 /* checks that arguments for a function make sense for marshalling and unmarshalling */
 static void check_remoting_args(const var_t *func)
 {
@@ -2571,6 +2598,11 @@ static void check_remoting_args(const var_t *func)
     if (!type_function_get_args(func->declspec.type))
         return;

+    if (winrt_mode)
+    {
+        check_eventadd_args(func);
+    }
+
     LIST_FOR_EACH_ENTRY( arg, type_function_get_args(func->declspec.type), const var_t, entry )
     {
         const type_t *type = arg->declspec.type;