December 2005 - Wine-commits

Robert Shearman : widl: Add support for marshalling and unmarshalling conformant strings.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 413738810f8fad7553f29b75eacce5b5c1f8cfa0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=413738810f8fad7553f29b7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:12:03 2005 +0100 widl: Add support for marshalling and unmarshalling conformant strings. --- tools/widl/client.c | 3 ++ tools/widl/server.c | 3 ++ tools/widl/typegen.c | 64 +++++++++++++++++++++++++++++++++++++++++++++----- tools/widl/typegen.h | 4 ++- 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index ba73b35..56b8f91 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -128,6 +128,7 @@ static void write_function_stubs(type_t var_t *var; int method_count = 0; unsigned int proc_offset = 0; + unsigned int type_offset = 2; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -226,7 +227,7 @@ static void write_function_stubs(type_t /* marshal arguments */ - marshall_arguments(client, indent, func); + marshall_arguments(client, indent, func, &type_offset); /* send/receive message */ /* print_client("NdrNsSendReceive(\n"); */ diff --git a/tools/widl/server.c b/tools/widl/server.c index 319094c..005d85b 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -95,6 +95,7 @@ static void write_function_stubs(type_t var_t *var; var_t* explicit_handle_var; unsigned int proc_offset = 0; + unsigned int type_offset = 2; while (NEXT_LINK(func)) func = NEXT_LINK(func); while (func) @@ -197,7 +198,7 @@ static void write_function_stubs(type_t indent -= 2; fprintf(server, "\n"); - unmarshall_arguments(server, indent, func); + unmarshall_arguments(server, indent, func, &type_offset); } print_server("if (_StubMsg.Buffer > _StubMsg.BufferEnd)\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 87bf2ab..48c18b4 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -281,7 +281,7 @@ unsigned int get_required_buffer_size(ty } } -void marshall_arguments(FILE *file, int indent, func_t *func) +void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) { unsigned int last_size = 0; var_t *var; @@ -332,8 +332,8 @@ void marshall_arguments(FILE *file, int break; default: + error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } if (alignment != 0) @@ -351,17 +351,43 @@ void marshall_arguments(FILE *file, int last_size = size; } + else if (var->ptr_level == 1) + { + if (is_attr(var->attrs, ATTR_STRING)) + { + switch (var->type->type) + { + case RPC_FC_CHAR: + case RPC_FC_WCHAR: + print_file(file, indent, + "NdrConformantStringMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + var->name, *type_offset); + break; + default: + error("marshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + else + { + switch (var->type->type) + { + default: + error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + last_size = 1; + } else { error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); - last_size = 0; + last_size = 1; } var = PREV_LINK(var); } } -void unmarshall_arguments(FILE *file, int indent, func_t *func) +void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset) { unsigned int last_size = 0; var_t *var; @@ -413,8 +439,8 @@ void unmarshall_arguments(FILE *file, in break; default: + error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } if (alignment != 0) @@ -432,10 +458,36 @@ void unmarshall_arguments(FILE *file, in last_size = size; } + else if (var->ptr_level == 1) + { + if (is_attr(var->attrs, ATTR_STRING)) + { + switch (var->type->type) + { + case RPC_FC_CHAR: + case RPC_FC_WCHAR: + print_file(file, indent, + "NdrConformantStringUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + var->name, *type_offset); + break; + default: + error("unmarshall_arguments: Unsupported [string] type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + else + { + switch (var->type->type) + { + default: + error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 1)\n", var->name, var->type->type); + } + } + last_size = 1; + } else { error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); - last_size = 0; + last_size = 1; } var = PREV_LINK(var); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index fe8dc38..c444132 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -23,7 +23,7 @@ void write_procformatstring(FILE *file, type_t *iface); void write_typeformatstring(FILE *file, type_t *iface); unsigned int get_required_buffer_size(type_t *type); -void marshall_arguments(FILE *file, int indent, func_t *func); -void unmarshall_arguments(FILE *file, int indent, func_t *func); +void marshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); +void unmarshall_arguments(FILE *file, int indent, func_t *func, unsigned int *type_offset); size_t get_size_procformatstring_var(var_t *var); size_t get_size_typeformatstring_var(var_t *var);

1 0

Robert Shearman : widl: Add some const attributes.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 7f2419ceed5c90130a8ac2062d6daa5f2e487930 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f2419ceed5c90130a8ac20… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:11:33 2005 +0100 widl: Add some const attributes. --- tools/widl/header.c | 46 +++++++++++++++++++++++----------------------- tools/widl/header.h | 20 ++++++++++---------- tools/widl/parser.y | 6 +++--- tools/widl/proxy.c | 6 +++--- tools/widl/write_msft.c | 2 +- 5 files changed, 40 insertions(+), 40 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index f68844b..b60cf8e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -46,7 +46,7 @@ static void indent(FILE *h, int delta) if (delta > 0) indentation += delta; } -int is_attr(attr_t *a, enum attr_type t) +int is_attr(const attr_t *a, enum attr_type t) { while (a) { if (a->type == t) return 1; @@ -55,7 +55,7 @@ int is_attr(attr_t *a, enum attr_type t) return 0; } -void *get_attrp(attr_t *a, enum attr_type t) +void *get_attrp(const attr_t *a, enum attr_type t) { while (a) { if (a->type == t) return a->u.pval; @@ -64,7 +64,7 @@ void *get_attrp(attr_t *a, enum attr_typ return NULL; } -unsigned long get_attrv(attr_t *a, enum attr_type t) +unsigned long get_attrv(const attr_t *a, enum attr_type t) { while (a) { if (a->type == t) return a->u.ival; @@ -73,7 +73,7 @@ unsigned long get_attrv(attr_t *a, enum return 0; } -int is_void(type_t *t, var_t *v) +int is_void(const type_t *t, const var_t *v) { if (v && v->ptr_level) return 0; if (!t->type && !t->ref) return 1; @@ -90,7 +90,7 @@ static void write_guid(const char *guid_ uuid->Data4[6], uuid->Data4[7]); } -static void write_pident(FILE *h, var_t *v) +static void write_pident(FILE *h, const var_t *v) { int c; for (c=0; c<v->ptr_level; c++) { @@ -99,7 +99,7 @@ static void write_pident(FILE *h, var_t if (v->name) fprintf(h, "%s", v->name); } -void write_name(FILE *h, var_t *v) +void write_name(FILE *h, const var_t *v) { if (is_attr( v->attrs, ATTR_PROPGET )) fprintf(h, "get_" ); @@ -110,12 +110,12 @@ void write_name(FILE *h, var_t *v) fprintf(h, "%s", v->name); } -char* get_name(var_t *v) +const char* get_name(const var_t *v) { return v->name; } -static void write_array(FILE *h, expr_t *v, int field) +static void write_array(FILE *h, const expr_t *v, int field) { if (!v) return; while (NEXT_LINK(v)) v = NEXT_LINK(v); @@ -199,7 +199,7 @@ static void write_enums(FILE *h, var_t * fprintf(h, "\n"); } -void write_type(FILE *h, type_t *t, var_t *v, const char *n) +void write_type(FILE *h, type_t *t, const var_t *v, const char *n) { int c; @@ -381,10 +381,10 @@ void write_user_types(void) } } -void write_typedef(type_t *type, var_t *names) +void write_typedef(type_t *type, const var_t *names) { char *tname = names->tname; - var_t *lname; + const var_t *lname; while (NEXT_LINK(names)) names = NEXT_LINK(names); lname = names; fprintf(header, "typedef "); @@ -477,14 +477,14 @@ void write_expr(FILE *h, expr_t *e) do_write_expr(h, e, 0); } -void write_constdef(var_t *v) +void write_constdef(const var_t *v) { fprintf(header, "#define %s (", get_name(v)); write_expr(header, v->eval); fprintf(header, ")\n\n"); } -void write_externdef(var_t *v) +void write_externdef(const var_t *v) { fprintf(header, "extern const "); write_type(header, v->type, NULL, v->tname); @@ -545,7 +545,7 @@ var_t *is_callas(attr_t *a) return get_attrp(a, ATTR_CALLAS); } -static int write_method_macro(type_t *iface, char *name) +static int write_method_macro(const type_t *iface, const char *name) { int idx; func_t *cur = iface->funcs; @@ -636,7 +636,7 @@ void write_args(FILE *h, var_t *arg, con if (do_indent) indentation--; } -static void write_cpp_method_def(type_t *iface) +static void write_cpp_method_def(const type_t *iface) { func_t *cur = iface->funcs; @@ -659,7 +659,7 @@ static void write_cpp_method_def(type_t } } -static void do_write_c_method_def(type_t *iface, char *name) +static void do_write_c_method_def(const type_t *iface, char *name) { func_t *cur = iface->funcs; @@ -685,17 +685,17 @@ static void do_write_c_method_def(type_t } } -static void write_c_method_def(type_t *iface) +static void write_c_method_def(const type_t *iface) { do_write_c_method_def(iface, iface->name); } -static void write_c_disp_method_def(type_t *iface) +static void write_c_disp_method_def(const type_t *iface) { do_write_c_method_def(iface->ref, iface->name); } -static void write_method_proto(type_t *iface) +static void write_method_proto(const type_t *iface) { func_t *cur = iface->funcs; @@ -759,7 +759,7 @@ static void write_method_proto(type_t *i } } -static void write_function_proto(type_t *iface) +static void write_function_proto(const type_t *iface) { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); @@ -816,13 +816,13 @@ void write_forward(type_t *iface) } } -static void write_iface_guid(type_t *iface) +static void write_iface_guid(const type_t *iface) { UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("IID", iface->name, uuid); } -static void write_dispiface_guid(type_t *iface) +static void write_dispiface_guid(const type_t *iface) { UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("DIID", iface->name, uuid); @@ -895,7 +895,7 @@ static void write_com_interface(type_t * fprintf(header,"\n#endif /* __%s_INTERFACE_DEFINED__ */\n\n", iface->name); } -static void write_rpc_interface(type_t *iface) +static void write_rpc_interface(const type_t *iface) { unsigned long ver = get_attrv(iface->attrs, ATTR_VERSION); char *var = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); diff --git a/tools/widl/header.h b/tools/widl/header.h index c649513..8adf929 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -21,13 +21,13 @@ #ifndef __WIDL_HEADER_H #define __WIDL_HEADER_H -extern int is_attr(attr_t *a, enum attr_type t); -extern void *get_attrp(attr_t *a, enum attr_type t); -extern unsigned long get_attrv(attr_t *a, enum attr_type t); -extern int is_void(type_t *t, var_t *v); -extern void write_name(FILE *h, var_t *v); -extern char* get_name(var_t *v); -extern void write_type(FILE *h, type_t *t, var_t *v, const char *n); +extern int is_attr(const attr_t *a, enum attr_type t); +extern void *get_attrp(const attr_t *a, enum attr_type t); +extern unsigned long get_attrv(const attr_t *a, enum attr_type t); +extern int is_void(const type_t *t, const var_t *v); +extern void write_name(FILE *h, const var_t *v); +extern const char* get_name(const var_t *v); +extern void write_type(FILE *h, type_t *t, const var_t *v, const char *n); extern int is_object(attr_t *a); extern int is_local(attr_t *a); extern var_t *is_callas(attr_t *a); @@ -36,10 +36,10 @@ extern void write_forward(type_t *iface) extern void write_interface(type_t *iface); extern void write_dispinterface(type_t *iface); extern void write_coclass(class_t *iface); -extern void write_typedef(type_t *type, var_t *names); +extern void write_typedef(type_t *type, const var_t *names); extern void write_expr(FILE *h, expr_t *e); -extern void write_constdef(var_t *v); -extern void write_externdef(var_t *v); +extern void write_constdef(const var_t *v); +extern void write_externdef(const var_t *v); extern void write_library(const char *name, attr_t *attr); extern void write_user_types(void); extern var_t* get_explicit_handle_var(func_t* func); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a556108..7c32944 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -84,7 +84,7 @@ static var_t *make_var(char *name); static func_t *make_func(var_t *def, var_t *args); static class_t *make_class(char *name); -static type_t *reg_type(type_t *type, char *name, int t); +static type_t *reg_type(type_t *type, const char *name, int t); static type_t *reg_types(type_t *type, var_t *names, int t); static type_t *find_type(const char *name, int t); static type_t *find_type2(char *name, int t); @@ -1102,7 +1102,7 @@ static int hash_ident(const char *name) /***** type repository *****/ struct rtype { - char *name; + const char *name; type_t *type; int t; struct rtype *next; @@ -1110,7 +1110,7 @@ struct rtype { struct rtype *type_hash[HASHMAX]; -static type_t *reg_type(type_t *type, char *name, int t) +static type_t *reg_type(type_t *type, const char *name, int t) { struct rtype *nt; int hash; diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c91d388..988f1e7 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -206,7 +206,7 @@ static void proxy_check_pointers( var_t static void marshall_size_arg( var_t *arg ) { int index = 0; - type_t *type = get_base_type(arg); + const type_t *type = get_base_type(arg); expr_t *expr; expr = get_attrp( arg->attrs, ATTR_SIZEIS ); @@ -728,7 +728,7 @@ static void stub_genmarshall( var_t *arg stub_gen_marshall_copydata( args ); } -static void gen_stub(type_t *iface, func_t *cur, char *cas) +static void gen_stub(type_t *iface, func_t *cur, const char *cas) { var_t *def = cur->def; var_t *arg; @@ -892,7 +892,7 @@ static void write_proxy(type_t *iface) var_t *def = cur->def; if (!is_local(def->attrs)) { var_t *cas = is_callas(def->attrs); - char *cname = cas ? cas->name : NULL; + const char *cname = cas ? cas->name : NULL; int idx = cur->idx; if (cname) { func_t *m = iface->funcs; diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 220fc50..bf1806b 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1627,7 +1627,7 @@ static HRESULT add_impl_type(msft_typein } static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_kind kind, - char *name, attr_t *attr, int idx) + const char *name, attr_t *attr, int idx) { msft_typeinfo_t *msft_typeinfo; int nameoffset;

1 0

Robert Shearman : widl: Prepare marshall and unmarshall code generation functions for
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 73dff5c465224a7b4e9708c16125e8ae18097ebd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73dff5c465224a7b4e9708c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:09:36 2005 +0100 widl: Prepare marshall and unmarshall code generation functions for accepting pointers. --- tools/widl/typegen.c | 219 +++++++++++++++++++++++++++----------------------- 1 files changed, 117 insertions(+), 102 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5f5eb3d..87bf2ab 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -146,7 +146,7 @@ void write_procformatstring(FILE *file, var = PREV_LINK(var); } } - + /* emit return value data */ var = func->def; if (is_void(var->type, NULL)) @@ -283,8 +283,6 @@ unsigned int get_required_buffer_size(ty void marshall_arguments(FILE *file, int indent, func_t *func) { - unsigned int alignment; - unsigned int size; unsigned int last_size = 0; var_t *var; @@ -295,60 +293,69 @@ void marshall_arguments(FILE *file, int while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 0) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - alignment = 0; - break; + unsigned int size; + unsigned int alignment = 0; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + default: + size = 0; + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + } - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); - break; + if (alignment != 0) + print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; - - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + print_file(file, indent, "*("); + write_type(file, var->type, var, var->tname); + fprintf(file, " *)_StubMsg.Buffer = "); + write_name(file, var); + fprintf(file, ";\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, var, var->tname); + fprintf(file, ");\n"); + fprintf(file, "\n"); - default: - size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + last_size = size; + } + else + { + error("marshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); + last_size = 0; } - - if (alignment != 0) - print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - - print_file(file, indent, "*("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer = "); - write_name(file, var); - fprintf(file, ";\n"); - fprintf(file, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); - fprintf(file, "\n"); - - last_size = size; var = PREV_LINK(var); } @@ -356,8 +363,6 @@ void marshall_arguments(FILE *file, int void unmarshall_arguments(FILE *file, int indent, func_t *func) { - unsigned int alignment; - unsigned int size; unsigned int last_size = 0; var_t *var; @@ -368,60 +373,70 @@ void unmarshall_arguments(FILE *file, in while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - alignment = 0; - switch (var->type->type) + if (var->ptr_level == 0) { - case RPC_FC_BYTE: - case RPC_FC_CHAR: - case RPC_FC_SMALL: - case RPC_FC_USMALL: - size = 1; - alignment = 0; - break; + unsigned int size; + unsigned int alignment = 0; - case RPC_FC_WCHAR: - case RPC_FC_USHORT: - case RPC_FC_SHORT: - size = 2; - if (last_size != 0 && last_size < 2) - alignment = (2 - last_size); - break; + switch (var->type->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + size = 1; + alignment = 0; + break; + + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + size = 2; + if (last_size != 0 && last_size < 2) + alignment = (2 - last_size); + break; + + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_FLOAT: + case RPC_FC_ERROR_STATUS_T: + size = 4; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + if (last_size != 0 && last_size < 4) + alignment = (4 - last_size); + break; + + default: + size = 0; + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + } - case RPC_FC_ULONG: - case RPC_FC_LONG: - case RPC_FC_FLOAT: - case RPC_FC_ERROR_STATUS_T: - size = 4; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + if (alignment != 0) + print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - case RPC_FC_HYPER: - case RPC_FC_DOUBLE: - size = 8; - if (last_size != 0 && last_size < 4) - alignment = (4 - last_size); - break; + print_file(file, indent, ""); + write_name(file, var); + fprintf(file, " = *("); + write_type(file, var->type, var, var->tname); + fprintf(file, " *)_StubMsg.Buffer;\n"); + fprintf(file, "_StubMsg.Buffer += sizeof("); + write_type(file, var->type, var, var->tname); + fprintf(file, ");\n"); + fprintf(file, "\n"); - default: - size = 0; - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + last_size = size; + } + else + { + error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); + last_size = 0; } - - if (alignment != 0) - print_file(file, indent, "_StubMsg.Buffer += %u;\n", alignment); - - print_file(file, indent, ""); - write_name(file, var); - fprintf(file, " = *("); - write_type(file, var->type, var, var->tname); - fprintf(file, " *)_StubMsg.Buffer;\n"); - fprintf(file, "_StubMsg.Buffer += sizeof("); - write_type(file, var->type, var, var->tname); - fprintf(file, ");\n"); - fprintf(file, "\n"); - - last_size = size; var = PREV_LINK(var); }

1 0

Robert Shearman : widl: Fix SEGVs with client and server code generation when an
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 86c3a2e76a76c430dca2f4024700c22538511b6a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=86c3a2e76a76c430dca2f40… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:08:51 2005 +0100 widl: Fix SEGVs with client and server code generation when an interface has no methods. --- tools/widl/client.c | 54 ++++++++++++++++++++++------------------ tools/widl/server.c | 52 +++++++++++++++++++++------------------ tools/widl/typegen.c | 67 ++++++++++++++++++++++++++------------------------ 3 files changed, 92 insertions(+), 81 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 2d33496..ba73b35 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -403,32 +403,33 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - func_t *func; - var_t *var; int byte_count = 1; print_client("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ /* determine the proc format string size */ - func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - /* argument list size */ - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + /* argument list size */ + if (func->args) { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + byte_count += 2; /* FIXME: determine real size */ + var = PREV_LINK(var); + } } + + /* return value size */ + byte_count += 2; /* FIXME: determine real size */ + func = PREV_LINK(func); } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); } print_client("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); @@ -492,15 +493,18 @@ void write_client(ifref_t *ifaces) fprintf(client, " */\n"); fprintf(client, "\n"); - write_formatstringsdecl(iface->iface); - write_implicithandledecl(iface->iface); - - write_clientinterfacedecl(iface->iface); - write_stubdescdecl(iface->iface); - write_bindinghandledecl(iface->iface); - - write_function_stubs(iface->iface); - write_stubdescriptor(iface->iface); + if (iface->iface->funcs) + { + write_formatstringsdecl(iface->iface); + write_implicithandledecl(iface->iface); + + write_clientinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + write_bindinghandledecl(iface->iface); + + write_function_stubs(iface->iface); + write_stubdescriptor(iface->iface); + } print_client("#if !defined(__RPC_WIN32__)\n"); print_client("#error Invalid build platform for this stub.\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index b007a8f..319094c 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -428,32 +428,33 @@ static void write_formatdesc( const char static void write_formatstringsdecl(type_t *iface) { - func_t *func; - var_t *var; int byte_count = 1; print_server("#define TYPE_FORMAT_STRING_SIZE %d\n", 3); /* FIXME */ /* determine the proc format string size */ - func = iface->funcs; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - /* argument list size */ - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + while (func) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + /* argument list size */ + if (func->args) { - byte_count += 2; /* FIXME: determine real size */ - var = PREV_LINK(var); + var_t *var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + byte_count += 2; /* FIXME: determine real size */ + var = PREV_LINK(var); + } } + + /* return value size */ + byte_count += 2; /* FIXME: determine real size */ + func = PREV_LINK(func); } - - /* return value size */ - byte_count += 2; /* FIXME: determine real size */ - func = PREV_LINK(func); } print_server("#define PROC_FORMAT_STRING_SIZE %d\n", byte_count); @@ -503,14 +504,17 @@ void write_server(ifref_t *ifaces) fprintf(server, " */\n"); fprintf(server, "\n"); - write_formatstringsdecl(iface->iface); - write_serverinterfacedecl(iface->iface); - write_stubdescdecl(iface->iface); - - write_function_stubs(iface->iface); - - write_stubdescriptor(iface->iface); - write_dispatchtable(iface->iface); + if (iface->iface->funcs) + { + write_formatstringsdecl(iface->iface); + write_serverinterfacedecl(iface->iface); + write_stubdescdecl(iface->iface); + + write_function_stubs(iface->iface); + + write_stubdescriptor(iface->iface); + write_dispatchtable(iface->iface); + } print_server("#if !defined(__RPC_WIN32__)\n"); print_server("#error Invalid build platform for this stub.\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 09420dc..5f5eb3d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -119,7 +119,6 @@ static size_t write_procformatstring_var void write_procformatstring(FILE *file, type_t *iface) { int indent = 0; - func_t *func = iface->funcs; var_t *var; unsigned int type_offset = 2; @@ -130,32 +129,34 @@ void write_procformatstring(FILE *file, print_file(file, indent, "{\n"); indent++; - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - /* emit argument data */ - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + for (; func; func = PREV_LINK(func)) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + /* emit argument data */ + if (func->args) { - write_procformatstring_var(file, indent, var, FALSE, &type_offset); - var = PREV_LINK(var); + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + write_procformatstring_var(file, indent, var, FALSE, &type_offset); + var = PREV_LINK(var); + } } + + /* emit return value data */ + var = func->def; + if (is_void(var->type, NULL)) + { + print_file(file, indent, "0x5b, /* FC_END */\n"); + print_file(file, indent, "0x5c, /* FC_PAD */\n"); + } + else + write_procformatstring_var(file, indent, var, TRUE, &type_offset); } - - /* emit return value data */ - var = func->def; - if (is_void(var->type, NULL)) - { - print_file(file, indent, "0x5b, /* FC_END */\n"); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - } - else - write_procformatstring_var(file, indent, var, TRUE, &type_offset); - - func = PREV_LINK(func); } print_file(file, indent, "0x0\n"); @@ -214,7 +215,6 @@ static size_t write_typeformatstring_var void write_typeformatstring(FILE *file, type_t *iface) { int indent = 0; - func_t *func = iface->funcs; var_t *var; print_file(file, indent, "static const MIDL_TYPE_FORMAT_STRING __MIDL_TypeFormatString =\n"); @@ -225,20 +225,23 @@ void write_typeformatstring(FILE *file, indent++; print_file(file, indent, "NdrFcShort(0x0),\n"); - while (NEXT_LINK(func)) func = NEXT_LINK(func); - while (func) + if (iface->funcs) { - if (func->args) + func_t *func = iface->funcs; + while (NEXT_LINK(func)) func = NEXT_LINK(func); + for (; func; func = PREV_LINK(func)) { - var = func->args; - while (NEXT_LINK(var)) var = NEXT_LINK(var); - while (var) + if (func->args) { - write_typeformatstring_var(file, indent, var); - var = PREV_LINK(var); + var = func->args; + while (NEXT_LINK(var)) var = NEXT_LINK(var); + while (var) + { + write_typeformatstring_var(file, indent, var); + var = PREV_LINK(var); + } } } - func = PREV_LINK(func); } print_file(file, indent, "0x0\n");

1 0

Robert Shearman : widl: Generate correct proc format strings for [out] and [in, out] parameters.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 73a25d316ddec23509fdd2ff0de3e5ced680bcba URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73a25d316ddec23509fdd2f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:07:55 2005 +0100 widl: Generate correct proc format strings for [out] and [in, out] parameters. --- tools/widl/typegen.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 5724d96..09420dc 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -96,10 +96,18 @@ static size_t write_procformatstring_var } else { + int in_attr = is_attr(var->attrs, ATTR_IN); + int out_attr = is_attr(var->attrs, ATTR_OUT); + if (is_return) print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); + else if (in_attr && out_attr) + print_file(file, indent, "0x50, /* FC_IN_OUT_PARAM */\n"); + else if (out_attr) + print_file(file, indent, "0x51, /* FC_OUT_PARAM */\n"); else print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); + print_file(file, indent, "0x01,\n"); print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); size = 4; /* includes param type prefix */

1 0

Robert Shearman : widl: Use the same precendence rule for the conditional operator as in wpp.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: e59dcf53fcd5fbe2cabb500330090bff62480336 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e59dcf53fcd5fbe2cabb500… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:07:08 2005 +0100 widl: Use the same precendence rule for the conditional operator as in wpp. Fixes several shift/reduce warnings. --- tools/widl/parser.y | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 4fc19fb..a556108 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -216,7 +216,7 @@ static type_t std_uhyper = { "MIDL_uhype %type <str> libraryhdr %left ',' -%right COND +%right '?' ':' %left '|' %left '&' %left '-' '+' @@ -480,7 +480,7 @@ m_expr: { $$ = make_expr(EXPR_VOID) expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | aHEXNUM { $$ = make_exprl(EXPR_HEXNUM, $1); } | aIDENTIFIER { $$ = make_exprs(EXPR_IDENTIFIER, $1); } - | expr '?' expr ':' expr %prec COND { $$ = make_expr3(EXPR_COND, $1, $3, $5); } + | expr '?' expr ':' expr { $$ = make_expr3(EXPR_COND, $1, $3, $5); } | expr '|' expr { $$ = make_expr2(EXPR_OR , $1, $3); } | expr '&' expr { $$ = make_expr2(EXPR_AND, $1, $3); } | expr '+' expr { $$ = make_expr2(EXPR_ADD, $1, $3); }

1 0

Robert Shearman : widl: Better array support.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 30a9f99bb95707c68c9247cbfafd1d4a878b0f71 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=30a9f99bb95707c68c9247c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:06:29 2005 +0100 widl: Better array support. Treat variables with array indices the same as pointers when writing out the proc & type format strings. Fix a typo when writing out the proc format string where a non-return type was written out for a return type and vice-versa. --- tools/widl/typegen.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1e6581a..5724d96 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -59,7 +59,7 @@ static int print_file(FILE *file, int in static size_t write_procformatstring_var(FILE *file, int indent, var_t *var, int is_return, unsigned int *type_offset) { size_t size; - if (var->ptr_level == 0) + if (var->ptr_level == 0 && !var->array) { if (is_return) print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); @@ -97,9 +97,9 @@ static size_t write_procformatstring_var else { if (is_return) - print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); - else print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); + else + print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); print_file(file, indent, "0x01,\n"); print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); size = 4; /* includes param type prefix */ @@ -164,10 +164,11 @@ static size_t write_typeformatstring_var int ptr_level = var->ptr_level; /* basic types don't need a type format string */ - if (ptr_level == 0) + if (ptr_level == 0 && !var->array) return 0; - if (ptr_level == 1) + if (ptr_level == 1 || + (var->ptr_level == 0 && var->array && !NEXT_LINK(var->array))) { switch (var->type->type) {

1 0

Robert Shearman : widl: Support non-basic variables in proc format strings.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 783198be3795707a70d416eab2d8570ce3321dae URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=783198be3795707a70d416e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:05:55 2005 +0100 widl: Support non-basic variables in proc format strings. --- tools/widl/typegen.c | 79 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 48 insertions(+), 31 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1039eea..1e6581a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -56,36 +56,55 @@ static int print_file(FILE *file, int in return r; } -static size_t write_procformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_procformatstring_var(FILE *file, int indent, var_t *var, int is_return, unsigned int *type_offset) { size_t size; - switch(var->type->type) + if (var->ptr_level == 0) { + if (is_return) + print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); + else + print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); + + switch(var->type->type) + { #define CASE_BASETYPE(fctype) \ - case RPC_##fctype: \ - print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ - size = 2; /* includes param type prefix */ \ - break - - CASE_BASETYPE(FC_BYTE); - CASE_BASETYPE(FC_CHAR); - CASE_BASETYPE(FC_WCHAR); - CASE_BASETYPE(FC_USHORT); - CASE_BASETYPE(FC_SHORT); - CASE_BASETYPE(FC_ULONG); - CASE_BASETYPE(FC_LONG); - CASE_BASETYPE(FC_HYPER); - CASE_BASETYPE(FC_IGNORE); - CASE_BASETYPE(FC_USMALL); - CASE_BASETYPE(FC_SMALL); - CASE_BASETYPE(FC_FLOAT); - CASE_BASETYPE(FC_DOUBLE); - CASE_BASETYPE(FC_ERROR_STATUS_T); + case RPC_##fctype: \ + print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + size = 2; /* includes param type prefix */ \ + break + + CASE_BASETYPE(FC_BYTE); + CASE_BASETYPE(FC_CHAR); + CASE_BASETYPE(FC_WCHAR); + CASE_BASETYPE(FC_USHORT); + CASE_BASETYPE(FC_SHORT); + CASE_BASETYPE(FC_ULONG); + CASE_BASETYPE(FC_LONG); + CASE_BASETYPE(FC_HYPER); + CASE_BASETYPE(FC_IGNORE); + CASE_BASETYPE(FC_USMALL); + CASE_BASETYPE(FC_SMALL); + CASE_BASETYPE(FC_FLOAT); + CASE_BASETYPE(FC_DOUBLE); + CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE - default: - error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); - size = 0; + default: + error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + size = 0; + } + } + else + { + if (is_return) + print_file(file, indent, "0x4d, /* FC_IN_PARAM */\n"); + else + print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); + print_file(file, indent, "0x01,\n"); + print_file(file, indent, "NdrFcShort(0x%x),\n", *type_offset); + size = 4; /* includes param type prefix */ } + *type_offset += get_size_typeformatstring_var(var); return size; } @@ -94,6 +113,7 @@ void write_procformatstring(FILE *file, int indent = 0; func_t *func = iface->funcs; var_t *var; + unsigned int type_offset = 2; print_file(file, indent, "static const MIDL_PROC_FORMAT_STRING __MIDL_ProcFormatString =\n"); print_file(file, indent, "{\n"); @@ -112,8 +132,7 @@ void write_procformatstring(FILE *file, while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - print_file(file, indent, "0x4e, /* FC_IN_PARAM_BASETYPE */\n"); - write_procformatstring_var(file, indent, var); + write_procformatstring_var(file, indent, var, FALSE, &type_offset); var = PREV_LINK(var); } } @@ -126,10 +145,7 @@ void write_procformatstring(FILE *file, print_file(file, indent, "0x5c, /* FC_PAD */\n"); } else - { - print_file(file, indent, "0x53, /* FC_RETURN_PARAM_BASETYPE */\n"); - write_procformatstring_var(file, indent, var); - } + write_procformatstring_var(file, indent, var, TRUE, &type_offset); func = PREV_LINK(func); } @@ -402,7 +418,8 @@ void unmarshall_arguments(FILE *file, in size_t get_size_procformatstring_var(var_t *var) { - return write_procformatstring_var(NULL, 0, var); + unsigned int type_offset = 2; + return write_procformatstring_var(NULL, 0, var, FALSE, &type_offset); }

1 0

Robert Shearman : widl: Add helper functions that return the size of procformat and
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: 88fd90b4c591159ba0bf8cf4dfd3c3c39232d4dd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=88fd90b4c591159ba0bf8cf… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:05:29 2005 +0100 widl: Add helper functions that return the size of procformat and typeformat strings for variables. --- tools/widl/client.c | 5 +++-- tools/widl/server.c | 5 +++-- tools/widl/typegen.c | 29 +++++++++++++++++++++++++---- tools/widl/typegen.h | 2 ++ 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 3fd5f5c..2d33496 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -270,11 +270,12 @@ static void write_function_stubs(type_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - proc_offset += 2; /* FIXME */ + proc_offset += get_size_procformatstring_var(var); var = PREV_LINK(var); } } - proc_offset += 2; /* FIXME */ + if (!is_void(def->type, NULL)) + proc_offset += get_size_procformatstring_var(def); indent--; print_client("}\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index 6022f5a..b007a8f 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -299,11 +299,12 @@ static void write_function_stubs(type_t while (NEXT_LINK(var)) var = NEXT_LINK(var); while (var) { - proc_offset += 2; /* FIXME */ + proc_offset += get_size_procformatstring_var(var); var = PREV_LINK(var); } } - proc_offset += 2; /* FIXME */ + if (!is_void(def->type, NULL)) + proc_offset += get_size_procformatstring_var(def); func = PREV_LINK(func); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index cb6e87b..1039eea 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -46,6 +46,8 @@ static int print_file(FILE *file, int in va_list va; int i, r; + if (!file) return 0; + va_start(va, format); for (i = 0; i < indent; i++) fprintf(file, " "); @@ -54,13 +56,15 @@ static int print_file(FILE *file, int in return r; } -static void write_procformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_procformatstring_var(FILE *file, int indent, var_t *var) { + size_t size; switch(var->type->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ + size = 2; /* includes param type prefix */ \ break CASE_BASETYPE(FC_BYTE); @@ -80,7 +84,9 @@ static void write_procformatstring_var(F #undef CASE_BASETYPE default: error("Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); + size = 0; } + return size; } void write_procformatstring(FILE *file, type_t *iface) @@ -137,13 +143,13 @@ void write_procformatstring(FILE *file, } -static void write_typeformatstring_var(FILE *file, int indent, var_t *var) +static size_t write_typeformatstring_var(FILE *file, int indent, var_t *var) { int ptr_level = var->ptr_level; /* basic types don't need a type format string */ if (ptr_level == 0) - return; + return 0; if (ptr_level == 1) { @@ -154,7 +160,7 @@ static void write_typeformatstring_var(F print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ print_file(file, indent, "0x%02x, /* " #fctype " */\n", var->type->type); \ print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ - break + return 4 CASE_BASETYPE(FC_BYTE); CASE_BASETYPE(FC_CHAR); CASE_BASETYPE(FC_SMALL); @@ -175,8 +181,11 @@ static void write_typeformatstring_var(F error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", var->name, var->type->type); } } + error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, var->name); + return 0; } + void write_typeformatstring(FILE *file, type_t *iface) { int indent = 0; @@ -389,3 +398,15 @@ void unmarshall_arguments(FILE *file, in var = PREV_LINK(var); } } + + +size_t get_size_procformatstring_var(var_t *var) +{ + return write_procformatstring_var(NULL, 0, var); +} + + +size_t get_size_typeformatstring_var(var_t *var) +{ + return write_typeformatstring_var(NULL, 0, var); +} diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 6670197..fe8dc38 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -25,3 +25,5 @@ void write_typeformatstring(FILE *file, unsigned int get_required_buffer_size(type_t *type); void marshall_arguments(FILE *file, int indent, func_t *func); void unmarshall_arguments(FILE *file, int indent, func_t *func); +size_t get_size_procformatstring_var(var_t *var); +size_t get_size_typeformatstring_var(var_t *var);

1 0

Robert Shearman : oleaut: Small re-organisation of ITypeInfo::Invoke.
by Alexandre Julliard 26 Dec '05

26 Dec '05

Module: wine Branch: refs/heads/master Commit: e6fa361967ce788cd9fea6a38a92ec4b9d7e517a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6fa361967ce788cd9fea6a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 26 13:04:31 2005 +0100 oleaut: Small re-organisation of ITypeInfo::Invoke. Only output the one function in the trace for ITypeInfo::Invoke. Process the return value on output in ITypeInfo::Invoke, but only copy it to pVarResult if pVarResult is not NULL. --- dlls/oleaut32/typelib.c | 68 +++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1c56c46..a3e9e86 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5320,7 +5320,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke if (TRACE_ON(ole)) { TRACE("invoking:\n"); - dump_TLBFuncDesc(pFuncInfo); + dump_TLBFuncDescOne(pFuncInfo); } switch (func_desc->funckind) { @@ -5430,39 +5430,43 @@ static HRESULT WINAPI ITypeInfo_fnInvoke args ); - if (pVarResult) { - for (i = 0; i < func_desc->cParams; i++) { - USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; - if (wParamFlags & PARAMFLAG_FRETVAL) { - ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; - TYPEDESC *tdesc = &elemdesc->tdesc; - VARIANTARG varresult; - V_VT(&varresult) = 0; - hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &V_VT(&varresult)); - if (hres) - break; - /* FIXME: this is really messy - we should keep the - * args in VARIANTARGs rather than a DWORD array */ - memcpy(&V_UI4(&varresult), &args[i+1], sizeof(DWORD)); - if (TRACE_ON(ole)) - { - TRACE("varresult: "); - dump_Variant(&varresult); - } - hres = VariantCopyInd(pVarResult, &varresult); - /* free data stored in varresult. Note that - * VariantClear doesn't do what we want because we are - * working with byref types. */ - /* FIXME: clear safearrays, bstrs, records and - * variants here too */ - if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || - (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) - { - if(*V_UNKNOWNREF(&varresult)) - IUnknown_Release(*V_UNKNOWNREF(&varresult)); - } + for (i = 0; i < func_desc->cParams; i++) + { + USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + if (wParamFlags & PARAMFLAG_FRETVAL) + { + ELEMDESC *elemdesc = &func_desc->lprgelemdescParam[i]; + TYPEDESC *tdesc = &elemdesc->tdesc; + VARIANTARG varresult; + V_VT(&varresult) = 0; + hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &V_VT(&varresult)); + if (hres) break; + /* FIXME: this is really messy - we should keep the + * args in VARIANTARGs rather than a DWORD array */ + memcpy(&V_UI4(&varresult), &args[i+1], sizeof(DWORD)); + if (TRACE_ON(ole)) + { + TRACE("varresult: "); + dump_Variant(&varresult); + } + + if (pVarResult) + /* deref return value */ + hres = VariantCopyInd(pVarResult, &varresult); + + /* free data stored in varresult. Note that + * VariantClear doesn't do what we want because we are + * working with byref types. */ + /* FIXME: clear safearrays, bstrs, records and + * variants here too */ + if ((V_VT(&varresult) == (VT_UNKNOWN | VT_BYREF)) || + (V_VT(&varresult) == (VT_DISPATCH | VT_BYREF))) + { + if(*V_UNKNOWNREF(&varresult)) + IUnknown_Release(*V_UNKNOWNREF(&varresult)); } + break; } }

1 0