June 2011 - Wine-commits - list.winehq.org

Alexandre Julliard : widl: Output the list of rundown routines in server files.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: e620869d5f81d033550c853f51484b60a6cd4d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e620869d5f81d033550c853f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 20:31:42 2011 +0200 widl: Output the list of rundown routines in server files. --- tools/widl/header.c | 2 +- tools/widl/server.c | 26 +++++++++++++++++++++++++- tools/widl/widltypes.h | 1 + 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 8abce70..9d12696 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -39,7 +39,7 @@ static int indentation = 0; static int is_object_interface = 0; user_type_list_t user_type_list = LIST_INIT(user_type_list); -static context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); +context_handle_list_t context_handle_list = LIST_INIT(context_handle_list); generic_handle_list_t generic_handle_list = LIST_INIT(generic_handle_list); static void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name); diff --git a/tools/widl/server.c b/tools/widl/server.c index 19293ae..3a8810e 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -307,6 +307,26 @@ static void write_routinetable(type_t *iface) } +static void write_rundown_routines(void) +{ + context_handle_t *ch; + int count = list_count( &context_handle_list ); + + if (!count) return; + print_server( "static const NDR_RUNDOWN RundownRoutines[] =\n" ); + print_server( "{\n" ); + indent++; + LIST_FOR_EACH_ENTRY( ch, &context_handle_list, context_handle_t, entry ) + { + print_server( "%s_rundown", ch->name ); + if (--count) fputc( ',', server ); + fputc( '\n', server ); + } + indent--; + print_server( "};\n\n" ); +} + + static void write_serverinfo(type_t *iface) { print_server( "static const MIDL_SERVER_INFO %s_ServerInfo =\n", iface->name ); @@ -345,7 +365,10 @@ static void write_stubdescriptor(type_t *iface, int expr_eval_routines) print_server("0,\n"); indent--; print_server("},\n"); - print_server("0,\n"); + if (!list_empty( &context_handle_list )) + print_server("RundownRoutines,\n"); + else + print_server("0,\n"); print_server("0,\n"); if (expr_eval_routines) print_server("ExprEvalRoutines,\n"); @@ -505,6 +528,7 @@ static void write_server_routines(const statement_list_t *stmts) if (expr_eval_routines) write_expr_eval_routine_list(server, server_token); write_user_quad_list(server); + write_rundown_routines(); write_server_stmts(stmts, expr_eval_routines, &proc_offset); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index b2ac116..ccb9d1a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -533,6 +533,7 @@ typedef enum { extern syskind_t typelib_kind; extern user_type_list_t user_type_list; +extern context_handle_list_t context_handle_list; extern generic_handle_list_t generic_handle_list; void check_for_additional_prototype_types(const var_list_t *list);

1 0

Alexandre Julliard : widl: Use the local function as proxy entry for callas interpreted functions.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 0cba5b06f5a8f87c4de503468b96ff7df3037f49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cba5b06f5a8f87c4de503468… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 21:17:52 2011 +0200 widl: Use the local function as proxy entry for callas interpreted functions. --- tools/widl/proxy.c | 26 ++++++++------------------ 1 files changed, 8 insertions(+), 18 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 7bc7753..32a5054 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -554,24 +554,14 @@ static int write_proxy_methods(type_t *iface, int skip) STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) { const var_t *func = stmt->u.var; if (!is_callas(func->attrs)) { - int missing = 0; - const char * fname = get_name(func); - if (is_local(func->attrs)) { - const statement_t * callas_source = get_callas_source(iface, func); - if(!callas_source) - missing = 1; - else - fname = get_name(callas_source->u.var); - } - if (skip || missing) print_proxy( "0, /* %s::%s */\n", iface->name, get_name(func)); - else if (is_interpreted_func( iface, func )) - { - if (!is_local( func->attrs ) && type_iface_get_inherit(iface)) - print_proxy( "(void *)-1, /* %s::%s */\n", iface->name, get_name(func)); - else - print_proxy( "%s_%s_Proxy,\n", iface->name, fname); - } - else print_proxy( "%s_%s_Proxy,\n", iface->name, get_name(func)); + if (skip || (is_local(func->attrs) && !get_callas_source(iface, func))) + print_proxy( "0, /* %s::%s */\n", iface->name, get_name(func)); + else if (is_interpreted_func( iface, func ) && + !is_local( func->attrs ) && + type_iface_get_inherit(iface)) + print_proxy( "(void *)-1, /* %s::%s */\n", iface->name, get_name(func)); + else + print_proxy( "%s_%s_Proxy,\n", iface->name, get_name(func)); i++; } }

1 0

Alexandre Julliard : widl: Include the parent interfaces in the proc format string offsets for proxies .
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 799000ea3a48a7984bd7059040109bad1b47bbf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=799000ea3a48a7984bd705904… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 21:58:33 2011 +0200 widl: Include the parent interfaces in the proc format string offsets for proxies. --- tools/widl/proxy.c | 37 ++++++++++++++++++++++++++++++++++++- 1 files changed, 36 insertions(+), 1 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 32a5054..5f17631 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -543,6 +543,36 @@ static const statement_t * get_callas_source(const type_t * iface, const var_t * return NULL; } +static void write_proxy_procformatstring_offsets( const type_t *iface, int skip ) +{ + const statement_t *stmt; + + if (type_iface_get_inherit(iface)) + write_proxy_procformatstring_offsets( type_iface_get_inherit(iface), need_delegation(iface)); + else + return; + + STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) + { + const var_t *func = stmt->u.var; + int missing = 0; + + if (is_callas(func->attrs)) continue; + if (is_local(func->attrs)) + { + const statement_t * callas_source = get_callas_source(iface, func); + if (!callas_source) + missing = 1; + else + func = callas_source->u.var; + } + if (skip || missing) + print_proxy( "(unsigned short)-1, /* %s::%s */\n", iface->name, get_name(func)); + else + print_proxy( "%u, /* %s::%s */\n", func->procstring_offset, iface->name, get_name(func)); + } +} + static int write_proxy_methods(type_t *iface, int skip) { const statement_t *stmt; @@ -667,7 +697,12 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) count = count_methods(iface); - write_procformatstring_offsets( proxy, iface ); + print_proxy( "static const unsigned short %s_FormatStringOffsetTable[] =\n", iface->name ); + print_proxy( "{\n" ); + indent++; + write_proxy_procformatstring_offsets( iface, 0 ); + indent--; + print_proxy( "};\n\n" ); /* proxy info */ if (get_stub_mode() == MODE_Oif)

