widl: Generate header macros even for aggregate return methods.

A generated macro has a clear suggestion what to do (#define WIDL_C_INLINE_WRAPPERS) instead of completely omitting the macro and leaving one wondering what is going on. Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

widl: Generate header macros even for aggregate return methods.
b63274f3 · Dmitry Timoshkov · Alexandre Julliard · 585dfa14 · b63274f3
Commit b63274f3 authored Nov 14, 2017 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 15, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

header.c tools/widl/header.c +7 -1

No files found.
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -960,7 +960,7 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t *
    if (is_override_method(iface, child, func))
      continue;

-    if (!is_callas(func->attrs) && !is_aggregate_return(func)) {
+    if (!is_callas(func->attrs)) {
      const var_t *arg;

      fprintf(header, "#define %s_%s(This", name, get_name(func));
@@ -969,6 +969,12 @@ static void write_method_macro(FILE *header, const type_t *iface, const type_t *
              fprintf(header, ",%s", arg->name);
      fprintf(header, ") ");

+      if (is_aggregate_return(func))
+      {
+        fprintf(header, "%s_%s_define_WIDL_C_INLINE_WRAPPERS_for_aggregate_return_support\n", name, get_name(func));
+        continue;
+      }
+
      fprintf(header, "(This)->lpVtbl->%s(This", get_vtbl_entry_name(iface, func));
      if (type_get_function_args(func->type))
          LIST_FOR_EACH_ENTRY( arg, type_get_function_args(func->type), const var_t, entry )