January 2006 - Wine-commits

Alexandre Julliard : msvcrt: Use the msvcrt version of printf everywhere.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: a17b2c1cd2551eaf001d7df07c5121ebea5d3146 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a17b2c1cd2551eaf001d7df… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 12:21:58 2006 +0100 msvcrt: Use the msvcrt version of printf everywhere. --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/msvcrt.h | 4 ++-- dlls/msvcrt/wcs.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index aeb4d75..718e980 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -254,7 +254,7 @@ int _cprintf(const char* format, ...) * Return the number of bytes that would have been written * The code below handles both cases */ - while ((written = _snprintf( mem, resize, format, valist )) == -1 || + while ((written = MSVCRT_vsnprintf( mem, resize, format, valist )) == -1 || written > resize) { resize = (written == -1 ? resize * 2 : written + 1); diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 1f751f8..b6897b2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2908,7 +2908,7 @@ int MSVCRT_vfwprintf(MSVCRT_FILE* file, MSVCRT_wchar_t buf[2048], *mem = buf; int written, resize = sizeof(buf) / sizeof(MSVCRT_wchar_t), retval; /* See vfprintf comments */ - while ((written = _vsnwprintf(mem, resize, format, valist)) == -1 || + while ((written = MSVCRT_vsnwprintf(mem, resize, format, valist)) == -1 || written > resize) { resize = (written == -1 ? resize * 2 : written + sizeof(MSVCRT_wchar_t)); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 0ac0758..3e00480 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -611,11 +611,12 @@ double MSVCRT_difftime(MSVCRT_ti MSVCRT_time_t MSVCRT_time(MSVCRT_time_t*); MSVCRT_FILE* MSVCRT__fdopen(int, const char *); int MSVCRT_vsnprintf(char *str, unsigned int len, const char *format, va_list valist); +int MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len, + const MSVCRT_wchar_t *format, va_list valist ); #ifndef __WINE_MSVCRT_TEST int _write(int,const void*,unsigned int); int _getch(void); -int _vsnwprintf(MSVCRT_wchar_t*,MSVCRT_size_t,const MSVCRT_wchar_t*,va_list); int _ismbstrail(const unsigned char* start, const unsigned char* str); MSVCRT_intptr_t _spawnve(int,const char*,const char* const *,const char* const *); void _searchenv(const char*,const char*,char*); @@ -626,7 +627,6 @@ char* _strset(char*,int); int _ungetch(int); int _cputs(const char*); int _cprintf(const char*,...); -int _snprintf(char*,size_t,const char*,...); char*** __p__environ(void); int* __p___mb_cur_max(void); unsigned int* __p__fmode(void); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 992185d..9c35c46 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -764,7 +764,7 @@ int MSVCRT__snprintf(char *str, unsigned * _vsnwsprintf (MSVCRT.@) */ int MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, - const WCHAR *format, va_list valist ) + const MSVCRT_wchar_t *format, va_list valist ) { pf_output out;

1 0

Juan Lang : iphlpapi: Clean up memory allocation.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 5cd6b34259f6da65bd221a069e9fa2aff592979d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5cd6b34259f6da65bd221a0… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Tue Jan 24 12:18:50 2006 +0100 iphlpapi: Clean up memory allocation. - pass heap to allocate from directly to helper functions, instead of unnecessarily copying returned data - use public types rather than internal ones - make sure GetBestRoute doesn't return bogus matches --- dlls/iphlpapi/ifenum.c | 90 +++++++ dlls/iphlpapi/ifenum.h | 7 + dlls/iphlpapi/iphlpapi_main.c | 419 +++++++++++++-------------------- dlls/iphlpapi/ipstats.c | 527 ++++++++++++++++++++++++----------------- dlls/iphlpapi/ipstats.h | 49 +--- 5 files changed, 587 insertions(+), 505 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=5cd6b34259f6da65bd2…

1 0

Robert Shearman : widl: Generate type format strings for conformant varying arrays.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 2d4edc3b3d1d68f010f978c2bdf8351b7777ee2b URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2d4edc3b3d1d68f010f978c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:14:59 2006 +0100 widl: Generate type format strings for conformant varying arrays. --- tools/widl/typegen.c | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 4a486e5..631a0f1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -654,7 +654,7 @@ static size_t write_array_tfs(FILE *file } } -static const var_t *find_array_in_struct(const type_t *type) +static const var_t *find_array_or_string_in_struct(const type_t *type) { /* last field is the first in the fields linked list */ const var_t *last_field = type->fields; @@ -665,7 +665,7 @@ static const var_t *find_array_in_struct (last_field->type->type == RPC_FC_CPSTRUCT) || (last_field->type->type == RPC_FC_CVSTRUCT)); - return find_array_in_struct(last_field->type); + return find_array_or_string_in_struct(last_field->type); } static size_t write_struct_tfs(FILE *file, const type_t *type, const char *name) @@ -713,7 +713,7 @@ static size_t write_struct_tfs(FILE *fil print_file(file, 2, "FC_END,\n"); typestring_size = 7; - array = find_array_in_struct(type); + array = find_array_or_string_in_struct(type); /* assumes array points to the start of the linked list, which is true * if the array is the last member of the struct */ current_fields = array; @@ -722,6 +722,36 @@ static size_t write_struct_tfs(FILE *fil current_fields = NULL; return typestring_size; + case RPC_FC_CVSTRUCT: + 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_CVSTRUCT, "FC_CVSTRUCT"); + /* alignment */ + print_file(file, 2, "0x0,\n"); + /* total size */ + print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); + /* FIXME: a fixed offset won't work when pointer layout is present */ + print_file(file, 2, "NdrShort(0x3), /* 3 */\n"); + print_file(file, 2, "FC_END,\n"); + typestring_size = 7; + + array = find_array_or_string_in_struct(type); + /* assumes array points to the start of the linked list, which is true + * if the array is the last member of the struct */ + current_fields = array; + if (is_attr(array->attrs, ATTR_STRING)) + typestring_size += write_string_tfs(file, array->attrs, array->type, + array->array, array->name); + else + typestring_size += write_array_tfs(file, array->attrs, array->type, + array->array, array->name); + current_fields = NULL; + + return typestring_size; default: error("write_struct_tfs: Unimplemented for type 0x%x\n", type->type); return 0;

1 0

Robert Shearman : widl: Fix detection of varying arrays.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 2eedb11f22345160bb1991f5cc841922849abc49 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2eedb11f22345160bb1991f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:14:38 2006 +0100 widl: Fix detection of varying arrays. Correctly identify structures containing varying arrays as conformant varying structures. --- tools/widl/parser.y | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index bbce165..49532a0 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1258,13 +1258,17 @@ static int get_struct_type(var_t *field) continue; } - if (is_array_type(field->attrs, field->ptr_level, field->array) && - field->array && !field->array->is_const) + if (is_array_type(field->attrs, field->ptr_level, field->array)) { - has_conformance = 1; - if (PREV_LINK(field)) - yyerror("field %s deriving from a conformant array must be the last field in the structure\n", - field->name); + if (field->array && !field->array->is_const) + { + has_conformance = 1; + if (PREV_LINK(field)) + yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + field->name); + } + if (is_attr(field->attrs, ATTR_LENGTHIS)) + has_variance = 1; continue; }

1 0

Robert Shearman : widl: Support generation of conformant structure type strings.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 9f76c0cfee24c24dcdc5fe4c82fd077e405ddd50 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f76c0cfee24c24dcdc5fe4… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:13:49 2006 +0100 widl: Support generation of conformant structure type strings. --- tools/widl/typegen.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 85c83c4..4a486e5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -654,10 +654,26 @@ static size_t write_array_tfs(FILE *file } } +static const var_t *find_array_in_struct(const type_t *type) +{ + /* last field is the first in the fields linked list */ + const var_t *last_field = type->fields; + if (is_array_type(last_field->attrs, last_field->ptr_level, last_field->array)) + return last_field; + + assert((last_field->type->type == RPC_FC_CSTRUCT) || + (last_field->type->type == RPC_FC_CPSTRUCT) || + (last_field->type->type == RPC_FC_CVSTRUCT)); + + return find_array_in_struct(last_field->type); +} + static size_t write_struct_tfs(FILE *file, const type_t *type, const char *name) { size_t total_size; size_t typestring_size; + const var_t *array; + switch (type->type) { case RPC_FC_STRUCT: @@ -680,6 +696,32 @@ static size_t write_struct_tfs(FILE *fil typestring_size += 2; return typestring_size; + case RPC_FC_CSTRUCT: + 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_CSTRUCT, "FC_CSTRUCT"); + /* alignment */ + print_file(file, 2, "0x0,\n"); + /* total size */ + print_file(file, 2, "NdrShort(0x%x), /* %u */\n", total_size, total_size); + /* FIXME: a fixed offset won't work when pointer layout is present */ + print_file(file, 2, "NdrShort(0x3), /* 3 */\n"); + print_file(file, 2, "FC_END,\n"); + typestring_size = 7; + + array = find_array_in_struct(type); + /* assumes array points to the start of the linked list, which is true + * if the array is the last member of the struct */ + current_fields = array; + typestring_size += write_array_tfs(file, array->attrs, array->type, + array->array, array->name); + current_fields = NULL; + + return typestring_size; default: error("write_struct_tfs: Unimplemented for type 0x%x\n", type->type); return 0;

1 0

Robert Shearman : widl: Fix detection of conformant varying structs.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: b4fb36c363f0bfc55556439a326f0926316d9780 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b4fb36c363f0bfc55556439… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:14:15 2006 +0100 widl: Fix detection of conformant varying structs. Rename has_conformant_array to has_conformance, add a new variable has_variance and map has_conformant_string to has_conformance and has_variance. A conformant varying struct should be returned if just variance is present and even if no pointers are present. --- tools/widl/parser.y | 27 +++++++++++++++------------ 1 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 8585218..bbce165 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1240,8 +1240,8 @@ static type_t *get_typev(unsigned char t static int get_struct_type(var_t *field) { int has_pointer = 0; - int has_conformant_array = 0; - int has_conformant_string = 0; + int has_conformance = 0; + int has_variance = 0; for (; field; field = NEXT_LINK(field)) { @@ -1253,14 +1253,15 @@ static int get_struct_type(var_t *field) if (is_string_type(field->attrs, field->ptr_level, field->array)) { - has_conformant_string = 1; + has_conformance = 1; + has_variance = 1; continue; } if (is_array_type(field->attrs, field->ptr_level, field->array) && field->array && !field->array->is_const) { - has_conformant_array = 1; + has_conformance = 1; if (PREV_LINK(field)) yyerror("field %s deriving from a conformant array must be the last field in the structure\n", field->name); @@ -1306,14 +1307,15 @@ static int get_struct_type(var_t *field) has_pointer = 1; break; case RPC_FC_CARRAY: - has_conformant_array = 1; + has_conformance = 1; if (PREV_LINK(field)) yyerror("field %s deriving from a conformant array must be the last field in the structure\n", field->name); break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: - has_conformant_string = 1; + has_conformance = 1; + has_variance = 1; break; /* @@ -1321,12 +1323,13 @@ static int get_struct_type(var_t *field) * a struct should be at least as complex as its member */ case RPC_FC_CVSTRUCT: - has_conformant_string = 1; + has_conformance = 1; + has_variance = 1; has_pointer = 1; break; case RPC_FC_CPSTRUCT: - has_conformant_array = 1; + has_conformance = 1; if (PREV_LINK(field)) yyerror("field %s deriving from a conformant array must be the last field in the structure\n", field->name); @@ -1334,7 +1337,7 @@ static int get_struct_type(var_t *field) break; case RPC_FC_CSTRUCT: - has_conformant_array = 1; + has_conformance = 1; if (PREV_LINK(field)) yyerror("field %s deriving from a conformant array must be the last field in the structure\n", field->name); @@ -1362,11 +1365,11 @@ static int get_struct_type(var_t *field) } } - if( has_conformant_string && has_pointer ) + if( has_variance ) return RPC_FC_CVSTRUCT; - if( has_conformant_array && has_pointer ) + if( has_conformance && has_pointer ) return RPC_FC_CPSTRUCT; - if( has_conformant_array ) + if( has_conformance ) return RPC_FC_CSTRUCT; if( has_pointer ) return RPC_FC_PSTRUCT;

1 0

Robert Shearman : widl: Conformant arrays have a size of 0.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 90032b2da62ee4dd93ff71bcd16088f6948661a9 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=90032b2da62ee4dd93ff71b… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:13:30 2006 +0100 widl: Conformant arrays have a size of 0. Conformant arrays should cause a size of 0 to be returned from type_memsize. --- tools/widl/typegen.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8f12934..85c83c4 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -430,8 +430,13 @@ static size_t type_memsize(const type_t size = 0; } - if (array && array->is_const) - size *= array->cval; + if (array) + { + if (array->is_const) + size *= array->cval; + else + size = 0; + } return size; }

1 0

Robert Shearman : widl: Error if an array is in the middle of a structure.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: e9c771f98b214092cd20c3e492c73ac24f3c28b8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e9c771f98b214092cd20c3e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:12:20 2006 +0100 widl: Error if an array is in the middle of a structure. Fix detection of conformant arrays and output an error if the array isn't at the end of the structure. --- tools/widl/parser.y | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e4ee9ff..8585218 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1257,9 +1257,13 @@ static int get_struct_type(var_t *field) continue; } - if (is_array_type(field->attrs, field->ptr_level, field->array)) + if (is_array_type(field->attrs, field->ptr_level, field->array) && + field->array && !field->array->is_const) { has_conformant_array = 1; + if (PREV_LINK(field)) + yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + field->name); continue; } @@ -1303,6 +1307,9 @@ static int get_struct_type(var_t *field) break; case RPC_FC_CARRAY: has_conformant_array = 1; + if (PREV_LINK(field)) + yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + field->name); break; case RPC_FC_C_CSTRING: case RPC_FC_C_WSTRING: @@ -1320,11 +1327,17 @@ static int get_struct_type(var_t *field) case RPC_FC_CPSTRUCT: has_conformant_array = 1; + if (PREV_LINK(field)) + yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + field->name); has_pointer = 1; break; case RPC_FC_CSTRUCT: has_conformant_array = 1; + if (PREV_LINK(field)) + yyerror("field %s deriving from a conformant array must be the last field in the structure\n", + field->name); break; case RPC_FC_PSTRUCT:

1 0

Robert Shearman : widl: Support correlation descriptors in structures.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 73023890c51a914d49d7d0c7ca3ea31cca9bfbb5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=73023890c51a914d49d7d0c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:12:54 2006 +0100 widl: Support correlation descriptors in structures. --- tools/widl/typegen.c | 152 ++++++++++++++++++++++++++++++-------------------- 1 files changed, 92 insertions(+), 60 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2a395c9..8f12934 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -43,6 +43,9 @@ #include "typegen.h" static const func_t *current_func; +static const var_t *current_fields; + +static size_t type_memsize(const type_t *t, int ptr_level, const expr_t *array); static int print_file(FILE *file, int indent, const char *format, ...) { @@ -215,8 +218,7 @@ void write_procformatstring(FILE *file, } /* 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) +static size_t write_conf_or_var_desc(FILE *file, const func_t *func, const var_t *fields, const expr_t *expr) { unsigned char operator_type = 0; const char *operator_string = "no operators"; @@ -269,80 +271,104 @@ static size_t write_conf_or_var_desc(FIL if (subexpr->type == EXPR_IDENTIFIER) { - if (func) + unsigned char correlation_type; + const type_t *correlation_variable = NULL; + unsigned char param_type = 0; + const char *param_type_string = NULL; + size_t offset; + + if (fields) + { + const var_t *var; + + for (offset = 0, var = fields; var; var = NEXT_LINK(var)) + { + offset -= type_memsize(var->type, var->ptr_level, var->array); + if (!strcmp(var->name, subexpr->u.sval)) + { + correlation_variable = var->type; + break; + } + } + if (!correlation_variable) + error("write_conf_or_var_desc: couldn't find variable %s in structure\n", + subexpr->u.sval); + + correlation_type = RPC_FC_NORMAL_CONFORMANCE; + } + else { - 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)) + /* FIXME: not all stack variables are sizeof(void *) */ + for (offset = 0; var; offset += sizeof(void *), var = PREV_LINK(var)) { if (!strcmp(var->name, subexpr->u.sval)) { - conformance_type = var->type; + correlation_variable = var->type; break; } } - if (!conformance_type) - error("write_conf_or_var_desc: couldn't find variable %s\n", + if (!correlation_variable) + error("write_conf_or_var_desc: couldn't find variable %s in function\n", subexpr->u.sval); - while (type_has_ref(conformance_type)) - conformance_type = conformance_type->ref; + correlation_type = RPC_FC_TOP_LEVEL_CONFORMANCE; + } - 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); - } + while (type_has_ref(correlation_variable)) + correlation_variable = correlation_variable->ref; - 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, "0x%x, /* %s */\n", operator_type, operator_string); - print_file(file, 2, "0x%x, /* x86 stack size / offset = %d */\n", stack_offset, stack_offset); + switch (correlation_variable->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", + correlation_variable->type); } - else - error("write_conf_or_var_desc: not supported for non-functions yet\n"); + + print_file(file, 2, "0x%x, /* Corr desc: %s%s */\n", + correlation_type | param_type, + correlation_type == RPC_FC_TOP_LEVEL_CONFORMANCE ? "parameter, " : "", + param_type_string); + print_file(file, 2, "0x%x, /* %s */\n", operator_type, operator_string); + print_file(file, 2, "0x%x, /* %soffset = %d */\n", + offset, + correlation_type == RPC_FC_TOP_LEVEL_CONFORMANCE ? "x86 stack size / " : "", + offset); } else error("write_conf_or_var_desc: expression type %d\n", subexpr->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) { size_t size = 0; @@ -454,7 +480,7 @@ static size_t write_string_tfs(FILE *fil 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); + typestring_size += write_conf_or_var_desc(file, current_func, NULL, size_is); return typestring_size; } @@ -557,7 +583,9 @@ static size_t write_array_tfs(FILE *file print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); typestring_size += 2; - typestring_size += write_conf_or_var_desc(file, current_func, length_is); + typestring_size += write_conf_or_var_desc(file, current_func, + current_fields, + length_is); /* FIXME: write out pointer descriptor if necessary */ @@ -580,7 +608,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; - typestring_size += write_conf_or_var_desc(file, current_func, size_is); + typestring_size += write_conf_or_var_desc(file, current_func, + current_fields, size_is); /* FIXME: write out pointer descriptor if necessary */ @@ -603,8 +632,11 @@ static size_t write_array_tfs(FILE *file print_file(file, 2, "NdrFcShort(0x%x), /* %d */\n", element_size, element_size); typestring_size = 4; - typestring_size += write_conf_or_var_desc(file, current_func, size_is); - typestring_size += write_conf_or_var_desc(file, current_func, length_is); + typestring_size += write_conf_or_var_desc(file, current_func, + current_fields, size_is); + typestring_size += write_conf_or_var_desc(file, current_func, + current_fields, + length_is); /* FIXME: write out pointer descriptor if necessary */

1 0

Robert Shearman : widl: Fix the detection of conformant and pointer structs.
by Alexandre Julliard 24 Jan '06

24 Jan '06

Module: wine Branch: refs/heads/master Commit: 362d42e0826dd2907418ec78bb9da5717e491a72 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=362d42e0826dd2907418ec7… Author: Robert Shearman <rob(a)codeweavers.com> Date: Tue Jan 24 11:11:56 2006 +0100 widl: Fix the detection of conformant and pointer structs. --- tools/widl/header.h | 12 ++++++++++++ tools/widl/parser.y | 21 +++++++++++++++++++-- tools/widl/typegen.c | 12 ------------ 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 1a767c7..a29502d 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -45,4 +45,16 @@ extern void write_library(const char *na extern void write_user_types(void); extern var_t* get_explicit_handle_var(func_t* func); +static inline int is_string_type(const attr_t *attrs, int ptr_level, const expr_t *array) +{ + return (is_attr(attrs, ATTR_STRING) && + ((ptr_level == 1 && !array) || (ptr_level == 0 && array))); +} + +static inline int is_array_type(const attr_t *attrs, int ptr_level, const expr_t *array) +{ + return ((ptr_level == 1 && !array && is_attr(attrs, ATTR_SIZEIS)) || + (ptr_level == 0 && array)); +} + #endif diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7c32944..e4ee9ff 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1243,7 +1243,7 @@ static int get_struct_type(var_t *field) int has_conformant_array = 0; int has_conformant_string = 0; - while (field) + for (; field; field = NEXT_LINK(field)) { type_t *t = field->type; @@ -1251,6 +1251,24 @@ 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)) + { + has_conformant_string = 1; + continue; + } + + if (is_array_type(field->attrs, field->ptr_level, field->array)) + { + has_conformant_array = 1; + continue; + } + + if (field->ptr_level > 0) + { + has_pointer = 1; + continue; + } + switch (t->type) { /* @@ -1329,7 +1347,6 @@ static int get_struct_type(var_t *field) case RPC_FC_BOGUS_STRUCT: return RPC_FC_BOGUS_STRUCT; } - field = NEXT_LINK(field); } if( has_conformant_string && has_pointer ) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index b54ad11..2a395c9 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -91,18 +91,6 @@ static inline int is_base_type(unsigned } } -static inline int is_string_type(const attr_t *attrs, int ptr_level, const expr_t *array) -{ - return (is_attr(attrs, ATTR_STRING) && - ((ptr_level == 1 && !array) || (ptr_level == 0 && array))); -} - -static inline int is_array_type(const attr_t *attrs, int ptr_level, const expr_t *array) -{ - return ((ptr_level == 1 && !array && is_attr(attrs, ATTR_SIZEIS)) || - (ptr_level == 0 && array)); -} - static size_t write_procformatstring_var(FILE *file, int indent, const var_t *var, int is_return, unsigned int *type_offset) {

1 0