March 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : iphlpapi: Implemented GetIcmpStatistics for Solaris.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: a82f443c0c671188b6d786c38d6f957c9c72cf92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82f443c0c671188b6d786c38… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 19:18:51 2009 +0100 iphlpapi: Implemented GetIcmpStatistics for Solaris. --- dlls/iphlpapi/Makefile.in | 2 +- dlls/iphlpapi/ipstats.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 76315af..09ed78d 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = iphlpapi.dll IMPORTLIB = iphlpapi IMPORTS = advapi32 kernel32 -EXTRALIBS = @RESOLVLIBS@ +EXTRALIBS = @RESOLVLIBS@ @LIBKSTAT@ C_SRCS = \ icmp.c \ diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 3884cfc..888f95f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -107,6 +107,9 @@ #ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif +#ifdef HAVE_KSTAT_H +#include <kstat.h> +#endif #ifndef ROUNDUP #define ROUNDUP(a) \ @@ -148,6 +151,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); +#ifdef HAVE_LIBKSTAT +static DWORD kstat_get_ui32( kstat_t *ksp, const char *name ) +{ + unsigned int i; + kstat_named_t *data = ksp->ks_data; + + for (i = 0; i < ksp->ks_ndata; i++) + if (!strcmp( data[i].name, name )) return data[i].value.ui32; + return 0; +} +#endif + DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) { DWORD ret = ERROR_NOT_SUPPORTED; @@ -308,6 +323,47 @@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP stats) ret = NO_ERROR; } } +#elif defined(HAVE_LIBKSTAT) + { + static char ip[] = "ip", icmp[] = "icmp"; + kstat_ctl_t *kc; + kstat_t *ksp; + + if ((kc = kstat_open()) && + (ksp = kstat_lookup( kc, ip, 0, icmp )) && + kstat_read( kc, ksp, NULL ) != -1 && + ksp->ks_type == KSTAT_TYPE_NAMED) + { + stats->stats.icmpInStats.dwMsgs = kstat_get_ui32( ksp, "inMsgs" ); + stats->stats.icmpInStats.dwErrors = kstat_get_ui32( ksp, "inErrors" ); + stats->stats.icmpInStats.dwDestUnreachs = kstat_get_ui32( ksp, "inDestUnreachs" ); + stats->stats.icmpInStats.dwTimeExcds = kstat_get_ui32( ksp, "inTimeExcds" ); + stats->stats.icmpInStats.dwParmProbs = kstat_get_ui32( ksp, "inParmProbs" ); + stats->stats.icmpInStats.dwSrcQuenchs = kstat_get_ui32( ksp, "inSrcQuenchs" ); + stats->stats.icmpInStats.dwRedirects = kstat_get_ui32( ksp, "inRedirects" ); + stats->stats.icmpInStats.dwEchos = kstat_get_ui32( ksp, "inEchos" ); + stats->stats.icmpInStats.dwEchoReps = kstat_get_ui32( ksp, "inEchoReps" ); + stats->stats.icmpInStats.dwTimestamps = kstat_get_ui32( ksp, "inTimestamps" ); + stats->stats.icmpInStats.dwTimestampReps = kstat_get_ui32( ksp, "inTimestampReps" ); + stats->stats.icmpInStats.dwAddrMasks = kstat_get_ui32( ksp, "inAddrMasks" ); + stats->stats.icmpInStats.dwAddrMaskReps = kstat_get_ui32( ksp, "inAddrMaskReps" ); + stats->stats.icmpOutStats.dwMsgs = kstat_get_ui32( ksp, "outMsgs" ); + stats->stats.icmpOutStats.dwErrors = kstat_get_ui32( ksp, "outErrors" ); + stats->stats.icmpOutStats.dwDestUnreachs = kstat_get_ui32( ksp, "outDestUnreachs" ); + stats->stats.icmpOutStats.dwTimeExcds = kstat_get_ui32( ksp, "outTimeExcds" ); + stats->stats.icmpOutStats.dwParmProbs = kstat_get_ui32( ksp, "outParmProbs" ); + stats->stats.icmpOutStats.dwSrcQuenchs = kstat_get_ui32( ksp, "outSrcQuenchs" ); + stats->stats.icmpOutStats.dwRedirects = kstat_get_ui32( ksp, "outRedirects" ); + stats->stats.icmpOutStats.dwEchos = kstat_get_ui32( ksp, "outEchos" ); + stats->stats.icmpOutStats.dwEchoReps = kstat_get_ui32( ksp, "outEchoReps" ); + stats->stats.icmpOutStats.dwTimestamps = kstat_get_ui32( ksp, "outTimestamps" ); + stats->stats.icmpOutStats.dwTimestampReps = kstat_get_ui32( ksp, "outTimestampReps" ); + stats->stats.icmpOutStats.dwAddrMasks = kstat_get_ui32( ksp, "outAddrMasks" ); + stats->stats.icmpOutStats.dwAddrMaskReps = kstat_get_ui32( ksp, "outAddrMaskReps" ); + ret = NO_ERROR; + } + if (kc) kstat_close( kc ); + } #elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS};

