system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 05:56:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

widl: Use type_get_type to determine the types during statement enumeration.

Browse source
This commit is contained in:
Rob Shearman 2009-02-23 13:48:05 +00:00 committed by Alexandre Julliard
parent ba91ee607c
commit fb934347b4
7 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/widl/client.c
View file

@ -469,7 +469,7 @@ static void write_client_ifaces(const statement_list_t *stmts, int expr_eval_rou
const statement_t *stmt; const statement_t *stmt;
if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry )
{ {
if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
int has_func = 0; int has_func = 0;
const statement_t *stmt2; const statement_t *stmt2;

16
tools/widl/header.c
View file

@ -824,7 +824,7 @@ static void write_local_stubs_stmts(FILE *local_stubs, const statement_list_t *s
const statement_t *stmt; const statement_t *stmt;
if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry )
{ {
if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
write_locals(local_stubs, stmt->u.type, TRUE); write_locals(local_stubs, stmt->u.type, TRUE);
else if (stmt->type == STMT_LIBRARY) else if (stmt->type == STMT_LIBRARY)
write_local_stubs_stmts(local_stubs, stmt->u.lib->stmts); write_local_stubs_stmts(local_stubs, stmt->u.lib->stmts);
@ -1047,7 +1047,7 @@ static void write_imports(FILE *header, const statement_list_t *stmts)
switch (stmt->type) switch (stmt->type)
{ {
case STMT_TYPE: case STMT_TYPE:
if (stmt->u.type->type == RPC_FC_IP) if (type_get_type(stmt->u.type) == TYPE_INTERFACE)
write_imports(header, type_iface_get_stmts(stmt->u.type)); write_imports(header, type_iface_get_stmts(stmt->u.type));
break; break;
case STMT_TYPEREF: case STMT_TYPEREF:
@ -1078,12 +1078,12 @@ static void write_forward_decls(FILE *header, const statement_list_t *stmts)
switch (stmt->type) switch (stmt->type)
{ {
case STMT_TYPE: case STMT_TYPE:
if (stmt->u.type->type == RPC_FC_IP) if (type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
if (is_object(stmt->u.type->attrs) || is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE)) if (is_object(stmt->u.type->attrs) || is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE))
write_forward(header, stmt->u.type); write_forward(header, stmt->u.type);
} }
else if (stmt->u.type->type == RPC_FC_COCLASS) else if (type_get_type(stmt->u.type) == TYPE_COCLASS)
write_coclass_forward(header, stmt->u.type); write_coclass_forward(header, stmt->u.type);
break; break;
case STMT_TYPEREF: case STMT_TYPEREF:
@ -1112,7 +1112,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons
switch (stmt->type) switch (stmt->type)
{ {
case STMT_TYPE: case STMT_TYPE:
if (stmt->u.type->type == RPC_FC_IP) if (type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
type_t *iface = stmt->u.type; type_t *iface = stmt->u.type;
if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type->attrs)) if (is_attr(stmt->u.type->attrs, ATTR_DISPINTERFACE) || is_object(stmt->u.type->attrs))
@ -1128,7 +1128,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons
write_rpc_interface_end(header, iface); write_rpc_interface_end(header, iface);
} }
} }
else if (stmt->u.type->type == RPC_FC_COCLASS) else if (type_get_type(stmt->u.type) == TYPE_COCLASS)
write_coclass(header, stmt->u.type); write_coclass(header, stmt->u.type);
else else
{ {
@ -1139,7 +1139,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons
case STMT_TYPEREF: case STMT_TYPEREF:
/* FIXME: shouldn't write out forward declarations for undefined /* FIXME: shouldn't write out forward declarations for undefined
* interfaces but a number of our IDL files depend on this */ * interfaces but a number of our IDL files depend on this */
if (stmt->u.type->type == RPC_FC_IP && !stmt->u.type->written) if (type_get_type(stmt->u.type) == TYPE_INTERFACE && !stmt->u.type->written)
write_forward(header, stmt->u.type); write_forward(header, stmt->u.type);
break; break;
case STMT_IMPORTLIB: case STMT_IMPORTLIB:
@ -1164,7 +1164,7 @@ static void write_header_stmts(FILE *header, const statement_list_t *stmts, cons
fprintf(header, "%s\n", stmt->u.str); fprintf(header, "%s\n", stmt->u.str);
break; break;
case STMT_DECLARATION: case STMT_DECLARATION:
if (iface && stmt->u.var->type->type == RPC_FC_FUNCTION) if (iface && type_get_type(stmt->u.var->type) == TYPE_FUNCTION)
{ {
if (!ignore_funcs) if (!ignore_funcs)
{ {

4
tools/widl/parser.y
View file

@ -2533,7 +2533,7 @@ static void check_statements(const statement_list_t *stmts, int is_inside_librar
{ {
if (stmt->type == STMT_LIBRARY) if (stmt->type == STMT_LIBRARY)
check_statements(stmt->u.lib->stmts, TRUE); check_statements(stmt->u.lib->stmts, TRUE);
else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
check_functions(stmt->u.type, is_inside_library); check_functions(stmt->u.type, is_inside_library);
} }
} }
@ -2546,7 +2546,7 @@ static void check_all_user_types(const statement_list_t *stmts)
{ {
if (stmt->type == STMT_LIBRARY) if (stmt->type == STMT_LIBRARY)
check_all_user_types(stmt->u.lib->stmts); check_all_user_types(stmt->u.lib->stmts);
else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP && else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE &&
!is_local(stmt->u.type->attrs)) !is_local(stmt->u.type->attrs))
{ {
const statement_t *stmt_func; const statement_t *stmt_func;

6
tools/widl/proxy.c
View file

@ -709,7 +709,7 @@ static int does_any_iface(const statement_list_t *stmts, type_pred_t pred)
if (does_any_iface(stmt->u.lib->stmts, pred)) if (does_any_iface(stmt->u.lib->stmts, pred))
return TRUE; return TRUE;
} }
else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
if (pred(stmt->u.type)) if (pred(stmt->u.type))
return TRUE; return TRUE;
@ -746,7 +746,7 @@ static void write_proxy_stmts(const statement_list_t *stmts, unsigned int *proc_
{ {
if (stmt->type == STMT_LIBRARY) if (stmt->type == STMT_LIBRARY)
write_proxy_stmts(stmt->u.lib->stmts, proc_offset); write_proxy_stmts(stmt->u.lib->stmts, proc_offset);
else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
if (need_proxy(stmt->u.type)) if (need_proxy(stmt->u.type))
write_proxy(stmt->u.type, proc_offset); write_proxy(stmt->u.type, proc_offset);
@ -772,7 +772,7 @@ static void build_iface_list( const statement_list_t *stmts, type_t **ifaces[],
{ {
if (stmt->type == STMT_LIBRARY) if (stmt->type == STMT_LIBRARY)
build_iface_list(stmt->u.lib->stmts, ifaces, count); build_iface_list(stmt->u.lib->stmts, ifaces, count);
else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
type_t *iface = stmt->u.type; type_t *iface = stmt->u.type;
if (type_iface_get_inherit(iface) && need_proxy(iface)) if (type_iface_get_inherit(iface) && need_proxy(iface))

2
tools/widl/server.c
View file

@ -407,7 +407,7 @@ static void write_server_stmts(const statement_list_t *stmts, int expr_eval_rout
{ {
if (stmt->type == STMT_LIBRARY) if (stmt->type == STMT_LIBRARY)
write_server_stmts(stmt->u.lib->stmts, expr_eval_routines, proc_offset); write_server_stmts(stmt->u.lib->stmts, expr_eval_routines, proc_offset);
else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) else if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
type_t *iface = stmt->u.type; type_t *iface = stmt->u.type;
if (!need_stub(iface)) if (!need_stub(iface))

6
tools/widl/typegen.c
View file

@ -724,7 +724,7 @@ static void write_procformatstring_stmts(FILE *file, int indent, const statement
const statement_t *stmt; const statement_t *stmt;
if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry )
{ {
if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) if (stmt->type == STMT_TYPE && type_get_type(stmt->u.type) == TYPE_INTERFACE)
{ {
const statement_t *stmt_func; const statement_t *stmt_func;
if (!pred(stmt->u.type)) if (!pred(stmt->u.type))
@ -2655,7 +2655,7 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts,
process_tfs_stmts(file, stmt->u.lib->stmts, pred, typeformat_offset); process_tfs_stmts(file, stmt->u.lib->stmts, pred, typeformat_offset);
continue; continue;
} }
else if (stmt->type != STMT_TYPE || stmt->u.type->type != RPC_FC_IP) else if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE)
continue; continue;
iface = stmt->u.type; iface = stmt->u.type;
@ -3420,7 +3420,7 @@ unsigned int get_size_procformatstring(const statement_list_t *stmts, type_pred_
size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1; size += get_size_procformatstring(stmt->u.lib->stmts, pred) - 1;
continue; continue;
} }
else if (stmt->type != STMT_TYPE || stmt->u.type->type != RPC_FC_IP) else if (stmt->type != STMT_TYPE || type_get_type(stmt->u.type) != TYPE_INTERFACE)
continue; continue;
iface = stmt->u.type; iface = stmt->u.type;

4
tools/widl/widl.c
View file

@ -349,7 +349,7 @@ static void write_id_data_stmts(const statement_list_t *stmts)
if (stmt->type == STMT_TYPE) if (stmt->type == STMT_TYPE)
{ {
const type_t *type = stmt->u.type; const type_t *type = stmt->u.type;
if (type->type == RPC_FC_IP) if (type_get_type(type) == TYPE_INTERFACE)
{ {
const UUID *uuid; const UUID *uuid;
if (!is_object(type->attrs) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) if (!is_object(type->attrs) && !is_attr(type->attrs, ATTR_DISPINTERFACE))
@ -358,7 +358,7 @@ static void write_id_data_stmts(const statement_list_t *stmts)
write_guid(idfile, is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", write_guid(idfile, is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID",
type->name, uuid); type->name, uuid);
} }
else if (type->type == RPC_FC_COCLASS) else if (type_get_type(type) == TYPE_COCLASS)
{ {
const UUID *uuid = get_attrp(type->attrs, ATTR_UUID); const UUID *uuid = get_attrp(type->attrs, ATTR_UUID);
write_guid(idfile, "CLSID", type->name, uuid); write_guid(idfile, "CLSID", type->name, uuid);