widl: Use for_each_iface in process_tfs.
Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
53e54833f6
commit
212cffbf99
|
@ -3675,23 +3675,10 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty
|
|||
return write_type_tfs(file, 2, attrs, type, name, write_ptr ? TYPE_CONTEXT_CONTAINER : TYPE_CONTEXT_CONTAINER_NO_POINTERS, tfsoff);
|
||||
}
|
||||
|
||||
static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts,
|
||||
type_pred_t pred, unsigned int *typeformat_offset)
|
||||
static void process_tfs_iface(type_t *iface, FILE *file, int indent, unsigned int *offset)
|
||||
{
|
||||
var_t *var;
|
||||
const statement_t *stmt;
|
||||
|
||||
if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry )
|
||||
{
|
||||
const type_t *iface;
|
||||
const statement_t *stmt_func;
|
||||
|
||||
if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE)
|
||||
continue;
|
||||
|
||||
iface = stmt->u.type;
|
||||
if (!pred(iface))
|
||||
continue;
|
||||
var_t *var;
|
||||
|
||||
current_iface = iface;
|
||||
STATEMENTS_FOR_EACH_FUNC( stmt_func, type_iface_get_stmts(iface) )
|
||||
|
@ -3703,24 +3690,20 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts,
|
|||
var = type_function_get_retval(func->type);
|
||||
if (!is_void(var->type))
|
||||
var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name,
|
||||
TYPE_CONTEXT_PARAM, typeformat_offset);
|
||||
TYPE_CONTEXT_PARAM, offset);
|
||||
|
||||
if (type_get_function_args(func->type))
|
||||
LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry )
|
||||
var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name,
|
||||
TYPE_CONTEXT_TOPLEVELPARAM,
|
||||
typeformat_offset );
|
||||
TYPE_CONTEXT_TOPLEVELPARAM, offset );
|
||||
}
|
||||
}
|
||||
|
||||
return *typeformat_offset + 1;
|
||||
}
|
||||
|
||||
static unsigned int process_tfs(FILE *file, const statement_list_t *stmts, type_pred_t pred)
|
||||
{
|
||||
unsigned int typeformat_offset = 2;
|
||||
|
||||
return process_tfs_stmts(file, stmts, pred, &typeformat_offset);
|
||||
for_each_iface(stmts, process_tfs_iface, pred, file, 0, &typeformat_offset);
|
||||
return typeformat_offset + 1;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue