January 2006 - Wine-commits

Robert Shearman : widl: Simple structs and complex pointers.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 8f1ed85891341a6ca41b9e319e7a0124ff6bdb9a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8f1ed85891341a6ca41b9e3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:11:29 2006 +0100 widl: Simple structs and complex pointers. Write out type format string for simple structs and for pointers to non-simple types. --- tools/widl/typegen.c | 73 +++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 60 insertions(+), 13 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4fe349d..b54ad11 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -631,8 +631,34 @@ static size_t write_array_tfs(FILE *file static size_t write_struct_tfs(FILE *file, const type_t *type, const char *name) { - error("write_struct_tfs: Unimplemented\n"); - return 0; + size_t total_size; + size_t typestring_size; + switch (type->type) + { + case RPC_FC_STRUCT: + total_size = type_memsize(type, 0, NULL); + + if (total_size > USHRT_MAX) + error("structure size for parameter %s exceeds %d bytes by %d bytes\n", + name, USHRT_MAX, total_size - USHRT_MAX); + + print_file(file, 2, "0x%x, /* %s */\n", RPC_FC_STRUCT, "FC_STRUCT"); + /* alignment */ + print_file(file, 2, "0x0,\n"); + /* total size */ + print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); + typestring_size = 4; + + /* member layout */ + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + print_file(file, 2, "FC_END,\n"); + + typestring_size += 2; + return typestring_size; + default: + error("write_struct_tfs: Unimplemented for type 0x%x\n", type->type); + return 0; + } } static size_t write_union_tfs(FILE *file, const attr_t *attrs, const type_t *type, const char *name) @@ -649,11 +675,20 @@ static size_t write_typeformatstring_var while (TRUE) { + int pointer_type; + size_t typeformat_size = 0; + if (is_string_type(var->attrs, ptr_level, var->array)) - return write_string_tfs(file, var->attrs, type, var->array, var->name); + { + typeformat_size += write_string_tfs(file, var->attrs, type, var->array, var->name); + return typeformat_size; + } if (is_array_type(var->attrs, ptr_level, var->array)) - return write_array_tfs(file, var->attrs, type, var->array, var->name); + { + typeformat_size += write_array_tfs(file, var->attrs, type, var->array, var->name); + return typeformat_size; + } if (ptr_level == 0) { @@ -667,7 +702,7 @@ static size_t write_typeformatstring_var /* basic types don't need a type format string */ if (is_base_type(type->type)) - return 0; + return typeformat_size; switch (type->type) { @@ -677,17 +712,19 @@ static size_t write_typeformatstring_var case RPC_FC_CPSTRUCT: case RPC_FC_CVSTRUCT: case RPC_FC_BOGUS_STRUCT: - return write_struct_tfs(file, type, var->name); + typeformat_size += write_struct_tfs(file, type, var->name); + return typeformat_size; case RPC_FC_ENCAPSULATED_UNION: case RPC_FC_NON_ENCAPSULATED_UNION: - return write_union_tfs(file, var->attrs, type, var->name); + typeformat_size += write_union_tfs(file, var->attrs, type, var->name); + return typeformat_size; default: error("write_typeformatstring_var: Unsupported type 0x%x for variable %s\n", type->type, var->name); } } else if (ptr_level == 1 && !type_has_ref(type)) { - int pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); + pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); if (!pointer_type) pointer_type = RPC_FC_RP; /* special case for pointers to base types */ @@ -700,7 +737,8 @@ static size_t write_typeformatstring_var pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); \ print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ - return 4 + typeformat_size += 4; \ + return typeformat_size CASE_BASETYPE(FC_BYTE); CASE_BASETYPE(FC_CHAR); CASE_BASETYPE(FC_SMALL); @@ -718,12 +756,21 @@ static size_t write_typeformatstring_var CASE_BASETYPE(FC_IGNORE); CASE_BASETYPE(FC_ERROR_STATUS_T); default: - error("write_typeformatstring_var: Unknown/unsupported type: %s (0x%02x)\n", var->name, type->type); - return 0; + break; } } - error("write_typeformatstring_var: Pointer level %d not supported for variable %s\n", ptr_level, var->name); - return 0; + + assert(ptr_level > 0); + + pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); + if (!pointer_type) pointer_type = RPC_FC_RP; + + print_file(file, indent, "0x%x, 0x00, /* %s */\n", + pointer_type, + pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); + print_file(file, indent, "NdrShort(0x2), /* 2 */\n"); + + ptr_level--; } }

1 0

Robert Shearman : widl: Add framework for generating struct and union type format strings.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 584c89bd8fbd32e98eda10a9a29aa32d48b26b8a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=584c89bd8fbd32e98eda10a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:10:59 2006 +0100 widl: Add framework for generating struct and union type format strings. --- tools/widl/typegen.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index fe2da2d..4fe349d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -629,6 +629,18 @@ static size_t write_array_tfs(FILE *file } } +static size_t write_struct_tfs(FILE *file, const type_t *type, const char *name) +{ + error("write_struct_tfs: Unimplemented\n"); + return 0; +} + +static size_t write_union_tfs(FILE *file, const attr_t *attrs, const type_t *type, const char *name) +{ + error("write_union_tfs: Unimplemented\n"); + return 0; +} + static size_t write_typeformatstring_var(FILE *file, int indent, const var_t *var) { @@ -656,6 +668,22 @@ static size_t write_typeformatstring_var /* basic types don't need a type format string */ if (is_base_type(type->type)) return 0; + + switch (type->type) + { + case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_BOGUS_STRUCT: + return write_struct_tfs(file, type, var->name); + case RPC_FC_ENCAPSULATED_UNION: + case RPC_FC_NON_ENCAPSULATED_UNION: + return write_union_tfs(file, var->attrs, type, var->name); + default: + error("write_typeformatstring_var: Unsupported type 0x%x for variable %s\n", type->type, var->name); + } } else if (ptr_level == 1 && !type_has_ref(type)) {

1 0

Robert Shearman : widl: Support different types of simple pointers.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 263a75d47a91c4aef1fd3f16e12c3a5e1e126716 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=263a75d47a91c4aef1fd3f1… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:10:42 2006 +0100 widl: Support different types of simple pointers. Support pointer types in unmarshall_arguments. --- tools/widl/typegen.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 97aaa2d..fe2da2d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -659,12 +659,17 @@ static size_t write_typeformatstring_var } else if (ptr_level == 1 && !type_has_ref(type)) { + int pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); + if (!pointer_type) pointer_type = RPC_FC_RP; + /* special case for pointers to base types */ switch (type->type) { #define CASE_BASETYPE(fctype) \ case RPC_##fctype: \ - print_file(file, indent, "0x11, 0x08, /* FC_RP [simple_pointer] */\n"); \ + print_file(file, indent, "0x%x, 0x08, /* %s [simple_pointer] */\n", \ + pointer_type, \ + pointer_type == RPC_FC_FP ? "FC_FP" : (pointer_type == RPC_FC_UP ? "FC_UP" : "FC_RP")); \ print_file(file, indent, "0x%02x, /* " #fctype " */\n", RPC_##fctype); \ print_file(file, indent, "0x5c, /* FC_PAD */\n"); \ return 4 @@ -1150,7 +1155,9 @@ void unmarshall_arguments(FILE *file, in } else { - error("unmarshall_arguments: Pointer level %d not supported for variable %s\n", var->ptr_level, var->name); + print_file(file, indent, + "NdrPointerUnmarshall(&_StubMsg, (unsigned char **)&%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + var->name, *type_offset); last_size = 1; } fprintf(file, "\n");

1 0

Robert Shearman : widl: Generate NdrNonConformatString* calls for non-conformant string types.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 69551fdf74290773516507d605455d661cbad8c9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69551fdf74290773516507d… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:10:08 2006 +0100 widl: Generate NdrNonConformatString* calls for non-conformant string types. --- tools/widl/typegen.c | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 1cef936..97aaa2d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -833,9 +833,14 @@ void marshall_arguments(FILE *file, int if (is_string_type(var->attrs, var->ptr_level, var->array)) { - print_file(file, indent, - "NdrConformantStringMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", - var->name, *type_offset); + if (var->array && var->array->is_const) + print_file(file, indent, + "NdrNonConformantStringMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + var->name, *type_offset); + else + print_file(file, indent, + "NdrConformantStringMarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d]);\n", + var->name, *type_offset); last_size = 1; } else if (is_array_type(var->attrs, var->ptr_level, var->array)) @@ -1018,9 +1023,14 @@ void unmarshall_arguments(FILE *file, in if (is_string_type(var->attrs, var->ptr_level, var->array)) { - print_file(file, indent, - "NdrConformantStringUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", - var->name, *type_offset); + if (var->array && var->array->is_const) + print_file(file, indent, + "NdrNonConformantStringUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + var->name, *type_offset); + else + print_file(file, indent, + "NdrConformantStringUnmarshall(&_StubMsg, (unsigned char *)%s, &__MIDL_TypeFormatString.Format[%d], 0);\n", + var->name, *type_offset); last_size = 1; } else if (is_array_type(var->attrs, var->ptr_level, var->array))

1 0

Robert Shearman : widl: Add functions for detecting array and string types.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: a6c6e1d032480b038c66e09918539d64285c3e26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a6c6e1d032480b038c66e09… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:09:53 2006 +0100 widl: Add functions for detecting array and string types. Add functions for detecting array and string types and use these in both writing type format strings and when marshalling and unmarshalling parameters. --- tools/widl/typegen.c | 327 ++++++++++++++++++++++++-------------------------- 1 files changed, 160 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=a6c6e1d032480b038c6…

1 0

Robert Shearman : widl: Support some more complicated conformance / variance expressions.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 793bc8de69292c33a856e22cd283e1b99f313009 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=793bc8de69292c33a856e22… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:09:03 2006 +0100 widl: Support some more complicated conformance / variance expressions. --- tools/widl/typegen.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 52 insertions(+), 5 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8e23b92..48823c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -218,9 +218,56 @@ void write_procformatstring(FILE *file, /* FIXME: only works for top-level variables at the moment */ static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const expr_t *expr) { + unsigned char operator_type = 0; + const char *operator_string = "no operators"; + const expr_t *subexpr = expr; + if (!file) return 4; /* optimisation for sizing pass */ - if (expr->type == EXPR_IDENTIFIER) + switch (subexpr->type) + { + 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: + if (subexpr->u.ext->is_const && (subexpr->u.ext->cval == 2)) + { + subexpr = subexpr->ref; + operator_type = RPC_FC_MULT_2; + operator_string = "FC_MULT_2"; + } + break; + case EXPR_SUB: + if (subexpr->u.ext->is_const && (subexpr->u.ext->cval == 1)) + { + subexpr = subexpr->ref; + operator_type = RPC_FC_SUB_1; + operator_string = "FC_SUB_1"; + } + break; + case EXPR_ADD: + if (subexpr->u.ext->is_const && (subexpr->u.ext->cval == 1)) + { + subexpr = subexpr->ref; + operator_type = RPC_FC_ADD_1; + operator_string = "FC_ADD_1"; + } + break; + default: + break; + } + + if (subexpr->type == EXPR_IDENTIFIER) { if (func) { @@ -233,7 +280,7 @@ static size_t write_conf_or_var_desc(FIL while (NEXT_LINK(var)) var = NEXT_LINK(var); for (stack_offset = 0; var; stack_offset += sizeof(void *), var = PREV_LINK(var)) { - if (!strcmp(var->name, expr->u.sval)) + if (!strcmp(var->name, subexpr->u.sval)) { conformance_type = var->type; break; @@ -241,7 +288,7 @@ static size_t write_conf_or_var_desc(FIL } if (!conformance_type) error("write_conf_or_var_desc: couldn't find variable %s\n", - expr->u.sval); + subexpr->u.sval); while (type_has_ref(conformance_type)) conformance_type = conformance_type->ref; @@ -283,14 +330,14 @@ static size_t write_conf_or_var_desc(FIL print_file(file, 2, "0x%x, /* Corr desc: parameter, %s */\n", RPC_FC_TOP_LEVEL_CONFORMANCE | param_type, param_type_string); - print_file(file, 2, "0x0, /* no operators */\n"); + print_file(file, 2, "0x%x, /* %s */\n", operator_type, operator_string); print_file(file, 2, "0x%x, /* x86 stack size / offset = %d */\n", stack_offset, stack_offset); } else error("write_conf_or_var_desc: not supported for non-functions yet\n"); } else - error("write_conf_or_var_desc: expression type %d\n", expr->type); + error("write_conf_or_var_desc: expression type %d\n", subexpr->type); return 4; }

1 0

Robert Shearman : widl: Start implementing writing of conformance/variance descriptors.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 4a7c04791dc3b5aee9bb906602f7d2b33ac1060d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a7c04791dc3b5aee9bb906… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:08:20 2006 +0100 widl: Start implementing writing of conformance/variance descriptors. --- tools/widl/typegen.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 94 insertions(+), 8 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index d1ce3ca..8e23b92 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -42,6 +42,8 @@ #include "widl.h" #include "typegen.h" +static const func_t *current_func; + static int print_file(FILE *file, int indent, const char *format, ...) { va_list va; @@ -212,6 +214,86 @@ void write_procformatstring(FILE *file, print_file(file, indent, "\n"); } +/* write conformance / variance descriptor */ +/* FIXME: only works for top-level variables at the moment */ +static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const expr_t *expr) +{ + if (!file) return 4; /* optimisation for sizing pass */ + + if (expr->type == EXPR_IDENTIFIER) + { + if (func) + { + size_t stack_offset; + const var_t *var = func->args; + unsigned char param_type = 0; + const char *param_type_string = NULL; + const type_t *conformance_type = NULL; + + while (NEXT_LINK(var)) var = NEXT_LINK(var); + for (stack_offset = 0; var; stack_offset += sizeof(void *), var = PREV_LINK(var)) + { + if (!strcmp(var->name, expr->u.sval)) + { + conformance_type = var->type; + break; + } + } + if (!conformance_type) + error("write_conf_or_var_desc: couldn't find variable %s\n", + expr->u.sval); + + while (type_has_ref(conformance_type)) + conformance_type = conformance_type->ref; + + switch (conformance_type->type) + { + case RPC_FC_CHAR: + case RPC_FC_SMALL: + param_type = RPC_FC_SMALL; + param_type_string = "FC_SMALL"; + break; + case RPC_FC_BYTE: + case RPC_FC_USMALL: + param_type = RPC_FC_USMALL; + param_type_string = "FC_USMALL"; + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + param_type = RPC_FC_SHORT; + param_type_string = "FC_SHORT"; + break; + case RPC_FC_USHORT: + param_type = RPC_FC_USHORT; + param_type_string = "FC_USHORT"; + break; + case RPC_FC_LONG: + param_type = RPC_FC_LONG; + param_type_string = "FC_LONG"; + break; + case RPC_FC_ULONG: + param_type = RPC_FC_ULONG; + param_type_string = "FC_ULONG"; + break; + default: + error("write_conf_or_var_desc: conformance variable type not supported 0x%x\n", + conformance_type->type); + } + + print_file(file, 2, "0x%x, /* Corr desc: parameter, %s */\n", + RPC_FC_TOP_LEVEL_CONFORMANCE | param_type, + param_type_string); + print_file(file, 2, "0x0, /* no operators */\n"); + print_file(file, 2, "0x%x, /* x86 stack size / offset = %d */\n", stack_offset, stack_offset); + } + else + error("write_conf_or_var_desc: not supported for non-functions yet\n"); + } + else + error("write_conf_or_var_desc: expression type %d\n", expr->type); + return 4; +} + static size_t type_memsize(const type_t *t, int ptr_level, const expr_t *array); static size_t fields_memsize(const var_t *v) @@ -322,9 +404,11 @@ static size_t write_string_tfs(FILE *fil print_file(file, 2, "0x%x, /* FC_C_CSTRING */\n", RPC_FC_C_CSTRING); else print_file(file, 2, "0x%x, /* FC_C_WSTRING */\n", RPC_FC_C_WSTRING); - print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + print_file(file, 2, "0x%x, /* FC_STRING_SIZED */\n", RPC_FC_STRING_SIZED); typestring_size = 2; + typestring_size += write_conf_or_var_desc(file, current_func, size_is); + return typestring_size; } else @@ -335,11 +419,9 @@ static size_t write_string_tfs(FILE *fil print_file(file, 2, "0x%x, /* FC_C_CSTRING */\n", RPC_FC_C_CSTRING); else print_file(file, 2, "0x%x, /* FC_C_WSTRING */\n", RPC_FC_C_WSTRING); - print_file(file, 2, "0x%x, /* FC_STRING_SIZED */\n", RPC_FC_STRING_SIZED); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); typestring_size = 2; - /* FIXME: write out conformance descriptor */ - return typestring_size; } } @@ -428,7 +510,8 @@ static size_t write_array_tfs(FILE *file print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); typestring_size += 2; - /* FIXME: write out variance descriptor */ + typestring_size += write_conf_or_var_desc(file, current_func, length_is); + /* FIXME: write out pointer descriptor if necessary */ print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); @@ -450,7 +533,8 @@ static size_t write_array_tfs(FILE *file print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); typestring_size = 4; - /* FIXME: write out conformance descriptor */ + typestring_size += write_conf_or_var_desc(file, current_func, size_is); + /* FIXME: write out pointer descriptor if necessary */ print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); @@ -472,8 +556,9 @@ static size_t write_array_tfs(FILE *file print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); typestring_size = 4; - /* FIXME: write out conformance descriptor */ - /* FIXME: write out variance descriptor */ + typestring_size += write_conf_or_var_desc(file, current_func, size_is); + typestring_size += write_conf_or_var_desc(file, current_func, length_is); + /* FIXME: write out pointer descriptor if necessary */ print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); @@ -570,6 +655,7 @@ void write_typeformatstring(FILE *file, while (NEXT_LINK(func)) func = NEXT_LINK(func); for (; func; func = PREV_LINK(func)) { + current_func = func; if (func->args) { var = func->args;

1 0

Robert Shearman : widl: Added some more constants for conformance descriptors.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 368da7dcc2611d975b3ed59b38c92bd718454587 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=368da7dcc2611d975b3ed59… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:08:49 2006 +0100 widl: Added some more constants for conformance descriptors. --- include/wine/rpcfc.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index f918f74..090ab28 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -161,6 +161,10 @@ /* FC_RETURN_PARAM_BASETYPE: basetype */ #define RPC_FC_DEREFERENCE 0x54 +#define RPC_FC_DIV_2 0x55 +#define RPC_FC_MULT_2 0x56 +#define RPC_FC_ADD_1 0x57 +#define RPC_FC_SUB_1 0x58 #define RPC_FC_CALLBACK 0x59

1 0

Robert Shearman : widl: Strings.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 21a90850cb2c898775cb73ecb24d8aa613752bb4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=21a90850cb2c898775cb73e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:07:39 2006 +0100 widl: Strings. Write out type format strings for string types. --- include/wine/rpcfc.h | 2 ++ tools/widl/typegen.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/include/wine/rpcfc.h b/include/wine/rpcfc.h index 466a571..f918f74 100644 --- a/include/wine/rpcfc.h +++ b/include/wine/rpcfc.h @@ -130,6 +130,8 @@ #define RPC_FC_STRUCTPAD2 0x3e +#define RPC_FC_STRING_SIZED 0x44 + #define RPC_FC_NO_REPEAT 0x46 #define RPC_FC_FIXED_REPEAT 0x47 #define RPC_FC_VARIABLE_REPEAT 0x48 diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index f334d73..d1ce3ca 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -281,12 +281,67 @@ static size_t type_memsize(const type_t return size; } -static size_t write_string_tfs(FILE *file, const attr_t *attr, +static size_t write_string_tfs(FILE *file, const attr_t *attrs, const type_t *type, const expr_t *array, const char *name) { - error("write_string_tfs: Unimplemented. name: %s\n", name); - return 0; + const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); + int has_size = size_is && (size_is->type != EXPR_VOID); + + if ((type->type != RPC_FC_CHAR) && (type->type != RPC_FC_WCHAR)) + { + error("write_string_tfs: Unimplemented for type 0x%x of name: %s\n", type->type, name); + return 0; + } + + if (array && array->is_const) + { + size_t typestring_size; + + if (array->cval > USHRT_MAX) + error("array size for parameter %s exceeds %d bytes by %ld bytes\n", + name, USHRT_MAX, array->cval - USHRT_MAX); + + if (type->type == RPC_FC_CHAR) + print_file(file, 2, "0x%x, /* FC_CSTRING */\n", RPC_FC_C_CSTRING); + else + print_file(file, 2, "0x%x, /* FC_WSTRING */\n", RPC_FC_C_WSTRING); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + typestring_size = 2; + + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", array->cval, array->cval); + typestring_size += 2; + + return typestring_size; + } + else if (has_size) + { + size_t typestring_size; + + if (type->type == RPC_FC_CHAR) + print_file(file, 2, "0x%x, /* FC_C_CSTRING */\n", RPC_FC_C_CSTRING); + else + print_file(file, 2, "0x%x, /* FC_C_WSTRING */\n", RPC_FC_C_WSTRING); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + typestring_size = 2; + + return typestring_size; + } + else + { + size_t typestring_size; + + if (type->type == RPC_FC_CHAR) + print_file(file, 2, "0x%x, /* FC_C_CSTRING */\n", RPC_FC_C_CSTRING); + else + print_file(file, 2, "0x%x, /* FC_C_WSTRING */\n", RPC_FC_C_WSTRING); + print_file(file, 2, "0x%x, /* FC_STRING_SIZED */\n", RPC_FC_STRING_SIZED); + typestring_size = 2; + + /* FIXME: write out conformance descriptor */ + + return typestring_size; + } } static size_t write_array_tfs(FILE *file, const attr_t *attrs,

1 0

Robert Shearman : widl: Arrays.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: d07589e32f767f3904b129aedc24ba653266ca5e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d07589e32f767f3904b129a… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:07:13 2006 +0100 widl: Arrays. Write out type format strings for arrays, except for the missing generic functionality of conformance and variance descriptors. --- tools/widl/typegen.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 206 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0c8a3b0..f334d73 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -31,6 +31,7 @@ #include <assert.h> #include <ctype.h> #include <signal.h> +#include <limits.h> #include "widl.h" #include "utils.h" @@ -211,6 +212,75 @@ void write_procformatstring(FILE *file, print_file(file, indent, "\n"); } +static size_t type_memsize(const type_t *t, int ptr_level, const expr_t *array); + +static size_t fields_memsize(const var_t *v) +{ + size_t size = 0; + const var_t *first = v; + if (!v) return 0; + while (NEXT_LINK(v)) v = NEXT_LINK(v); + while (v) { + size += type_memsize(v->type, v->ptr_level, v->array); + if (v == first) break; + v = PREV_LINK(v); + } + return size; +} + +static size_t type_memsize(const type_t *t, int ptr_level, const expr_t *array) +{ + size_t size = 0; + + if (ptr_level) + return sizeof(void *); + + switch (t->type) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_USMALL: + case RPC_FC_SMALL: + size = 1; + break; + case RPC_FC_WCHAR: + case RPC_FC_USHORT: + case RPC_FC_SHORT: + case RPC_FC_ENUM16: + size = 2; + break; + case RPC_FC_ULONG: + case RPC_FC_LONG: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: + case RPC_FC_FLOAT: + size = 4; + break; + case RPC_FC_HYPER: + case RPC_FC_DOUBLE: + size = 8; + break; + case RPC_FC_STRUCT: + case RPC_FC_CVSTRUCT: + case RPC_FC_CPSTRUCT: + case RPC_FC_CSTRUCT: + case RPC_FC_PSTRUCT: + case RPC_FC_BOGUS_STRUCT: + case RPC_FC_ENCAPSULATED_UNION: + case RPC_FC_NON_ENCAPSULATED_UNION: + size = fields_memsize(t->fields); + break; + default: + error("type_memsize: Unknown type %d", t->type); + size = 0; + } + + if (array && array->is_const) + size *= array->cval; + + return size; +} + static size_t write_string_tfs(FILE *file, const attr_t *attr, const type_t *type, const expr_t *array, const char *name) @@ -219,12 +289,145 @@ static size_t write_string_tfs(FILE *fil return 0; } -static size_t write_array_tfs(FILE *file, const attr_t *attr, +static size_t write_array_tfs(FILE *file, const attr_t *attrs, const type_t *type, const expr_t *array, const char *name) { - error("write_array_tfs: Unimplemented. name: %s\n", name); - return 0; + const expr_t *length_is = get_attrp(attrs, ATTR_LENGTHIS); + const expr_t *size_is = get_attrp(attrs, ATTR_SIZEIS); + int has_length = length_is && (length_is->type != EXPR_VOID); + int has_size = size_is && (size_is->type != EXPR_VOID) && !array->is_const; + + /* FIXME: need to analyse type for pointers */ + + if (NEXT_LINK(array)) /* multi-dimensional array */ + { + error("write_array_tfs: Multi-dimensional arrays not implemented yet (param %s)\n", name); + return 0; + } + else + { + if (!has_length && !has_size) + { + /* fixed array */ + size_t typestring_size; + size_t size = type_memsize(type, 0, array); + if (size < USHRT_MAX) + { + print_file(file, 2, "0x%x, /* FC_SMFARRAY */\n", RPC_FC_SMFARRAY); + /* alignment */ + print_file(file, 2, "0x%x, /* 0 */\n", 0); + /* size */ + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", size, size); + typestring_size = 4; + } + else + { + print_file(file, 2, "0x%x, /* FC_LGFARRAY */\n", RPC_FC_LGFARRAY); + /* alignment */ + print_file(file, 2, "0x%x, /* 0 */\n", 0); + /* size */ + print_file(file, 2, "NdrFcLong(0x%x), /* %d */\n", size, size); + typestring_size = 6; + } + + /* FIXME: write out pointer descriptor if necessary */ + + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + print_file(file, 2, "FC_END,\n"); + typestring_size += 2; + + return typestring_size; + } + else if (has_length && !has_size) + { + /* varying array */ + size_t typestring_size; + size_t element_size = type_memsize(type, 0, NULL); + size_t elements = array->cval; + size_t total_size = element_size * elements; + + if (total_size < USHRT_MAX) + { + print_file(file, 2, "0x%x, /* FC_SMVARRAY */\n", RPC_FC_SMVARRAY); + /* alignment */ + print_file(file, 2, "0x%x, /* 0 */\n", 0); + /* total size */ + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", total_size, total_size); + /* number of elements */ + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", elements, elements); + typestring_size = 6; + } + else + { + print_file(file, 2, "0x%x, /* FC_LGVARRAY */\n", RPC_FC_LGVARRAY); + /* alignment */ + print_file(file, 2, "0x%x, /* 0 */\n", 0); + /* total size */ + print_file(file, 2, "NdrFcLong(0x%x), /* %d */\n", total_size, total_size); + /* number of elements */ + print_file(file, 2, "NdrFcLong(0x%x), /* %d */\n", elements, elements); + typestring_size = 10; + } + /* element size */ + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); + typestring_size += 2; + + /* FIXME: write out variance descriptor */ + /* FIXME: write out pointer descriptor if necessary */ + + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + print_file(file, 2, "FC_END,\n"); + typestring_size += 2; + + return typestring_size; + } + else if (!has_length && has_size) + { + /* conformant array */ + size_t typestring_size; + size_t element_size = type_memsize(type, 0, NULL); + + print_file(file, 2, "0x%x, /* FC_CARRAY */\n", RPC_FC_CARRAY); + /* alignment */ + print_file(file, 2, "0x%x, /* 0 */\n", 0); + /* element size */ + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); + typestring_size = 4; + + /* FIXME: write out conformance descriptor */ + /* FIXME: write out pointer descriptor if necessary */ + + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + print_file(file, 2, "FC_END,\n"); + typestring_size += 2; + + return typestring_size; + } + else + { + /* conformant varying array */ + size_t typestring_size; + size_t element_size = type_memsize(type, 0, NULL); + + print_file(file, 2, "0x%x, /* FC_CARRAY */\n", RPC_FC_CARRAY); + /* alignment */ + print_file(file, 2, "0x%x, /* 0 */\n", 0); + /* element size */ + print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); + typestring_size = 4; + + /* FIXME: write out conformance descriptor */ + /* FIXME: write out variance descriptor */ + /* FIXME: write out pointer descriptor if necessary */ + + print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); + print_file(file, 2, "FC_END,\n"); + typestring_size += 2; + + return typestring_size; + } + } } static size_t write_typeformatstring_var(FILE *file, int indent,

1 0