March 2010 - Wine-commits - list.winehq.org

Rob Shearman : include: Change an unsized [out] string to be sized in IMultiLanguage2.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: cf45d599124a7bbb53a511e271d7864a0548e722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf45d599124a7bbb53a511e27… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:29 2010 +0000 include: Change an unsized [out] string to be sized in IMultiLanguage2. Unsized [out] strings are not allowed because of the potential to overflow the buffer passed in. --- include/mlang.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mlang.idl b/include/mlang.idl index a5b1b47..7664a22 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -668,7 +668,7 @@ interface IMultiLanguage2 : IUnknown HRESULT GetCodePageDescription( [in] UINT uiCodePage, [in] LCID lcid, - [in,out] LPWSTR lpWideCharStr, + [in,out,size_is(cchWideChar)] LPWSTR lpWideCharStr, [in] int cchWideChar); HRESULT IsCodePageInstallable(

1 0

Rob Shearman : widl: Issue an error if an out parameter is a conformant string.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: a3f649f730ed9f8881e6f2572fe9475728caf670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3f649f730ed9f8881e6f2572… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:32 2010 +0000 widl: Issue an error if an out parameter is a conformant string. --- tools/widl/parser.y | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a6b6bce..5c021ae 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2527,10 +2527,11 @@ static void check_remoting_args(const var_t *func) error_loc_info(&arg->loc_info, "out interface pointer \'%s\' of function \'%s\' is not a double pointer\n", arg->name, funcname); break; case TGT_STRING: - if (!is_array(type)) - { - /* FIXME */ - } + if (is_ptr(type) || + (is_array(type) && + (!type_array_has_conformance(type) || + type_array_get_conformance(type)->type == EXPR_VOID))) + 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: /* already error'd before we get here */

1 0

Rob Shearman : widl: Remove func_t type.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 979bdf28b60dbb10782dc8a34e1f308112a8a81a URL: http://source.winehq.org/git/wine.git/?a=commit;h=979bdf28b60dbb10782dc8a34… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:36 2010 +0000 widl: Remove func_t type. It was just a simple indirection to get to a var_t, so just replace all uses of it with the latter. --- tools/widl/parser.y | 41 ++++++++--------------------------------- tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 2 +- tools/widl/widltypes.h | 12 +----------- tools/widl/write_msft.c | 8 ++++---- 5 files changed, 15 insertions(+), 50 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5c021ae..d0985e9 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -108,8 +108,6 @@ static ifref_t *make_ifref(type_t *iface); static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); static declarator_t *make_declarator(var_t *var); -static func_list_t *append_func(func_list_t *list, func_t *func); -static func_t *make_func(var_t *def); static type_t *make_safearray(type_t *type); static typelib_t *make_library(const char *name, const attr_list_t *attrs); static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); @@ -165,8 +163,6 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s var_list_t *var_list; declarator_t *declarator; declarator_list_t *declarator_list; - func_t *func; - func_list_t *func_list; statement_t *statement; statement_list_t *stmt_list; ifref_t *ifref; @@ -293,14 +289,14 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <ifref> coclass_int %type <ifref_list> coclass_ints %type <var> arg ne_union_field union_field s_field case enum declaration -%type <var_list> m_args arg_list args +%type <var> funcdef +%type <var_list> m_args arg_list args dispint_meths %type <var_list> fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident ident %type <declarator> declarator direct_declarator init_declarator struct_declarator %type <declarator> m_any_declarator any_declarator any_declarator_no_direct any_direct_declarator %type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list -%type <func> funcdef %type <type> coclass coclasshdr coclassdef %type <num> pointer_type version %type <str> libraryhdr callconv cppquote importlib import t_ident @@ -308,7 +304,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <import> import_start %type <typelib> library_start librarydef %type <statement> statement typedef -%type <stmt_list> gbl_statements imp_statements int_statements dispint_meths +%type <stmt_list> gbl_statements imp_statements int_statements %left ',' %right '?' ':' @@ -720,12 +716,10 @@ s_field: m_attributes decl_spec declarator { $$ = declare_var(check_field_attrs } ; -funcdef: - m_attributes decl_spec declarator { var_t *v; - v = declare_var(check_function_attrs($3->var->name, $1), - $2, $3, FALSE); - free($3); - $$ = make_func(v); +funcdef: declaration { $$ = $1; + if (type_get_type($$->type) != TYPE_FUNCTION) + error_loc("only methods may be declared inside the methods section of a dispinterface\n"); + check_function_attrs($$->name, $$->attrs); } ; @@ -826,7 +820,7 @@ dispint_props: tPROPERTIES ':' { $$ = NULL; } ; dispint_meths: tMETHODS ':' { $$ = NULL; } - | dispint_meths funcdef ';' { $$ = append_func( $1, $2 ); } + | dispint_meths funcdef ';' { $$ = append_var( $1, $2 ); } ; dispinterfacedef: dispinterfacehdr '{' @@ -1693,25 +1687,6 @@ static declarator_t *make_declarator(var_t *var) return d; } -static func_list_t *append_func(func_list_t *list, func_t *func) -{ - if (!func) return list; - if (!list) - { - list = xmalloc( sizeof(*list) ); - list_init( list ); - } - list_add_tail( list, &func->entry ); - return list; -} - -static func_t *make_func(var_t *def) -{ - func_t *f = xmalloc(sizeof(func_t)); - f->def = def; - return f; -} - static type_t *make_safearray(type_t *type) { return type_new_array(NULL, type_new_alias(type, "SAFEARRAY"), TRUE, 0, diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index a60e757..a9e71be 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -386,7 +386,7 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm compute_method_indexes(iface); } -void type_dispinterface_define(type_t *iface, var_list_t *props, func_list_t *methods) +void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods) { iface->details.iface = xmalloc(sizeof(*iface->details.iface)); iface->details.iface->disp_props = props; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 591406b..8b19739 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -41,7 +41,7 @@ type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); -void type_dispinterface_define(type_t *iface, var_list_t *props, func_list_t *methods); +void type_dispinterface_define(type_t *iface, var_list_t *props, var_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts); type_t *type_coclass_define(type_t *coclass, ifref_list_t *ifaces); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 18f601c..d40fe1e 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -41,7 +41,6 @@ typedef struct _expr_t expr_t; typedef struct _type_t type_t; typedef struct _var_t var_t; typedef struct _declarator_t declarator_t; -typedef struct _func_t func_t; typedef struct _ifref_t ifref_t; typedef struct _typelib_entry_t typelib_entry_t; typedef struct _importlib_t importlib_t; @@ -54,7 +53,6 @@ typedef struct _statement_t statement_t; typedef struct list attr_list_t; typedef struct list str_list_t; -typedef struct list func_list_t; typedef struct list expr_list_t; typedef struct list var_list_t; typedef struct list declarator_list_t; @@ -301,7 +299,7 @@ struct func_details struct iface_details { statement_list_t *stmts; - func_list_t *disp_methods; + var_list_t *disp_methods; var_list_t *disp_props; struct _type_t *inherit; }; @@ -309,7 +307,6 @@ struct iface_details struct module_details { statement_list_t *stmts; - func_list_t *funcs; }; struct array_details @@ -418,13 +415,6 @@ struct _declarator_t { struct list entry; }; -struct _func_t { - var_t *def; - - /* parser-internal */ - struct list entry; -}; - struct _ifref_t { type_t *iface; attr_list_t *attrs; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 5bbc95e..15761a0 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1950,7 +1950,7 @@ static void add_dispatch(msft_typelib_t *typelib) static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinterface) { int idx = 0; - const func_t *func; + var_t *func; var_t *var; msft_typeinfo_t *msft_typeinfo; @@ -1970,7 +1970,7 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte /* count the no of methods, as the variable indices come after the funcs */ if (dispinterface->details.iface->disp_methods) - LIST_FOR_EACH_ENTRY( func, dispinterface->details.iface->disp_methods, const func_t, entry ) + LIST_FOR_EACH_ENTRY( func, dispinterface->details.iface->disp_methods, var_t, entry ) idx++; if (type_dispiface_get_props(dispinterface)) @@ -1980,8 +1980,8 @@ static void add_dispinterface_typeinfo(msft_typelib_t *typelib, type_t *dispinte if (type_dispiface_get_methods(dispinterface)) { idx = 0; - LIST_FOR_EACH_ENTRY( func, type_dispiface_get_methods(dispinterface), const func_t, entry ) - if(add_func_desc(msft_typeinfo, func->def, idx) == S_OK) + LIST_FOR_EACH_ENTRY( func, type_dispiface_get_methods(dispinterface), var_t, entry ) + if(add_func_desc(msft_typeinfo, func, idx) == S_OK) idx++; } }

1 0

Rob Shearman : widl: Fix the calculation of casted integer constant expressions.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: b544014b8e1bb1e3e6f89d96edbeead320375afc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b544014b8e1bb1e3e6f89d96e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:46 2010 +0000 widl: Fix the calculation of casted integer constant expressions. --- tools/widl/expr.c | 141 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 98 insertions(+), 43 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index bca7c5a..67c5e71 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -35,8 +35,76 @@ #include "typetree.h" #include "typegen.h" -static int is_integer_type(const type_t *type); -static int is_float_type(const type_t *type); +static int is_integer_type(const type_t *type) +{ + switch (type_get_type(type)) + { + case TYPE_ENUM: + return TRUE; + case TYPE_BASIC: + switch (type_basic_get_type(type)) + { + case TYPE_BASIC_INT8: + case TYPE_BASIC_INT16: + case TYPE_BASIC_INT32: + case TYPE_BASIC_INT64: + case TYPE_BASIC_INT: + case TYPE_BASIC_INT3264: + case TYPE_BASIC_CHAR: + case TYPE_BASIC_HYPER: + case TYPE_BASIC_BYTE: + case TYPE_BASIC_WCHAR: + case TYPE_BASIC_ERROR_STATUS_T: + return TRUE; + case TYPE_BASIC_FLOAT: + case TYPE_BASIC_DOUBLE: + case TYPE_BASIC_HANDLE: + return FALSE; + } + return FALSE; + default: + return FALSE; + } +} + +static int is_signed_integer_type(const type_t *type) +{ + switch (type_get_type(type)) + { + case TYPE_ENUM: + return FALSE; + case TYPE_BASIC: + switch (type_basic_get_type(type)) + { + case TYPE_BASIC_INT8: + case TYPE_BASIC_INT16: + case TYPE_BASIC_INT32: + case TYPE_BASIC_INT64: + case TYPE_BASIC_INT: + case TYPE_BASIC_INT3264: + return type_basic_get_sign(type) < 0; + case TYPE_BASIC_CHAR: + return TRUE; + case TYPE_BASIC_HYPER: + case TYPE_BASIC_BYTE: + case TYPE_BASIC_WCHAR: + case TYPE_BASIC_ERROR_STATUS_T: + case TYPE_BASIC_FLOAT: + case TYPE_BASIC_DOUBLE: + case TYPE_BASIC_HANDLE: + return FALSE; + } + default: + return FALSE; + } +} + +static int is_float_type(const type_t *type) +{ + return (type_get_type(type) == TYPE_BASIC && + (type_basic_get_type(type) == TYPE_BASIC_FLOAT || + type_basic_get_type(type) == TYPE_BASIC_DOUBLE)); +} expr_t *make_expr(enum expr_type type) { @@ -146,8 +214,34 @@ expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr) /* check for cast of constant expression */ if (type == EXPR_CAST && expr->is_const) { - e->is_const = TRUE; - e->cval = expr->cval; + if (is_integer_type(tref)) + { + unsigned int align = 0; + unsigned int cast_type_bits = type_memsize(tref, &align) * 8; + unsigned long cast_mask; + + e->is_const = TRUE; + if (is_signed_integer_type(tref)) + { + cast_mask = (1 << (cast_type_bits - 1)) - 1; + if (expr->cval & (1 << (cast_type_bits - 1))) + e->cval = -((-expr->cval) & cast_mask); + else + e->cval = expr->cval & cast_mask; + } + else + { + /* calculate ((1 << cast_type_bits) - 1) avoiding overflow */ + cast_mask = ((1 << (cast_type_bits - 1)) - 1) | + 1 << (cast_type_bits - 1); + e->cval = expr->cval & cast_mask; + } + } + else + { + e->is_const = TRUE; + e->cval = expr->cval; + } } free(var); return e; @@ -308,45 +402,6 @@ struct expression_type type_t *type; }; -static int is_integer_type(const type_t *type) -{ - switch (type_get_type(type)) - { - case TYPE_ENUM: - return TRUE; - case TYPE_BASIC: - switch (type_basic_get_type(type)) - { - case TYPE_BASIC_INT8: - case TYPE_BASIC_INT16: - case TYPE_BASIC_INT32: - case TYPE_BASIC_INT64: - case TYPE_BASIC_INT: - case TYPE_BASIC_INT3264: - case TYPE_BASIC_CHAR: - case TYPE_BASIC_HYPER: - case TYPE_BASIC_BYTE: - case TYPE_BASIC_WCHAR: - case TYPE_BASIC_ERROR_STATUS_T: - return TRUE; - case TYPE_BASIC_FLOAT: - case TYPE_BASIC_DOUBLE: - case TYPE_BASIC_HANDLE: - return FALSE; - } - return FALSE; - default: - return FALSE; - } -} - -static int is_float_type(const type_t *type) -{ - return (type_get_type(type) == TYPE_BASIC && - (type_basic_get_type(type) == TYPE_BASIC_FLOAT || - type_basic_get_type(type) == TYPE_BASIC_DOUBLE)); -} - static void check_scalar_type(const struct expr_loc *expr_loc, const type_t *cont_type, const type_t *type) {

1 0

Rob Shearman : widl: Return a pointer to the correct part of the string from the lexer for WSTRQUOTE tokens .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 8a8fff6415e7e03c4c51b3abbabac816208563f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8fff6415e7e03c4c51b3abb… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:51 2010 +0000 widl: Return a pointer to the correct part of the string from the lexer for WSTRQUOTE tokens. --- tools/widl/parser.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 0d231fc..bcf7436 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -150,7 +150,7 @@ UUID *parse_uuid(const char *u) parser_lval.str = get_buffered_cstring(); return aSTRING; } -<INITIAL,ATTR>L\" yy_push_state(WSTRQUOTE); +<INITIAL,ATTR>L\" yy_push_state(WSTRQUOTE); cbufidx = 0; <WSTRQUOTE>\" { yy_pop_state(); parser_lval.str = get_buffered_cstring();

