From: Hans Leidekker hans@codeweavers.com
--- tools/widl/parser.y | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/tools/widl/parser.y b/tools/widl/parser.y index baf4dddb503..1e83cd2802f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2589,6 +2589,27 @@ static void check_eventadd_args(const var_t *func) } }
+static void check_eventremove_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_EVENTREMOVE)) return; + + LIST_FOR_EACH_ENTRY(arg, arg_list, const var_t, entry) + { + const type_t *type = arg->declspec.type; + + count++; + if (count == 1 && (!type->name || strcmp(type->name, "EventRegistrationToken"))) + error_at( &arg->where, "first parameter '%s' of function '%s' must be an EventRegistrationToken\n", + arg->name, func->name ); + + if (count > 1) error_at( &arg->where, "eventremove 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) { @@ -2601,6 +2622,7 @@ static void check_remoting_args(const var_t *func) if (winrt_mode) { check_eventadd_args(func); + check_eventremove_args(func); }
LIST_FOR_EACH_ENTRY( arg, type_function_get_args(func->declspec.type), const var_t, entry )