(!is_ptr(t) && (!is_array(t) || !type_array_is_decl_as_ptr(t) || t->name)));
}
+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))
+ fprintf(h, "(");
+ fprintf(h, "*");
+}
+
void write_type_left(FILE *h, type_t *t, enum name_type name_type, int declonly)
{
const char *name;
else fprintf(h, "union %s", t->name ? t->name : "");
break;
case TYPE_POINTER:
+ {
write_type_left(h, type_pointer_get_ref(t), name_type, declonly);
- fprintf(h, "%s*", needs_space_after(type_pointer_get_ref(t)) ? " " : "");
+ write_pointer_left(h, type_pointer_get_ref(t));
if (is_attr(t->attrs, ATTR_CONST)) fprintf(h, "const ");
break;
+ }
case TYPE_ARRAY:
if (t->name && type_array_is_decl_as_ptr(t))
fprintf(h, "%s", t->name);
{
write_type_left(h, type_array_get_element(t), name_type, declonly);
if (type_array_is_decl_as_ptr(t))
- fprintf(h, "%s*", needs_space_after(type_array_get_element(t)) ? " " : "");
+ write_pointer_left(h, type_array_get_element(t));
}
break;
case TYPE_BASIC:
if (type_basic_get_type(t) != TYPE_BASIC_INT32 &&
type_basic_get_type(t) != TYPE_BASIC_INT64 &&
+ type_basic_get_type(t) != TYPE_BASIC_LONG &&
type_basic_get_type(t) != TYPE_BASIC_HYPER)
{
if (type_basic_get_sign(t) < 0) fprintf(h, "signed ");
case TYPE_BASIC_ERROR_STATUS_T: fprintf(h, "error_status_t"); break;
case TYPE_BASIC_HANDLE: fprintf(h, "handle_t"); break;
case TYPE_BASIC_INT32:
+ if (type_basic_get_sign(t) > 0)
+ fprintf(h, "UINT32");
+ else
+ fprintf(h, "INT32");
+ break;
+ case TYPE_BASIC_LONG:
if (type_basic_get_sign(t) > 0)
fprintf(h, "ULONG");
else
void write_type_right(FILE *h, type_t *t, int is_field)
{
if (!h) return;
+ if (type_is_alias(t)) return;
switch (type_get_type(t))
{
case TYPE_ARRAY:
- if (!type_array_is_decl_as_ptr(t))
+ {
+ type_t *elem = type_array_get_element(t);
+ if (type_array_is_decl_as_ptr(t))
+ {
+ if (!type_is_alias(elem) && is_array(elem) && !type_array_is_decl_as_ptr(elem))
+ fprintf(h, ")");
+ }
+ else
{
if (is_conformant_array(t))
- {
fprintf(h, "[%s]", is_field ? "1" : "");
- t = type_array_get_element(t);
- }
- for ( ;
- type_get_type(t) == TYPE_ARRAY && !type_array_is_decl_as_ptr(t);
- t = type_array_get_element(t))
+ else
fprintf(h, "[%u]", type_array_get_dim(t));
}
+ write_type_right(h, elem, FALSE);
break;
+ }
+ case TYPE_POINTER:
+ {
+ type_t *ref = type_pointer_get_ref(t);
+ if (!type_is_alias(ref) && is_array(ref) && !type_array_is_decl_as_ptr(ref))
+ fprintf(h, ")");
+ write_type_right(h, ref, FALSE);
+ break;
+ }
case TYPE_BITFIELD:
fprintf(h, " : %u", type_bitfield_get_bits(t)->cval);
break;
case TYPE_COCLASS:
case TYPE_FUNCTION:
case TYPE_INTERFACE:
- case TYPE_POINTER:
break;
}
}
}
}
+static int write_serialize_function_decl(FILE *header, const type_t *type)
+{
+ write_serialize_functions(header, type, NULL);
+ return 1;
+}
+
+static int serializable_exists(FILE *header, const type_t *type)
+{
+ return 0;
+}
+
+static int for_each_serializable(const statement_list_t *stmts, FILE *header,
+ int (*proc)(FILE*, const type_t*))
+{
+ statement_t *stmt, *iface_stmt;
+ statement_list_t *iface_stmts;
+ const type_list_t *type_entry;
+
+ if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, statement_t, entry )
+ {
+ if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE)
+ continue;
+
+ iface_stmts = type_iface_get_stmts(stmt->u.type);
+ if (iface_stmts) LIST_FOR_EACH_ENTRY( iface_stmt, iface_stmts, statement_t, entry )
+ {
+ if (iface_stmt->type != STMT_TYPEDEF) continue;
+ for (type_entry = iface_stmt->u.type_list; type_entry; type_entry = type_entry->next)
+ {
+ if (!is_attr(type_entry->type->attrs, ATTR_ENCODE)
+ && !is_attr(type_entry->type->attrs, ATTR_DECODE))
+ continue;
+ if (!proc(header, type_entry->type))
+ return 0;
+ }
+ }
+ }
+
+ return 1;
+}
+
static void write_user_types(FILE *header)
{
user_type_t *ut;
if (!is_attr( var->attrs, ATTR_IN ) && is_attr( var->attrs, ATTR_OUT )) continue;
if (type_get_type( var->type ) == TYPE_BASIC && type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE)
{
- *explicit_fc = RPC_FC_BIND_PRIMITIVE;
+ *explicit_fc = FC_BIND_PRIMITIVE;
return var;
}
if (get_explicit_generic_handle_type( var ))
{
- *explicit_fc = RPC_FC_BIND_GENERIC;
+ *explicit_fc = FC_BIND_GENERIC;
return var;
}
if (is_context_handle( var->type ))
{
- *explicit_fc = RPC_FC_BIND_CONTEXT;
+ *explicit_fc = FC_BIND_CONTEXT;
return var;
}
}
{
if (type_get_type( var->type ) == TYPE_BASIC &&
type_basic_get_type( var->type ) == TYPE_BASIC_HANDLE)
- *implicit_fc = RPC_FC_BIND_PRIMITIVE;
+ *implicit_fc = FC_BIND_PRIMITIVE;
else
- *implicit_fc = RPC_FC_BIND_GENERIC;
+ *implicit_fc = FC_BIND_GENERIC;
return var;
}
- *implicit_fc = RPC_FC_AUTO_HANDLE;
+ *implicit_fc = FC_AUTO_HANDLE;
return NULL;
}
if (cas) {
const statement_t *stmt2 = NULL;
STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface))
- if (!strcmp(stmt2->u.var->name, cas->name))
+ if (!strcmp(get_name(stmt2->u.var), cas->name))
break;
if (&stmt2->entry != type_iface_get_stmts(iface)) {
const var_t *m = stmt2->u.var;
case STMT_TYPE:
if (type_get_type(stmt->u.type) == TYPE_INTERFACE)
{
- if (is_object(stmt->u.type) || is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE))
- write_forward(header, stmt->u.type);
+ type_t *iface = stmt->u.type;
+ if (is_object(iface) || is_attr(iface->attrs, ATTR_DISPINTERFACE))
+ {
+ write_forward(header, iface);
+ if (iface->details.iface->async_iface)
+ write_forward(header, iface->details.iface->async_iface);
+ }
}
else if (type_get_type(stmt->u.type) == TYPE_COCLASS)
write_coclass_forward(header, stmt->u.type);
if (type_get_type(stmt->u.type) == TYPE_INTERFACE)
{
type_t *iface = stmt->u.type;
+ type_t *async_iface = iface->details.iface->async_iface;
if (is_object(iface)) is_object_interface++;
if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type))
{
write_com_interface_start(header, iface);
write_header_stmts(header, type_iface_get_stmts(iface), stmt->u.type, TRUE);
write_com_interface_end(header, iface);
+ if (async_iface)
+ {
+ write_com_interface_start(header, async_iface);
+ write_com_interface_end(header, async_iface);
+ }
}
else
{
}
fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name);
+ fprintf(header, "#ifdef _WIN32\n");
fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n");
fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n");
fprintf(header, "#endif\n\n");
fprintf(header, "#endif\n\n");
fprintf(header, "#include <rpc.h>\n" );
- fprintf(header, "#include <rpcndr.h>\n\n" );
+ fprintf(header, "#include <rpcndr.h>\n" );
+ if (!for_each_serializable(stmts, NULL, serializable_exists))
+ fprintf(header, "#include <midles.h>\n" );
+ fprintf(header, "#endif\n\n");
fprintf(header, "#ifndef COM_NO_WINDOWS_H\n");
fprintf(header, "#include <windows.h>\n");
fprintf(header, "/* Begin additional prototypes for all interfaces */\n");
fprintf(header, "\n");
+ for_each_serializable(stmts, header, write_serialize_function_decl);
write_user_types(header);
write_generic_handle_routines(header);
write_context_handle_rundowns(header);
projects / reactos.git / blobdiff