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

widl: Recurse search for need of delegation. 

If any ancestor of an interface needs delegation, the interface itself
has holes in the vtables and thus needs delegation, too.
This commit is contained in:
Michael Karcher 2009-01-01 11:25:39 +01:00 committed by Alexandre Julliard
parent aff1dbe531
commit 2fe1f36793
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tools/widl/proxy.c
View File

@ -197,6 +197,24 @@ static int need_delegation(const type_t *iface)
return iface->ref && iface->ref->ref && iface->ref->ignore; return iface->ref && iface->ref->ref && iface->ref->ignore;
} }
static int get_delegation_indirect(const type_t *iface, const type_t ** delegate_to)
{
const type_t * cur_iface;
for (cur_iface = iface; cur_iface != NULL; cur_iface = cur_iface->ref)
if (need_delegation(cur_iface))
{
if(delegate_to)
*delegate_to = cur_iface->ref;
return 1;
}
return 0;
}
static int need_delegation_indirect(const type_t *iface)
{
return get_delegation_indirect(iface, NULL);
}
static void proxy_check_pointers( const var_list_t *args ) static void proxy_check_pointers( const var_list_t *args )
{ {
const var_t *arg; const var_t *arg;
@ -626,7 +644,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset)
fprintf(proxy, "};\n"); fprintf(proxy, "};\n");
print_proxy( "\n"); print_proxy( "\n");
print_proxy( "static %sCInterfaceStubVtbl _%sStubVtbl =\n", print_proxy( "static %sCInterfaceStubVtbl _%sStubVtbl =\n",
need_delegation(iface) ? "" : "const ", iface->name); need_delegation_indirect(iface) ? "" : "const ", iface->name);
print_proxy( "{\n"); print_proxy( "{\n");
indent++; indent++;
print_proxy( "{\n"); print_proxy( "{\n");
@ -639,7 +657,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset)
print_proxy( "},\n", iface->name); print_proxy( "},\n", iface->name);
print_proxy( "{\n"); print_proxy( "{\n");
indent++; indent++;
print_proxy( "CStdStubBuffer_%s\n", need_delegation(iface) ? "DELEGATING_METHODS" : "METHODS"); print_proxy( "CStdStubBuffer_%s\n", need_delegation_indirect(iface) ? "DELEGATING_METHODS" : "METHODS");
indent--; indent--;
print_proxy( "}\n"); print_proxy( "}\n");
indent--; indent--;
@ -773,6 +791,7 @@ void write_proxies(const statement_list_t *stmts)
char *file_id = proxy_token; char *file_id = proxy_token;
int i, count, have_baseiid; int i, count, have_baseiid;
type_t **interfaces; type_t **interfaces;
const type_t * delegate_to;
if (!do_proxies) return; if (!do_proxies) return;
if (do_everything && !need_proxy_file(stmts)) return; if (do_everything && !need_proxy_file(stmts)) return;
@ -826,14 +845,14 @@ void write_proxies(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))) if ((have_baseiid = does_any_iface(stmts, need_delegation_indirect)))
{ {
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");
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
if (need_delegation(interfaces[i])) if (get_delegation_indirect(interfaces[i], &delegate_to))
fprintf( proxy, " &IID_%s, /* %s */\n", interfaces[i]->ref->name, interfaces[i]->name ); fprintf( proxy, " &IID_%s, /* %s */\n", delegate_to->name, interfaces[i]->name );
else else
fprintf( proxy, " 0,\n" ); fprintf( proxy, " 0,\n" );
} }