1 0

Rob Shearman : widl: Remove the current_func variable.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 5e0030b4cb4c06e926effa5cdb68f8f2fa295fb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0030b4cb4c06e926effa5cd… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:55 2010 +0000 widl: Remove the current_func variable. It's only set, never read from. --- tools/widl/typegen.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 771cd2a..2433b8b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -46,7 +46,6 @@ /* value to add on to round size up to a multiple of alignment */ #define ROUNDING(size, alignment) (((alignment) - 1) - (((size) + ((alignment) - 1)) & ((alignment) - 1))) -static const var_t *current_func; static const type_t *current_structure; static const type_t *current_iface; @@ -2916,7 +2915,6 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, file); } - current_func = func; if (type_get_function_args(func->type)) LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) update_tfsoff(

1 0

Rob Shearman : widl: Make use of string_of_type in write_conf_or_var_desc.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: c65d16e9d5857c25a3916b80ad414026e81deff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c65d16e9d5857c25a3916b80a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:59 2010 +0000 widl: Make use of string_of_type in write_conf_or_var_desc. This allows the code to not have to track the operator type twice. --- tools/widl/typegen.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2433b8b..30d6727 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -123,6 +123,41 @@ static const char *string_of_type(unsigned char type) case RPC_FC_C_WSTRING: return "FC_C_WSTRING"; case RPC_FC_CSTRING: return "FC_CSTRING"; case RPC_FC_WSTRING: return "FC_WSTRING"; + case RPC_FC_BYTE_COUNT_POINTER: return "FC_BYTE_COUNT_POINTER"; + case RPC_FC_TRANSMIT_AS: return "FC_TRANSMIT_AS"; + case RPC_FC_REPRESENT_AS: return "FC_REPRESENT_AS"; + case RPC_FC_IP: return "FC_IP"; + case RPC_FC_BIND_CONTEXT: return "FC_BIND_CONTEXT"; + case RPC_FC_BIND_GENERIC: return "FC_BIND_GENERIC"; + case RPC_FC_BIND_PRIMITIVE: return "FC_BIND_PRIMITIVE"; + case RPC_FC_AUTO_HANDLE: return "FC_AUTO_HANDLE"; + case RPC_FC_CALLBACK_HANDLE: return "FC_CALLBACK_HANDLE"; + case RPC_FC_STRUCTPAD1: return "FC_STRUCTPAD1"; + case RPC_FC_STRUCTPAD2: return "FC_STRUCTPAD2"; + case RPC_FC_STRUCTPAD3: return "FC_STRUCTPAD3"; + case RPC_FC_STRUCTPAD4: return "FC_STRUCTPAD4"; + case RPC_FC_STRUCTPAD5: return "FC_STRUCTPAD5"; + case RPC_FC_STRUCTPAD6: return "FC_STRUCTPAD6"; + case RPC_FC_STRUCTPAD7: return "FC_STRUCTPAD7"; + case RPC_FC_STRING_SIZED: return "FC_STRING_SIZED"; + case RPC_FC_NO_REPEAT: return "FC_NO_REPEAT"; + case RPC_FC_FIXED_REPEAT: return "FC_FIXED_REPEAT"; + case RPC_FC_VARIABLE_REPEAT: return "FC_VARIABLE_REPEAT"; + case RPC_FC_FIXED_OFFSET: return "FC_FIXED_OFFSET"; + case RPC_FC_VARIABLE_OFFSET: return "FC_VARIABLE_OFFSET"; + case RPC_FC_PP: return "FC_PP"; + case RPC_FC_EMBEDDED_COMPLEX: return "FC_EMBEDDED_COMPLEX"; + case RPC_FC_DEREFERENCE: return "FC_DEREFERENCE"; + case RPC_FC_DIV_2: return "FC_DIV_2"; + case RPC_FC_MULT_2: return "FC_MULT_2"; + case RPC_FC_ADD_1: return "FC_ADD_1"; + case RPC_FC_SUB_1: return "FC_SUB_1"; + case RPC_FC_CALLBACK: return "FC_CALLBACK"; + case RPC_FC_CONSTANT_IID: return "FC_CONSTANT_IID"; + case RPC_FC_END: return "FC_END"; + case RPC_FC_PAD: return "FC_PAD"; + case RPC_FC_USER_MARSHAL: return "FC_USER_MARSHAL"; + case RPC_FC_RANGE: return "FC_RANGE"; case RPC_FC_INT3264: return "FC_INT3264"; case RPC_FC_UINT3264: return "FC_UINT3264"; default: @@ -942,7 +977,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, unsigned char operator_type = 0; unsigned char conftype = RPC_FC_NORMAL_CONFORMANCE; const char *conftype_string = ""; - const char *operator_string = "no operators"; const expr_t *subexpr; if (!expr) @@ -988,14 +1022,12 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, case EXPR_PPTR: subexpr = subexpr->ref; operator_type = RPC_FC_DEREFERENCE; - operator_string = "FC_DEREFERENCE"; break; case EXPR_DIV: if (subexpr->u.ext->is_const && (subexpr->u.ext->cval == 2)) { subexpr = subexpr->ref; operator_type = RPC_FC_DIV_2; - operator_string = "FC_DIV_2"; } break; case EXPR_MUL: @@ -1003,7 +1035,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, { subexpr = subexpr->ref; operator_type = RPC_FC_MULT_2; - operator_string = "FC_MULT_2"; } break; case EXPR_SUB: @@ -1011,7 +1042,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, { subexpr = subexpr->ref; operator_type = RPC_FC_SUB_1; - operator_string = "FC_SUB_1"; } break; case EXPR_ADD: @@ -1019,7 +1049,6 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, { subexpr = subexpr->ref; operator_type = RPC_FC_ADD_1; - operator_string = "FC_ADD_1"; } break; default: @@ -1105,7 +1134,8 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, print_file(file, 2, "0x%x, /* Corr desc: %s%s */\n", conftype | param_type, conftype_string, string_of_type(param_type)); - print_file(file, 2, "0x%x, /* %s */\n", operator_type, operator_string); + print_file(file, 2, "0x%x, /* %s */\n", operator_type, + operator_type ? string_of_type(operator_type) : "no operators"); print_file(file, 2, "NdrFcShort(0x%hx),\t/* offset = %d */\n", offset, offset); }

