ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

widl: Use delegation when inheriting from a local interface.

This commit is contained in:
Alexandre Julliard 2011-06-13 22:16:05 +02:00
parent 799000ea3a
commit 5881069601
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/widl/proxy.c
View File

@ -142,9 +142,8 @@ int cant_be_null(const var_t *v)
static int need_delegation(const type_t *iface) static int need_delegation(const type_t *iface)
{ {
return type_iface_get_inherit(iface) && const type_t *parent = type_iface_get_inherit( iface );
type_iface_get_inherit(type_iface_get_inherit(iface)) && return parent && type_iface_get_inherit(parent) && (parent->ignore || is_local( parent->attrs ));
type_iface_get_inherit(iface)->ignore;
} }
static int get_delegation_indirect(const type_t *iface, const type_t ** delegate_to) static int get_delegation_indirect(const type_t *iface, const type_t ** delegate_to)
@ -944,7 +943,7 @@ static void write_proxy_routines(const statement_list_t *stmts)
int expr_eval_routines; int expr_eval_routines;
unsigned int proc_offset = 0; unsigned int proc_offset = 0;
char *file_id = proxy_token; char *file_id = proxy_token;
int i, count, have_baseiid; int i, count, have_baseiid = 0;
type_t **interfaces; type_t **interfaces;
const type_t * delegate_to; const type_t * delegate_to;
@ -1021,7 +1020,10 @@ static void write_proxy_routines(const statement_list_t *stmts)
fprintf(proxy, "};\n"); fprintf(proxy, "};\n");
fprintf(proxy, "\n"); fprintf(proxy, "\n");
if ((have_baseiid = does_any_iface(stmts, need_delegation_indirect))) for (i = 0; i < count; i++)
if ((have_baseiid = get_delegation_indirect( interfaces[i], NULL ))) break;
if (have_baseiid)
{ {
fprintf(proxy, "static const IID * _%s_BaseIIDList[] =\n", file_id); fprintf(proxy, "static const IID * _%s_BaseIIDList[] =\n", file_id);
fprintf(proxy, "{\n"); fprintf(proxy, "{\n");