wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Rob Shearman : widl: Remove some FIXME comments and replace them with comments explaining why the current behaviour is correct .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 0e6ad1fa8566f07fc82c392a80ad4b1b7e86a84c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6ad1fa8566f07fc82c392a8… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:50 2010 +0000 widl: Remove some FIXME comments and replace them with comments explaining why the current behaviour is correct. --- tools/widl/typegen.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b7982b0..a241e69 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1555,8 +1555,10 @@ static void write_member_type(FILE *file, const type_t *cont, reloff = absoff - (*tfsoff + 2); print_file(file, 2, "0x4c,\t/* FC_EMBEDDED_COMPLEX */\n"); - /* FIXME: actually compute necessary padding */ - print_file(file, 2, "0x0,\t/* FIXME: padding */\n"); + /* padding is represented using FC_STRUCTPAD* types, so presumably + * this is left over in the format for historical purposes in MIDL + * or rpcrt4. */ + print_file(file, 2, "0x0,\n"); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Offset= %hd (%u) */\n", reloff, reloff, absoff); *tfsoff += 4; @@ -1651,8 +1653,11 @@ static int write_pointer_description_offsets( { unsigned int memsize; - /* pointer instance */ - /* FIXME: sometimes from end of structure, sometimes from beginning */ + /* pointer instance + * + * note that MSDN states that for pointer layouts in structures, + * this is a negative offset from the end of the structure, but + * this statement is incorrect. all offsets are positive */ print_file(file, 2, "NdrFcShort(0x%hx),\t/* Memory offset = %d */\n", *offset_in_memory, *offset_in_memory); print_file(file, 2, "NdrFcShort(0x%hx),\t/* Buffer offset = %d */\n", *offset_in_buffer, *offset_in_buffer);

1 0

Rob Shearman : widl: Fix the writing of expressions in un-typedef' d structures by using write_type_left to write out the type, which adds the "struct ..." if necessary.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 9aad1447552173d2bbe07021c859907e344e54a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aad1447552173d2bbe07021c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:37 2010 +0000 widl: Fix the writing of expressions in un-typedef'd structures by using write_type_left to write out the type, which adds the "struct ..." if necessary. Also improve the type comparison code to not crash on unnamed structures (although further changes need to be made to fix the output in this case) and make it more efficient by first doing a comparison on the values of the type pointers. --- tools/widl/typegen.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7e7a851..b7982b0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1118,8 +1118,10 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, LIST_FOR_EACH_ENTRY(eval, &expr_eval_routines, struct expr_eval_routine, entry) { - if (!strcmp (eval->structure->name, structure->name) - && !compare_expr (eval->expr, expr)) + if (eval->structure == structure || + (eval->structure->name && structure->name && + !strcmp(eval->structure->name, structure->name) && + !compare_expr(eval->expr, expr))) { found = 1; break; @@ -3957,8 +3959,11 @@ int write_expr_eval_routines(FILE *file, const char *iface) print_file(file, 0, "static void __RPC_USER %s_%sExprEval_%04u(PMIDL_STUB_MESSAGE pStubMsg)\n", iface, name, callback_offset); print_file(file, 0, "{\n"); - print_file (file, 1, "%s *%s = (%s *)(pStubMsg->StackTop - %u);\n", - name, var_name, name, eval->baseoff); + print_file(file, 1, "%s", ""); + write_type_left(file, (type_t *)eval->structure, TRUE); + fprintf(file, " *%s = (", var_name); + write_type_left(file, (type_t *)eval->structure, TRUE); + fprintf(file, " *)(pStubMsg->StackTop - %u);\n", eval->baseoff); print_file(file, 1, "pStubMsg->Offset = 0;\n"); /* FIXME */ print_file(file, 1, "pStubMsg->MaxCount = (ULONG_PTR)"); write_expr(file, eval->expr, 1, 1, var_name_expr, eval->structure, "");

1 0

Rob Shearman : widl: error_status_t isn't an allowed conformance type.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: df853f8ed2ce37587585055cf0926e3ced745041 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df853f8ed2ce37587585055cf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:28 2010 +0000 widl: error_status_t isn't an allowed conformance type. The FC code requires more than 4 bits to represent it and the correlation descriptor and union formats only allow 4 bits to represent the type referred to. --- tools/widl/parser.y | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 71b7ed6..8a23a82 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2261,7 +2261,6 @@ static int is_allowed_conf_type(const type_t *type) case TYPE_BASIC_HYPER: case TYPE_BASIC_BYTE: case TYPE_BASIC_WCHAR: - case TYPE_BASIC_ERROR_STATUS_T: return TRUE; default: return FALSE;

1 0

Rob Shearman : widl: Pass current_structure into write_conf_or_var_desc in write_ip_tfs.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 5b533c1845d5e1acc12de40ecce006325d9c19f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b533c1845d5e1acc12de40ec… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:20 2010 +0000 widl: Pass current_structure into write_conf_or_var_desc in write_ip_tfs. This allows write_conf_or_var_desc to have the context enabling it to write out an appropriate correlation descriptor when iid_is is used from within a structure. --- tools/widl/typegen.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4f56bda..7e7a851 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1090,6 +1090,13 @@ static unsigned int write_conf_or_var_desc(FILE *file, const type_t *structure, else param_type = RPC_FC_SHORT; } + else if (type_get_type(correlation_variable) == TYPE_POINTER) + { + if (pointer_size == 8) + param_type = RPC_FC_HYPER; + else + param_type = RPC_FC_LONG; + } else { error("write_conf_or_var_desc: non-arithmetic type used as correlation variable %s\n", @@ -2647,12 +2654,14 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t unsigned int start_offset = *typeformat_offset; expr_t *iid = get_attrp(attrs, ATTR_IIDIS); + print_start_tfs_comment(file, type, start_offset); + if (iid) { print_file(file, 2, "0x2f, /* FC_IP */\n"); print_file(file, 2, "0x5c, /* FC_PAD */\n"); *typeformat_offset - += write_conf_or_var_desc(file, NULL, 0, type, iid) + 2; + += write_conf_or_var_desc(file, current_structure, 0, type, iid) + 2; } else { @@ -2663,7 +2672,6 @@ static unsigned int write_ip_tfs(FILE *file, const attr_list_t *attrs, type_t *t error("%s: interface %s missing UUID\n", __FUNCTION__, base->name); update_tfsoff(type, start_offset, file); - print_start_tfs_comment(file, type, start_offset); print_file(file, 2, "0x2f,\t/* FC_IP */\n"); print_file(file, 2, "0x5a,\t/* FC_CONSTANT_IID */\n"); print_file(file, 2, "NdrFcLong(0x%08x),\n", uuid->Data1);

1 0

Rob Shearman : widl: Use typegen_detect_type to determine which types should be written for the pointer description in write_struct_tfs .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 1d1d49b6abe7fd86b171346d4bd3ff30735a8268 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1d49b6abe7fd86b171346d4… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:30:02 2010 +0000 widl: Use typegen_detect_type to determine which types should be written for the pointer description in write_struct_tfs. Otherwise extra pointers for user types could be written. --- tools/widl/typegen.c | 30 ++++++++++++++++++------------ 1 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 7827e14..4f56bda 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2417,27 +2417,33 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, if (fields) LIST_FOR_EACH_ENTRY(f, fields, const var_t, entry) { type_t *ft = f->type; - if (is_ptr(ft)) + switch (typegen_detect_type(ft, f->attrs, TDT_IGNORE_STRINGS)) { + case TGT_POINTER: if (is_string_type(f->attrs, ft)) write_string_tfs(file, f->attrs, ft, FALSE, f->name, tfsoff); else write_pointer_tfs(file, f->attrs, ft, type_pointer_get_ref(ft)->typestring_offset, FALSE, tfsoff); - } - else if (type_get_type(ft) == TYPE_ARRAY && type_array_is_decl_as_ptr(ft)) - { - unsigned int offset; + break; + case TGT_ARRAY: + if (type_array_is_decl_as_ptr(ft)) + { + unsigned int offset; - print_file(file, 0, "/* %d */\n", *tfsoff); + print_file(file, 0, "/* %d */\n", *tfsoff); - offset = ft->typestring_offset; - /* skip over the pointer that is written for strings, since a - * pointer has to be written in-place here */ - if (is_string_type(f->attrs, ft)) - offset += 4; - write_nonsimple_pointer(file, f->attrs, ft, FALSE, offset, tfsoff); + offset = ft->typestring_offset; + /* skip over the pointer that is written for strings, since a + * pointer has to be written in-place here */ + if (is_string_type(f->attrs, ft)) + offset += 4; + write_nonsimple_pointer(file, f->attrs, ft, FALSE, offset, tfsoff); + } + break; + default: + break; } } if (type->ptrdesc == *tfsoff)

1 0

Rob Shearman : widl: Merge write_typeformatstring_var and write_embedded_types into one function , write_type_tfs.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 06e7eb5c98d473cf1edc828c67f6a6586a94e2f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06e7eb5c98d473cf1edc828c6… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:57 2010 +0000 widl: Merge write_typeformatstring_var and write_embedded_types into one function, write_type_tfs. --- tools/widl/typegen.c | 191 ++++++++++++++++++++++---------------------------- 1 files changed, 84 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06e7eb5c98d473cf1edc8…

1 0

Rob Shearman : widl: Don' t use the return value of write_embedded_types to determine whether a type contains pointers or not .
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 2fd6be54bee3c639bdeb0754eddd085ec0a6191f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd6be54bee3c639bdeb0754e… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:53 2010 +0000 widl: Don't use the return value of write_embedded_types to determine whether a type contains pointers or not. It isn't correct in all situations, so type_has_pointer has to be used anyway so using the return value of write_embedded_types just clutters the code. --- tools/widl/typegen.c | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 0316531..78fe60c 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2137,7 +2137,6 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t unsigned int size; unsigned int start_offset; unsigned char fc; - int has_pointer; int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); unsigned int baseoff = !type_array_is_decl_as_ptr(type) && current_structure @@ -2147,10 +2146,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t if (!pointer_type) pointer_type = RPC_FC_RP; - if (write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset)) - has_pointer = TRUE; - else - has_pointer = type_has_pointers(type_array_get_element(type)); + write_embedded_types(file, attrs, type_array_get_element(type), name, FALSE, typestring_offset); align = 0; size = type_memsize((is_conformant_array(type) ? type_array_get_element(type) : type), &align); @@ -2208,7 +2204,8 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is); - if (has_pointer && (type_array_is_decl_as_ptr(type) || !current_structure)) + if (type_has_pointers(type_array_get_element(type)) && + (type_array_is_decl_as_ptr(type) || !current_structure)) { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); @@ -2328,7 +2325,6 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, const var_t *array; unsigned int start_offset; unsigned int array_offset; - int has_pointers = 0; unsigned int align = 0; unsigned int corroff; var_t *f; @@ -2344,9 +2340,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, name, USHRT_MAX, total_size - USHRT_MAX); if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) - has_pointers |= write_embedded_types(file, f->attrs, f->type, f->name, - FALSE, tfsoff); - if (!has_pointers) has_pointers = type_has_pointers(type); + write_embedded_types(file, f->attrs, f->type, f->name, FALSE, tfsoff); array = find_array_or_string_in_struct(type); if (array && !processed(array->type)) @@ -2394,7 +2388,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, } else if ((fc == RPC_FC_PSTRUCT) || (fc == RPC_FC_CPSTRUCT) || - (fc == RPC_FC_CVSTRUCT && has_pointers)) + (fc == RPC_FC_CVSTRUCT && type_has_pointers(type))) { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD);

1 0

Rob Shearman : widl: Write pointers in write_typeformatstring_var using write_pointer_tfs.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 484fe1cff30fafcf21c0f8b5b2d41caefbc57909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=484fe1cff30fafcf21c0f8b5b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:48 2010 +0000 widl: Write pointers in write_typeformatstring_var using write_pointer_tfs. Avoid duplicating the pointer writing code. --- tools/widl/typegen.c | 71 +++++++++++++++---------------------------------- 1 files changed, 22 insertions(+), 49 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b0c2c20..0316531 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1366,6 +1366,9 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, c unsigned char fc; unsigned char pointer_fc; const type_t *ref; + int in_attr = is_attr(attrs, ATTR_IN); + int out_attr = is_attr(attrs, ATTR_OUT); + unsigned char flags = RPC_FC_P_SIMPLEPOINTER; /* for historical reasons, write_simple_pointer also handled string types, * but no longer does. catch bad uses of the function with this check */ @@ -1380,8 +1383,12 @@ static unsigned int write_simple_pointer(FILE *file, const attr_list_t *attrs, c else fc = get_basic_fc(ref); - print_file(file, 2, "0x%02x, 0x%x,\t/* %s [simple_pointer] */\n", - pointer_fc, RPC_FC_P_SIMPLEPOINTER, string_of_type(pointer_fc)); + if (out_attr && !in_attr) + flags |= RPC_FC_P_ONSTACK; + + print_file(file, 2, "0x%02x, 0x%x,\t/* %s %s[simple_pointer] */\n", + pointer_fc, flags, string_of_type(pointer_fc), + flags & RPC_FC_P_ONSTACK ? "[allocated_on_stack] " : ""); print_file(file, 2, "0x%02x,\t/* %s */\n", fc, string_of_type(fc)); print_file(file, 2, "0x5c,\t/* FC_PAD */\n"); return 4; @@ -1395,7 +1402,8 @@ static void print_start_tfs_comment(FILE *file, type_t *t, unsigned int tfsoff) } static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, - type_t *type, int toplevel_param, + type_t *type, unsigned int ref_offset, + int toplevel_param, unsigned int *typestring_offset) { unsigned int offset = *typestring_offset; @@ -1412,10 +1420,10 @@ static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, toplevel_param); break; default: - if (ref->typestring_offset) + if (ref_offset) write_nonsimple_pointer(file, attrs, type, toplevel_param, - type_pointer_get_ref(type)->typestring_offset, + ref_offset, typestring_offset); break; } @@ -2412,7 +2420,9 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, if (is_string_type(f->attrs, ft)) write_string_tfs(file, f->attrs, ft, FALSE, f->name, tfsoff); else - write_pointer_tfs(file, f->attrs, ft, FALSE, tfsoff); + write_pointer_tfs(file, f->attrs, ft, + type_pointer_get_ref(ft)->typestring_offset, + FALSE, tfsoff); } else if (type_get_type(ft) == TYPE_ARRAY && type_array_is_decl_as_ptr(ft)) { @@ -2794,48 +2804,11 @@ static unsigned int write_typeformatstring_var(FILE *file, int indent, const var case TGT_IFACE_POINTER: return write_ip_tfs(file, var->attrs, type, typeformat_offset); case TGT_POINTER: - { - type_t *ref = type_pointer_get_ref(type); - - switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) - { - /* special case for pointers to base types */ - case TGT_BASIC: - case TGT_ENUM: - { - unsigned char fc; - size_t start_offset = *typeformat_offset; - int in_attr = is_attr(var->attrs, ATTR_IN); - int out_attr = is_attr(var->attrs, ATTR_OUT); - - if (type_get_type(ref) == TYPE_ENUM) - fc = get_enum_fc(ref); - else - fc = get_basic_fc(ref); - - print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", - get_pointer_fc(type, var->attrs, toplevel_param), - (!in_attr && out_attr) ? 0x0C : 0x08, - string_of_type(get_pointer_fc(type, var->attrs, toplevel_param)), - (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); - print_file(file, indent, "0x%02x, /* %s */\n", - fc, string_of_type(fc)); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - *typeformat_offset += 4; - return start_offset; - } - default: - break; - } - - offset = write_typeformatstring_var(file, indent, func, ref, var, - FALSE, typeformat_offset); - if (file) - fprintf(file, "/* %2u */\n", *typeformat_offset); - return write_nonsimple_pointer(file, var->attrs, type, - toplevel_param, - offset, typeformat_offset); - } + offset = write_typeformatstring_var(file, indent, func, + type_pointer_get_ref(type), var, + FALSE, typeformat_offset); + return write_pointer_tfs(file, var->attrs, type, offset, + toplevel_param, typeformat_offset); case TGT_INVALID: break; } @@ -2867,7 +2840,7 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty retmask |= write_embedded_types(file, NULL, ref, name, TRUE, tfsoff); if (write_ptr) - write_pointer_tfs(file, attrs, type, FALSE, tfsoff); + write_pointer_tfs(file, attrs, type, type_pointer_get_ref(type)->typestring_offset, FALSE, tfsoff); retmask |= 1; break;

1 0

Rob Shearman : widl: Simplify write_typeformatstring_var.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 7a69fcabacb8c88aaee615629f51b9181975d5e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a69fcabacb8c88aaee615629… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:43 2010 +0000 widl: Simplify write_typeformatstring_var. The check for whether a pointer is the last one is redundant since typegen_detect_type does a stricter check on the ref type. Replace one other instance of last_ptr with a more readable equivalent. --- tools/widl/typegen.c | 62 ++++++++++++++++++++++++------------------------- 1 files changed, 30 insertions(+), 32 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 19f66c0..b0c2c20 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1339,7 +1339,7 @@ static unsigned int write_nonsimple_pointer(FILE *file, const attr_list_t *attrs if (out_attr && !in_attr && pointer_type == RPC_FC_RP) flags |= RPC_FC_P_ONSTACK; - if (is_ptr(type) && !last_ptr(type)) + if (is_ptr(type) && is_declptr(type_pointer_get_ref(type))) flags |= RPC_FC_P_DEREF; print_file(file, 2, "0x%x, 0x%x,\t\t/* %s", @@ -2794,50 +2794,48 @@ static unsigned int write_typeformatstring_var(FILE *file, int indent, const var case TGT_IFACE_POINTER: return write_ip_tfs(file, var->attrs, type, typeformat_offset); case TGT_POINTER: - if (last_ptr(type)) + { + type_t *ref = type_pointer_get_ref(type); + + switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) { + /* special case for pointers to base types */ + case TGT_BASIC: + case TGT_ENUM: + { + unsigned char fc; size_t start_offset = *typeformat_offset; int in_attr = is_attr(var->attrs, ATTR_IN); int out_attr = is_attr(var->attrs, ATTR_OUT); - const type_t *ref = type_pointer_get_ref(type); - - switch (typegen_detect_type(ref, NULL, TDT_ALL_TYPES)) - { - /* special case for pointers to base types */ - case TGT_BASIC: - case TGT_ENUM: - { - unsigned char fc; - if (type_get_type(ref) == TYPE_ENUM) - fc = get_enum_fc(ref); - else - fc = get_basic_fc(ref); - - print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", - get_pointer_fc(type, var->attrs, toplevel_param), - (!in_attr && out_attr) ? 0x0C : 0x08, - string_of_type(get_pointer_fc(type, var->attrs, toplevel_param)), - (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); - print_file(file, indent, "0x%02x, /* %s */\n", - fc, string_of_type(fc)); - print_file(file, indent, "0x5c, /* FC_PAD */\n"); - *typeformat_offset += 4; - return start_offset; - } - default: - break; - } + if (type_get_type(ref) == TYPE_ENUM) + fc = get_enum_fc(ref); + else + fc = get_basic_fc(ref); + + print_file(file, indent, "0x%x, 0x%x, /* %s %s[simple_pointer] */\n", + get_pointer_fc(type, var->attrs, toplevel_param), + (!in_attr && out_attr) ? 0x0C : 0x08, + string_of_type(get_pointer_fc(type, var->attrs, toplevel_param)), + (!in_attr && out_attr) ? "[allocated_on_stack] " : ""); + print_file(file, indent, "0x%02x, /* %s */\n", + fc, string_of_type(fc)); + print_file(file, indent, "0x5c, /* FC_PAD */\n"); + *typeformat_offset += 4; + return start_offset; + } + default: + break; } - offset = write_typeformatstring_var(file, indent, func, - type_pointer_get_ref(type), var, + offset = write_typeformatstring_var(file, indent, func, ref, var, FALSE, typeformat_offset); if (file) fprintf(file, "/* %2u */\n", *typeformat_offset); return write_nonsimple_pointer(file, var->attrs, type, toplevel_param, offset, typeformat_offset); + } case TGT_INVALID: break; }

1 0

Rob Shearman : widl: Make write_pointer_tfs more readable.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 08126d7483bf798e692edec9b8320ad10bbf433c URL: http://source.winehq.org/git/wine.git/?a=commit;h=08126d7483bf798e692edec9b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Mar 15 19:29:38 2010 +0000 widl: Make write_pointer_tfs more readable. Change write_pointer_tfs to rely on the detected type of the type to determine when to write a simple pointer rather than relying on typestring_offset not being set anywhere else. --- tools/widl/typegen.c | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 60668dd..19f66c0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1404,15 +1404,21 @@ static unsigned int write_pointer_tfs(FILE *file, const attr_list_t *attrs, print_start_tfs_comment(file, type, offset); update_tfsoff(type, offset, file); - if (ref->typestring_offset) - write_nonsimple_pointer(file, attrs, type, - toplevel_param, - type_pointer_get_ref(type)->typestring_offset, - typestring_offset); - else if (type_get_type(ref) == TYPE_BASIC || - type_get_type(ref) == TYPE_ENUM) + switch (typegen_detect_type(ref, attrs, TDT_ALL_TYPES)) + { + case TGT_BASIC: + case TGT_ENUM: *typestring_offset += write_simple_pointer(file, attrs, type, toplevel_param); + break; + default: + if (ref->typestring_offset) + write_nonsimple_pointer(file, attrs, type, + toplevel_param, + type_pointer_get_ref(type)->typestring_offset, + typestring_offset); + break; + } return offset; }

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010