1 0

Huw Davies : dispex: Check whether the server function changes the type of the arguments.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: f1ebd2d8948243afc2e2f2a0d4222c8093112e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1ebd2d8948243afc2e2f2a0d… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 22 14:44:52 2010 +0000 dispex: Check whether the server function changes the type of the arguments. --- dlls/dispex/tests/marshal.c | 1 - dlls/dispex/usrmarshal.c | 24 ++++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/dispex/tests/marshal.c b/dlls/dispex/tests/marshal.c index b277719..4380621 100644 --- a/dlls/dispex/tests/marshal.c +++ b/dlls/dispex/tests/marshal.c @@ -405,7 +405,6 @@ static void test_dispex(void) /* change one of the argument vts */ i = 0xbeef; hr = IDispatchEx_InvokeEx(dispex, 3, LOCALE_SYSTEM_DEFAULT, DISPATCH_METHOD, &params, NULL, NULL, NULL); -todo_wine ok(hr == DISP_E_BADCALLEE, "got %08x\n", hr); hr = IDispatchEx_InvokeEx(dispex, 4, LOCALE_SYSTEM_DEFAULT, 0xffff, &params, NULL, NULL, NULL); diff --git a/dlls/dispex/usrmarshal.c b/dlls/dispex/usrmarshal.c index 915e5bc..cc72469 100644 --- a/dlls/dispex/usrmarshal.c +++ b/dlls/dispex/usrmarshal.c @@ -118,6 +118,7 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID { HRESULT hr; UINT arg; + VARTYPE *vt_list = NULL; TRACE("(%p)->(%08x, %04x, %08x, %p, %p, %p, %p, %d, %p, %p)\n", This, id, lcid, dwFlags, pdp, result, pei, pspCaller, byref_args, ref_idx, ref_arg); @@ -131,8 +132,30 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID if(dwFlags & NULL_RESULT) result = NULL; if(dwFlags & NULL_EXCEPINFO) pei = NULL; + /* Create an array of the original VTs to check that the function doesn't change + any on return. */ + if(byref_args) + { + vt_list = HeapAlloc(GetProcessHeap(), 0, pdp->cArgs * sizeof(vt_list[0])); + if(!vt_list) return E_OUTOFMEMORY; + for(arg = 0; arg < pdp->cArgs; arg++) + vt_list[arg] = V_VT(pdp->rgvarg + arg); + } + hr = IDispatchEx_InvokeEx(This, id, lcid, dwFlags & 0xffff, pdp, result, pei, pspCaller); + if(SUCCEEDED(hr) && byref_args) + { + for(arg = 0; arg < pdp->cArgs; arg++) + { + if(vt_list[arg] != V_VT(pdp->rgvarg + arg)) + { + hr = DISP_E_BADCALLEE; + break; + } + } + } + if(hr == DISP_E_EXCEPTION) { if(pei && pei->pfnDeferredFillIn) @@ -145,5 +168,6 @@ HRESULT __RPC_STUB IDispatchEx_InvokeEx_Stub(IDispatchEx* This, DISPID id, LCID for(arg = 0; arg < byref_args; arg++) VariantInit(pdp->rgvarg + ref_idx[arg]); + HeapFree(GetProcessHeap(), 0, vt_list); return hr; }

1 0

Rob Shearman : widl: Don't pre-calculate buffer size for arrays that aren' t treated as reference pointers.
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: f6b53be0d9c051265846c92ef480bd74dde0a03d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6b53be0d9c051265846c92ef… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:01 2010 +0000 widl: Don't pre-calculate buffer size for arrays that aren't treated as reference pointers. --- tools/widl/typegen.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index ca0faf1..c9f9549 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3069,9 +3069,10 @@ static unsigned int get_required_buffer_size_type( break; case TGT_ARRAY: - /* FIXME: depends on pointer type */ - return type_array_get_dim(type) * - get_required_buffer_size_type(type_array_get_element(type), name, NULL, FALSE, alignment); + if (get_pointer_fc(type, attrs, toplevel_param) == RPC_FC_RP) + return type_array_get_dim(type) * + get_required_buffer_size_type(type_array_get_element(type), name, + NULL, FALSE, alignment); default: break;

1 0

Rob Shearman : widl: Convert assign_stub_out_args to using typegen_detect_type and fix the non-conformant array case .
by Alexandre Julliard 23 Mar '10

23 Mar '10

Module: wine Branch: master Commit: 0ec617e01d3b2d7ef89e099fe5a3fa08b666bc6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec617e01d3b2d7ef89e099fe… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Mar 23 13:33:08 2010 +0000 widl: Convert assign_stub_out_args to using typegen_detect_type and fix the non-conformant array case. --- tools/widl/typegen.c | 46 ++++++++++++++++++++++++++-------------------- 1 files changed, 26 insertions(+), 20 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index c9f9549..155e01b 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3900,33 +3900,36 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char { print_file(file, indent, "%s%s", local_var_prefix, var->name); - if (is_context_handle(var->type)) + switch (typegen_detect_type(var->type, var->attrs, TDT_IGNORE_STRINGS)) { + case TGT_CTXT_HANDLE_POINTER: fprintf(file, " = NdrContextHandleInitialize(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", var->type->typestring_offset); - } - else if (is_array(var->type) && - type_array_has_conformance(var->type)) - { - unsigned int size, align = 0; - type_t *type = var->type; - - fprintf(file, " = NdrAllocate(&__frame->_StubMsg, "); - for ( ; - is_array(type) && type_array_has_conformance(type); - type = type_array_get_element(type)) + break; + case TGT_ARRAY: + if (type_array_has_conformance(var->type)) { - write_expr(file, type_array_get_conformance(type), TRUE, - TRUE, NULL, NULL, local_var_prefix); - fprintf(file, " * "); + unsigned int size, align = 0; + type_t *type = var->type; + + fprintf(file, " = NdrAllocate(&__frame->_StubMsg, "); + for ( ; + is_array(type) && type_array_has_conformance(type); + type = type_array_get_element(type)) + { + write_expr(file, type_array_get_conformance(type), TRUE, + TRUE, NULL, NULL, local_var_prefix); + fprintf(file, " * "); + } + size = type_memsize(type, &align); + fprintf(file, "%u);\n", size); } - size = type_memsize(type, &align); - fprintf(file, "%u);\n", size); - } - else - { + else + fprintf(file, " = &%s_W%u;\n", local_var_prefix, i++); + break; + case TGT_POINTER: fprintf(file, " = &%s_W%u;\n", local_var_prefix, i); switch (typegen_detect_type(type_pointer_get_ref(var->type), var->attrs, TDT_IGNORE_STRINGS)) { @@ -3949,6 +3952,9 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char break; } i++; + break; + default: + break; } sep = 1;

1 0