1 0

Alexandre Julliard : widl: Use delegation when inheriting from a local interface.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 58810696015caed0d4c81d728b9b8ac4134feb87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58810696015caed0d4c81d728… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 22:16:05 2011 +0200 widl: Use delegation when inheriting from a local interface. --- tools/widl/proxy.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5f17631..e5b2f9f 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -142,9 +142,8 @@ int cant_be_null(const var_t *v) static int need_delegation(const type_t *iface) { - return type_iface_get_inherit(iface) && - type_iface_get_inherit(type_iface_get_inherit(iface)) && - type_iface_get_inherit(iface)->ignore; + const type_t *parent = type_iface_get_inherit( iface ); + return parent && type_iface_get_inherit(parent) && (parent->ignore || is_local( parent->attrs )); } 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; unsigned int proc_offset = 0; char *file_id = proxy_token; - int i, count, have_baseiid; + int i, count, have_baseiid = 0; type_t **interfaces; 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"); - 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, "{\n");

1 0

Alexandre Julliard : widl: Include the parent interfaces in the proxy thunk table too.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 7a0ce4c8641e2a6c76e7a69da166ac907b3fcfcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0ce4c8641e2a6c76e7a69da… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 23:16:36 2011 +0200 widl: Include the parent interfaces in the proxy thunk table too. --- tools/widl/proxy.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index e5b2f9f..f4bd8d8 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -630,25 +630,28 @@ static int write_stub_methods(type_t *iface, int skip) return i; } -static void write_thunk_methods( type_t *iface ) +static void write_thunk_methods( type_t *iface, int skip ) { const statement_t *stmt; - int i = 0; + + if (type_iface_get_inherit( iface )) + write_thunk_methods( type_iface_get_inherit(iface), need_delegation(iface) ); + else + return; /* skip IUnknown */ STATEMENTS_FOR_EACH_FUNC( stmt, type_iface_get_stmts(iface) ) { var_t *func = stmt->u.var; - const var_t *cas = is_callas(func->attrs); + const statement_t * callas_source = NULL; - if (is_local( func->attrs )) continue; - if (i) fprintf(proxy, ",\n"); - if (cas && is_interpreted_func( iface, func )) - print_proxy( "%s_%s_Thunk", iface->name, func->name ); + if (is_callas(func->attrs)) continue; + if (is_local(func->attrs)) callas_source = get_callas_source(iface, func); + + if (!skip && callas_source && is_interpreted_func( iface, func )) + print_proxy( "%s_%s_Thunk,\n", iface->name, get_name(callas_source->u.var) ); else - print_proxy( "0" ); - i++; + print_proxy( "0, /* %s::%s */\n", iface->name, get_name(func) ); } - fputc( '\n', proxy ); } static void write_proxy(type_t *iface, unsigned int *proc_offset) @@ -744,7 +747,7 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) print_proxy( "static const STUB_THUNK %s_StubThunkTable[] =\n", iface->name); print_proxy( "{\n"); indent++; - write_thunk_methods( iface ); + write_thunk_methods( iface, 0 ); indent--; print_proxy( "};\n\n"); }

1 0

