Skip to content

W
wine-winehq
Commit df948ccc authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

widl: Fix nesting of functions, pointers, and arrays.

This is actually broken in MIDL, even as recent as the version shipped with the Windows 10 SDK, but it makes our code simpler, so there's no reason not to do it right. Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent ecbd2dd3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 118 deletions
tools/widl/header.c
View file @ df948ccc
......@@ -285,16 +285,31 @@ int needs_space_after(type_t *t)
(!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name)));
}
int decl_needs_parens(const type_t *t)
{
if (type_is_alias(t))
return FALSE;
if (is_array(t) && !type_array_is_decl_as_ptr(t))
return TRUE;
return is_func(t);
}
static void write_pointer_left(FILE *h, type_t *ref)
{
if (needs_space_after(ref))
fprintf(h, " ");
if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref))
if (decl_needs_parens(ref))
fprintf(h, "(");
if (type_get_type_detect_alias(ref) == TYPE_FUNCTION)
{
const char *callconv = get_attrp(ref->attrs, ATTR_CALLCONV);
if (!callconv && is_object_interface) callconv = "STDMETHODCALLTYPE";
if (callconv) fprintf(h, "%s ", callconv);
}
fprintf(h, "*");
}
void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, int declonly)
void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, int declonly, int write_callconv)
{
type_t *t = ds->type;
const char *name;
......@@ -352,7 +367,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i
break;
case TYPE_POINTER:
{
write_type_left(h, type_pointer_get_ref(t), name_type, declonly);
write_type_left(h, type_pointer_get_ref(t), name_type, declonly, FALSE);
write_pointer_left(h, type_pointer_get_ref_type(t));
if (is_attr(t->attrs, ATTR_CONST)) fprintf(h, "const ");
break;
......@@ -362,11 +377,28 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i
fprintf(h, "%s", t->name);
else
{
write_type_left(h, type_array_get_element(t), name_type, declonly);
write_type_left(h, type_array_get_element(t), name_type, declonly, !type_array_is_decl_as_ptr(t));
if (type_array_is_decl_as_ptr(t))
write_pointer_left(h, type_array_get_element_type(t));
}
break;
case TYPE_FUNCTION:
{
if (is_attr(t->attrs, ATTR_INLINE)) fprintf(h, "inline ");
write_type_left(h, type_function_get_ret(t), name_type, declonly, TRUE);
/* A pointer to a function has to write the calling convention inside
* the parentheses. There's no way to handle that here, so we have to
* use an extra parameter to tell us whether to write the calling
* convention or not. */
if (write_callconv)
{
const char *callconv = get_attrp(t->attrs, ATTR_CALLCONV);
if (!callconv && is_object_interface) callconv = "STDMETHODCALLTYPE";
if (callconv) fprintf(h, " %s ", callconv);
}
break;
}
case TYPE_BASIC:
if (type_basic_get_type(t) != TYPE_BASIC_INT32 &&
type_basic_get_type(t) != TYPE_BASIC_INT64 &&
......@@ -426,11 +458,10 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i
case TYPE_BITFIELD:
{
const decl_spec_t ds = {.type = type_bitfield_get_field(t)};
write_type_left(h, &ds, name_type, declonly);
write_type_left(h, &ds, name_type, declonly, TRUE);
break;
}
case TYPE_ALIAS:
case TYPE_FUNCTION:
/* handled elsewhere */
assert(0);
break;
......@@ -450,7 +481,7 @@ void write_type_right(FILE *h, type_t *t, int is_field)
type_t *elem = type_array_get_element_type(t);
if (type_array_is_decl_as_ptr(t))
{
if (!type_is_alias(elem) && is_array(elem) && !type_array_is_decl_as_ptr(elem))
if (decl_needs_parens(elem))
fprintf(h, ")");
}
else
......@@ -463,10 +494,22 @@ void write_type_right(FILE *h, type_t *t, int is_field)
write_type_right(h, elem, FALSE);
break;
}
case TYPE_FUNCTION:
{
const var_list_t *args = type_function_get_args(t);
fputc('(', h);
if (args)
write_args(h, args, NULL, 0, FALSE);
else
fprintf(h, "void");
fputc(')', h);
write_type_right(h, type_function_get_rettype(t), FALSE);
break;
}
case TYPE_POINTER:
{
type_t *ref = type_pointer_get_ref_type(t);
if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref))
if (decl_needs_parens(ref))
fprintf(h, ")");
write_type_right(h, ref, FALSE);
break;
......@@ -483,7 +526,6 @@ void write_type_right(FILE *h, type_t *t, int is_field)
case TYPE_ALIAS:
case TYPE_MODULE:
case TYPE_COCLASS:
case TYPE_FUNCTION:
case TYPE_INTERFACE:
break;
}
......@@ -491,46 +533,17 @@ void write_type_right(FILE *h, type_t *t, int is_field)
static void write_type_v(FILE *h, const decl_spec_t *ds, int is_field, int declonly, const char *name)
{
type_t *t = ds->type, *pt = NULL;
int ptr_level = 0;
type_t *t = ds->type;
if (!h) return;
if (t) {
for (pt = t; is_ptr(pt); pt = type_pointer_get_ref_type(pt), ptr_level++)
;
if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) {
int i;
const char *callconv = get_attrp(pt->attrs, ATTR_CALLCONV);
if (!callconv && is_object_interface) callconv = "STDMETHODCALLTYPE";
if (is_attr(pt->attrs, ATTR_INLINE)) fprintf(h, "inline ");
write_type_left(h, type_function_get_ret(pt), NAME_DEFAULT, declonly);
fputc(' ', h);
if (ptr_level) fputc('(', h);
if (callconv) fprintf(h, "%s ", callconv);
for (i = 0; i < ptr_level; i++)
fputc('*', h);
} else
write_type_left(h, ds, NAME_DEFAULT, declonly);
}
if (!h) return;
if (name) fprintf(h, "%s%s", !t || needs_space_after(t) ? " " : "", name );
if (t)
write_type_left(h, ds, NAME_DEFAULT, declonly, TRUE);
if (t) {
if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) {
const var_list_t *args = type_function_get_args(pt);
if (name) fprintf(h, "%s%s", !t || needs_space_after(t) ? " " : "", name );
if (ptr_level) fputc(')', h);
fputc('(', h);
if (args)
write_args(h, args, NULL, 0, FALSE);
else
fprintf(h, "void");
fputc(')', h);
} else
write_type_right(h, t, is_field);
}
if (t)
write_type_right(h, t, is_field);
}
static void write_type_def_or_decl(FILE *f, const decl_spec_t *t, int field, const char *name)
......@@ -550,14 +563,14 @@ static void write_type_definition(FILE *f, type_t *t)
write_namespace_start(f, t->namespace);
}
indent(f, 0);
write_type_left(f, &ds, NAME_DEFAULT, FALSE);
write_type_left(f, &ds, NAME_DEFAULT, FALSE, TRUE);
fprintf(f, ";\n");
if(in_namespace) {
t->written = save_written;
write_namespace_end(f, t->namespace);
fprintf(f, "extern \"C\" {\n");
fprintf(f, "#else\n");
write_type_left(f, &ds, NAME_C, FALSE);
write_type_left(f, &ds, NAME_C, FALSE, TRUE);
fprintf(f, ";\n");
fprintf(f, "#endif\n\n");
}
......@@ -570,7 +583,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, TRUE, TRUE);
}
static int user_type_registered(const char *name)
......
tools/widl/header.h
View file @ df948ccc
......@@ -29,7 +29,7 @@ extern int is_attr(const attr_list_t *list, enum attr_type t);
extern void *get_attrp(const attr_list_t *list, enum attr_type t);
extern unsigned int get_attrv(const attr_list_t *list, enum attr_type t);
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, int declonly);
extern void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, int declonly, int write_callconv);
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);
......@@ -66,6 +66,11 @@ static inline int is_array(const type_t *t)
return type_get_type(t) == TYPE_ARRAY;
}
static inline int is_func(const type_t *t)
{
return type_get_type(t) == TYPE_FUNCTION;
}
static inline int is_void(const type_t *t)
{
return type_get_type(t) == TYPE_VOID;
......
tools/widl/typegen.c
View file @ df948ccc
......@@ -4805,7 +4805,7 @@ void write_func_param_struct( FILE *file, const type_t *iface, const type_t *fun
if (args) LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry )
{
print_file(file, 2, "%s", "");
write_type_left( file, &arg->declspec, NAME_DEFAULT, TRUE );
write_type_left( file, &arg->declspec, NAME_DEFAULT, TRUE, TRUE );
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 );
......@@ -4871,9 +4871,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, TRUE, TRUE);
fprintf(file, " *%s = (", var_name);
write_type_left(file, &ds, NAME_DEFAULT, TRUE);
write_type_left(file, &ds, NAME_DEFAULT, TRUE, TRUE);
fprintf(file, " *)(pStubMsg->StackTop - %u);\n", eval->baseoff);
}
print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */
......
tools/widl/typetree.c
View file @ df948ccc
......@@ -172,6 +172,7 @@ type_t *type_new_function(var_list_t *args)
t = make_type(TYPE_FUNCTION);
t->details.function = xmalloc(sizeof(*t->details.function));
t->details.function->args = args;
t->details.function->retval = make_var(xstrdup("_RetVal"));
return t;
}
......
tools/widl/widltypes.h
View file @ df948ccc
......@@ -478,7 +478,6 @@ struct _var_t {
struct _declarator_t {
var_t *var;
type_t *type;
type_t *func_type;
expr_t *bits;
/* parser-internal */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment