Module: wine Branch: master Commit: cb7a0da5db7588d63b505d3c9ea94306df7a20bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb7a0da5db7588d63b505d3c9e...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Nov 28 12:55:59 2008 +0100
widl: Fix the handling of proxy delegation.
Generate a BaseIIDList for delegated interface, and point directly to the methods that have been defined in the same file instead of delegating them.
---
dlls/oleaut32/usrmarshal.c | 2 + tools/widl/proxy.c | 47 ++++++++++++++++++++++++++++++++++++++++--- tools/widl/widl.c | 1 + 3 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 8f55f8f..b31eb39 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -25,6 +25,7 @@ #define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT +#define PROXY_DELEGATION
#include "windef.h" #include "winbase.h" @@ -49,6 +50,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); static CStdPSFactoryBuffer PSFactoryBuffer;
CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer) +CSTDSTUBBUFFER2RELEASE(&PSFactoryBuffer)
extern const ExtendedProxyFileInfo oleaut32_oaidl_ProxyFileInfo; extern const ExtendedProxyFileInfo oleaut32_ocidl_ProxyFileInfo; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 3d0a766..74bec7b 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -187,6 +187,11 @@ int cant_be_null(const var_t *v) return 1; /* Default is RPC_FC_RP. */ }
+static int need_delegation(const type_t *iface) +{ + return iface->ref && iface->ref->ref && iface->ref->ignore; +} + static void proxy_check_pointers( const var_list_t *args ) { const var_t *arg; @@ -504,7 +509,7 @@ static int write_proxy_methods(type_t *iface, int skip) const func_t *cur; int i = 0;
- if (iface->ref) i = write_proxy_methods(iface->ref, iface->ref->ref != NULL); + if (iface->ref) i = write_proxy_methods(iface->ref, need_delegation(iface)); if (iface->funcs) LIST_FOR_EACH_ENTRY( cur, iface->funcs, const func_t, entry ) { var_t *def = cur->def; if (!is_callas(def->attrs)) { @@ -615,7 +620,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "},\n", iface->name); print_proxy( "{\n"); indent++; - print_proxy( "CStdStubBuffer_METHODS\n"); + print_proxy( "CStdStubBuffer_%s\n", need_delegation(iface) ? "DELEGATING_METHODS" : "METHODS"); indent--; print_proxy( "}\n"); indent--; @@ -696,6 +701,29 @@ static void write_proxy_iface_name_format(const statement_list_t *stmts, const c } }
+static void write_proxy_iface_base_iids(const statement_list_t *stmts) +{ + const statement_t *stmt; + + if (!stmts) return; + LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type == STMT_LIBRARY) + write_proxy_iface_base_iids(stmt->u.lib->stmts); + else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) + { + type_t *iface = stmt->u.type; + if (iface->ref && iface->funcs && need_proxy(iface)) + { + if (need_delegation(iface)) + fprintf( proxy, " &IID_%s, /* %s */\n", iface->ref->name, iface->name ); + else + fprintf( proxy, " 0,\n" ); + } + } + } +} + static void write_iid_lookup(const statement_list_t *stmts, const char *file_id, int *c) { const statement_t *stmt; @@ -723,7 +751,7 @@ void write_proxies(const statement_list_t *stmts) { int expr_eval_routines; char *file_id = proxy_token; - int c; + int c, have_baseiid; unsigned int proc_offset = 0;
if (!do_proxies) return; @@ -768,6 +796,16 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, "};\n"); fprintf(proxy, "\n");
+ if ((have_baseiid = does_any_iface(stmts, need_delegation))) + { + fprintf(proxy, "static const IID * _%s_BaseIIDList[] =\n", file_id); + fprintf(proxy, "{\n"); + write_proxy_iface_base_iids(stmts); + fprintf(proxy, " 0\n"); + fprintf(proxy, "};\n"); + fprintf(proxy, "\n"); + } + fprintf(proxy, "#define _%s_CHECK_IID(n) IID_GENERIC_CHECK_IID(_%s, pIID, n)\n", file_id, file_id); fprintf(proxy, "\n"); fprintf(proxy, "int __stdcall _%s_IID_Lookup(const IID* pIID, int* pIndex)\n", file_id); @@ -783,7 +821,8 @@ void write_proxies(const statement_list_t *stmts) fprintf(proxy, " (const PCInterfaceProxyVtblList*)&_%s_ProxyVtblList,\n", file_id); fprintf(proxy, " (const PCInterfaceStubVtblList*)&_%s_StubVtblList,\n", file_id); fprintf(proxy, " _%s_InterfaceNamesList,\n", file_id); - fprintf(proxy, " 0,\n"); + if (have_baseiid) fprintf(proxy, " _%s_BaseIIDList,\n", file_id); + else fprintf(proxy, " 0,\n"); fprintf(proxy, " &_%s_IID_Lookup,\n", file_id); fprintf(proxy, " %d,\n", c); fprintf(proxy, " 1,\n"); diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 9b14de2..c49b009 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -253,6 +253,7 @@ static void write_dlldata_list(struct list *filenames)
fprintf(dlldata, "/*** Autogenerated by WIDL %s ", PACKAGE_VERSION); fprintf(dlldata, "- Do not edit ***/\n\n"); + fprintf(dlldata, "#define PROXY_DELEGATION\n"); fprintf(dlldata, "#include <objbase.h>\n"); fprintf(dlldata, "#include <rpcproxy.h>\n\n"); start_cplusplus_guard(dlldata);