From: Rémi Bernon rbernon@codeweavers.com
--- tools/widl/header.c | 12 ++++++------ tools/widl/header.h | 2 +- tools/widl/typegen.c | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/widl/header.c b/tools/widl/header.c index a14c9e16946..b1489989cb5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -154,7 +154,7 @@ static void write_type_v( FILE *h, const decl_spec_t *ds, bool is_field, const c type_t *t = ds->type;
if (!h) return; - if (t) write_type_left( h, ds, name_type, true ); + if (t) write_type_left( h, ds, name_type ); if (name) fprintf( h, "%s%s", !t || needs_space_after( t ) ? " " : "", name ); if (t) write_type_right( h, t, is_field ); } @@ -376,11 +376,11 @@ static void write_type_definition_left( FILE *h, const decl_spec_t *decl_spec, e } }
-void write_type_left( FILE *h, const decl_spec_t *ds, enum name_type name_type, bool write_callconv ) +void write_type_left( FILE *h, const decl_spec_t *ds, enum name_type name_type ) { struct strbuf str = {0}; if (!h) return; - append_type_left( &str, ds, name_type, write_callconv ? is_object_interface ? "STDMETHODCALLTYPE" : "" : NULL ); + append_type_left( &str, ds, name_type, is_object_interface ? "STDMETHODCALLTYPE" : "" ); fwrite( str.buf, 1, str.pos, h ); }
@@ -474,7 +474,7 @@ static void write_type( FILE *f, type_t *t, bool define ) } indent(f, 0); if (define) write_type_definition_left( f, &ds, NAME_DEFAULT, true ); - else write_type_left( f, &ds, NAME_DEFAULT, true ); + else write_type_left( f, &ds, NAME_DEFAULT ); fprintf(f, ";\n"); if(in_namespace) { t->written = false; @@ -482,7 +482,7 @@ static void write_type( FILE *f, type_t *t, bool define ) fprintf(f, "extern "C" {\n"); fprintf(f, "#else\n"); if (define) write_type_definition_left( f, &ds, NAME_C, true ); - else write_type_left( f, &ds, NAME_C, true ); + else write_type_left( f, &ds, NAME_C ); fprintf(f, ";\n"); if (winrt_mode) write_widl_using_macros(f, t); fprintf(f, "#endif\n\n"); @@ -499,7 +499,7 @@ void write_type_decl(FILE *f, const decl_spec_t *t, const char *name)
void write_type_decl_left(FILE *f, const decl_spec_t *ds) { - write_type_left( f, ds, NAME_DEFAULT, true ); + write_type_left( f, ds, NAME_DEFAULT ); }
static int user_type_registered(const char *name) diff --git a/tools/widl/header.h b/tools/widl/header.h index e995815ee8b..b1bcbfee6b8 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -24,7 +24,7 @@ #include "typetree.h"
extern const char* get_name(const var_t *v); -extern void write_type_left( FILE *h, const decl_spec_t *ds, enum name_type name_type, bool write_callconv ); +extern void write_type_left( FILE *h, const decl_spec_t *ds, enum name_type name_type ); extern void write_type_right(FILE *h, type_t *t, int is_field); extern void write_type_decl(FILE *f, const decl_spec_t *t, const char *name); extern void write_type_decl_left(FILE *f, const decl_spec_t *ds); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index cb8e030a206..ddde229bee8 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -5064,7 +5064,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun { print_file(file, 2, "%s", ""); init_param_struct_declspec( &declspec, &arg->declspec ); - write_type_left( file, &declspec, NAME_DEFAULT, true ); + write_type_left( file, &declspec, NAME_DEFAULT ); if (needs_space_after( arg->declspec.type )) fputc( ' ', file ); if (is_array( arg->declspec.type ) && !type_array_is_decl_as_ptr( arg->declspec.type )) fputc( '*', file );
@@ -5081,7 +5081,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun { print_file(file, 2, "%s", ""); init_param_struct_declspec( &declspec, &retval->declspec ); - write_type_left( file, &declspec, NAME_DEFAULT, true ); + write_type_left( file, &declspec, NAME_DEFAULT ); if (needs_space_after( retval->declspec.type )) fputc( ' ', file ); if (!is_array( retval->declspec.type ) && !is_ptr( retval->declspec.type ) && type_memsize( retval->declspec.type ) != pointer_size) @@ -5132,9 +5132,9 @@ int write_expr_eval_routines(FILE *file, const char *iface) { decl_spec_t ds = {.type = (type_t *)eval->cont_type}; print_file(file, 1, "%s", ""); - write_type_left( file, &ds, NAME_DEFAULT, true ); + write_type_left( file, &ds, NAME_DEFAULT ); fprintf(file, " *%s = (", var_name); - write_type_left( file, &ds, NAME_DEFAULT, true ); + write_type_left( file, &ds, NAME_DEFAULT ); fprintf(file, " *)(pStubMsg->StackTop - %u);\n", eval->baseoff); } print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */