November 2009 - Wine-commits

André Hentschel : ws2_32: Fix a comment.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 905dc0c8fc105934b0f0bb6ed858dd0782458977 URL: http://source.winehq.org/git/wine.git/?a=commit;h=905dc0c8fc105934b0f0bb6ed… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Nov 9 20:08:19 2009 +0100 ws2_32: Fix a comment. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 98b94e8..5975684 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -987,7 +987,7 @@ static void test_set_getsockopt(void) ok( !err, "get/setsockopt(SO_RCVTIMEO) failed error: %d\n", WSAGetLastError()); ok( timeout == SOCKTIMEOUT1, "getsockopt(SO_RCVTIMEO) returned wrong value %d\n", timeout); /* SO_SNDTIMEO */ - timeout = SOCKTIMEOUT2; /* 54 seconds. See remark above */ + timeout = SOCKTIMEOUT2; /* 997 seconds. See remark above */ size = sizeof(timeout); err = setsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char *) &timeout, size); if( !err)

1 0

Rob Shearman : widl: Implement [range] attribute.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 2b3659f326da64723f9d9e1adb14a6c6d0ec5c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b3659f326da64723f9d9e1ad… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:54:28 2009 +0100 widl: Implement [range] attribute. --- dlls/rpcrt4/tests/server.c | 19 ++++++ dlls/rpcrt4/tests/server.idl | 15 +++++ tools/widl/parser.y | 37 +++++++++++ tools/widl/typegen.c | 139 +++++++++++++++++++++++++++++++++++++---- tools/widl/typegen.h | 1 + 5 files changed, 197 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b3659f326da64723f9d9…

1 0

Rob Shearman : widl: Check for [string] attribute being applied when the elements are ranged.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 3885dd778a389802c04ac4a99b45433526786bdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3885dd778a389802c04ac4a99… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:54:32 2009 +0100 widl: Check for [string] attribute being applied when the elements are ranged. The range will not be verified in and misconception could turn into a security problem. Move [string] attribute validation from reg_typedefs to set_type. --- tools/widl/parser.y | 52 ++++++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 23 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 42123d3..70a7c9c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1384,9 +1384,26 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, error_loc("%s: pointer attribute applied to non-pointer type\n", v->name); } - if (is_attr(v->attrs, ATTR_STRING) && !is_ptr(v->type) && !arr) - error_loc("'%s': [string] attribute applied to non-pointer, non-array type\n", - v->name); + if (is_attr(v->attrs, ATTR_STRING)) + { + type_t *t = type; + + if (!is_ptr(v->type) && !arr) + error_loc("'%s': [string] attribute applied to non-pointer, non-array type\n", + v->name); + + while (is_ptr(t)) + t = type_pointer_get_ref(t); + + if (type_get_type(t) != TYPE_BASIC && + (get_basic_fc(t) != RPC_FC_CHAR && + get_basic_fc(t) != RPC_FC_BYTE && + get_basic_fc(t) != RPC_FC_WCHAR)) + { + error_loc("'%s': [string] attribute is only valid on 'char', 'byte', or 'wchar_t' pointers and arrays\n", + v->name); + } + } if (is_attr(v->attrs, ATTR_V1ENUM)) { @@ -1747,27 +1764,8 @@ static void fix_incomplete_types(type_t *complete_type) static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, attr_list_t *attrs) { const declarator_t *decl; - int is_str = is_attr(attrs, ATTR_STRING); type_t *type = decl_spec->type; - if (is_str) - { - type_t *t = decl_spec->type; - - while (is_ptr(t)) - t = type_pointer_get_ref(t); - - if (type_get_type(t) != TYPE_BASIC && - (get_basic_fc(t) != RPC_FC_CHAR && - get_basic_fc(t) != RPC_FC_BYTE && - get_basic_fc(t) != RPC_FC_WCHAR)) - { - decl = LIST_ENTRY( list_head( decls ), const declarator_t, entry ); - error_loc("'%s': [string] attribute is only valid on 'char', 'byte', or 'wchar_t' pointers and arrays\n", - decl->var->name); - } - } - /* We must generate names for tagless enum, struct or union. Typedef-ing a tagless enum, struct or union means we want the typedef to be included in a library hence the public attribute. */ @@ -2361,6 +2359,15 @@ static void check_field_common(const type_t *container_type, case TGT_CTXT_HANDLE_POINTER: /* FIXME */ break; + case TGT_STRING: + { + const type_t *t = type; + while (is_ptr(t)) + t = type_pointer_get_ref(t); + if (is_aliaschain_attr(t, ATTR_RANGE)) + warning_loc_info(&arg->loc_info, "%s: range not verified for a string of ranged types\n", arg->name); + break; + } case TGT_POINTER: type = type_pointer_get_ref(type); more_to_do = TRUE; @@ -2370,7 +2377,6 @@ static void check_field_common(const type_t *container_type, more_to_do = TRUE; break; case TGT_USER_TYPE: - case TGT_STRING: case TGT_IFACE_POINTER: case TGT_BASIC: case TGT_ENUM:

1 0

Rob Shearman : widl: Rename set_type to declare_var.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 4383d47ef4bad3463962934af3844f0cc908cf7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4383d47ef4bad3463962934af… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:54:41 2009 +0100 widl: Rename set_type to declare_var. Make it return the var_t object rather than making the callers dig it out, and make it take the attributes list so that callers don't have to set it. --- tools/widl/parser.y | 58 ++++++++++++++++++++++----------------------------- 1 files changed, 25 insertions(+), 33 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 70a7c9c..1929242 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -101,7 +101,7 @@ static attr_t *make_attrv(enum attr_type type, unsigned long val); static attr_t *make_attrp(enum attr_type type, void *val); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static array_dims_t *append_array(array_dims_t *list, expr_t *expr); -static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, int top); +static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); static ifref_list_t *append_ifref(ifref_list_t *list, ifref_t *iface); static ifref_t *make_ifref(type_t *iface); @@ -431,17 +431,14 @@ args: arg { check_arg_attrs($1); $$ = append_var( NULL, $1 ); } ; /* split into two rules to get bison to resolve a tVOID conflict */ -arg: attributes decl_spec m_any_declarator { $$ = $3->var; - $$->attrs = $1; - if ($2->stgclass != STG_NONE && $2->stgclass != STG_REGISTER) +arg: attributes decl_spec m_any_declarator { if ($2->stgclass != STG_NONE && $2->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); - set_type($$, $2, $3, TRUE); + $$ = declare_var($1, $2, $3, TRUE); free($3); } - | decl_spec m_any_declarator { $$ = $2->var; - if ($1->stgclass != STG_NONE && $1->stgclass != STG_REGISTER) + | decl_spec m_any_declarator { if ($1->stgclass != STG_NONE && $1->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); - set_type($$, $1, $2, TRUE); + $$ = declare_var(NULL, $1, $2, TRUE); free($2); } ; @@ -707,17 +704,16 @@ union_field: | ';' { $$ = NULL; } ; -s_field: m_attributes decl_spec declarator { $$ = $3->var; - $$->attrs = check_field_attrs($$->name, $1); - set_type($$, $2, $3, FALSE); +s_field: m_attributes decl_spec declarator { $$ = declare_var(check_field_attrs($3->var->name, $1), + $2, $3, FALSE); free($3); } ; funcdef: - m_attributes decl_spec declarator { var_t *v = $3->var; - v->attrs = check_function_attrs(v->name, $1); - set_type(v, $2, $3, FALSE); + m_attributes decl_spec declarator { var_t *v; + v = declare_var(check_function_attrs($3->var->name, $1), + $2, $3, FALSE); free($3); $$ = make_func(v); } @@ -725,13 +721,10 @@ funcdef: declaration: attributes decl_spec init_declarator - { $$ = $3->var; - $$->attrs = $1; - set_type($$, $2, $3, FALSE); + { $$ = declare_var($1, $2, $3, FALSE); free($3); } - | decl_spec init_declarator { $$ = $2->var; - set_type($$, $1, $2, FALSE); + | decl_spec init_declarator { $$ = declare_var(NULL, $1, $2, FALSE); free($2); } ; @@ -1317,11 +1310,12 @@ static type_t *append_ptrchain_type(type_t *ptrchain, type_t *type) return ptrchain; } -static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, - int top) +static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const declarator_t *decl, + int top) { - expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); - expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); + var_t *v = decl->var; + expr_list_t *sizes = get_attrp(attrs, ATTR_SIZEIS); + expr_list_t *lengs = get_attrp(attrs, ATTR_LENGTHIS); int sizeless; expr_t *dim; type_t **ptype; @@ -1346,6 +1340,7 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, /* add type onto the end of the pointers in pident->type */ v->type = append_ptrchain_type(decl ? decl->type : NULL, type); v->stgclass = decl_spec->stgclass; + v->attrs = attrs; /* check for pointer attribute being applied to non-pointer, non-array * type */ @@ -1531,6 +1526,8 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, if (is_attr(t->attrs, ATTR_CALLCONV)) error_loc("calling convention applied to non-function-pointer type\n"); } + + return v; } static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls) @@ -1540,10 +1537,7 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec LIST_FOR_EACH_ENTRY_SAFE( decl, next, decls, declarator_t, entry ) { - var_t *var = decl->var; - - var->attrs = attrs; - set_type(var, decl_spec, decl, 0); + var_t *var = declare_var(attrs, decl_spec, decl, 0); var_list = append_var(var_list, var); free(decl); } @@ -1784,20 +1778,18 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at LIST_FOR_EACH_ENTRY( decl, decls, const declarator_t, entry ) { - var_t *name = decl->var; - if (name->name) { + if (decl->var->name) { type_t *cur; + var_t *name; - cur = find_type(name->name, 0); + cur = find_type(decl->var->name, 0); if (cur) error_loc("%s: redefinition error; original definition was at %s:%d\n", cur->name, cur->loc_info.input_name, cur->loc_info.line_number); - /* set the attributes to allow set_type to do some checks on them */ - name->attrs = attrs; - set_type(name, decl_spec, decl, 0); + name = declare_var(attrs, decl_spec, decl, 0); cur = type_new_alias(name->type, name->name); cur->attrs = attrs;

1 0

Rob Shearman : widl: Implement __int3264 keyword.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 4339f9edfbcacfc45c7e76ecf1af98997886e83c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4339f9edfbcacfc45c7e76ecf… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:54:56 2009 +0100 widl: Implement __int3264 keyword. --- tools/widl/expr.c | 6 ++- tools/widl/header.c | 1 + tools/widl/parser.l | 1 + tools/widl/parser.y | 4 +- tools/widl/typegen.c | 177 +++++++++++++++++++++++------------------------ tools/widl/typelib.c | 15 ++++ tools/widl/typelib.h | 3 + tools/widl/widltypes.h | 1 + 8 files changed, 116 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4339f9edfbcacfc45c7e7…

1 0

Rob Shearman : include: Declare the *_PTR types on top of the __int3264 intrinsic IDL types for widl in basetsd .h.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 2906af597dd291d8133356ac7407064d469a9b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2906af597dd291d8133356ac7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:55:01 2009 +0100 include: Declare the *_PTR types on top of the __int3264 intrinsic IDL types for widl in basetsd.h. --- include/basetsd.h | 38 +++++++++++++++++++++++++++++--------- 1 files changed, 29 insertions(+), 9 deletions(-) diff --git a/include/basetsd.h b/include/basetsd.h index 308a65d..6ce0102 100644 --- a/include/basetsd.h +++ b/include/basetsd.h @@ -102,15 +102,41 @@ typedef unsigned __int64 DECLSPEC_ALIGN(8) ULONG64, *PULONG64; typedef unsigned __int64 DECLSPEC_ALIGN(8) DWORD64, *PDWORD64; #endif -/* Win32 or Win64 dependent typedef/defines. */ +/* Basic pointer-sized integer types */ -#ifdef _WIN64 +#if defined(__midl) || defined(__WIDL__) + +typedef /* [public] */ signed __int3264 INT_PTR, *PINT_PTR; +typedef /* [public] */ signed __int3264 LONG_PTR, *PLONG_PTR; +typedef /* [public] */ unsigned __int3264 UINT_PTR, *PUINT_PTR; +typedef /* [public] */ unsigned __int3264 ULONG_PTR, *PULONG_PTR; +typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; + +#elif defined(_WIN64) + +#define __int3264 __int64 typedef signed __int64 INT_PTR, *PINT_PTR; typedef signed __int64 LONG_PTR, *PLONG_PTR; typedef unsigned __int64 UINT_PTR, *PUINT_PTR; typedef unsigned __int64 ULONG_PTR, *PULONG_PTR; -typedef unsigned __int64 DWORD_PTR, *PDWORD_PTR; +typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; + +#else + +#define __int3264 __int32 + +typedef long INT_PTR, *PINT_PTR; +typedef unsigned long UINT_PTR, *PUINT_PTR; +typedef long LONG_PTR, *PLONG_PTR; +typedef unsigned long ULONG_PTR, *PULONG_PTR; +typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; + +#endif + +/* Win32 or Win64 dependent typedef/defines. */ + +#ifdef _WIN64 #define MAXINT_PTR 0x7fffffffffffffff #define MININT_PTR 0x8000000000000000 @@ -201,12 +227,6 @@ static inline void *ULongToPtr(ULONG32 ul) #else /* FIXME: defined(_WIN32) */ -typedef long INT_PTR, *PINT_PTR; -typedef unsigned long UINT_PTR, *PUINT_PTR; -typedef long LONG_PTR, *PLONG_PTR; -typedef unsigned long ULONG_PTR, *PULONG_PTR; -typedef ULONG_PTR DWORD_PTR, *PDWORD_PTR; - #define MAXINT_PTR 0x7fffffff #define MININT_PTR 0x80000000 #define MAXUINT_PTR 0xffffffff

1 0

Rob Shearman : widl: Add support for bit-fields in non-remote structures.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: cdec0fe4852b160ab2fa3205d49b9272711cbd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdec0fe4852b160ab2fa3205d… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:55:09 2009 +0100 widl: Add support for bit-fields in non-remote structures. --- tools/widl/expr.c | 1 + tools/widl/header.c | 42 ++++++++++++++++++++++----- tools/widl/parser.y | 72 ++++++++++++++++++++++++++++++++++++++++-------- tools/widl/typegen.c | 4 ++- tools/widl/typelib.c | 4 ++ tools/widl/typetree.c | 50 +++++++++++++++++++++++++++++++++ tools/widl/typetree.h | 16 ++++++++++ tools/widl/widltypes.h | 9 ++++++ 8 files changed, 177 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdec0fe4852b160ab2fa3…

1 0

Rob Shearman : widl: Add support for varargs functions.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 97d5f3401d94af2c662c4e45b24d8687ca274d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=97d5f3401d94af2c662c4e45b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:55:13 2009 +0100 widl: Add support for varargs functions. --- dlls/rpcrt4/tests/server.c | 3 ++ dlls/rpcrt4/tests/server.idl | 2 + tools/widl/header.c | 68 ++++++++++++++++++++++------------------- tools/widl/parser.l | 1 + tools/widl/parser.y | 12 +++++-- 5 files changed, 51 insertions(+), 35 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index d9a9fcc..1205ea4 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -42,6 +42,9 @@ static NDR_SCONTEXT (WINAPI *pNDRSContextUnmarshall2)(RPC_BINDING_HANDLE, void*, static RPC_STATUS (WINAPI *pRpcServerRegisterIfEx)(RPC_IF_HANDLE,UUID*, RPC_MGR_EPV*, unsigned int, unsigned int,RPC_IF_CALLBACK_FN*); +/* type check statements generated in header file */ +fnprintf *p_printf = printf; + static void InitFunctionPointers(void) { HMODULE hrpcrt4 = GetModuleHandleA("rpcrt4.dll"); diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index fe2c075..d8e79bd 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -27,6 +27,8 @@ typedef struct tag_vector int z; } vector_t; +typedef int fnprintf(const char *format, ...); + [ uuid(00000000-4114-0704-2301-000000000000), #ifndef __midl diff --git a/tools/widl/header.c b/tools/widl/header.c index a0582f2..e87a44e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -348,42 +348,46 @@ void write_type_right(FILE *h, type_t *t, int is_field) static void write_type_v(FILE *h, type_t *t, int is_field, int declonly, const char *name) { - type_t *pt; + type_t *pt = NULL; int ptr_level = 0; if (!h) return; - for (pt = t; is_ptr(pt); pt = type_pointer_get_ref(pt), ptr_level++) - ; - - if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) { - int i; - const char *callconv = get_attrp(pt->attrs, ATTR_CALLCONV); - if (!callconv) callconv = ""; - if (is_attr(pt->attrs, ATTR_INLINE)) fprintf(h, "inline "); - write_type_left(h, type_function_get_rettype(pt), declonly); - fputc(' ', h); - if (ptr_level) fputc('(', h); - fprintf(h, "%s ", callconv); - for (i = 0; i < ptr_level; i++) - fputc('*', h); - } else - write_type_left(h, t, declonly); - - if (name) fprintf(h, "%s%s", needs_space_after(t) ? " " : "", name ); - - if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) { - const var_list_t *args = type_function_get_args(pt); - - if (ptr_level) fputc(')', h); - fputc('(', h); - if (args) - write_args(h, args, NULL, 0, FALSE); - else - fprintf(h, "void"); - fputc(')', h); - } else - write_type_right(h, t, is_field); + if (t) { + for (pt = t; is_ptr(pt); pt = type_pointer_get_ref(pt), ptr_level++) + ; + + if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) { + int i; + const char *callconv = get_attrp(pt->attrs, ATTR_CALLCONV); + if (!callconv) callconv = ""; + if (is_attr(pt->attrs, ATTR_INLINE)) fprintf(h, "inline "); + write_type_left(h, type_function_get_rettype(pt), declonly); + fputc(' ', h); + if (ptr_level) fputc('(', h); + fprintf(h, "%s ", callconv); + for (i = 0; i < ptr_level; i++) + fputc('*', h); + } else + write_type_left(h, t, declonly); + } + + if (name) fprintf(h, "%s%s", !t || needs_space_after(t) ? " " : "", name ); + + if (t) { + if (type_get_type_detect_alias(pt) == TYPE_FUNCTION) { + const var_list_t *args = type_function_get_args(pt); + + if (ptr_level) fputc(')', h); + fputc('(', h); + if (args) + write_args(h, args, NULL, 0, FALSE); + else + fprintf(h, "void"); + fputc(')', h); + } else + write_type_right(h, t, is_field); + } } void write_type_def_or_decl(FILE *f, type_t *t, int field, const char *name) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index d3f355f..f509cb1 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -193,6 +193,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>\<= return LESSEQUAL; <INITIAL,ATTR>\|\| return LOGICALOR; <INITIAL,ATTR>&& return LOGICALAND; +<INITIAL,ATTR>\.\.\. return ELLIPSIS; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { if (import_stack_ptr) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9e1598e..0c216ec 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -194,6 +194,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %token EQUALITY INEQUALITY %token GREATEREQUAL LESSEQUAL %token LOGICALOR LOGICALAND +%token ELLIPSIS %token tAGGREGATABLE tALLOCATE tANNOTATION tAPPOBJECT tASYNC tASYNCUUID %token tAUTOHANDLE tBINDABLE tBOOLEAN tBROADCAST tBYTE tBYTECOUNT %token tCALLAS tCALLBACK tCASE tCDECL tCHAR tCOCLASS tCODE tCOMMSTATUS @@ -292,7 +293,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <ifref> coclass_int %type <ifref_list> coclass_ints %type <var> arg ne_union_field union_field s_field case enum declaration -%type <var_list> m_args args fields ne_union_fields cases enums enum_list dispint_props field +%type <var_list> m_args arg_list args +%type <var_list> fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident ident %type <declarator> declarator direct_declarator init_declarator struct_declarator %type <declarator> m_any_declarator any_declarator any_declarator_no_ident any_direct_declarator @@ -426,8 +428,12 @@ m_args: { $$ = NULL; } | args ; -args: arg { check_arg_attrs($1); $$ = append_var( NULL, $1 ); } - | args ',' arg { check_arg_attrs($3); $$ = append_var( $1, $3); } +arg_list: arg { check_arg_attrs($1); $$ = append_var( NULL, $1 ); } + | arg_list ',' arg { check_arg_attrs($3); $$ = append_var( $1, $3 ); } + ; + +args: arg_list + | arg_list ',' ELLIPSIS { $$ = append_var( $1, make_var(strdup("...")) ); } ; /* split into two rules to get bison to resolve a tVOID conflict */

1 0

Rob Shearman : widl: Allow pointers, type-qualifiers and other more complicated constructions in sizeof and cast expressions .
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: 0228008bb889b8b69ec57622b1b8a577b13617b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0228008bb889b8b69ec57622b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 15:55:22 2009 +0100 widl: Allow pointers, type-qualifiers and other more complicated constructions in sizeof and cast expressions. --- dlls/ole32/marshal.c | 2 +- include/objidl.idl | 4 +- tools/widl/expr.c | 10 +++++++- tools/widl/expr.h | 2 +- tools/widl/parser.y | 62 +++++++++++++++++++++++++++++++++++++++++-------- 5 files changed, 65 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index a5c4d11..821cb87 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -554,7 +554,7 @@ static HRESULT WINAPI ProxyCliSec_SetBlanket(IClientSecurity *iface, DWORD Capabilities) { FIXME("(%p, %d, %d, %s, %d, %d, %p, 0x%x): stub\n", pProxy, AuthnSvc, AuthzSvc, - pServerPrincName == (OLECHAR*)COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName), + pServerPrincName == COLE_DEFAULT_PRINCIPAL ? "<default principal>" : debugstr_w(pServerPrincName), AuthnLevel, ImpLevel, pAuthInfo, Capabilities); return E_NOTIMPL; } diff --git a/include/objidl.idl b/include/objidl.idl index 95f4b9f..70f93ab 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1950,8 +1950,8 @@ interface IClientSecurity : IUnknown void *pAuthInfo; } SOLE_AUTHENTICATION_INFO; - const OLECHAR *COLE_DEFAULT_PRINCIPAL = /*(OLECHAR*)*/ -1; - const void *COLE_DEFAULT_AUTHINFO = /*(void*)*/ -1; + const OLECHAR *COLE_DEFAULT_PRINCIPAL = (OLECHAR*) -1; + const void *COLE_DEFAULT_AUTHINFO = (void*) -1; typedef struct tagSOLE_AUTHENTICATION_LIST { DWORD cAuthInfo; diff --git a/tools/widl/expr.c b/tools/widl/expr.c index cfe672d..b528376 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -101,9 +101,16 @@ expr_t *make_exprs(enum expr_type type, char *val) return e; } -expr_t *make_exprt(enum expr_type type, type_t *tref, expr_t *expr) +expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr) { expr_t *e; + type_t *tref; + + if (var->stgclass != STG_NONE && var->stgclass != STG_REGISTER) + error_loc("invalid storage class for type expression\n"); + + tref = var->type; + e = xmalloc(sizeof(expr_t)); e->type = type; e->ref = expr; @@ -125,6 +132,7 @@ expr_t *make_exprt(enum expr_type type, type_t *tref, expr_t *expr) e->is_const = TRUE; e->cval = expr->cval; } + free(var); return e; } diff --git a/tools/widl/expr.h b/tools/widl/expr.h index 31ce31d..e16975a 100644 --- a/tools/widl/expr.h +++ b/tools/widl/expr.h @@ -29,7 +29,7 @@ extern expr_t *make_expr(enum expr_type type); extern expr_t *make_exprl(enum expr_type type, long val); extern expr_t *make_exprd(enum expr_type type, double val); extern expr_t *make_exprs(enum expr_type type, char *val); -extern expr_t *make_exprt(enum expr_type type, type_t *tref, expr_t *expr); +extern expr_t *make_exprt(enum expr_type type, var_t *var, expr_t *expr); extern expr_t *make_expr1(enum expr_type type, expr_t *expr); extern expr_t *make_expr2(enum expr_type type, expr_t *exp1, expr_t *exp2); extern expr_t *make_expr3(enum expr_type type, expr_t *expr1, expr_t *expr2, expr_t *expr3); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 0c216ec..de44ab5 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -297,7 +297,8 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %type <var_list> fields ne_union_fields cases enums enum_list dispint_props field %type <var> m_ident ident %type <declarator> declarator direct_declarator init_declarator struct_declarator -%type <declarator> m_any_declarator any_declarator any_declarator_no_ident any_direct_declarator +%type <declarator> m_any_declarator any_declarator any_declarator_no_direct any_direct_declarator +%type <declarator> m_abstract_declarator abstract_declarator abstract_declarator_no_direct abstract_direct_declarator %type <declarator_list> declarator_list struct_declarator_list %type <func> funcdef %type <type> coclass coclasshdr coclassdef @@ -440,12 +441,12 @@ args: arg_list arg: attributes decl_spec m_any_declarator { if ($2->stgclass != STG_NONE && $2->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); $$ = declare_var($1, $2, $3, TRUE); - free($3); + free($2); free($3); } | decl_spec m_any_declarator { if ($1->stgclass != STG_NONE && $1->stgclass != STG_REGISTER) error_loc("invalid storage class for function parameter\n"); $$ = declare_var(NULL, $1, $2, TRUE); - free($2); + free($1); free($2); } ; @@ -659,8 +660,10 @@ expr: aNUM { $$ = make_exprl(EXPR_NUM, $1); } | '*' expr %prec PPTR { $$ = make_expr1(EXPR_PPTR, $2); } | expr MEMBERPTR aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, make_expr1(EXPR_PPTR, $1), make_exprs(EXPR_IDENTIFIER, $3)); } | expr '.' aIDENTIFIER { $$ = make_expr2(EXPR_MEMBER, $1, make_exprs(EXPR_IDENTIFIER, $3)); } - | '(' type ')' expr %prec CAST { $$ = make_exprt(EXPR_CAST, $2, $4); } - | tSIZEOF '(' type ')' { $$ = make_exprt(EXPR_SIZEOF, $3, NULL); } + | '(' decl_spec m_abstract_declarator ')' expr %prec CAST + { $$ = make_exprt(EXPR_CAST, declare_var(NULL, $2, $3, 0), $5); free($2); free($3); } + | tSIZEOF '(' decl_spec m_abstract_declarator ')' + { $$ = make_exprt(EXPR_SIZEOF, declare_var(NULL, $3, $4, 0), NULL); free($3); free($4); } | expr '[' expr ']' { $$ = make_expr2(EXPR_ARRAY, $1, $3); } | '(' expr ')' { $$ = $2; } ; @@ -942,6 +945,43 @@ direct_declarator: } ; +/* abstract declarator */ +abstract_declarator: + '*' m_type_qual_list m_abstract_declarator %prec PPTR + { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + | callconv m_abstract_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } + | abstract_direct_declarator + ; + +/* abstract declarator without accepting direct declarator */ +abstract_declarator_no_direct: + '*' m_type_qual_list m_any_declarator %prec PPTR + { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } + | callconv m_any_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } + ; + +/* abstract declarator or empty */ +m_abstract_declarator: { $$ = make_declarator(NULL); } + | abstract_declarator + ; + +/* abstract direct declarator */ +abstract_direct_declarator: + '(' abstract_declarator_no_direct ')' { $$ = $2; } + | abstract_direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } + | array { $$ = make_declarator(NULL); $$->array = append_array($$->array, $1); } + | '(' m_args ')' + { $$ = make_declarator(NULL); + $$->func_type = append_ptrchain_type($$->type, type_new_function($2)); + $$->type = NULL; + } + | abstract_direct_declarator '(' m_args ')' + { $$ = $1; + $$->func_type = append_ptrchain_type($$->type, type_new_function($3)); + $$->type = NULL; + } + ; + /* abstract or non-abstract declarator */ any_declarator: '*' m_type_qual_list m_any_declarator %prec PPTR @@ -950,8 +990,8 @@ any_declarator: | any_direct_declarator ; -/* abstract or non-abstract declarator without accepting idents */ -any_declarator_no_ident: +/* abstract or non-abstract declarator without accepting direct declarator */ +any_declarator_no_direct: '*' m_type_qual_list m_any_declarator %prec PPTR { $$ = $3; $$->type = append_ptrchain_type($$->type, type_new_pointer(pointer_default, NULL, $2)); } | callconv m_any_declarator { $$ = $2; $$->type->attrs = append_attr($$->type->attrs, make_attrp(ATTR_CALLCONV, $1)); } @@ -962,11 +1002,12 @@ m_any_declarator: { $$ = make_declarator(NULL); } | any_declarator ; -/* abstract or non-abstract direct declarator. note: idents aren't accepted - * inside brackets to avoid ambiguity with the rule for function arguments */ +/* abstract or non-abstract direct declarator. note: direct declarators + * aren't accepted inside brackets to avoid ambiguity with the rule for + * function arguments */ any_direct_declarator: ident { $$ = make_declarator($1); } - | '(' any_declarator_no_ident ')' { $$ = $2; } + | '(' any_declarator_no_direct ')' { $$ = $2; } | any_direct_declarator array { $$ = $1; $$->array = append_array($$->array, $2); } | array { $$ = make_declarator(NULL); $$->array = append_array($$->array, $1); } | '(' m_args ')' @@ -1568,6 +1609,7 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec var_list = append_var(var_list, var); free(decl); } + free(decl_spec); return var_list; }

1 0

Rob Shearman : oledb32: Add test for marshalling IDBProperties.
by Alexandre Julliard 09 Nov '09

09 Nov '09

Module: wine Branch: master Commit: d5ef09409d202eb9f4437e33bea5ae2242d85ecc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5ef09409d202eb9f4437e33b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Sat Nov 7 13:29:11 2009 +0100 oledb32: Add test for marshalling IDBProperties. --- dlls/oledb32/tests/Makefile.in | 5 +- dlls/oledb32/tests/marshal.c | 271 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5ef09409d202eb9f4437…

1 0