1 0

Alexandre Julliard : iphlpapi: Implemented GetIpStatistics for Solaris.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: ac72b866035742e9f04ece2854ab3c7ac0e9a2c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac72b866035742e9f04ece285… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 5 19:25:36 2009 +0100 iphlpapi: Implemented GetIpStatistics for Solaris. --- dlls/iphlpapi/ipstats.c | 35 +++++++++++++++++++++++++++++++++++ 1 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 888f95f..e8e8781 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -495,6 +495,41 @@ DWORD WINAPI GetIpStatistics(PMIB_IPSTATS stats) ret = NO_ERROR; } } +#elif defined(HAVE_LIBKSTAT) + { + static char ip[] = "ip"; + kstat_ctl_t *kc; + kstat_t *ksp; + + if ((kc = kstat_open()) && + (ksp = kstat_lookup( kc, ip, 0, ip )) && + kstat_read( kc, ksp, NULL ) != -1 && + ksp->ks_type == KSTAT_TYPE_NAMED) + { + stats->dwForwarding = kstat_get_ui32( ksp, "forwarding" ); + stats->dwDefaultTTL = kstat_get_ui32( ksp, "defaultTTL" ); + stats->dwInReceives = kstat_get_ui32( ksp, "inReceives" ); + stats->dwInHdrErrors = kstat_get_ui32( ksp, "inHdrErrors" ); + stats->dwInAddrErrors = kstat_get_ui32( ksp, "inAddrErrors" ); + stats->dwForwDatagrams = kstat_get_ui32( ksp, "forwDatagrams" ); + stats->dwInUnknownProtos = kstat_get_ui32( ksp, "inUnknownProtos" ); + stats->dwInDiscards = kstat_get_ui32( ksp, "inDiscards" ); + stats->dwInDelivers = kstat_get_ui32( ksp, "inDelivers" ); + stats->dwOutRequests = kstat_get_ui32( ksp, "outRequests" ); + stats->dwRoutingDiscards = kstat_get_ui32( ksp, "routingDiscards" ); + stats->dwOutDiscards = kstat_get_ui32( ksp, "outDiscards" ); + stats->dwOutNoRoutes = kstat_get_ui32( ksp, "outNoRoutes" ); + stats->dwReasmTimeout = kstat_get_ui32( ksp, "reasmTimeout" ); + stats->dwReasmReqds = kstat_get_ui32( ksp, "reasmReqds" ); + stats->dwReasmOks = kstat_get_ui32( ksp, "reasmOKs" ); + stats->dwReasmFails = kstat_get_ui32( ksp, "reasmFails" ); + stats->dwFragOks = kstat_get_ui32( ksp, "fragOKs" ); + stats->dwFragFails = kstat_get_ui32( ksp, "fragFails" ); + stats->dwFragCreates = kstat_get_ui32( ksp, "fragCreates" ); + ret = NO_ERROR; + } + if (kc) kstat_close( kc ); + } #elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS};

1 0

Rob Shearman : widl: Move type_new_enum, type_new_struct, type_new_encapsulated_union and type_new_unencapsulated_union to typetree. c.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 13c39675229cc7789a41c428588f40ef490d0e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13c39675229cc7789a41c4285… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:23:00 2009 +0000 widl: Move type_new_enum, type_new_struct, type_new_encapsulated_union and type_new_unencapsulated_union to typetree.c. --- tools/widl/parser.y | 113 ++--------------------------------------------- tools/widl/typetree.c | 83 +++++++++++++++++++++++++++++++++++ tools/widl/typetree.h | 4 ++ tools/widl/widltypes.h | 10 ++++ 4 files changed, 102 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13c39675229cc7789a41c…

1 0

Rob Shearman : widl: Add coclass and module types to the global namespace.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 9d878f220b234f195732d077cd5157ff5a31f9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d878f220b234f195732d077c… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:23:07 2009 +0000 widl: Add coclass and module types to the global namespace. --- tools/widl/typetree.c | 20 ++++++++++++-------- tools/widl/typetree.h | 4 ++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index f589353..3b38278 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -96,20 +96,24 @@ type_t *type_new_alias(type_t *t, const char *name) return a; } -type_t *type_new_module(const char *name) +type_t *type_new_module(char *name) { - type_t *type = make_type(TYPE_MODULE); + type_t *type = get_type(TYPE_MODULE, name, 0); + if (type->type_type != TYPE_MODULE || type->defined) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); type->name = name; - /* FIXME: register type to detect multiple definitions */ return type; } -type_t *type_new_coclass(const char *name) +type_t *type_new_coclass(char *name) { - type_t *c = make_type(TYPE_COCLASS); - c->name = name; - /* FIXME: register type to detect multiple definitions */ - return c; + type_t *type = get_type(TYPE_COCLASS, name, 0); + if (type->type_type != TYPE_COCLASS || type->defined) + error_loc("%s: redefinition error; original definition was at %s:%d\n", + type->name, type->loc_info.input_name, type->loc_info.line_number); + type->name = name; + return type; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index c267e5f..4c25aa1 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -27,13 +27,13 @@ type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref, attr_list_t *attrs); type_t *type_new_alias(type_t *t, const char *name); -type_t *type_new_module(const char *name); +type_t *type_new_module(char *name); type_t *type_new_array(const char *name, type_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is); type_t *type_new_basic(enum type_basic_type basic_type); type_t *type_new_int(enum type_basic_type basic_type, int sign); type_t *type_new_void(void); -type_t *type_new_coclass(const char *name); +type_t *type_new_coclass(char *name); type_t *type_new_enum(const char *name, int defined, var_list_t *enums); type_t *type_new_struct(char *name, int defined, var_list_t *fields); type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields);

1 0

Rob Shearman : widl: Pass var attrs into write_no_repeat_pointer_descriptions and use them for the string check .
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: a8238dd1423bdf5d69fa63333ef6359ca439e614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8238dd1423bdf5d69fa63333… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:23:54 2009 +0000 widl: Pass var attrs into write_no_repeat_pointer_descriptions and use them for the string check. --- tools/widl/typegen.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6782528..5896089 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1471,7 +1471,7 @@ static void write_descriptors(FILE *file, type_t *type, unsigned int *tfsoff) } static int write_no_repeat_pointer_descriptions( - FILE *file, type_t *type, + FILE *file, const attr_list_t *attrs, type_t *type, unsigned int *offset_in_memory, unsigned int *offset_in_buffer, unsigned int *typestring_offset) { @@ -1493,7 +1493,7 @@ static int write_no_repeat_pointer_descriptions( if (is_ptr(type)) { - if (is_string_type(type->attrs, type)) + if (is_string_type(attrs, type)) write_string_tfs(file, NULL, type, NULL, typestring_offset); else write_pointer_tfs(file, type, typestring_offset); @@ -1534,7 +1534,7 @@ static int write_no_repeat_pointer_descriptions( *offset_in_buffer += padding; } written += write_no_repeat_pointer_descriptions( - file, v->type, + file, v->attrs, v->type, offset_in_memory, offset_in_buffer, typestring_offset); } } @@ -1852,7 +1852,7 @@ static void write_pointer_description(FILE *file, type_t *type, offset_in_memory = 0; offset_in_buffer = 0; write_no_repeat_pointer_descriptions( - file, type, + file, NULL, type, &offset_in_memory, &offset_in_buffer, typestring_offset); }

1 0

Rob Shearman : widl: Store the abstract identifier of the type in type object instead of an NDR format character .
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 277e0617d5d23ba49ec57c75f72923ff55db1f63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=277e0617d5d23ba49ec57c75f… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:22:19 2009 +0000 widl: Store the abstract identifier of the type in type object instead of an NDR format character. --- tools/widl/header.c | 2 +- tools/widl/parser.y | 51 ++++++++++++---------------------- tools/widl/typegen.c | 2 +- tools/widl/typelib.c | 9 ++++-- tools/widl/typetree.c | 24 ++++++++++++---- tools/widl/typetree.h | 3 +- tools/widl/widltypes.h | 70 ++++++----------------------------------------- tools/widl/write_msft.c | 14 ++------- 8 files changed, 58 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=277e0617d5d23ba49ec57…

1 0

Rob Shearman : widl: Move the pointer referent, array element, function return type and interface inheritance properties from type_t to details structures for the appropriate types .
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 4866026d7f6753643ef57f34bf387320f1325d8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4866026d7f6753643ef57f34b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:22:32 2009 +0000 widl: Move the pointer referent, array element, function return type and interface inheritance properties from type_t to details structures for the appropriate types. --- tools/widl/parser.y | 50 ++++++++++++++++------------------------------- tools/widl/typetree.c | 44 +++++++++++++++++++++++++++++++--------- tools/widl/typetree.h | 8 +++--- tools/widl/widltypes.h | 9 +++++-- tools/widl/write_msft.c | 7 ++--- 5 files changed, 64 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4866026d7f6753643ef57…

1 0

Rob Shearman : widl: Allow enum and union tags to be used without being defined.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 7c711d0736dfa4190210e66a285ab48092afd9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c711d0736dfa4190210e66a2… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:22:51 2009 +0000 widl: Allow enum and union tags to be used without being defined. --- tools/widl/parser.y | 59 ++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 42 insertions(+), 17 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c70d3d5..816d5e1 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -117,9 +117,9 @@ static type_t *make_safearray(type_t *type); static typelib_t *make_library(const char *name, const attr_list_t *attrs); static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type); -static type_t *type_new_enum(char *name, var_list_t *enums); +static type_t *type_new_enum(const char *name, int defined, var_list_t *enums); static type_t *type_new_struct(char *name, int defined, var_list_t *fields); -static type_t *type_new_nonencapsulated_union(char *name, var_list_t *fields); +static type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields); static type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *union_field, var_list_t *cases); static type_t *reg_type(type_t *type, const char *name, int t); @@ -614,7 +614,7 @@ enum: ident '=' expr_int_const { $$ = reg_const($1); } ; -enumdef: tENUM t_ident '{' enums '}' { $$ = type_new_enum($2, $4); } +enumdef: tENUM t_ident '{' enums '}' { $$ = type_new_enum($2, TRUE, $4); } ; m_exprs: m_expr { $$ = append_expr( NULL, $1 ); } @@ -980,11 +980,11 @@ type: tVOID { $$ = type_new_void(); } | aKNOWNTYPE { $$ = find_type_or_error($1, 0); } | base_type { $$ = $1; } | enumdef { $$ = $1; } - | tENUM aIDENTIFIER { $$ = find_type_or_error2($2, tsENUM); } + | tENUM aIDENTIFIER { $$ = type_new_enum($2, FALSE, NULL); } | structdef { $$ = $1; } | tSTRUCT aIDENTIFIER { $$ = type_new_struct($2, FALSE, NULL); } | uniondef { $$ = $1; } - | tUNION aIDENTIFIER { $$ = find_type_or_error2($2, tsUNION); } + | tUNION aIDENTIFIER { $$ = type_new_nonencapsulated_union($2, FALSE, NULL); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; @@ -995,7 +995,7 @@ typedef: tTYPEDEF m_attributes decl_spec declarator_list ; uniondef: tUNION t_ident '{' ne_union_fields '}' - { $$ = type_new_nonencapsulated_union($2, $4); } + { $$ = type_new_nonencapsulated_union($2, TRUE, $4); } | tUNION t_ident tSWITCH '(' s_field ')' m_ident '{' cases '}' { $$ = type_new_encapsulated_union($2, $5, $7, $9); } @@ -1240,17 +1240,28 @@ void clear_all_offsets(void) node->data.typestring_offset = node->data.ptrdesc = 0; } -static type_t *type_new_enum(char *name, var_list_t *enums) +static type_t *type_new_enum(const char *name, int defined, var_list_t *enums) { - type_t *t = get_type(TYPE_ENUM, name, tsENUM); - if (enums) + type_t *tag_type = name ? find_type(name, tsENUM) : NULL; + type_t *t = make_type(TYPE_ENUM); + t->name = name; + + if (tag_type && tag_type->details.enumeration) + t->details.enumeration = tag_type->details.enumeration; + else if (defined) { t->details.enumeration = xmalloc(sizeof(*t->details.enumeration)); t->details.enumeration->enums = enums; + t->defined = TRUE; + } + + if (name) + { + if (defined) + reg_type(t, name, tsENUM); + else + add_incomplete(t); } - else - t->details.enumeration = NULL; - t->defined = TRUE; return t; } @@ -1280,12 +1291,26 @@ static type_t *type_new_struct(char *name, int defined, var_list_t *fields) return t; } -static type_t *type_new_nonencapsulated_union(char *name, var_list_t *fields) +static type_t *type_new_nonencapsulated_union(const char *name, int defined, var_list_t *fields) { - type_t *t = get_type(TYPE_UNION, name, tsUNION); - t->details.structure = xmalloc(sizeof(*t->details.structure)); - t->details.structure->fields = fields; - t->defined = TRUE; + type_t *tag_type = name ? find_type(name, tsUNION) : NULL; + type_t *t = make_type(TYPE_UNION); + t->name = name; + if (tag_type && tag_type->details.structure) + t->details.structure = tag_type->details.structure; + else if (defined) + { + t->details.structure = xmalloc(sizeof(*t->details.structure)); + t->details.structure->fields = fields; + t->defined = TRUE; + } + if (name) + { + if (defined) + reg_type(t, name, tsUNION); + else + add_incomplete(t); + } return t; }

1 0

Rob Shearman : widl: Move declarray property to array_details.
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 7e08ff27c2daeacad1977bada0a385ba2e4a79f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e08ff27c2daeacad1977bada… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:21:35 2009 +0000 widl: Move declarray property to array_details. Invert the property since an array being declared as a pointer is more surprising than an array being declared as an array. Provide an accessor, type_array_is_decl_as_ptr. --- tools/widl/expr.c | 2 +- tools/widl/header.c | 16 +++++++++------- tools/widl/parser.y | 9 ++++----- tools/widl/proxy.c | 2 +- tools/widl/server.c | 2 +- tools/widl/typegen.c | 36 ++++++++++++++++++++---------------- tools/widl/typelib.c | 2 +- tools/widl/typetree.c | 5 ++--- tools/widl/typetree.h | 9 ++++++++- tools/widl/widltypes.h | 5 +++-- tools/widl/write_msft.c | 10 +++++++--- 11 files changed, 57 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7e08ff27c2daeacad1977…

1 0

Rob Shearman : widl: Fix get_explicit_generic_handle_type and is_context_handle to detect attributes set on typedefs other than the first .
by Alexandre Julliard 06 Mar '09

06 Mar '09

Module: wine Branch: master Commit: 0be9d2595dd10eed12ad97c836f14cb7278a045f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be9d2595dd10eed12ad97c83… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Thu Mar 5 08:21:42 2009 +0000 widl: Fix get_explicit_generic_handle_type and is_context_handle to detect attributes set on typedefs other than the first. Change get_explicit_handle_var to use accessors for the type structure. --- tools/widl/header.c | 12 +++++++++--- tools/widl/header.h | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index e1c76a0..410a857 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -548,8 +548,11 @@ const var_t* get_explicit_handle_var(const var_t *func) return NULL; LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - if (var->type->type == RPC_FC_BIND_PRIMITIVE) + { + const type_t *type = var->type; + if (type_get_type(type) == TYPE_BASIC && type_basic_get_fc(type) == RPC_FC_BIND_PRIMITIVE) return var; + } return NULL; } @@ -557,8 +560,11 @@ const var_t* get_explicit_handle_var(const var_t *func) const type_t* get_explicit_generic_handle_type(const var_t* var) { const type_t *t; - for (t = var->type; is_ptr(t); t = type_pointer_get_ref(t)) - if (t->type != RPC_FC_BIND_PRIMITIVE && is_attr(t->attrs, ATTR_HANDLE)) + for (t = var->type; + is_ptr(t) || type_is_alias(t); + t = type_is_alias(t) ? type_alias_get_aliasee(t) : type_pointer_get_ref(t)) + if ((type_get_type_detect_alias(t) != TYPE_BASIC || type_basic_get_fc(t) != RPC_FC_BIND_PRIMITIVE) && + is_attr(t->attrs, ATTR_HANDLE)) return t; return NULL; } diff --git a/tools/widl/header.h b/tools/widl/header.h index 0c0c0a4..d4b3b88 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -75,7 +75,9 @@ static inline int is_string_type(const attr_list_t *attrs, const type_t *type) static inline int is_context_handle(const type_t *type) { const type_t *t; - for (t = type; is_ptr(t); t = type_pointer_get_ref(t)) + for (t = type; + is_ptr(t) || type_is_alias(t); + t = type_is_alias(t) ? type_alias_get_aliasee(t) : type_pointer_get_ref(t)) if (is_attr(t->attrs, ATTR_CONTEXTHANDLE)) return 1; return 0;

1 0