February 2006 - Wine-Commits

Robert Shearman : widl: More const attributes.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 511463f3a592e92663826086c516b6dc46ce7382 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=511463f3a592e9266382608… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:31:17 2006 +0100 widl: More const attributes. --- tools/widl/header.c | 36 ++++++++++++++++++------------------ tools/widl/widltypes.h | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index ef77308..c618406 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -80,7 +80,7 @@ int is_void(const type_t *t, const var_t return 0; } -static void write_guid(const char *guid_prefix, const char *name, UUID *uuid) +static void write_guid(const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; fprintf(header, "DEFINE_GUID(%s_%s, 0x%08lx, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," @@ -333,7 +333,7 @@ static int user_type_registered(const ch return 0; } -static void check_for_user_types(var_t *v) +static void check_for_user_types(const var_t *v) { while (v) { type_t *type = v->type; @@ -355,7 +355,7 @@ static void check_for_user_types(var_t * } else if (type->fields) { - var_t *fields = type->fields; + const var_t *fields = type->fields; while (NEXT_LINK(fields)) fields = NEXT_LINK(fields); check_for_user_types(fields); } @@ -383,7 +383,7 @@ void write_user_types(void) void write_typedef(type_t *type, const var_t *names) { - char *tname = names->tname; + const char *tname = names->tname; const var_t *lname; while (NEXT_LINK(names)) names = NEXT_LINK(names); lname = names; @@ -654,9 +654,9 @@ static void write_cpp_method_def(const t } } -static void do_write_c_method_def(const type_t *iface, char *name) +static void do_write_c_method_def(const type_t *iface, const char *name) { - func_t *cur = iface->funcs; + const func_t *cur = iface->funcs; if (iface->ref) do_write_c_method_def(iface->ref, name); @@ -665,7 +665,7 @@ static void do_write_c_method_def(const indent(header, 0); fprintf(header, "/*** %s methods ***/\n", iface->name); while (cur) { - var_t *def = cur->def; + const var_t *def = cur->def; if (!is_callas(def->attrs)) { indent(header, 0); write_type(header, def->type, def, def->tname); @@ -692,14 +692,14 @@ static void write_c_disp_method_def(cons static void write_method_proto(const type_t *iface) { - func_t *cur = iface->funcs; + const func_t *cur = iface->funcs; if (!cur) return; while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); while (cur) { - var_t *def = cur->def; - var_t *cas = is_callas(def->attrs); - var_t *args; + const var_t *def = cur->def; + const var_t *cas = is_callas(def->attrs); + const var_t *args; if (!is_local(def->attrs)) { /* proxy prototype */ write_type(header, def->type, def, def->tname); @@ -725,11 +725,11 @@ static void write_method_proto(const typ check_for_user_types(args); } if (cas) { - func_t *m = iface->funcs; + const func_t *m = iface->funcs; while (m && strcmp(get_name(m->def), cas->name)) m = NEXT_LINK(m); if (m) { - var_t *mdef = m->def; + const var_t *mdef = m->def; /* proxy prototype - use local prototype */ write_type(header, mdef->type, mdef, mdef->tname); fprintf(header, " CALLBACK %s_", iface->name); @@ -756,9 +756,9 @@ static void write_method_proto(const typ static void write_function_proto(const type_t *iface) { - char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); + const char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); int explicit_handle = is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE); - var_t* explicit_handle_var; + const var_t* explicit_handle_var; func_t *cur = iface->funcs; while (NEXT_LINK(cur)) cur = NEXT_LINK(cur); @@ -813,19 +813,19 @@ void write_forward(type_t *iface) static void write_iface_guid(const type_t *iface) { - UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("IID", iface->name, uuid); } static void write_dispiface_guid(const type_t *iface) { - UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); write_guid("DIID", iface->name, uuid); } static void write_coclass_guid(class_t *cocl) { - UUID *uuid = get_attrp(cocl->attrs, ATTR_UUID); + const UUID *uuid = get_attrp(cocl->attrs, ATTR_UUID); write_guid("CLSID", cocl->name, uuid); } diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 0534339..36d4aad 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -206,7 +206,7 @@ struct _var_t { expr_t *array; type_t *type; var_t *args; /* for function pointers */ - char *tname; + const char *tname; attr_t *attrs; expr_t *eval; long lval;

1 0

Eric Kohl : widl: Fix proc format string for explicit binding handles.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 417a61fa6137a2fe322b91e59fe27ca6b5704b50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=417a61fa6137a2fe322b91e… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Tue Feb 7 12:30:55 2006 +0100 widl: Fix proc format string for explicit binding handles. --- tools/widl/typegen.c | 27 ++++++++++++++++++--------- 1 files changed, 18 insertions(+), 9 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index a9c9473..df58428 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -156,6 +156,7 @@ static inline int is_base_type(unsigned case RPC_FC_ENUM16: case RPC_FC_ENUM32: case RPC_FC_ERROR_STATUS_T: + case RPC_FC_BIND_PRIMITIVE: return TRUE; default: @@ -208,6 +209,12 @@ static size_t write_procformatstring_var CASE_BASETYPE(FC_DOUBLE); CASE_BASETYPE(FC_ERROR_STATUS_T); #undef CASE_BASETYPE + + case RPC_FC_BIND_PRIMITIVE: + print_file(file, indent, "0x%02x, /* FC_IGNORE */\n", RPC_FC_IGNORE); + size = 2; /* includes param type prefix */ + break; + default: error("Unknown/unsupported type: %s (0x%02x)\n", var->name, type->type); size = 0; @@ -1003,7 +1010,7 @@ static size_t write_struct_tfs(FILE *fil array = find_array_or_string_in_struct(type); current_structure = type; - array_offset = write_array_tfs(file, array->attrs, array->type, + array_offset = write_array_tfs(file, array->attrs, array->type, array->array, array->name, typestring_offset); current_structure = NULL; @@ -1461,6 +1468,11 @@ void marshall_arguments(FILE *file, int alignment = (4 - last_size); break; + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + /* no marshalling needed */ + continue; + default: error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); size = 0; @@ -1499,10 +1511,6 @@ void marshall_arguments(FILE *file, int case RPC_FC_BOGUS_STRUCT: ndrtype = "ComplexStruct"; break; - case RPC_FC_IGNORE: - case RPC_FC_BIND_PRIMITIVE: - /* no marshalling needed */ - continue; default: error("marshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", var->name, var->type->type, var->ptr_level); @@ -1636,6 +1644,11 @@ void unmarshall_arguments(FILE *file, in alignment = (4 - last_size); break; + case RPC_FC_IGNORE: + case RPC_FC_BIND_PRIMITIVE: + /* no unmarshalling needed */ + continue; + default: error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: 0)\n", var->name, var->type->type); size = 0; @@ -1674,10 +1687,6 @@ void unmarshall_arguments(FILE *file, in case RPC_FC_BOGUS_STRUCT: ndrtype = "ComplexStruct"; break; - case RPC_FC_IGNORE: - case RPC_FC_BIND_PRIMITIVE: - /* no unmarshalling needed */ - continue; default: error("unmarshall_arguments: Unsupported type: %s (0x%02x, ptr_level: %d)\n", var->name, var->type->type, var->ptr_level);

1 0

Robert Shearman : widl: Write out the correct FC type if the structure has pointers.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 8d7fa4c013991d79068436121f7948d367cf0fef URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8d7fa4c013991d790684361… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:30:23 2006 +0100 widl: Write out the correct FC type if the structure has pointers. --- tools/widl/typegen.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6bb2cae..a9c9473 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -966,7 +966,10 @@ static size_t write_struct_tfs(FILE *fil else pointer_offset = 0; /* silence warning */ start_offset = *typestring_offset; - WRITE_FCTYPE(file, FC_STRUCT, *typestring_offset); + if (type->type == RPC_FC_STRUCT) + WRITE_FCTYPE(file, FC_STRUCT, *typestring_offset); + else + WRITE_FCTYPE(file, FC_PSTRUCT, *typestring_offset); /* alignment */ print_file(file, 2, "0x0,\n"); /* total size */ @@ -1013,7 +1016,10 @@ static size_t write_struct_tfs(FILE *fil else pointer_offset = 0; /* silence warning */ start_offset = *typestring_offset; - WRITE_FCTYPE(file, FC_CSTRUCT, *typestring_offset); + if (type->type == RPC_FC_CSTRUCT) + WRITE_FCTYPE(file, FC_CSTRUCT, *typestring_offset); + else + WRITE_FCTYPE(file, FC_CPSTRUCT, *typestring_offset); /* alignment */ print_file(file, 2, "0x0,\n"); /* total size */

1 0

Robert Shearman : widl: Split pointer writing into a separate function.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 4c8370f97ee0ecb6ada3d67b68b05194a61431a1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4c8370f97ee0ecb6ada3d67… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:30:07 2006 +0100 widl: Split pointer writing into a separate function. --- tools/widl/typegen.c | 25 ++++++++++++++----------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 067c2c9..6bb2cae 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1097,6 +1097,18 @@ static size_t write_struct_tfs(FILE *fil } } +static void write_pointer_only_tfs(FILE *file, const attr_t *attrs, size_t offset, size_t *typeformat_offset) +{ + int pointer_type = get_attrv(attrs, ATTR_POINTERTYPE); + if (!pointer_type) pointer_type = RPC_FC_RP; + + print_file(file, 2, "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, 2, "NdrShort(0x%x), /* %d */\n", offset, offset); + *typeformat_offset += 4; +} + static size_t write_union_tfs(FILE *file, const attr_t *attrs, const type_t *type, const char *name, size_t *typeformat_offset) @@ -1113,8 +1125,6 @@ static size_t write_typeformatstring_var while (TRUE) { - int pointer_type; - if (is_string_type(var->attrs, ptr_level, var->array)) return write_string_tfs(file, var->attrs, type, var->array, var->name, typeformat_offset); @@ -1158,7 +1168,7 @@ static size_t write_typeformatstring_var else if (ptr_level == 1 && !type_has_ref(type)) { size_t start_offset = *typeformat_offset; - pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); + int pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); if (!pointer_type) pointer_type = RPC_FC_RP; /* special case for pointers to base types */ @@ -1196,16 +1206,9 @@ static size_t write_typeformatstring_var assert(ptr_level > 0); - pointer_type = get_attrv(var->attrs, ATTR_POINTERTYPE); - if (!pointer_type) pointer_type = RPC_FC_RP; - if (file) fprintf(file, "/* %2u */\n", *typeformat_offset); - 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"); - *typeformat_offset += 4; + write_pointer_only_tfs(file, var->attrs, 2, typeformat_offset); ptr_level--; }

1 0

Robert Shearman : widl: Fix pointer detection for structures with embedded arrays.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 9f0c45b7e79ba2faebaf2b9b63bf711cf86b7ded URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f0c45b7e79ba2faebaf2b9… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:29:39 2006 +0100 widl: Fix pointer detection for structures with embedded arrays. Pointers have priority over every other type, so move the detection to the top of get_struct_type. Fall through from the embedded array detection to the embedded structure handling code so that conformance, variance and pointer presence is inherited from the array's base type. --- tools/widl/parser.y | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 15f1367..499f0f4 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1280,14 +1280,20 @@ static int get_struct_type(var_t *field) while( (t->type == 0) && t->ref ) t = t->ref; - if (is_string_type(field->attrs, field->ptr_level, field->array)) + if (field->ptr_level > 0) + { + has_pointer = 1; + continue; + } + + if (is_string_type(field->attrs, 0, field->array)) { has_conformance = 1; has_variance = 1; continue; } - if (is_array_type(field->attrs, field->ptr_level, field->array)) + if (is_array_type(field->attrs, 0, field->array)) { if (field->array && !field->array->is_const) { @@ -1298,13 +1304,6 @@ static int get_struct_type(var_t *field) } if (is_attr(field->attrs, ATTR_LENGTHIS)) has_variance = 1; - continue; - } - - if (field->ptr_level > 0) - { - has_pointer = 1; - continue; } switch (t->type)

1 0

Robert Shearman : widl: Increment the type format string when writing the pointer
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 864d5a38c5a8e16b77ea4ab8cc00d49b3f0759a2 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=864d5a38c5a8e16b77ea4ab… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:28:33 2006 +0100 widl: Increment the type format string when writing the pointer layouts. Write out pointer layouts for structures. --- tools/widl/typegen.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 72 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index bd0efde..067c2c9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -786,8 +786,11 @@ static size_t write_array_tfs(FILE *file { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); - write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + *typestring_offset += 2; + *typestring_offset = write_pointer_description(file, attrs, + type, 0, array, 0, pointer_start_offset); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + *typestring_offset += 1; } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); @@ -837,8 +840,11 @@ static size_t write_array_tfs(FILE *file { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); - write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + *typestring_offset += 2; + *typestring_offset += write_pointer_description(file, attrs, + type, 0, array, 0, pointer_start_offset); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + *typestring_offset += 1; } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); @@ -867,8 +873,11 @@ static size_t write_array_tfs(FILE *file { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); - write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + *typestring_offset += 2; + *typestring_offset += write_pointer_description(file, attrs, + type, 0, array, 0, pointer_start_offset); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + *typestring_offset += 1; } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); @@ -900,8 +909,11 @@ static size_t write_array_tfs(FILE *file { print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); - write_pointer_description(file, attrs, type, 0, array, 0, pointer_start_offset); + *typestring_offset += 2; + *typestring_offset += write_pointer_description(file, attrs, + type, 0, array, 0, pointer_start_offset); print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + *typestring_offset += 1; } print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); @@ -934,16 +946,25 @@ static size_t write_struct_tfs(FILE *fil const var_t *array; size_t start_offset; size_t array_offset; + size_t pointer_offset; switch (type->type) { case RPC_FC_STRUCT: + case RPC_FC_PSTRUCT: 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); + if (type->type == RPC_FC_PSTRUCT) + { + pointer_offset = *typestring_offset; + write_pointers(file, NULL, type, 0, NULL, 0, typestring_offset); + } + else pointer_offset = 0; /* silence warning */ + start_offset = *typestring_offset; WRITE_FCTYPE(file, FC_STRUCT, *typestring_offset); /* alignment */ @@ -952,6 +973,17 @@ static size_t write_struct_tfs(FILE *fil print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); *typestring_offset += 4; + if (type->type == RPC_FC_PSTRUCT) + { + print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + *typestring_offset += 2; + *typestring_offset += write_pointer_description(file, NULL, + type, 0, NULL, 0, pointer_offset); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + *typestring_offset += 1; + } + /* member layout */ print_file(file, 2, "0x0, /* FIXME: write out conversion data */\n"); print_file(file, 2, "FC_END,\n"); @@ -959,6 +991,7 @@ static size_t write_struct_tfs(FILE *fil *typestring_offset += 2; return start_offset; case RPC_FC_CSTRUCT: + case RPC_FC_CPSTRUCT: total_size = type_memsize(type, 0, NULL); if (total_size > USHRT_MAX) @@ -972,6 +1005,13 @@ static size_t write_struct_tfs(FILE *fil typestring_offset); current_structure = NULL; + if (type->type == RPC_FC_CPSTRUCT) + { + pointer_offset = *typestring_offset; + write_pointers(file, NULL, type, 0, NULL, 0, typestring_offset); + } + else pointer_offset = 0; /* silence warning */ + start_offset = *typestring_offset; WRITE_FCTYPE(file, FC_CSTRUCT, *typestring_offset); /* alignment */ @@ -984,6 +1024,18 @@ static size_t write_struct_tfs(FILE *fil array_offset - *typestring_offset, array_offset); *typestring_offset += 2; + + if (type->type == RPC_FC_CPSTRUCT) + { + print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + *typestring_offset += 2; + *typestring_offset += write_pointer_description(file, NULL, + type, 0, NULL, 0, pointer_offset); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + *typestring_offset += 1; + } + print_file(file, 2, "FC_END,\n"); *typestring_offset += 1; @@ -1007,6 +1059,10 @@ static size_t write_struct_tfs(FILE *fil typestring_offset); current_structure = NULL; + pointer_offset = *typestring_offset; + if (!write_pointers(file, NULL, type, 0, NULL, 0, typestring_offset)) + pointer_offset = 0; + start_offset = *typestring_offset; WRITE_FCTYPE(file, FC_CVSTRUCT, *typestring_offset); /* alignment */ @@ -1019,6 +1075,18 @@ static size_t write_struct_tfs(FILE *fil array_offset - *typestring_offset, array_offset); *typestring_offset += 2; + + if (pointer_offset != 0) + { + print_file(file, 2, "0x%x, /* FC_PP */\n", RPC_FC_PP); + print_file(file, 2, "0x%x, /* FC_PAD */\n", RPC_FC_PAD); + *typestring_offset += 2; + *typestring_offset += write_pointer_description(file, NULL, + type, 0, NULL, 0, pointer_offset); + print_file(file, 2, "0x%x, /* FC_END */\n", RPC_FC_END); + *typestring_offset += 1; + } + print_file(file, 2, "FC_END,\n"); *typestring_offset += 1;

1 0

Robert Shearman : widl: Make all pointer fields of expr_t structure constant.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 0d22347f4459c6a4d43bc1761ce8c82bcaa0dde8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0d22347f4459c6a4d43bc17… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Feb 7 12:28:20 2006 +0100 widl: Make all pointer fields of expr_t structure constant. --- tools/widl/widltypes.h | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 487b4ad..0534339 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -165,14 +165,14 @@ struct _attr_t { struct _expr_t { enum expr_type type; - expr_t *ref; + const expr_t *ref; union { long lval; - char *sval; - expr_t *ext; - typeref_t *tref; + const char *sval; + const expr_t *ext; + const typeref_t *tref; } u; - expr_t *ext2; + const expr_t *ext2; int is_const; long cval; /* parser-internal */

1 0

Dmitry Timoshkov : Clearly indicate that ICCVID and MSVIDC32 do not support compression.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 538ed06c41521fa8f884ecf39a7e617fafb43bc1 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=538ed06c41521fa8f884ecf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 7 12:28:04 2006 +0100 Clearly indicate that ICCVID and MSVIDC32 do not support compression. --- dlls/iccvid/iccvid.c | 20 ++++++++++++-------- dlls/msvidc32/msvideo1.c | 21 +++++++++++++-------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index ddb0d5b..69ccccd 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -765,7 +765,7 @@ static LRESULT ICCVID_DecompressQuery( I ICCVID_dump_BITMAPINFO(in); if( in->bmiHeader.biCompression != ICCVID_MAGIC ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( out ) { @@ -773,11 +773,11 @@ static LRESULT ICCVID_DecompressQuery( I ICCVID_dump_BITMAPINFO(out); if( in->bmiHeader.biPlanes != out->bmiHeader.biPlanes ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biHeight != out->bmiHeader.biHeight ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; if( in->bmiHeader.biWidth != out->bmiHeader.biWidth ) - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; switch( out->bmiHeader.biBitCount ) { @@ -788,7 +788,7 @@ static LRESULT ICCVID_DecompressQuery( I !ICCVID_CheckMask(out->bmiColors, 0xF800, 0x07E0, 0x001F) ) { TRACE("unsupported output bit field(s) for 16-bit colors\n"); - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } } break; @@ -797,7 +797,7 @@ static LRESULT ICCVID_DecompressQuery( I break; default: TRACE("unsupported output bitcount = %d\n", out->bmiHeader.biBitCount ); - return ICERR_UNSUPPORTED; + return ICERR_BADFORMAT; } } @@ -977,6 +977,9 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ return (LRESULT) info; } + case DRV_CLOSE: + return ICCVID_Close( info ); + case ICM_GETINFO: return ICCVID_GetInfo( info, (ICINFO *)lParam1, (DWORD)lParam2 ); @@ -999,8 +1002,9 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ case ICM_DECOMPRESS_END: return ICCVID_DecompressEnd( info ); - case DRV_CLOSE: - return ICCVID_Close( info ); + case ICM_COMPRESS_QUERY: + FIXME("compression not implemented\n"); + return ICERR_BADFORMAT; default: FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index c639d20..a4c1193 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -514,6 +514,16 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT break; } + case DRV_CLOSE: + HeapFree( GetProcessHeap(), 0, info ); + break; + + case DRV_DISABLE: + break; + + case DRV_FREE: + break; + case ICM_GETINFO: r = CRAM_GetInfo( info, (ICINFO *)lParam1, (DWORD)lParam2 ); break; @@ -551,14 +561,9 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT (DWORD) lParam2 ); break; - case DRV_CLOSE: - HeapFree( GetProcessHeap(), 0, info ); - break; - - case DRV_DISABLE: - break; - - case DRV_FREE: + case ICM_COMPRESS_QUERY: + FIXME("compression not implemented\n"); + r = ICERR_BADFORMAT; break; default:

1 0

Dmitry Timoshkov : msvideo: Add a codec to the compressors list only if it supports
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 75c436246d7eaf3d268a30e7401d289e6dd6e399 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=75c436246d7eaf3d268a30e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Feb 7 12:27:54 2006 +0100 msvideo: Add a codec to the compressors list only if it supports specified input format. Return a compressor handle in COMPVARS structure. --- dlls/msvideo/msvideo_main.c | 27 +++++++++++++++++++++------ 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/msvideo/msvideo_main.c b/dlls/msvideo/msvideo_main.c index cd638c0..5f6956c 100644 --- a/dlls/msvideo/msvideo_main.c +++ b/dlls/msvideo/msvideo_main.c @@ -705,19 +705,21 @@ struct choose_compressor COMPVARS cv; }; -static BOOL enum_compressors(HWND list) +static BOOL enum_compressors(HWND list, COMPVARS *pcv) { - UINT id; + UINT id, total = 0; ICINFO icinfo; id = 0; - while (ICInfo(ICTYPE_VIDEO, id, &icinfo)) + while (ICInfo(pcv->fccType, id, &icinfo)) { ICINFO *ic; DWORD idx; HIC hic; + id++; + hic = ICOpen(icinfo.fccType, icinfo.fccHandler, ICMODE_COMPRESS); if (hic) @@ -727,6 +729,17 @@ static BOOL enum_compressors(HWND list) */ DWORD fccHandler = icinfo.fccHandler; + if (pcv->lpbiIn) + { + if (ICCompressQuery(hic, pcv->lpbiIn, NULL) != ICERR_OK) + { + TRACE("fccHandler %s doesn't support input DIB format %ld\n", + wine_dbgstr_fcc(icinfo.fccHandler), pcv->lpbiIn->bmiHeader.biCompression); + ICClose(hic); + continue; + } + } + ICGetInfo(hic, &icinfo, sizeof(icinfo)); icinfo.fccHandler = fccHandler; ICClose(hic); @@ -737,10 +750,10 @@ static BOOL enum_compressors(HWND list) *ic = icinfo; SendMessageW(list, CB_SETITEMDATA, idx, (LPARAM)ic); } - id++; + total++; } - return id != 0; + return total != 0; } static INT_PTR CALLBACK icm_choose_compressor_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) @@ -764,7 +777,7 @@ static INT_PTR CALLBACK icm_choose_compr ic->fccHandler = comptypeDIB; SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETITEMDATA, 0, (LPARAM)ic); - enum_compressors(GetDlgItem(hdlg, IDC_COMP_LIST)); + enum_compressors(GetDlgItem(hdlg, IDC_COMP_LIST), &choose_comp->cv); SendDlgItemMessageW(hdlg, IDC_COMP_LIST, CB_SETCURSEL, 0, 0); SetFocus(GetDlgItem(hdlg, IDC_COMP_LIST)); @@ -795,6 +808,7 @@ static INT_PTR CALLBACK icm_choose_compr { choose_comp->cv.fccType = ic->fccType; choose_comp->cv.fccHandler = ic->fccHandler; + choose_comp->cv.hic = ICOpen(ic->fccType, ic->fccHandler, ICMODE_COMPRESS); /* FIXME: fill everything else */ } } @@ -860,6 +874,7 @@ BOOL VFWAPI ICCompressorChoose(HWND hwnd if (pc->fccType == 0) pc->fccType = ICTYPE_VIDEO; + choose_comp.cv = *pc; choose_comp.flags = uiFlags; choose_comp.title = lpszTitle;

1 0

Michael Stefaniuc : msvcrt: Handle data types B,R, S in C++ symbol demangling.
by Alexandre Julliard Feb. 7, 2006

Feb. 7, 2006

Module: wine Branch: refs/heads/master Commit: 0df8b0a0209f9f99bce5d001e56937af9e2c82d0 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0df8b0a0209f9f99bce5d00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 7 12:27:35 2006 +0100 msvcrt: Handle data types B,R,S in C++ symbol demangling. --- dlls/msvcrt/undname.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 222ce7e..5c2f47f 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -374,8 +374,11 @@ static const char* get_modified_type(str switch (modif) { case 'A': str_modif = " &"; break; + case 'B': str_modif = " & volatile"; break; case 'P': str_modif = " *"; break; case 'Q': str_modif = " * const"; break; + case 'R': str_modif = " * volatile"; break; + case 'S': str_modif = " * const volatile"; break; case '?': str_modif = ""; break; default: return NULL; } @@ -645,11 +648,14 @@ static BOOL demangle_datatype(struct par /* not all the time is seems */ if (!(ct->left = get_modified_type(sym, '?'))) goto done; break; - case 'A': - if (!(ct->left = get_modified_type(sym, 'A'))) goto done; - break; - case 'Q': - if (!(ct->left = get_modified_type(sym, in_args ? 'Q' : 'P'))) goto done; + case 'A': /* reference */ + case 'B': /* volatile reference */ + if (!(ct->left = get_modified_type(sym, dt))) goto done; + break; + case 'Q': /* const pointer */ + case 'R': /* volatile pointer */ + case 'S': /* const volatile pointer */ + if (!(ct->left = get_modified_type(sym, in_args ? dt : 'P'))) goto done; break; case 'P': /* Pointer */ if (isdigit(*sym->current))

1 0