Alexandre Julliard : widl: If possible, use the interface name as prefix for the expr eval functions.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: 351c6ca5e435357e6df1f5770b62a63bd2703094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=351c6ca5e435357e6df1f5770… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 13 23:59:04 2011 +0200 widl: If possible, use the interface name as prefix for the expr eval functions. --- tools/widl/typegen.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index e6de531..81c511d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -4727,7 +4727,7 @@ int write_expr_eval_routines(FILE *file, const char *iface) result = 1; print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", - iface, name, callback_offset); + eval->iface ? eval->iface->name : iface, name, callback_offset); print_file(file, 0, "{\n"); if (type_get_type( eval->cont_type ) == TYPE_FUNCTION) { @@ -4763,7 +4763,8 @@ void write_expr_eval_routine_list(FILE *file, const char *iface) LIST_FOR_EACH_ENTRY_SAFE(eval, cursor, &expr_eval_routines, struct expr_eval_routine, entry) { - print_file(file, 1, "%s_%sExprEval_%04u,\n", iface, eval->name, callback_offset); + print_file(file, 1, "%s_%sExprEval_%04u,\n", + eval->iface ? eval->iface->name : iface, eval->name, callback_offset); callback_offset++; list_remove(&eval->entry); free(eval->name);

1 0

Alexandre Julliard : widl: Allow unsized in,out string parameters.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: bcca410733f8a55157fd13e2d42a06730e4a518c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcca410733f8a55157fd13e2d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 12:23:32 2011 +0200 widl: Allow unsized in,out string parameters. --- tools/widl/parser.y | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 24107fc..f034074 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2572,6 +2572,7 @@ static void check_remoting_args(const var_t *func) type_array_get_conformance(type)->type != EXPR_VOID) break; if (!type_array_has_conformance(type) && type_array_get_dim(type)) break; } + if (is_attr( arg->attrs, ATTR_IN )) break; error_loc_info(&arg->loc_info, "out parameter \'%s\' of function \'%s\' cannot be an unsized string\n", arg->name, funcname); break; case TGT_INVALID:

1 0

Alexandre Julliard : widl: Make output unique pointers into object pointers in object interfaces.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: c70ef62958246c7f65cae0b984f47fe45c0fe563 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c70ef62958246c7f65cae0b98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 12:24:00 2011 +0200 widl: Make output unique pointers into object pointers in object interfaces. --- tools/widl/typegen.c | 69 +++++++++++++++++++++++++++---------------------- 1 files changed, 38 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c70ef62958246c7f65cae…

1 0

Alexandre Julliard : widl: Also check array pointers for null ref pointers.
by Alexandre Julliard 14 Jun '11

14 Jun '11

Module: wine Branch: master Commit: fa2b886d1d431f35c554d55f26e6f21653ffc5db URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2b886d1d431f35c554d55f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 14 12:55:22 2011 +0200 widl: Also check array pointers for null ref pointers. --- tools/widl/client.c | 13 ++----------- tools/widl/proxy.c | 17 ++++------------- tools/widl/widltypes.h | 1 - 3 files changed, 6 insertions(+), 25 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 8e259b9..84f480b 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -59,17 +59,8 @@ static void check_pointers(const var_t *func) return; LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - { - if (is_var_ptr(var) && cant_be_null(var)) - { - print_client("if (!%s)\n", var->name); - print_client("{\n"); - indent++; - print_client("RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); - indent--; - print_client("}\n\n"); - } - } + if (cant_be_null(var)) + print_client("if (!%s) RpcRaiseException(RPC_X_NULL_REF_POINTER);\n", var->name); } static void write_client_func_decl( const type_t *iface, const var_t *func ) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index f4bd8d8..2ff8ea1 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -120,16 +120,13 @@ static void clear_output_vars( const var_list_t *args ) } } -int is_var_ptr(const var_t *v) -{ - return is_ptr(v->type); -} - int cant_be_null(const var_t *v) { switch (typegen_detect_type(v->type, v->attrs, TDT_IGNORE_STRINGS)) { case TGT_ARRAY: + if (!type_array_is_decl_as_ptr( v->type )) return 0; + /* fall through */ case TGT_POINTER: return (get_pointer_fc(v->type, v->attrs, TRUE) == RPC_FC_RP); case TGT_CTXT_HANDLE_POINTER: @@ -170,14 +167,8 @@ static void proxy_check_pointers( const var_list_t *args ) if (!args) return; LIST_FOR_EACH_ENTRY( arg, args, const var_t, entry ) - { - if (is_var_ptr(arg) && cant_be_null(arg)) { - print_proxy( "if(!%s)\n", arg->name ); - indent++; - print_proxy( "RpcRaiseException(RPC_X_NULL_REF_POINTER);\n"); - indent--; - } - } + if (cant_be_null(arg)) + print_proxy( "if (!%s) RpcRaiseException(RPC_X_NULL_REF_POINTER);\n", arg->name ); } static void free_variable( const var_t *arg, const char *local_var_prefix ) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index ccb9d1a..9e9bec6 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -544,7 +544,6 @@ void clear_all_offsets(void); int is_ptr(const type_t *t); int is_array(const type_t *t); -int is_var_ptr(const var_t *v); int cant_be_null(const var_t *v); #define tsENUM 1

1 0

Francois Gouget : shdoclc: One of the 'Add to Favorites' menu was missing an ellipsis.
by Alexandre Julliard 13 Jun '11

13 Jun '11

1 0