wine-commits April 2008

wine-commits@winehq.org

4 participants
1278 discussions

Rob Shearman : widl: Write out TYPEFLAG, FUNCFLAG and VARFLAG flags for all attribute we currently parse.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f728fe168b7a5ff60101d08bdf9b8d2e205f5893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f728fe168b7a5ff60101d08bd… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 11:00:07 2008 +0100 widl: Write out TYPEFLAG, FUNCFLAG and VARFLAG flags for all attribute we currently parse. Add FIXMEs for the remaining ones and remove the warning for unimplemented attribute types since we now support all the attributes that we parse. --- tools/widl/write_msft.c | 69 ++++++++++++++++++++++++++++++++++------------- 1 files changed, 50 insertions(+), 19 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 06ac5b2..56bff46 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1319,10 +1319,14 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int expr_t *expr = attr->u.pval; switch(attr->type) { case ATTR_BINDABLE: - funcflags |= 0x4; /* FUNCFLAG_BINDABLE */ + funcflags |= 0x4; /* FUNCFLAG_FBINDABLE */ + break; + /* FIXME: FUNCFLAG_FDEFAULTBIND */ + case ATTR_DEFAULTCOLLELEM: + funcflags |= 0x100; /* FUNCFLAG_FDEFAULTCOLLELEM */ break; case ATTR_DISPLAYBIND: - funcflags |= 0x10; /* FUNCFLAG_DISPLAYBIND */ + funcflags |= 0x10; /* FUNCFLAG_FDISPLAYBIND */ break; case ATTR_ENTRY_ORDINAL: extra_attr = max(extra_attr, 3); @@ -1351,8 +1355,11 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int case ATTR_ID: id = expr->cval; break; + case ATTR_IMMEDIATEBIND: + funcflags |= 0x1000; /* FUNCFLAG_FIMMEDIATEBIND */ + break; case ATTR_NONBROWSABLE: - funcflags |= 0x400; /* FUNCFLAG_NONBROWSABLE */ + funcflags |= 0x400; /* FUNCFLAG_FNONBROWSABLE */ break; case ATTR_OUT: break; @@ -1365,9 +1372,18 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int case ATTR_PROPPUTREF: invokekind = 0x8; /* INVOKE_PROPERTYPUTREF */ break; + /* FIXME: FUNCFLAG_FREPLACEABLE */ + case ATTR_REQUESTEDIT: + funcflags |= 0x8; /* FUNCFLAG_FREQUESTEDIT */ + break; case ATTR_RESTRICTED: funcflags |= 0x1; /* FUNCFLAG_FRESTRICTED */ break; + case ATTR_SOURCE: + funcflags |= 0x2; /* FUNCFLAG_FSOURCE */ + break; + /* FIXME: FUNCFLAG_FUIDEFAULT */ + /* FIXME: FUNCFLAG_FUSESGETLASTERROR */ case ATTR_VARARG: if (num_optional || num_defaults) warning("add_func_desc: ignoring vararg in function with optional or defaultvalue params\n"); @@ -1375,7 +1391,6 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, const func_t *func, int num_optional = -1; break; default: - warning("add_func_desc: ignoring attr %d\n", attr->type); break; } } @@ -1597,23 +1612,44 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) if (var->attrs) LIST_FOR_EACH_ENTRY( attr, var->attrs, const attr_t, entry ) { expr_t *expr = attr->u.pval; switch(attr->type) { + case ATTR_BINDABLE: + varflags |= 0x04; /* VARFLAG_FBINDABLE */ + break; + /* FIXME: VARFLAG_FDEFAULTBIND */ + case ATTR_DEFAULTCOLLELEM: + varflags |= 0x100; /* VARFLAG_FDEFAULTCOLLELEM */ + break; + case ATTR_DISPLAYBIND: + varflags |= 0x10; /* VARFLAG_FDISPLAYBIND */ + break; case ATTR_HIDDEN: varflags |= 0x40; /* VARFLAG_FHIDDEN */ break; case ATTR_ID: id = expr->cval; break; + case ATTR_IMMEDIATEBIND: + varflags |= 0x1000; /* VARFLAG_FIMMEDIATEBIND */ + break; + case ATTR_NONBROWSABLE: + varflags |= 0x400; /* VARFLAG_FNONBROWSABLE */ + break; case ATTR_READONLY: varflags |= 0x01; /* VARFLAG_FREADONLY */ break; + /* FIXME: VARFLAG_FREPLACEABLE */ + break; + case ATTR_REQUESTEDIT: + varflags |= 0x08; /* VARFLAG_FREQUESTEDIT */ + break; case ATTR_RESTRICTED: varflags |= 0x80; /* VARFLAG_FRESTRICTED */ break; case ATTR_SOURCE: varflags |= 0x02; /* VARFLAG_FSOURCE */ break; + /* FIXME: VARFLAG_FUIDEFAULT */ default: - warning("AddVarDesc: unhandled attr type %d\n", attr->type); break; } } @@ -1801,9 +1837,6 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x20; /* TYPEFLAG_FCONTROL */ break; - case ATTR_DISPINTERFACE: - break; - case ATTR_DLLNAME: { int offset = ctl2_alloc_string(typelib, attr->u.pval); @@ -1840,8 +1873,7 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x10; /* TYPEFLAG_FHIDDEN */ break; - case ATTR_LOCAL: - break; + /* FIXME: TYPEFLAG_FLICENSED */ case ATTR_NONCREATABLE: typeinfo->flags &= ~0x2; /* TYPEFLAG_FCANCREATE */ @@ -1851,18 +1883,15 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ typeinfo->flags |= 0x80; /* TYPEFLAG_FNONEXTENSIBLE */ break; - case ATTR_OBJECT: - break; - - case ATTR_ODL: - break; - case ATTR_OLEAUTOMATION: typeinfo->flags |= 0x100; /* TYPEFLAG_FOLEAUTOMATION */ break; - case ATTR_PUBLIC: - break; + /* FIXME: TYPEFLAG_FPREDCLID */ + + /* FIXME: TYPEFLAG_FPROXY */ + + /* FIXME: TYPEFLAG_FREPLACEABLE */ case ATTR_RESTRICTED: typeinfo->flags |= 0x200; /* TYPEFLAG_FRESTRICTED */ @@ -1885,7 +1914,6 @@ static msft_typeinfo_t *create_msft_typeinfo(msft_typelib_t *typelib, enum type_ break; default: - warning("create_msft_typeinfo: ignoring attr %d\n", attr->type); break; } } @@ -2104,6 +2132,9 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) case ATTR_DEFAULT: ref->flags |= 0x1; /* IMPLTYPEFLAG_FDEFAULT */ break; + case ATTR_DEFAULTVTABLE: + ref->flags |= 0x8; /* IMPLTYPEFLAG_FDEFAULTVTABLE */ + break; case ATTR_RESTRICTED: ref->flags |= 0x4; /* IMPLTYPEFLAG_FRESTRICTED */ break;

1 0

Rob Shearman : widl: Add support for the broadcast and idempotent operation attributes.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 56e2553eff279a853a86551b861a9de1b6059d01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e2553eff279a853a86551b8… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:59:55 2008 +0100 widl: Add support for the broadcast and idempotent operation attributes. --- tools/widl/client.c | 10 ++++++++++ tools/widl/parser.y | 2 ++ tools/widl/widltypes.h | 1 + 3 files changed, 13 insertions(+), 0 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 7e1e70b..eb1ade2 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -186,6 +186,16 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent--; fprintf(client, "\n"); + if (is_attr(def->attrs, ATTR_IDEMPOTENT) || is_attr(def->attrs, ATTR_BROADCAST)) + { + print_client("_RpcMessage.RpcFlags = ( RPC_NCA_FLAGS_DEFAULT "); + if (is_attr(def->attrs, ATTR_IDEMPOTENT)) + fprintf(client, "| RPC_NCA_FLAGS_IDEMPOTENT "); + if (is_attr(def->attrs, ATTR_BROADCAST)) + fprintf(client, "| RPC_NCA_FLAGS_BROADCAST "); + fprintf(client, ");\n\n"); + } + if (implicit_handle) { print_client("_Handle = %s;\n", implicit_handle); diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 929d95c..81eacba 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -457,6 +457,7 @@ attribute: { $$ = NULL; } | tASYNC { $$ = make_attr(ATTR_ASYNC); } | tAUTOHANDLE { $$ = make_attr(ATTR_AUTO_HANDLE); } | tBINDABLE { $$ = make_attr(ATTR_BINDABLE); } + | tBROADCAST { $$ = make_attr(ATTR_BROADCAST); } | tCALLAS '(' ident ')' { $$ = make_attrp(ATTR_CALLAS, $3); } | tCASE '(' expr_list_const ')' { $$ = make_attrp(ATTR_CASE, $3); } | tCONTEXTHANDLE { $$ = make_attrv(ATTR_CONTEXTHANDLE, 0); } @@ -2154,6 +2155,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, "async" }, /* ATTR_AUTO_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, /* ATTR_BINDABLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "bindable" }, + /* ATTR_BROADCAST */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "broadcast" }, /* ATTR_CALLAS */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "call_as" }, /* ATTR_CALLCONV */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "case" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 3488337..d046447 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -69,6 +69,7 @@ enum attr_type ATTR_ASYNC, ATTR_AUTO_HANDLE, ATTR_BINDABLE, + ATTR_BROADCAST, ATTR_CALLAS, ATTR_CALLCONV, /* calling convention pseudo-attribute */ ATTR_CASE,

1 0

Rob Shearman : widl: Output a warning if duplicate attributes are specified .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 66b8574d8d0cb08435537ea3be5b2799eda9ef4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=66b8574d8d0cb08435537ea3b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:59:51 2008 +0100 widl: Output a warning if duplicate attributes are specified. --- tools/widl/parser.y | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9824634..929d95c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -138,6 +138,7 @@ static const attr_list_t *check_library_attrs(const char *name, const attr_list_ static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); static const attr_list_t *check_module_attrs(const char *name, const attr_list_t *attrs); static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_t *attrs); +const char *get_attr_display_name(enum attr_type type); #define tsENUM 1 #define tsSTRUCT 2 @@ -1031,12 +1032,21 @@ static str_list_t *append_str(str_list_t *list, char *str) static attr_list_t *append_attr(attr_list_t *list, attr_t *attr) { + attr_t *attr_existing; if (!attr) return list; if (!list) { list = xmalloc( sizeof(*list) ); list_init( list ); } + LIST_FOR_EACH_ENTRY(attr_existing, list, attr_t, entry) + if (attr_existing->type == attr->type) + { + parser_warning("duplicate attribute %s\n", get_attr_display_name(attr->type)); + /* use the last attribute, like MIDL does */ + list_remove(&attr_existing->entry); + break; + } list_add_tail( list, &attr->entry ); return list; } @@ -2211,6 +2221,11 @@ struct allowed_attr allowed_attr[] = /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "wire_marshal" }, }; +const char *get_attr_display_name(enum attr_type type) +{ + return allowed_attr[type].display_name; +} + static const attr_list_t *check_iface_attrs(const char *name, const attr_list_t *attrs) { const attr_t *attr;

1 0

Rob Shearman : widl: Check that attributes are applicable for libraries, modules, dispinterfaces and coclasses and otherwise issue an error.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: aa20221771c60e91e60c8128b1f11cc1b33f1611 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa20221771c60e91e60c8128b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:59:46 2008 +0100 widl: Check that attributes are applicable for libraries, modules, dispinterfaces and coclasses and otherwise issue an error. --- tools/widl/parser.y | 65 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 61 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index c47668b..9824634 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -134,6 +134,10 @@ static const attr_list_t *check_iface_attrs(const char *name, const attr_list_t static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_typedef_attrs(attr_list_t *attrs); static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs); +static const attr_list_t *check_library_attrs(const char *name, const attr_list_t *attrs); +static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs); +static const attr_list_t *check_module_attrs(const char *name, const attr_list_t *attrs); +static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_t *attrs); #define tsENUM 1 #define tsSTRUCT 2 @@ -382,7 +386,8 @@ importlib: tIMPORTLIB '(' aSTRING ')' libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } ; -library_start: attributes libraryhdr '{' { if (!parse_only) start_typelib($2, $1); +library_start: attributes libraryhdr '{' { check_library_attrs($2, $1); + if (!parse_only) start_typelib($2, $1); if (!parse_only && do_header) write_library($2, $1); if (!parse_only && do_idfile) write_libid($2, $1); } @@ -737,7 +742,7 @@ coclass: tCOCLASS aIDENTIFIER { $$ = make_class($2); } ; coclasshdr: attributes coclass { $$ = $2; - $$->attrs = $1; + $$->attrs = check_coclass_attrs($2->name, $1); if (!parse_only && do_header) write_coclass($$); if (!parse_only && do_idfile) @@ -769,7 +774,7 @@ dispinterfacehdr: attributes dispinterface { attr_t *attrs; $$ = $2; if ($$->defined) error_loc("multiple definition error\n"); attrs = make_attr(ATTR_DISPINTERFACE); - $$->attrs = append_attr( $1, attrs ); + $$->attrs = append_attr( check_dispiface_attrs($2->name, $1), attrs ); $$->ref = find_type("IDispatch", 0); if (!$$->ref) error_loc("IDispatch is undefined\n"); $$->defined = TRUE; @@ -860,7 +865,7 @@ module: tMODULE aIDENTIFIER { $$ = make_type(0, NULL); $$->name = $2; $$->ki ; modulehdr: attributes module { $$ = $2; - $$->attrs = $1; + $$->attrs = check_module_attrs($2->name, $1); } ; @@ -2277,6 +2282,58 @@ static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs) return attrs; } +static const attr_list_t *check_library_attrs(const char *name, const attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_library) + error_loc("inapplicable attribute %s for library %s\n", + allowed_attr[attr->type].display_name, name); + } + return attrs; +} + +static attr_list_t *check_dispiface_attrs(const char *name, attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_dispinterface) + error_loc("inapplicable attribute %s for dispinterface %s\n", + allowed_attr[attr->type].display_name, name); + } + return attrs; +} + +static const attr_list_t *check_module_attrs(const char *name, const attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_module) + error_loc("inapplicable attribute %s for module %s\n", + allowed_attr[attr->type].display_name, name); + } + return attrs; +} + +static const attr_list_t *check_coclass_attrs(const char *name, const attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_coclass) + error_loc("inapplicable attribute %s for coclass %s\n", + allowed_attr[attr->type].display_name, name); + } + return attrs; +} + static void check_all_user_types(ifref_list_t *ifrefs) { const ifref_t *ifref;

1 0

Rob Shearman : widl: The odl attribute is valid for dispinterfaces.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: fcc8a028d8ffa3e39850e07f1ac18aff0c916859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc8a028d8ffa3e39850e07f1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:59:39 2008 +0100 widl: The odl attribute is valid for dispinterfaces. --- tools/widl/parser.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 24bcd36..c47668b 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2177,7 +2177,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "noncreatable" }, /* ATTR_NONEXTENSIBLE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "nonextensible" }, /* ATTR_OBJECT */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "object" }, - /* ATTR_ODL */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "odl" }, + /* ATTR_ODL */ { 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, "odl" }, /* ATTR_OLEAUTOMATION */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "optional" }, /* ATTR_OUT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "out" },

1 0

Rob Shearman : widl: Make the attrs parameter passed to start_typelib const .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: abdc08e013b91edbb5bed102681e73577ba1a820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abdc08e013b91edbb5bed1026… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:59:35 2008 +0100 widl: Make the attrs parameter passed to start_typelib const. --- tools/widl/typelib.c | 2 +- tools/widl/typelib.h | 2 +- tools/widl/widltypes.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 100ae89..ac2815c 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -241,7 +241,7 @@ unsigned short get_type_vt(type_t *t) return 0; } -void start_typelib(char *name, attr_list_t *attrs) +void start_typelib(char *name, const attr_list_t *attrs) { in_typelib++; if (!do_typelib) return; diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h index b17387d..9dce14a 100644 --- a/tools/widl/typelib.h +++ b/tools/widl/typelib.h @@ -22,7 +22,7 @@ #define __WIDL_TYPELIB_H extern int in_typelib; -extern void start_typelib(char *name, attr_list_t *attrs); +extern void start_typelib(char *name, const attr_list_t *attrs); extern void end_typelib(void); extern void add_typelib_entry(type_t *t); extern void add_importlib(const char *name); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 259049e..3488337 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -307,7 +307,7 @@ struct _importlib_t { struct _typelib_t { char *name; char *filename; - attr_list_t *attrs; + const attr_list_t *attrs; struct list entries; struct list importlibs; };

1 0

Rob Shearman : widl: Check that attributes applied to typedefs and fields are applicable and issue an error otherwise .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e9afe272be36c4a8c0f10b0484eacb17d6d78e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9afe272be36c4a8c0f10b048… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:59:27 2008 +0100 widl: Check that attributes applied to typedefs and fields are applicable and issue an error otherwise. --- tools/widl/parser.y | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 49f7633..24bcd36 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -132,6 +132,8 @@ static void check_arg(var_t *arg); static void check_all_user_types(ifref_list_t *ifaces); static const attr_list_t *check_iface_attrs(const char *name, const attr_list_t *attrs); static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); +static attr_list_t *check_typedef_attrs(attr_list_t *attrs); +static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs); #define tsENUM 1 #define tsSTRUCT 2 @@ -655,7 +657,7 @@ field: s_field ';' { $$ = $1; } ; s_field: m_attributes type pident array { $$ = $3->var; - $$->attrs = $1; + $$->attrs = check_field_attrs($$->name, $1); set_type($$, $2, $3, $4, FALSE); free($3); } @@ -928,7 +930,7 @@ type: tVOID { $$ = duptype(find_type("void", 0), 1); } | tSAFEARRAY '(' type ')' { $$ = make_safearray($3); } ; -typedef: tTYPEDEF m_attributes type pident_list { reg_typedefs($3, $4, $2); +typedef: tTYPEDEF m_attributes type pident_list { reg_typedefs($3, $4, check_typedef_attrs($2)); process_typedefs($4); } ; @@ -2249,6 +2251,32 @@ static void check_arg(var_t *arg) } } +static attr_list_t *check_typedef_attrs(attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_type) + error_loc("inapplicable attribute %s for typedef\n", + allowed_attr[attr->type].display_name); + } + return attrs; +} + +static attr_list_t *check_field_attrs(const char *name, attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_field) + error_loc("inapplicable attribute %s for field %s\n", + allowed_attr[attr->type].display_name, name); + } + return attrs; +} + static void check_all_user_types(ifref_list_t *ifrefs) { const ifref_t *ifref;

1 0

Rob Shearman : widl: Check that attributes applied to interfaces, functions and arguments are applicable and issue an error if not.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 5f39b415265eb72e1dd3b3da5996cf77fa2f652d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f39b415265eb72e1dd3b3da5… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:59:12 2008 +0100 widl: Check that attributes applied to interfaces, functions and arguments are applicable and issue an error if not. --- tools/widl/parser.y | 139 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 133 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 46418a3..49f7633 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -130,6 +130,8 @@ static char *gen_name(void); static void process_typedefs(var_list_t *names); static void check_arg(var_t *arg); static void check_all_user_types(ifref_list_t *ifaces); +static const attr_list_t *check_iface_attrs(const char *name, const attr_list_t *attrs); +static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); #define tsENUM 1 #define tsSTRUCT 2 @@ -662,13 +664,10 @@ s_field: m_attributes type pident array { $$ = $3->var; funcdef: m_attributes type pident { var_t *v = $3->var; var_list_t *args = $3->args; - v->attrs = $1; + v->attrs = check_function_attrs(v->name, $1); set_type(v, $2, $3, NULL, FALSE); free($3); $$ = make_func(v, args); - if (is_attr(v->attrs, ATTR_IN)) { - error_loc("inapplicable attribute [in] for function '%s'\n",$$->def->name); - } } ; @@ -816,7 +815,7 @@ interfacehdr: attributes interface { $$.interface = $2; pointer_default = get_attrv($1, ATTR_POINTERDEFAULT); is_object_interface = is_object($1); if ($2->defined) error_loc("multiple definition error\n"); - $2->attrs = $1; + $2->attrs = check_iface_attrs($2->name, $1); $2->defined = TRUE; if (!parse_only && do_header) write_forward($2); } @@ -2114,12 +2113,140 @@ static void process_typedefs(pident_list_t *pidents) } } +struct allowed_attr +{ + unsigned int dce_compatible : 1; + unsigned int acf : 1; + unsigned int on_interface : 1; + unsigned int on_function : 1; + unsigned int on_arg : 1; + unsigned int on_type : 1; + unsigned int on_field : 1; + unsigned int on_library : 1; + unsigned int on_dispinterface : 1; + unsigned int on_module : 1; + unsigned int on_coclass : 1; + const char *display_name; +}; + +struct allowed_attr allowed_attr[] = +{ + /* attr { D ACF I Fn ARG T Fi L DI M C <display name> } */ + /* ATTR_AGGREGATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "aggregatable" }, + /* ATTR_APPOBJECT */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "appobject" }, + /* ATTR_ASYNC */ { 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, "async" }, + /* ATTR_AUTO_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, "auto_handle" }, + /* ATTR_BINDABLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "bindable" }, + /* ATTR_CALLAS */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "call_as" }, + /* ATTR_CALLCONV */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, + /* ATTR_CASE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, "case" }, + /* ATTR_CONTEXTHANDLE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "context_handle" }, + /* ATTR_CONTROL */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, "control" }, + /* ATTR_DEFAULT */ { 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, "default" }, + /* ATTR_DEFAULTCOLLELEM */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "defaultcollelem" }, + /* ATTR_DEFAULTVALUE_EXPR */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "defaultvalue" }, + /* ATTR_DEFAULTVALUE_STRING */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "defaultvalue" }, + /* ATTR_DEFAULTVTABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "defaultvtable" }, + /* ATTR_DISPINTERFACE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, + /* ATTR_DISPLAYBIND */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "displaybind" }, + /* ATTR_DLLNAME */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, "dllname" }, + /* ATTR_DUAL */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "dual" }, + /* ATTR_ENDPOINT */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "endpoint" }, + /* ATTR_ENTRY_ORDINAL */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_ENTRY_STRING */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "entry" }, + /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, + /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "handle" }, + /* ATTR_HELPCONTEXT */ { 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, "helpcontext" }, + /* ATTR_HELPFILE */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpfile" }, + /* ATTR_HELPSTRING */ { 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, "helpstring" }, + /* ATTR_HELPSTRINGCONTEXT */ { 0, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, "helpstringcontext" }, + /* ATTR_HELPSTRINGDLL */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, "helpstringdll" }, + /* ATTR_HIDDEN */ { 0, 0, 1, 1, 0, 0, 0, 1, 1, 0, 1, "hidden" }, + /* ATTR_ID */ { 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, "id" }, + /* ATTR_IDEMPOTENT */ { 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "idempotent" }, + /* ATTR_IIDIS */ { 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "iid_is" }, + /* ATTR_IMMEDIATEBIND */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "immediatebind" }, + /* ATTR_IMPLICIT_HANDLE */ { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, "implicit_handle" }, + /* ATTR_IN */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "in" }, + /* ATTR_INPUTSYNC */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "inputsync" }, + /* ATTR_LENGTHIS */ { 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "length_is" }, + /* ATTR_LOCAL */ { 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, "local" }, + /* ATTR_NONBROWSABLE */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "nonbrowsable" }, + /* ATTR_NONCREATABLE */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, "noncreatable" }, + /* ATTR_NONEXTENSIBLE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "nonextensible" }, + /* ATTR_OBJECT */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "object" }, + /* ATTR_ODL */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "odl" }, + /* ATTR_OLEAUTOMATION */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "oleautomation" }, + /* ATTR_OPTIONAL */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "optional" }, + /* ATTR_OUT */ { 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "out" }, + /* ATTR_POINTERDEFAULT */ { 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "pointer_default" }, + /* ATTR_POINTERTYPE */ { 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, "ref, unique or ptr" }, + /* ATTR_PROPGET */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "propget" }, + /* ATTR_PROPPUT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "propput" }, + /* ATTR_PROPPUTREF */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "propputref" }, + /* ATTR_PUBLIC */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "public" }, + /* ATTR_RANGE */ { 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, "range" }, + /* ATTR_READONLY */ { 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "readonly" }, + /* ATTR_REQUESTEDIT */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "requestedit" }, + /* ATTR_RESTRICTED */ { 0, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, "restricted" }, + /* ATTR_RETVAL */ { 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, "retval" }, + /* ATTR_SIZEIS */ { 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "size_is" }, + /* ATTR_SOURCE */ { 0, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, "source" }, + /* ATTR_STRICTCONTEXTHANDLE */ { 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, "strict_context_handle" }, + /* ATTR_STRING */ { 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, "string" }, + /* ATTR_SWITCHIS */ { 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, "switch_is" }, + /* ATTR_SWITCHTYPE */ { 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, "switch_type" }, + /* ATTR_TRANSMITAS */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "transmit_as" }, + /* ATTR_UUID */ { 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, "uuid" }, + /* ATTR_V1ENUM */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "v1_enum" }, + /* ATTR_VARARG */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "vararg" }, + /* ATTR_VERSION */ { 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, "version" }, + /* ATTR_WIREMARSHAL */ { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, "wire_marshal" }, +}; + +static const attr_list_t *check_iface_attrs(const char *name, const attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_interface) + error_loc("inapplicable attribute %s for interface %s\n", + allowed_attr[attr->type].display_name, name); + } + return attrs; +} + +static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs) +{ + const attr_t *attr; + if (!attrs) return attrs; + LIST_FOR_EACH_ENTRY(attr, attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_function) + error_loc("inapplicable attribute %s for function %s\n", + allowed_attr[attr->type].display_name, name); + } + return attrs; +} + static void check_arg(var_t *arg) { - type_t *t = arg->type; + const type_t *t = arg->type; + const attr_t *attr; if (t->type == 0 && ! is_var_ptr(arg)) error_loc("argument '%s' has void type\n", arg->name); + + if (arg->attrs) + { + LIST_FOR_EACH_ENTRY(attr, arg->attrs, const attr_t, entry) + { + if (!allowed_attr[attr->type].on_arg) + error_loc("inapplicable attribute %s for argument %s\n", + allowed_attr[attr->type].display_name, arg->name); + } + } } static void check_all_user_types(ifref_list_t *ifrefs)

1 0

Rob Shearman : pstorec: Fix incorrectly spelt PPST_PROMPTIFO type in pstorec.c and pstore.idl.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 413af7698865aceabf690cb2ae876d934a58023a URL: http://source.winehq.org/git/wine.git/?a=commit;h=413af7698865aceabf690cb2a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:55:38 2008 +0100 pstorec: Fix incorrectly spelt PPST_PROMPTIFO type in pstorec.c and pstore.idl. --- dlls/pstorec/pstorec.c | 6 +++--- include/pstore.idl | 23 ++++++++++------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 6e2b5a5..debb222 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -264,7 +264,7 @@ static HRESULT WINAPI PStore_fnDeleteItem( IPStore* This, PST_KEY Key, */ static HRESULT WINAPI PStore_fnReadItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, - DWORD *cbData, BYTE** pbData, PPST_PROMPTIFO pPromptInfo, DWORD dwFlags) + DWORD *cbData, BYTE** pbData, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags) { FIXME("%p %08x %s %s %s %p %p %p %08x\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), @@ -277,7 +277,7 @@ static HRESULT WINAPI PStore_fnReadItem( IPStore* This, PST_KEY Key, */ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, - DWORD cbData, BYTE* ppbData, PPST_PROMPTIFO pPromptInfo, + DWORD cbData, BYTE* ppbData, PPST_PROMPTINFO pPromptInfo, DWORD dwDefaultConfirmationStyle, DWORD dwFlags) { FIXME("%p %08x %s %s %s %d %p %p %08x\n", This, Key, @@ -291,7 +291,7 @@ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key, */ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, - PST_ACCESSMODE ModeFlags, PPST_PROMPTIFO pProomptInfo, DWORD dwFlags ) + PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pProomptInfo, DWORD dwFlags ) { FIXME("%p %08x %s %s %p %08x %p %08x\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), diff --git a/include/pstore.idl b/include/pstore.idl index 06f5132..ee184d4 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -42,9 +42,13 @@ typedef struct _PST_PROVIDERINFO LPWSTR szProviderName; } PST_PROVIDERINFO, *PPST_PROVIDERINFO; -typedef void *PPST_PROMPTIFO; - - +typedef struct _PST_PROMPTINFO +{ + DWORD cbSize; + DWORD dwPromptFlags; + HWND hwndApp; + LPCWSTR szPrompt; +} PST_PROMPTINFO, *PPST_PROMPTINFO; typedef struct { DWORD cbSize; @@ -71,13 +75,6 @@ typedef struct { LPWSTR szDisplayName; } PST_TYPEINFO, *PPST_TYPEINFO; -typedef struct { - DWORD cbSize; - DWORD dwPromptFlags; - DWORD_PTR hwndApp; - LPCWSTR szPrompt; -} PST_PROMPTINFO, *PPST_PROMPTINFO; - [ object, pointer_default(unique) @@ -222,7 +219,7 @@ interface IPStore : IUnknown [in] LPCWSTR szItemName, [in] DWORD *cbData, [in] BYTE** pbData, - [in] PPST_PROMPTIFO pPromptInfo, + [in] PPST_PROMPTINFO pPromptInfo, [in] DWORD dwFlags ); HRESULT WriteItem( @@ -232,7 +229,7 @@ interface IPStore : IUnknown [in] LPCWSTR szItemName, [in] DWORD cbData, [in,size_is(cbData)] BYTE *ppbData, - [in] PPST_PROMPTIFO pPromptInfo, + [in] PPST_PROMPTINFO pPromptInfo, [in] DWORD dwDefaultConfirmationStyle, [in] DWORD dwFlags); @@ -242,7 +239,7 @@ interface IPStore : IUnknown [in] const GUID* pItemSubtype, [in] LPCWSTR szItemName, [in] PST_ACCESSMODE ModeFlags, - [in] PPST_PROMPTIFO pProomptInfo, + [in] PPST_PROMPTINFO pProomptInfo, [in] DWORD dwFlags ); HRESULT CloseItem(

1 0

Rob Shearman : include: Add local to interfaces or functions that take a void * parameter and so aren 't designed to work remotely.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b4efe919cc16ef49621b360d1fca60c7463798ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4efe919cc16ef49621b360d1… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:56:02 2008 +0100 include: Add local to interfaces or functions that take a void * parameter and so aren't designed to work remotely. --- include/amvideo.idl | 12 ++++++++---- include/axextend.idl | 3 ++- include/dimm.idl | 6 ++++-- include/shobjidl.idl | 10 ++++++---- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/include/amvideo.idl b/include/amvideo.idl index c63275b..5e6cdd6 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -61,7 +61,8 @@ cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)") [ object, - pointer_default(unique) + pointer_default(unique), + local ] interface IDirectDrawVideo : IUnknown { @@ -85,7 +86,8 @@ interface IDirectDrawVideo : IUnknown [ object, - pointer_default(unique) + pointer_default(unique), + local ] interface IQualProp : IUnknown { @@ -124,7 +126,8 @@ interface IFullScreenVideo : IUnknown [ object, - pointer_default(unique) + pointer_default(unique), + local ] interface IFullScreenVideoEx : IFullScreenVideo { @@ -137,7 +140,8 @@ interface IFullScreenVideoEx : IFullScreenVideo [ object, - pointer_default(unique) + pointer_default(unique), + local ] interface IBaseVideoMixer : IUnknown { diff --git a/include/axextend.idl b/include/axextend.idl index 03ca187..26a7086 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -958,7 +958,8 @@ cpp_quote("#define KSPROPERTY_SUPPORT_SET 2") [ object, uuid(31efac30-515c-11d0-a9aa-00aa0061be93), - pointer_default(unique) + pointer_default(unique), + local ] interface IKsPropertySet : IUnknown { diff --git a/include/dimm.idl b/include/dimm.idl index ab74d4a..07e04b2 100644 --- a/include/dimm.idl +++ b/include/dimm.idl @@ -185,7 +185,8 @@ interface IEnumRegisterWordW : IUnknown [ object, uuid(09b5eab0-f997-11d1-93d4-0060b067b86e), - pointer_default(unique) + pointer_default(unique), + local ] interface IEnumInputContext : IUnknown { @@ -206,7 +207,8 @@ interface IEnumInputContext : IUnknown [ object, uuid(08c0e040-62d1-11d1-9326-0060b067b86e), - pointer_default(unique) + pointer_default(unique), + local ] interface IActiveIMMApp : IUnknown { diff --git a/include/shobjidl.idl b/include/shobjidl.idl index 3353268..54d617e 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -716,7 +716,8 @@ cpp_quote("#define IShellLink WINELIB_NAME_AW(IShellLink)") [ object, uuid(000214e8-0000-0000-c000-000000000046), - pointer_default(unique) + pointer_default(unique), + local ] interface IShellExtInit : IUnknown { @@ -869,7 +870,8 @@ cpp_quote("#define CDBOSC_STATECHANGE 0x00000004") [ object, uuid(47d2657a-7b27-11d0-8ca9-00a0c92dbfe8), - pointer_default(unique) + pointer_default(unique), + local ] interface IDockingWindowFrame : IOleWindow { @@ -1152,9 +1154,9 @@ interface IShellExecuteHookW : IUnknown ] interface IShellLinkDataList : IUnknown { - HRESULT AddDataBlock( + [local] HRESULT AddDataBlock( [in] void *pDataBlock); - HRESULT CopyDataBlock( + [local] HRESULT CopyDataBlock( [in] DWORD dwSig, [out] void **ppDataBlock); HRESULT RemoveDataBlock(

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2008