April 2008 - wine-commits

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

Rob Shearman : include: Fix a typo in a level of indirection in tom.idl.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0120c1a58215883d07e2c278876abb17ae357072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0120c1a58215883d07e2c2788… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:55:51 2008 +0100 include: Fix a typo in a level of indirection in tom.idl. The parameter for ITextPara::GetDuplicate should have two levels of indirection. --- include/tom.idl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/tom.idl b/include/tom.idl index f4dd2f0..28a71a7 100644 --- a/include/tom.idl +++ b/include/tom.idl @@ -368,7 +368,7 @@ interface ITextFont : IDispatch ] interface ITextPara : IDispatch { - HRESULT GetDuplicate([retval, out]ITextPara *ppPara); + HRESULT GetDuplicate([retval, out]ITextPara **ppPara); HRESULT SetDuplicate([in]ITextPara *pPara); HRESULT CanChange([out]long *pB); HRESULT IsEqual([in]ITextPara *pPara, [retval, out]long *pB);

1 0

Rob Shearman : include: The unique attribute doesn' t make any sense in the interface header, so remove it.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f86ace9067289ce867e44e4e71ee2b543f5f25e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86ace9067289ce867e44e4e7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Apr 14 10:55:25 2008 +0100 include: The unique attribute doesn't make any sense in the interface header, so remove it. It is only accepted by MIDL as a synonym for pointer_default(unique), but it isn't a synonym in widl so remove it. --- include/indexsrv.idl | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/include/indexsrv.idl b/include/indexsrv.idl index 85e4e66..397e691 100644 --- a/include/indexsrv.idl +++ b/include/indexsrv.idl @@ -50,7 +50,6 @@ typedef enum tagWORDREP_BREAK_TYPE * IWordSink interface */ [ - unique, uuid(cc907054-c058-101a-b554-08002b33b0e6), object, local @@ -77,7 +76,6 @@ interface IWordSink : IUnknown * IPhraseSink interface */ [ - unique, uuid(cc906ff0-c058-101a-b554-08002b33b0e6), object, local @@ -99,7 +97,6 @@ interface IPhraseSink: IUnknown * IWordBreaker interface */ [ - unique, uuid(d53552c8-77e3-101a-b552-08002b33b0e6), object, local

1 0

Alexandre Julliard : winex11: Fix the type hint for the desktop window.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 18f4fb98836eb615a46efabf20945e59339520ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=18f4fb98836eb615a46efabf2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 13:27:38 2008 +0200 winex11: Fix the type hint for the desktop window. --- dlls/winex11.drv/window.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a1477c0..ab63f3b 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -829,16 +829,22 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) Window group_leader; Atom window_type; MwmHints mwm_hints; - DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE ); - DWORD ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - HWND owner = GetWindow( data->hwnd, GW_OWNER ); + DWORD style, ex_style; + HWND owner; if (data->hwnd == GetDesktopWindow()) { /* force some styles for the desktop to get the correct decorations */ - style |= WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + style = WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX; + ex_style = WS_EX_APPWINDOW; owner = 0; } + else + { + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + owner = GetWindow( data->hwnd, GW_OWNER ); + } /* transient for hint */ if (owner)

1 0

Alexandre Julliard : winex11: Make WS_EX_APPWINDOW windows have normal type .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 9bf9c0b7ec6d4475962e6c739ca2f83a7a11fda7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bf9c0b7ec6d4475962e6c739… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 13:27:19 2008 +0200 winex11: Make WS_EX_APPWINDOW windows have normal type. --- dlls/winex11.drv/window.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7cbd102..a1477c0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -857,13 +857,14 @@ void X11DRV_set_wm_hints( Display *display, struct x11drv_win_data *data ) set_size_hints( display, data, style ); /* set the WM_WINDOW_TYPE */ - window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); if (style & WS_THICKFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); + else if (ex_style & WS_EX_APPWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); else if (style & WS_DLGFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); else if (ex_style & WS_EX_DLGMODALFRAME) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_DIALOG); #if 0 /* many window managers don't handle utility windows very well */ else if (ex_style & WS_EX_TOOLWINDOW) window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_UTILITY); #endif + else window_type = x11drv_atom(_NET_WM_WINDOW_TYPE_NORMAL); XChangeProperty(display, data->whole_window, x11drv_atom(_NET_WM_WINDOW_TYPE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&window_type, 1);

1 0

Alexandre Julliard : winex11: Don' t set full screen style on minimized windows.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 8577358ef54cce8a35c25f1d3c6d766cb9301f94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8577358ef54cce8a35c25f1d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 13:26:38 2008 +0200 winex11: Don't set full screen style on minimized windows. --- dlls/winex11.drv/winpos.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index b12ded1..f6b75d6 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -136,7 +136,7 @@ static void update_net_wm_states( Display *display, struct x11drv_win_data *data { if ((style & WS_MAXIMIZE) && (style & WS_CAPTION) == WS_CAPTION) new_state |= (1 << NET_WM_STATE_MAXIMIZED); - else + else if (!(style & WS_MINIMIZE)) new_state |= (1 << NET_WM_STATE_FULLSCREEN); } else if (style & WS_MAXIMIZE)

1 0

Kai Blin : dpnhpast: Implement a stub for DirectPlayNATHelpCreate.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: ab62cd360f611ea2cc806acee044a7ea25773fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab62cd360f611ea2cc806acee… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Apr 12 21:13:59 2008 +0200 dpnhpast: Implement a stub for DirectPlayNATHelpCreate. --- dlls/dpnhpast/dpnhpast.spec | 2 +- dlls/dpnhpast/main.c | 7 +++---- include/dpnathlp.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dpnhpast/dpnhpast.spec b/dlls/dpnhpast/dpnhpast.spec index 67fb171..ea61468 100644 --- a/dlls/dpnhpast/dpnhpast.spec +++ b/dlls/dpnhpast/dpnhpast.spec @@ -1,4 +1,4 @@ -1 stub DirectPlayNATHelpCreate +1 stdcall DirectPlayNATHelpCreate(ptr ptr) @ stdcall -private DllCanUnloadNow() @ stdcall -private DllGetClassObject(ptr ptr ptr) diff --git a/dlls/dpnhpast/main.c b/dlls/dpnhpast/main.c index 6ec2e6f..74427ba 100644 --- a/dlls/dpnhpast/main.c +++ b/dlls/dpnhpast/main.c @@ -55,12 +55,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) * * */ -#if 0 -HRESULT WINAPI DPNHPAST_DirectPlayNATHelpCreate(void) +HRESULT WINAPI DirectPlayNATHelpCreate(LPCGUID pIID, PVOID *ppvInterface) { - /* @stub in .spec */ + TRACE("(%p, %p) stub\n", pIID, ppvInterface); + return E_NOTIMPL; } -#endif /****************************************************************** diff --git a/include/dpnathlp.h b/include/dpnathlp.h index 68c0456..c1fa3c9 100644 --- a/include/dpnathlp.h +++ b/include/dpnathlp.h @@ -23,7 +23,7 @@ extern "C" { #endif -HRESULT DirectPlayNATHelpCreate(const PGUID pIID, void ** ppvInterface); +HRESULT DirectPlayNATHelpCreate(LPCGUID pIID, LPVOID *ppvInterface); DEFINE_GUID(CLSID_DirectPlayNATHelpUPnP, 0xb9c2e9c4,0x68c1,0x4d42,0xa7,0xa1,0xe7,0x6a,0x26,0x98,0x2a,0xd6); DEFINE_GUID(CLSID_DirectPlayNATHelpPAST, 0x963ab779,0x16a1,0x477c,0xa3,0x6d,0xcb,0x5e,0x71,0x19,0x38,0xf7);

1 0

Rok Mandeljc : shell32: Updated Slovenian translation to reflect changes in About dialog.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a2a8d1ad19d4920aff0c034458aab87a7a707984 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2a8d1ad19d4920aff0c03445… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:53 2008 +0200 shell32: Updated Slovenian translation to reflect changes in About dialog. --- dlls/shell32/shell32_Si.rc | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/shell32_Si.rc b/dlls/shell32/shell32_Si.rc index d10ab6b..af7e5f2 100644 --- a/dlls/shell32/shell32_Si.rc +++ b/dlls/shell32/shell32_Si.rc @@ -138,17 +138,19 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } -SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 210, 152 +SHELL_ABOUT_MSGBOX DIALOG LOADONCALL MOVEABLE DISCARDABLE 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "O %s" FONT 10, "MS Shell Dlg" { - DEFPUSHBUTTON "V redu", IDOK, 153, 133, 50, 12, WS_TABSTOP + DEFPUSHBUTTON "V redu", IDOK, 153, 133, 60, 12, WS_TABSTOP + PUSHBUTTON "&Licenčna pog.", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 - LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 - LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 - LTEXT "Wine smo ustvarili:", IDC_ABOUT_WINE_TEXT, 8, 55, 137, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT1, 42, 10, 170, 10 + LTEXT "", IDC_ABOUT_STATIC_TEXT2, 42, 22, 170, 10 + LTEXT "Različica Wine: %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 + LTEXT "Wine smo ustvarili:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 0, 0, 227, 95 @@ -250,4 +252,22 @@ STRINGTABLE IDS_NEWFOLDER "Nova mapa" } +STRINGTABLE +{ + IDS_LICENSE_CAPTION, "Licenčna pogodba za Wine" +IDS_LICENSE, +"Wine is free software; you can redistribute it and/or \ +modify it under the terms of the GNU Lesser General Public \ +License as published by the Free Software Foundation; either \ +version 2.1 of the License, or (at your option) any later version.\n\n\ +Wine is distributed in the hope that it will be useful, \ +but WITHOUT ANY WARRANTY; without even the implied warranty of \ +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU \ +Lesser General Public License for more details.\n\n\ +You should have received a copy of the GNU Lesser General Public \ +License along with this library; if not, write to the Free Software \ +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA." +} + + #pragma code_page(default)

1 0

Rok Mandeljc : winecfg: Update Slovenian translation to reflect recently introduced changes.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 7445e90b7ad1f0a5a74a4934e8082335b826025a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7445e90b7ad1f0a5a74a4934e… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:57 2008 +0200 winecfg: Update Slovenian translation to reflect recently introduced changes. --- programs/winecfg/Si.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index f560760..59df1e8 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -64,7 +64,9 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Nastavitve oken ",IDC_STATIC,8,4,244,184 - CONTROL "Dovoli DirectX programom, da preprečijo &miški zapuščanje njihovega okna",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Dovoli DirectX programom, da preprečijo &miški zapuščanje okna",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + + CONTROL "Dovoli upravljalniku oken, da okra&si okna",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 CONTROL "Dovoli upravljalniku &oken, da upravlja z Wine-ovimi okni",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Če z Wine-ovimi okni upravlja upravljalnik oken, so robovi, obnašanje in ostale nastavitve le-teh enake, kot za ostala okna vašega namizja, kar omogoča boljšo združitev z vašim namizjem.\n\nV nasprotnem primeru okna ne bodo tako tesno povezana z vašim namizjem, kar pa v nekaterih primerih omogoča pravilnejšo emulacijo in izboljša delovanje nekaterih programoh.",

1 0

Rok Mandeljc : comdlg32: Fix a mistake in Slovenian translation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 202cbcc11b96483c85b7e383293c4a954c09d722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=202cbcc11b96483c85b7e3832… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:52 2008 +0200 comdlg32: Fix a mistake in Slovenian translation. --- dlls/comdlg32/cdlg_Si.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/cdlg_Si.rc b/dlls/comdlg32/cdlg_Si.rc index dfd7e0a..66dc0d7 100644 --- a/dlls/comdlg32/cdlg_Si.rc +++ b/dlls/comdlg32/cdlg_Si.rc @@ -256,10 +256,10 @@ FONT 8, "MS Shell Dlg" CONTROL "&Vse", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,30,12 CONTROL "St&rani", rad3,"Button",BS_AUTORADIOBUTTON,16,122,30,12 CONTROL "I&zbor", rad2,"Button",BS_AUTORADIOBUTTON,16,138,30,12 - EDITTEXT edt1, 64,122, 26,12, WS_GROUP | ES_NUMBER + EDITTEXT edt1, 66,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 108,122, 26,12, WS_GROUP | ES_NUMBER - LTEXT "&od:", stc2, 52,124, 10,8 - LTEXT "&do:", stc3, 94,124, 10,8 + RTEXT "&od:", stc2, 52,124, 12,8 + RTEXT "&do:", stc3, 94,124, 12,8 } PRINT32_SETUP DIALOG LOADONCALL MOVEABLE DISCARDABLE 32, 32, 288, 178

1 0

Rok Mandeljc : winmm: Slovenian translation: Add a string that got lost during last update.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: f261e6db4d6befa5893600199c6cac3acd23fe94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f261e6db4d6befa5893600199… Author: Rok Mandeljc <rok.mandeljc(a)email.si> Date: Sat Apr 12 18:00:54 2008 +0200 winmm: Slovenian translation: Add a string that got lost during last update. --- dlls/winmm/winmm_Si.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winmm/winmm_Si.rc b/dlls/winmm/winmm_Si.rc index 1146e74..c4c11d0 100644 --- a/dlls/winmm/winmm_Si.rc +++ b/dlls/winmm/winmm_Si.rc @@ -50,6 +50,7 @@ MIDIERR_NODEVICE, "Trenutna nastavitev MIDI se sklicuje na MIDI napravo, ki ni MIDIERR_INVALIDSETUP, "Trenutna nastavitev MIDI je pošodovana. Namestite originalno datoteko MIDIMAP.CFG v sistemsko mapo Oken in poskusite znova." /* MCI errors */ +MCIERR_INVALID_DEVICE_ID, "Neveljaven ID MCI naprave. Uporabite ID, ki ga vrne odpiranje MCI naprave." MCIERR_UNRECOGNIZED_KEYWORD, "Naveden parameter ukaza ni definiran v naboru MCI ukazov." MCIERR_UNRECOGNIZED_COMMAND, "Naveden ukaz je neveljaven MCI ukaz." MCIERR_HARDWARE, "Z večpredstavnostno napravo so težave. Preverite, ali naprava deluje pravilno ali pa se posvetujte z izdelovalcem."

1 0

Andrew Talbot : comctl32: Remove unused variables.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 369d414d59bb2845a35e5fdd0e1179dee72850f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=369d414d59bb2845a35e5fdd0… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 12 18:31:47 2008 +0100 comctl32: Remove unused variables. --- dlls/comctl32/propsheet.c | 2 -- dlls/comctl32/toolbar.c | 3 +-- dlls/comctl32/trackbar.c | 3 +-- dlls/comctl32/treeview.c | 3 +-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index a193082..84b1b7f 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3412,7 +3412,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PropSheetInfo* psInfo = (PropSheetInfo*) lParam; WCHAR* strCaption = (WCHAR*)Alloc(MAX_CAPTION_LENGTH*sizeof(WCHAR)); HWND hwndTabCtrl = GetDlgItem(hwnd, IDC_TABCONTROL); - LPCPROPSHEETPAGEW ppshpage; int idx; LOGFONTW logFont; @@ -3508,7 +3507,6 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) PSCB_INITIALIZED, (LPARAM)0); idx = psInfo->active_page; - ppshpage = (LPCPROPSHEETPAGEW)psInfo->proppage[idx].hpage; psInfo->active_page = -1; PROPSHEET_SetCurSel(hwnd, idx, 1, psInfo->proppage[idx].hpage); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1bda0cc..9991683 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1280,7 +1280,7 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) TBUTTON_INFO *btnPtr; INT x, cx, i, j; RECT rc; - BOOL bWrap, bButtonWrap; + BOOL bButtonWrap; /* When the toolbar window style is not TBSTYLE_WRAPABLE, */ /* no layout is necessary. Applications may use this style */ @@ -1314,7 +1314,6 @@ TOOLBAR_WrapToolbar( HWND hwnd, DWORD dwStyle ) for (i = 0; i < infoPtr->nNumButtons; i++ ) { - bWrap = FALSE; btnPtr[i].fsState &= ~TBSTATE_WRAP; if (btnPtr[i].fsState & TBSTATE_HIDDEN) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 7cdfe71..e81d55f 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -822,7 +822,6 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) HBITMAP hOldBmp = 0, hOffScreenBmp = 0; NMCUSTOMDRAW nmcd; int gcdrf, icdrf; - HTHEME theme; if (infoPtr->flags & TB_THUMBCHANGED) { TRACKBAR_UpdateThumb (infoPtr); @@ -867,7 +866,7 @@ TRACKBAR_Refresh (TRACKBAR_INFO *infoPtr, HDC hdcDst) /* Erase background */ if (gcdrf == CDRF_DODEFAULT || notify_customdraw(infoPtr, &nmcd, CDDS_PREERASE) != CDRF_SKIPDEFAULT) { - if ((theme = GetWindowTheme (infoPtr->hwndSelf))) { + if (GetWindowTheme (infoPtr->hwndSelf)) { DrawThemeParentBackground (infoPtr->hwndSelf, hdc, 0); } else diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 5650c46..2b71a3b 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3575,12 +3575,11 @@ TREEVIEW_Command(TREEVIEW_INFO *infoPtr, WPARAM wParam, LPARAM lParam) TREEVIEW_ITEM *editItem = infoPtr->selectedItem; HDC hdc = GetDC(infoPtr->hwndEdit); SIZE sz; - int len; HFONT hFont, hOldFont = 0; infoPtr->bLabelChanged = TRUE; - len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); + GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); /* Select font to get the right dimension of the string */ hFont = (HFONT)SendMessageW(infoPtr->hwndEdit, WM_GETFONT, 0, 0);

1 0

Aric Stewart : imm32: Implement ImmProcessKey and ImmTranslateMessage.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 43dc41168d776cebd05bffffc17a2ebda33687fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=43dc41168d776cebd05bffffc… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 11 10:59:01 2008 -0500 imm32: Implement ImmProcessKey and ImmTranslateMessage. --- dlls/imm32/imm.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/imm32/imm32.spec | 4 +- 2 files changed, 97 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index ff6398c..c03d6fd 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -78,6 +78,7 @@ typedef struct tagInputContextData ImmHkl *immKbd; HWND imeWnd; + UINT lastVK; } InputContextData; typedef struct _tagTRANSMSG { @@ -2147,3 +2148,97 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC) return TRUE; } + +/*********************************************************************** +* ImmTranslateMessage(IMM32.@) +* ( Undocumented, call internally and from user32.dll ) +*/ +BOOL WINAPI ImmTranslateMessage(HWND hwnd, UINT msg, WCHAR chr, LPARAM lKeyData) +{ + InputContextData *data; + HIMC imc = ImmGetContext(hwnd); + BYTE state[256]; + UINT scancode; + LPVOID list = 0; + UINT msg_count; + UINT uVirtKey; + static const int list_count = 10; + + TRACE("%p %x '%c' %x\n",hwnd, msg, chr, (UINT)lKeyData); + + if (imc) + data = (InputContextData*)imc; + else + return FALSE; + + if (!data->immKbd->hIME || !data->immKbd->pImeToAsciiEx) + return FALSE; + + GetKeyboardState(state); + scancode = lKeyData >> 0x10 & 0xff; + + list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, list_count * sizeof(TRANSMSG) + sizeof(DWORD)); + ((DWORD*)list)[0] = list_count; + + if (data->immKbd->imeInfo.fdwProperty & IME_PROP_KBD_CHAR_FIRST) + { + if (!is_himc_ime_unicode(data)) + ToAscii(data->lastVK, scancode, state, &chr, 0); + uVirtKey = MAKELONG(data->lastVK,chr); + } + else + uVirtKey = data->lastVK; + + msg_count = data->immKbd->pImeToAsciiEx(uVirtKey, scancode, state, list, 0, imc); + TRACE("%i messages generated\n",msg_count); + if (msg_count && msg_count <= list_count) + { + int i; + LPTRANSMSG msgs = (LPTRANSMSG)((LPBYTE)list + sizeof(DWORD)); + + for (i = 0; i < msg_count; i++) + ImmInternalPostIMEMessage(data, msgs[i].message, msgs[i].wParam, msgs[i].lParam); + } + else if (msg_count > list_count) + ImmGenerateMessage(imc); + + HeapFree(GetProcessHeap(),0,list); + + return (msg_count > 0); +} + +/*********************************************************************** +* ImmProcessKey(IMM32.@) +* ( Undocumented, called from user32.dll ) +*/ +BOOL WINAPI ImmProcessKey(HWND hwnd, HKL hKL, UINT vKey, LPARAM lKeyData, DWORD unknown) +{ + InputContextData *data; + HIMC imc = ImmGetContext(hwnd); + BYTE state[256]; + + TRACE("%p %p %x %x %x\n",hwnd, hKL, vKey, (UINT)lKeyData, unknown); + + if (imc) + data = (InputContextData*)imc; + else + return FALSE; + + if (!data->immKbd->hIME || !data->immKbd->pImeProcessKey) + return FALSE; + + GetKeyboardState(state); + data->lastVK = vKey; + + if (data->immKbd->pImeProcessKey(imc, vKey, lKeyData, state)) + { + WCHAR key; + UINT scancode; + + scancode = lKeyData >> 0x10 & 0xff; + ToUnicodeEx(vKey, scancode, state, &key, 1, 0, hKL); + return ImmTranslateMessage(hwnd, WM_KEYDOWN, key, lKeyData ); + } + + return FALSE; +} diff --git a/dlls/imm32/imm32.spec b/dlls/imm32/imm32.spec index 0ecd1f9..4e0b023 100644 --- a/dlls/imm32/imm32.spec +++ b/dlls/imm32/imm32.spec @@ -72,7 +72,7 @@ @ stub ImmLockImeDpi @ stdcall ImmNotifyIME(long long long long) @ stub ImmPenAuxInput -@ stub ImmProcessKey +@ stdcall ImmProcessKey(long long long long long) @ stub ImmPutImeMenuItemsIntoMappedFile @ stdcall ImmReSizeIMCC(long long) @ stub ImmRegisterClient @@ -99,7 +99,7 @@ @ stub ImmShowSoftKeyboard @ stdcall ImmSimulateHotKey(long long) @ stub ImmSystemHandler -@ stub ImmTranslateMessage +@ stdcall ImmTranslateMessage(long long long long) @ stub ImmUnlockClientImc @ stdcall ImmUnlockIMC(long) @ stdcall ImmUnlockIMCC(long)

1 0

Aric Stewart : imm32: All HIMCC in the InputContext should be initialized at creation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 3dde049f31efb63013be2b01f5a08d6457222dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=3dde049f31efb63013be2b01f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 11 10:58:42 2008 -0500 imm32: All HIMCC in the InputContext should be initialized at creation. --- dlls/imm32/imm.c | 16 ++++++++++++++-- include/ddk/imm.h | 18 ++++++++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 3ff2228..ff6398c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -496,6 +496,8 @@ BOOL WINAPI ImmConfigureIMEW( HIMC WINAPI ImmCreateContext(void) { InputContextData *new_context; + LPGUIDELINE gl; + LPCANDIDATEINFO ci; new_context = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(InputContextData)); @@ -509,9 +511,19 @@ HIMC WINAPI ImmCreateContext(void) return 0; } - /* hCompStr is never NULL */ + /* the HIMCCs are never NULL */ new_context->IMC.hCompStr = ImmCreateBlankCompStr(); - new_context->IMC.hMsgBuf = ImmCreateIMCC(1); + new_context->IMC.hMsgBuf = ImmCreateIMCC(0); + new_context->IMC.hCandInfo = ImmCreateIMCC(sizeof(CANDIDATEINFO)); + ci = ImmLockIMCC(new_context->IMC.hCandInfo); + memset(ci,0,sizeof(CANDIDATEINFO)); + ci->dwSize = sizeof(CANDIDATEINFO); + ImmUnlockIMCC(new_context->IMC.hCandInfo); + new_context->IMC.hGuideLine = ImmCreateIMCC(sizeof(GUIDELINE)); + gl = ImmLockIMCC(new_context->IMC.hGuideLine); + memset(gl,0,sizeof(GUIDELINE)); + gl->dwSize = sizeof(GUIDELINE); + ImmUnlockIMCC(new_context->IMC.hGuideLine); /* Initialize the IME Private */ new_context->IMC.hPrivate = ImmCreateIMCC(new_context->immKbd->imeInfo.dwPrivateDataSize); diff --git a/include/ddk/imm.h b/include/ddk/imm.h index c492092..ee10b27 100644 --- a/include/ddk/imm.h +++ b/include/ddk/imm.h @@ -84,6 +84,24 @@ typedef struct tagCOMPOSITIONSTRING { DWORD dwPrivateOffset; } COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; +typedef struct tagGUIDELINE { + DWORD dwSize; + DWORD dwLevel; + DWORD dwIndex; + DWORD dwStrLen; + DWORD dwStrOffset; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} GUIDELINE, *LPGUIDELINE; + +typedef struct tagCANDIDATEINFO { + DWORD dwSize; + DWORD dwCount; + DWORD dwOffset[32]; + DWORD dwPrivateSize; + DWORD dwPrivateOffset; +} CANDIDATEINFO, *LPCANDIDATEINFO; + LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); BOOL WINAPI ImmUnlockIMC(HIMC); DWORD WINAPI ImmGetIMCLockCount(HIMC);

1 0

John Klehm : wintab32: Implement WTSetA/W.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 352c98d7d57103b7a5f1bef03eb77ac8a6c98039 URL: http://source.winehq.org/git/wine.git/?a=commit;h=352c98d7d57103b7a5f1bef03… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Wed Apr 9 18:44:36 2008 -0500 wintab32: Implement WTSetA/W. --- dlls/wintab32/context.c | 32 ++++++++++++++++++++++++++------ 1 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 3147ec0..9551d87 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -692,11 +692,21 @@ BOOL WINAPI WTGetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) */ BOOL WINAPI WTSetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) { - FIXME("(%p, %p): stub\n", hCtx, lpLogCtx); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("hCtx=%p, lpLogCtx=%p\n", hCtx, lpLogCtx); - return FALSE; + if (!hCtx || !lpLogCtx) return FALSE; + + /* TODO: if cur process not owner of hCtx only modify + * attribs not locked by owner */ + + EnterCriticalSection(&csTablet); + context = TABLET_FindOpenContext(hCtx); + LOGCONTEXTAtoW(lpLogCtx, &context->context); + LeaveCriticalSection(&csTablet); + + return TRUE; } /*********************************************************************** @@ -704,11 +714,21 @@ BOOL WINAPI WTSetA(HCTX hCtx, LPLOGCONTEXTA lpLogCtx) */ BOOL WINAPI WTSetW(HCTX hCtx, LPLOGCONTEXTW lpLogCtx) { - FIXME("(%p, %p): stub\n", hCtx, lpLogCtx); + LPOPENCONTEXT context; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + TRACE("hCtx=%p, lpLogCtx=%p\n", hCtx, lpLogCtx); - return FALSE; + if (!hCtx || !lpLogCtx) return FALSE; + + /* TODO: if cur process not hCtx owner only modify + * attribs not locked by owner */ + + EnterCriticalSection(&csTablet); + context = TABLET_FindOpenContext(hCtx); + memmove(&context->context, lpLogCtx, sizeof(LOGCONTEXTW)); + LeaveCriticalSection(&csTablet); + + return TRUE; } /***********************************************************************

1 0

Vitaliy Margolen : gphoto2.ds: Add Russian translation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 7a651e1c159852907f5f811d6ce1ee7655f14aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a651e1c159852907f5f811d6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 13 10:26:24 2008 -0600 gphoto2.ds: Add Russian translation. --- dlls/gphoto2.ds/gphoto2_Ru.rc | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/gphoto2.ds/rsrc.rc | 1 + 2 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_Ru.rc b/dlls/gphoto2.ds/gphoto2_Ru.rc new file mode 100644 index 0000000..9ac3c11 --- /dev/null +++ b/dlls/gphoto2.ds/gphoto2_Ru.rc @@ -0,0 +1,52 @@ +/* + * Russian resources for Twain + * + * Copyright 2008 Vitaliy Margolen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +IDD_CAMERAUI DIALOG DISCARDABLE 0, 0, 372, 273 +STYLE DS_MODALFRAME | DS_SETFOREGROUND | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "�� " +MENU 20545 +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "��1",IDC_LIST1,"SysListView32", LVS_ICON | WS_BORDER | WS_TABSTOP,7,7,358,229 + DEFPUSHBUTTON "�� ",IDC_IMPORT,152,252,72,14 + PUSHBUTTON "��",IDC_FETCH,7,252,64,14 + PUSHBUTTON "�� ",IDC_IMPORTALL,80,252,64,14 + CONTROL "�� ",IDC_SKIP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,230,252,76,14 + PUSHBUTTON "��",IDC_EXIT,315,252,50,14 +END + +IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "��" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "��.... ��",IDC_STATIC,5,19,176,8, SS_CENTER +END + +IDD_CONNECTING DIALOG DISCARDABLE 0, 0, 280, 116 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU| WS_VISIBLE | DS_CENTER +CAPTION "�� " +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 + LTEXT "�� ... ��",IDC_STATIC,128,58,116,8 +END diff --git a/dlls/gphoto2.ds/rsrc.rc b/dlls/gphoto2.ds/rsrc.rc index 9df3c28..5359e66 100644 --- a/dlls/gphoto2.ds/rsrc.rc +++ b/dlls/gphoto2.ds/rsrc.rc @@ -34,5 +34,6 @@ #include "gphoto2_Nl.rc" #include "gphoto2_No.rc" #include "gphoto2_Pl.rc" +#include "gphoto2_Ru.rc" #include "gphoto2_Si.rc" #include "gphoto2_Sv.rc"

1 0

Vitaliy Margolen : Update Russian translation.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a1eb6b7ece916c8457b91657eafc63a0dd3274a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1eb6b7ece916c8457b91657e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 13 10:26:03 2008 -0600 Update Russian translation. --- programs/notepad/Ru.rc | 2 +- programs/wineconsole/wineconsole_Ru.rc | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/notepad/Ru.rc b/programs/notepad/Ru.rc index 44152a9..a2184fa 100644 --- a/programs/notepad/Ru.rc +++ b/programs/notepad/Ru.rc @@ -28,9 +28,9 @@ MAIN_MENU MENU MENUITEM "&��\tCtrl+S", CMD_SAVE MENUITEM "�� &��...", CMD_SAVE_AS MENUITEM SEPARATOR + MENUITEM "&��...\tCtrl+P", CMD_PRINT MENUITEM "��&�� ...", CMD_PAGE_SETUP MENUITEM "&�� ...", CMD_PRINTER_SETUP - MENUITEM "&��...\tCtrl+P", CMD_PRINT MENUITEM SEPARATOR MENUITEM "�&��", CMD_EXIT } diff --git a/programs/wineconsole/wineconsole_Ru.rc b/programs/wineconsole/wineconsole_Ru.rc index 3fc25b4..7e1f2ec 100644 --- a/programs/wineconsole/wineconsole_Ru.rc +++ b/programs/wineconsole/wineconsole_Ru.rc @@ -128,6 +128,7 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION CAPTION "�� " FONT 8, "MS Shell Dlg" { + GROUPBOX "", -1, 10, 10, 178, 31, BS_GROUPBOX AUTORADIOBUTTON "�� ", IDC_SAV_SESSION, 14, 15, 170, 10, WS_TABSTOP AUTORADIOBUTTON "�� ", IDC_SAV_SAVE, 14, 27, 170, 10, WS_TABSTOP

1 0

Vitaliy Margolen : winex11.drv: Send scan code when adjusting modifier key states.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: a3b21209b2c07d8d972bf12958792118d2570373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3b21209b2c07d8d972bf1295… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Apr 13 09:16:02 2008 -0600 winex11.drv: Send scan code when adjusting modifier key states. --- dlls/winex11.drv/keyboard.c | 43 ++++++++++++++++++++----------------------- 1 files changed, 20 insertions(+), 23 deletions(-) diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 882b98c..6aa613f 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1242,23 +1242,22 @@ void X11DRV_send_keyboard_input( WORD wVk, WORD wScan, DWORD event_flags, DWORD * Updates internal state for <vkey>, depending on key <state> under X * */ -static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) +static inline void KEYBOARD_UpdateOneState ( WORD vkey, WORD scan, int state, DWORD time ) { /* Do something if internal table state != X state for keycode */ - if (((key_state_table[vkey] & 0x80)!=0) != state) + if (((key_state_table[vkey & 0xff] & 0x80)!=0) != state) { - DWORD flags = 0; + DWORD flags = vkey & 0x100 ? KEYEVENTF_EXTENDEDKEY : 0; if (!state) flags |= KEYEVENTF_KEYUP; - if (vkey == VK_RSHIFT || vkey == VK_RCONTROL || vkey == VK_RMENU) flags |= KEYEVENTF_EXTENDEDKEY; TRACE("Adjusting state for vkey %#.2x. State before %#.2x\n", - vkey, key_state_table[vkey]); + vkey, key_state_table[vkey & 0xff]); /* Fake key being pressed inside wine */ - X11DRV_send_keyboard_input( vkey, 0, flags, time, 0, 0 ); + X11DRV_send_keyboard_input( vkey & 0xff, scan & 0xff, flags, time, 0, 0 ); - TRACE("State after %#.2x\n",key_state_table[vkey]); + TRACE("State after %#.2x\n", key_state_table[vkey & 0xff]); } } @@ -1273,7 +1272,7 @@ static inline void KEYBOARD_UpdateOneState ( int vkey, int state, DWORD time ) */ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) { - int i, j, alt_r = 0, alt_l = 0, control_r = 0, control_l = 0, shift_r = 0, shift_l = 0; + int i, j; DWORD time = GetCurrentTime(); /* the minimum keycode is always greater or equal to 8, so we can @@ -1281,27 +1280,25 @@ void X11DRV_KeymapNotify( HWND hwnd, XEvent *event ) */ for (i = 1; i < 32; i++) { - if (!event->xkeymap.key_vector[i]) continue; for (j = 0; j < 8; j++) { - if (!(event->xkeymap.key_vector[i] & (1<<j))) continue; - switch(keyc2vkey[(i * 8) + j] & 0xff) + WORD vkey = keyc2vkey[(i * 8) + j]; + WORD scan = keyc2scan[(i * 8) + j]; + int state = (event->xkeymap.key_vector[i] & (1<<j)) != 0; + + switch(vkey & 0xff) { - case VK_LMENU: alt_l = 1; break; - case VK_RMENU: alt_r = 1; break; - case VK_LCONTROL: control_l = 1; break; - case VK_RCONTROL: control_r = 1; break; - case VK_LSHIFT: shift_l = 1; break; - case VK_RSHIFT: shift_r = 1; break; + case VK_LMENU: + case VK_RMENU: + case VK_LCONTROL: + case VK_RCONTROL: + case VK_LSHIFT: + case VK_RSHIFT: + KEYBOARD_UpdateOneState( vkey, scan, state, time ); + break; } } } - KEYBOARD_UpdateOneState( VK_LMENU, alt_l, time ); - KEYBOARD_UpdateOneState( VK_RMENU, alt_r, time ); - KEYBOARD_UpdateOneState( VK_LCONTROL, control_l, time ); - KEYBOARD_UpdateOneState( VK_RCONTROL, control_r, time ); - KEYBOARD_UpdateOneState( VK_LSHIFT, shift_l, time ); - KEYBOARD_UpdateOneState( VK_RSHIFT, shift_r, time ); } static void update_lock_state(BYTE vkey, WORD scan, DWORD time)

1 0

Alexander Nicolaysen Sørnes : winecfg: Update Norwegian Bokmål resource.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0c6311ea35c99af5af5b50ebf4cc716c77b43141 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c6311ea35c99af5af5b50ebf… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Apr 13 01:48:36 2008 +0200 winecfg: Update Norwegian Bokmål resource. --- programs/winecfg/No.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 384a197..2029336 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -60,9 +60,11 @@ IDD_GRAPHCFG DIALOG DISCARDABLE 0, 0, 260, 250 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,5,244,180 + GROUPBOX " Vinduinnstillinger ",IDC_STATIC,8,4,244,184 - CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,19,230,8 + CONTROL "Tillat DirectX-programmer � hindre musen fra � forlate vinduet",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 + + CONTROL "Tillat vindusbehandleren � &dekorere vinduer",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,30,230,8 CONTROL "Tillat vindusbehandleren � kontrollere vinduene",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,40,230,8 LTEXT "Hvis vinduer kontrolleres av din standardvindusbehandler, f�r de vanlige rammer, og respekterer det virtuelle skrivebordet ditt og vises i vinduslisten.\n\nHvis de er ukontrollerte er de koblet fra vindusbehandleren. Dette betyr at de ikke integreres like godt med skrivebordet ditt, men emuleringen blir mer presis s�nn at noen programmer virker bedre.",

1 0

Dmitry Timoshkov : gdi32: Clarify which font doesn't contain 'x'.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 2a2c66c0620f9a08be36923da967f281de2b27d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a2c66c0620f9a08be36923da… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Apr 13 14:08:44 2008 +0900 gdi32: Clarify which font doesn't contain 'x'. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index ef250d9..803994b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1518,7 +1518,7 @@ static void test_negative_width(HDC hdc, const LOGFONTA *lf) { SelectObject(hdc, hfont_prev); DeleteObject(hfont); - skip("This font doesn't contain 'x', skipping the test\n"); + skip("Font %s doesn't contain 'x', skipping the test\n", lf->lfFaceName); return; }

1 0

Francois Gouget : Spelling fix in the ldt bitfields.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d8c41a25da75d17f5430eb58b3942d68761b87ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c41a25da75d17f5430eb58b… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:03:24 2008 +0200 Spelling fix in the ldt bitfields. --- libs/wine/ldt.c | 4 ++-- loader/preloader.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index e05a962..c46ff6f 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -52,7 +52,7 @@ struct modify_ldt_s unsigned int read_exec_only : 1; unsigned int limit_in_pages : 1; unsigned int seg_not_present : 1; - unsigned int useable : 1; + unsigned int usable : 1; unsigned int garbage : 25; }; @@ -65,7 +65,7 @@ static inline void fill_modify_ldt_struct( struct modify_ldt_s *ptr, const LDT_E ptr->read_exec_only = !(entry->HighWord.Bits.Type & 2); ptr->limit_in_pages = entry->HighWord.Bits.Granularity; ptr->seg_not_present = !entry->HighWord.Bits.Pres; - ptr->useable = entry->HighWord.Bits.Sys; + ptr->usable = entry->HighWord.Bits.Sys; ptr->garbage = 0; } diff --git a/loader/preloader.c b/loader/preloader.c index 0034e9a..eef0b72 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -178,7 +178,7 @@ struct unsigned int read_exec_only : 1; unsigned int limit_in_pages : 1; unsigned int seg_not_present : 1; - unsigned int useable : 1; + unsigned int usable : 1; unsigned int garbage : 25; } thread_ldt = { -1, (unsigned long)thread_data, 0xfffff, 1, 0, 0, 1, 0, 1, 0 };

1 0

Francois Gouget : ddraw/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 4ba16af16bae9cd7b06befef0fdb008560339b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba16af16bae9cd7b06befef0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:02:26 2008 +0200 ddraw/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ddraw/tests/visual.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 02d9c59..4353f51 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -1763,7 +1763,7 @@ static void D3D1_ViewportClearTest(void) memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat); - U1(U1(mat).diffuse).r = 1.0f; + U1(U(mat).diffuse).r = 1.0f; hr = IDirect3DMaterial_SetMaterial(bgMaterial, &mat); ok(hr == D3D_OK, "IDirect3DMaterial_SetMaterial failed: %08x\n", hr); @@ -1781,16 +1781,16 @@ static void D3D1_ViewportClearTest(void) if (SUCCEEDED(hr)) { D3DRECT rect; - rect.x1 = rect.y1 = 0; - rect.x2 = 640; - rect.y2 = 480; + U1(rect).x1 = U2(rect).y1 = 0; + U3(rect).x2 = 640; + U4(rect).y2 = 480; hr = IDirect3DViewport_Clear(Viewport, 1, &rect, D3DCLEAR_TARGET); ok(hr == D3D_OK, "IDirect3DViewport_Clear failed: %08x\n", hr); memset(&mat, 0, sizeof(mat)); mat.dwSize = sizeof(mat); - U1(U1(mat).diffuse).b = 1.0f; + U3(U(mat).diffuse).b = 1.0f; hr = IDirect3DMaterial_SetMaterial(bgMaterial, &mat); ok(hr == D3D_OK, "IDirect3DMaterial_SetMaterial failed: %08x\n", hr); @@ -1832,7 +1832,7 @@ static DWORD D3D3_getPixelColor(IDirectDraw4 *DirectDraw, IDirectDrawSurface4 *S */ memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; ddsd.dwWidth = 640; ddsd.dwHeight = 480; @@ -1847,7 +1847,7 @@ static DWORD D3D3_getPixelColor(IDirectDraw4 *DirectDraw, IDirectDrawSurface4 *S memset(&ddsd, 0, sizeof(ddsd)); ddsd.dwSize = sizeof(ddsd); - ddsd.ddpfPixelFormat.dwSize = sizeof(ddsd.ddpfPixelFormat); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); hr = IDirectDrawSurface4_BltFast(surf, 0, 0, Surface, NULL, 0); ok(hr == DD_OK, "IDirectDrawSurface_BltFast returned %08x\n", hr); @@ -2025,9 +2025,9 @@ static void D3D3_ViewportClearTest(void) ok(hr == D3D_OK, "IDirect3DDevice3_SetRenderState returned %08x\n", hr); if (SUCCEEDED(hr)) { - rect.x1 = rect.y1 = 0; - rect.x2 = 640; - rect.y2 = 480; + U1(rect).x1 = U2(rect).y1 = 0; + U3(rect).x2 = 640; + U4(rect).y2 = 480; hr = IDirect3DViewport3_Clear2(Viewport3, 1, &rect, D3DCLEAR_TARGET, 0x00ff00, 0.0f, 0); ok(hr == D3D_OK, "IDirect3DViewport3_Clear2 failed, hr = %08x\n", hr);

1 0

Francois Gouget : jscript/tests: Fix the '\n's in an ok() call.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 7b404ff9d662d1b212274d5e970ab7e878e254c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b404ff9d662d1b212274d5e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:02:13 2008 +0200 jscript/tests: Fix the '\n's in an ok() call. --- dlls/jscript/tests/jscript.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index 2fec01c..a54aa48 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -68,7 +68,7 @@ static void test_safety(IUnknown *unk) INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER |INTERFACESAFE_FOR_UNTRUSTED_CALLER, INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER); - ok(hres == E_FAIL, "SetInterfaceSafetyOptions failed: %08x\n, expected E_FAIL", hres); + ok(hres == E_FAIL, "SetInterfaceSafetyOptions failed: %08x, expected E_FAIL\n", hres); hres = IObjectSafety_SetInterfaceSafetyOptions(safety, &IID_IActiveScriptParse, INTERFACESAFE_FOR_UNTRUSTED_DATA|INTERFACE_USES_DISPEX|INTERFACE_USES_SECURITY_MANAGER,

1 0

Francois Gouget : wldap32: Fix typo in the French resources.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d9e9e67ffc12417a1060961e1d702276b535f808 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e9e67ffc12417a1060961e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:02:05 2008 +0200 wldap32: Fix typo in the French resources. --- dlls/wldap32/wldap32_Fr.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index a725754..8ea8d1c 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -56,7 +56,7 @@ STRINGTABLE DISCARDABLE 31 "" 32 "Objet inconnu" 33 "Probl�me d'alias" - 34 "Synatxe DN invalide" + 34 "Syntaxe DN invalide" 35 "Est une feuille" 36 "Probl�me de d�r�f�rencement d'alias" 37 ""

1 0

Francois Gouget : Fix spelling of dwAssign.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0682f85c957253de79bc23ee246c2b575df10987 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0682f85c957253de79bc23ee2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:01:58 2008 +0200 Fix spelling of dwAssign. --- dlls/mshtml/tests/htmldoc.c | 2 +- dlls/shdocvw/tests/webbrowser.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 9f1d73d..34a7f24 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -1530,7 +1530,7 @@ static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface) return E_NOTIMPL; } -static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAsign, DWORD dwWhichMoniker, +static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmon) { ok(0, "unexpected call\n"); diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 0f337ed..2989076 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -671,7 +671,7 @@ static HRESULT WINAPI ClientSite_SaveObject(IOleClientSite *iface) return E_NOTIMPL; } -static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAsign, DWORD dwWhichMoniker, +static HRESULT WINAPI ClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmon) { ok(0, "unexpected call\n");

1 0

Francois Gouget : ole32: Fix spelling of GetComparisonData().
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 02bcdf6db71d4a7614f65696116b9908e225090e URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bcdf6db71d4a7614f656961… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 14 01:01:50 2008 +0200 ole32: Fix spelling of GetComparisonData(). --- dlls/ole32/antimoniker.c | 2 +- dlls/ole32/classmoniker.c | 6 +++--- dlls/ole32/filemoniker.c | 2 +- dlls/ole32/itemmoniker.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index e6f811b..5c907b7 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -532,7 +532,7 @@ static ULONG WINAPI AntiMonikerROTDataImpl_Release(IROTData* iface) } /****************************************************************************** - * AntiMonikerIROTData_GetComparaisonData + * AntiMonikerIROTData_GetComparisonData ******************************************************************************/ static HRESULT WINAPI AntiMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, diff --git a/dlls/ole32/classmoniker.c b/dlls/ole32/classmoniker.c index 514990a..5c95b0a 100644 --- a/dlls/ole32/classmoniker.c +++ b/dlls/ole32/classmoniker.c @@ -627,9 +627,9 @@ static ULONG WINAPI ClassMonikerROTData_Release(IROTData* iface) } /****************************************************************************** - * ClassMonikerIROTData_GetComparaisonData + * ClassMonikerIROTData_GetComparisonData ******************************************************************************/ -static HRESULT WINAPI ClassMonikerROTData_GetComparaisonData(IROTData* iface, +static HRESULT WINAPI ClassMonikerROTData_GetComparisonData(IROTData* iface, BYTE* pbData, ULONG cbMax, ULONG* pcbData) @@ -687,7 +687,7 @@ static const IROTDataVtbl ROTDataVtbl = ClassMonikerROTData_QueryInterface, ClassMonikerROTData_AddRef, ClassMonikerROTData_Release, - ClassMonikerROTData_GetComparaisonData + ClassMonikerROTData_GetComparisonData }; /****************************************************************************** diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 7737919..74c867a 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -1264,7 +1264,7 @@ FileMonikerROTDataImpl_Release(IROTData* iface) } /****************************************************************************** - * FileMonikerIROTData_GetComparaisonData + * FileMonikerIROTData_GetComparisonData */ static HRESULT WINAPI FileMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData, diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 8cab4f9..1a8822a 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -956,7 +956,7 @@ ULONG WINAPI ItemMonikerROTDataImpl_Release(IROTData* iface) } /****************************************************************************** - * ItemMonikerIROTData_GetComparaisonData + * ItemMonikerIROTData_GetComparisonData ******************************************************************************/ HRESULT WINAPI ItemMonikerROTDataImpl_GetComparisonData(IROTData* iface, BYTE* pbData,

1 0

Vitaliy Margolen : dinput: Don't use dead-zone from the device.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 3ba6f864f434f4e29ad189588d3981e453254303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ba6f864f434f4e29ad189588… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 12 11:33:28 2008 -0600 dinput: Don't use dead-zone from the device. --- dlls/dinput/joystick_linuxinput.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index f318392..50befd9 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -423,7 +423,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm int i, idx = 0; char buffer[MAX_PATH+16]; HKEY hkey, appkey; - LONG def_deadzone = -1; + LONG def_deadzone = 0; newDevice = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(JoystickImpl)); if (!newDevice) return NULL; @@ -471,9 +471,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm newDevice->props[idx].lMin = 0; newDevice->props[idx].lMax = 0xffff; newDevice->props[idx].lSaturation = 0; - newDevice->props[idx].lDeadZone = def_deadzone >= 0 ? def_deadzone : - MulDiv(newDevice->joydev->axes[i].flat, 0xffff, - newDevice->props[idx].lDevMax - newDevice->props[idx].lDevMin); + newDevice->props[idx].lDeadZone = def_deadzone; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numAxes++) | DIDFT_ABSAXIS; }

1 0

Vitaliy Margolen : dinput: Joysticks are not supported for DX v3.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e67c1cbf698f713761cf39abf9fe12375ab5e6e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67c1cbf698f713761cf39abf… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 12 11:33:18 2008 -0600 dinput: Joysticks are not supported for DX v3. --- dlls/dinput/joystick_linuxinput.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 76456b0..f318392 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -375,7 +375,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return FALSE; @@ -400,7 +400,7 @@ static BOOL joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN } if (!((dwDevType == 0) || - ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || + ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) return FALSE;

1 0

Vitaliy Margolen : dinput: Assign button GUID to joystick buttons.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b9801bba314561d76f0db171d8fa30522ec17219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9801bba314561d76f0db171d… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sat Apr 12 11:33:04 2008 -0600 dinput: Assign button GUID to joystick buttons. --- dlls/dinput/joystick_linux.c | 1 + dlls/dinput/joystick_linuxinput.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index a43f842..e9b8790 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -471,6 +471,7 @@ static HRESULT alloc_device(REFGUID rguid, const void *jvt, IDirectInputImpl *di for (i = 0; i < newDevice->buttons; i++) { memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[i + 12], df->dwObjSize); + df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(i) | DIDFT_PSHBUTTON; } newDevice->base.data_format.wine_df = df; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index c31fc28..76456b0 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -373,7 +373,7 @@ static BOOL joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTAN if (id >= have_joydevs) { return FALSE; } - + if (!((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800)))) @@ -498,6 +498,7 @@ static JoystickImpl *alloc_device(REFGUID rguid, const void *jvt, IDirectInputIm memcpy(&df->rgodf[idx], &c_dfDIJoystick2.rgodf[newDevice->numButtons + WINE_JOYSTICK_MAX_AXES + WINE_JOYSTICK_MAX_POVS], df->dwObjSize); newDevice->buttons[i] = 0x80 | newDevice->numButtons; + df->rgodf[idx ].pguid = &GUID_Button; df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(newDevice->numButtons++) | DIDFT_PSHBUTTON; } df->dwNumObjs = idx;

1 0

Piotr Caban : oleview: Fixed incorrect brackets bug.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 2e80f11c5e9bf9da3163231e66d251d6780fd0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e80f11c5e9bf9da3163231e6… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 22:58:26 2008 +0200 oleview: Fixed incorrect brackets bug. --- programs/oleview/typelib.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 8143906..5dbffb0 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -545,20 +545,7 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen AddToTLDataStrW(tld, wszCloseBrackets2); memset(wszText, 0, sizeof(wszText)); } - if(SysStringLen(bstrHelpString)) { - if(bFirst) AddToTLDataStrW(tld, wszOpenBrackets1); - else { - AddToTLDataStrW(tld, wszComa); - AddToTLDataStrW(tld, wszSpace); - } - bFirst = FALSE; - AddToTLDataStrW(tld, wszHelpstring); - AddToTLDataStrW(tld, wszOpenBrackets2); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, bstrHelpString); - AddToTLDataStrW(tld, wszInvertedComa); - AddToTLDataStrW(tld, wszCloseBrackets2); - } + CreateTypeInfo(wszText, wszAfter, pFuncDesc->elemdescFunc.tdesc, pTypeInfo); switch(pFuncDesc->invkind) { @@ -594,6 +581,22 @@ static int EnumFuncs(ITypeInfo *pTypeInfo, TYPEATTR *pTypeAttr, HTREEITEM hParen break; default:; } + if(SysStringLen(bstrHelpString)) + { + if(bFirst) AddToTLDataStrW(tld, wszOpenBrackets1); + else + { + AddToTLDataStrW(tld, wszComa); + AddToTLDataStrW(tld, wszSpace); + } + bFirst = FALSE; + AddToTLDataStrW(tld, wszHelpstring); + AddToTLDataStrW(tld, wszOpenBrackets2); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, bstrHelpString); + AddToTLDataStrW(tld, wszInvertedComa); + AddToTLDataStrW(tld, wszCloseBrackets2); + } if(!bFirst) { AddToTLDataStrW(tld, wszCloseBrackets1); @@ -1104,11 +1107,11 @@ static void CreateCoclassHeader(ITypeInfo *pTypeInfo, AddToTLDataStrW(pTLData, wszNewLine); AddSpaces(pTLData, TAB_SIZE); AddToTLDataStrW(pTLData, wszHelpstring); - AddToTLDataStrW(pTLData, wszOpenBrackets1); + AddToTLDataStrW(pTLData, wszOpenBrackets2); AddToTLDataStrW(pTLData, wszInvertedComa); AddToTLDataStrW(pTLData, bstrHelpString); AddToTLDataStrW(pTLData, wszInvertedComa); - AddToTLDataStrW(pTLData, wszCloseBrackets1); + AddToTLDataStrW(pTLData, wszCloseBrackets2); } SysFreeString(bstrHelpString); }

1 0

Piotr Caban : oleview: Add dual interfaces support to coclasses.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0701ddb6653c7bba67dca56f0bf2e845bbdbbac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0701ddb6653c7bba67dca56f0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Fri Apr 11 22:57:17 2008 +0200 oleview: Add dual interfaces support to coclasses. --- programs/oleview/typelib.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index 626abea..8143906 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -833,7 +833,8 @@ static void EnumCoclassImplTypes(ITypeInfo *pTypeInfo, AddToTLDataStrW(pTLData, wszSpace); } - if(pTypeAttr->typekind == TKIND_INTERFACE) + if(pTypeAttr->typekind == TKIND_INTERFACE || + (pTypeAttr->wTypeFlags & TYPEFLAG_FDUAL)) AddToTLDataStrW(pTLData, wszTKIND_INTERFACE); else if(pTypeAttr->typekind == TKIND_DISPATCH) AddToTLDataStrW(pTLData, wszTKIND_DISPATCH);

1 0

Eric Pouech : dbghelp: Fix invalid pointer dereference.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d2fa765087b0502242a1fa1ce2c8ad370be1e727 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2fa765087b0502242a1fa1ce… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Apr 12 12:58:50 2008 +0200 dbghelp: Fix invalid pointer dereference. --- dlls/dbghelp/pe_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/pe_module.c b/dlls/dbghelp/pe_module.c index ca40417..533cfeb 100644 --- a/dlls/dbghelp/pe_module.c +++ b/dlls/dbghelp/pe_module.c @@ -456,7 +456,7 @@ PVOID WINAPI ImageDirectoryEntryToDataEx( PVOID base, BOOLEAN image, USHORT dir, *size = nt->OptionalHeader.DataDirectory[dir].Size; if (image || addr < nt->OptionalHeader.SizeOfHeaders) { - if (*section) *section = NULL; + if (section) *section = NULL; return (char *)base + addr; }

1 0

Rob Shearman : rpcrt4: Add buffer size checks to base type unmarshalling.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: e05ccfe2bb50bf0f6f44d113b8f6a537d4524084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e05ccfe2bb50bf0f6f44d113b… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 12 10:07:26 2008 +0100 rpcrt4: Add buffer size checks to base type unmarshalling. Reimplement NdrSimpleTypeUnmarshall using similar macros to NdrBaseTypeUnmarshalling without buffer checks, due to NdrSimpleTypeUnmarshall not doing any safety checks. --- dlls/rpcrt4/ndr_marshall.c | 65 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index c496581..8e9ea5c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -24,7 +24,7 @@ * - transmit_as/represent as * - Multi-dimensional arrays * - Conversion functions (NdrConvert) - * - Checks for integer addition overflow in base type and user marshall functions + * - Checks for integer addition overflow in user marshall functions */ #include <stdarg.h> @@ -2003,11 +2003,70 @@ void WINAPI NdrSimpleTypeMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* p /*********************************************************************** * NdrSimpleTypeUnmarshall [RPCRT4.@] + * + * Unmarshall a base type. + * + * NOTES + * Doesn't check that the buffer is long enough before copying, so the caller + * should do this. */ void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, unsigned char FormatChar ) { - NdrBaseTypeUnmarshall(pStubMsg, &pMemory, &FormatChar, 0); +#define BASE_TYPE_UNMARSHALL(type) \ + ALIGN_POINTER(pStubMsg->Buffer, sizeof(type)); \ + TRACE("pMemory: %p\n", pMemory); \ + *(type *)pMemory = *(type *)pStubMsg->Buffer; \ + pStubMsg->Buffer += sizeof(type); + + switch(FormatChar) + { + case RPC_FC_BYTE: + case RPC_FC_CHAR: + case RPC_FC_SMALL: + case RPC_FC_USMALL: + BASE_TYPE_UNMARSHALL(UCHAR); + TRACE("value: 0x%02x\n", *pMemory); + break; + case RPC_FC_WCHAR: + case RPC_FC_SHORT: + case RPC_FC_USHORT: + BASE_TYPE_UNMARSHALL(USHORT); + TRACE("value: 0x%04x\n", *(USHORT *)pMemory); + break; + case RPC_FC_LONG: + case RPC_FC_ULONG: + case RPC_FC_ERROR_STATUS_T: + case RPC_FC_ENUM32: + BASE_TYPE_UNMARSHALL(ULONG); + TRACE("value: 0x%08x\n", *(ULONG *)pMemory); + break; + case RPC_FC_FLOAT: + BASE_TYPE_UNMARSHALL(float); + TRACE("value: %f\n", *(float *)pMemory); + break; + case RPC_FC_DOUBLE: + BASE_TYPE_UNMARSHALL(double); + TRACE("value: %f\n", *(double *)pMemory); + break; + case RPC_FC_HYPER: + BASE_TYPE_UNMARSHALL(ULONGLONG); + TRACE("value: %s\n", wine_dbgstr_longlong(*(ULONGLONG *)pMemory)); + break; + case RPC_FC_ENUM16: + ALIGN_POINTER(pStubMsg->Buffer, sizeof(USHORT)); + TRACE("pMemory: %p\n", pMemory); + /* 16-bits on the wire, but int in memory */ + *(UINT *)pMemory = *(USHORT *)pStubMsg->Buffer; + pStubMsg->Buffer += sizeof(USHORT); + TRACE("value: 0x%08x\n", *(UINT *)pMemory); + break; + case RPC_FC_IGNORE: + break; + default: + FIXME("Unhandled base type: 0x%02x\n", FormatChar); + } +#undef BASE_TYPE_UNMARSHALL } /*********************************************************************** @@ -6013,7 +6072,7 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( TRACE("*ppMemory: %p\n", *ppMemory); \ **(type **)ppMemory = *(type *)pStubMsg->Buffer; \ } \ - pStubMsg->Buffer += sizeof(type); + safe_buffer_increment(pStubMsg, sizeof(type)); switch(*pFormat) {

1 0

Rob Shearman : qmgr: Dynamically link to advpack.dll.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: b2603687ccac5a6ce51132a1da9a7111cf5e2326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2603687ccac5a6ce51132a1d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Sat Apr 12 10:06:56 2008 +0100 qmgr: Dynamically link to advpack.dll. Use RegInstall instead of RegInstallA as RegInstallA isn't available in some native versions of advpack commonly installed by programs. --- dlls/qmgr/Makefile.in | 2 +- dlls/qmgr/qmgr_main.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index de636db..57609ca 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = qmgr.dll -IMPORTS = advpack wininet urlmon ole32 advapi32 kernel32 +IMPORTS = wininet urlmon ole32 advapi32 kernel32 EXTRALIBS = -luuid C_SRCS = \ diff --git a/dlls/qmgr/qmgr_main.c b/dlls/qmgr/qmgr_main.c index 2a21a28..5094874 100644 --- a/dlls/qmgr/qmgr_main.c +++ b/dlls/qmgr/qmgr_main.c @@ -141,6 +141,9 @@ static HRESULT register_server(BOOL do_register) { HRESULT hr; STRTABLEA strtable; + HMODULE hAdvpack; + HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable); + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; TRACE("(%x)\n", do_register); @@ -150,9 +153,12 @@ static HRESULT register_server(BOOL do_register) return hr; } + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall"); + hr = init_register_strtable(&strtable); if (SUCCEEDED(hr)) - hr = RegInstallA(hInst, do_register ? "RegisterDll" : "UnregisterDll", + hr = pRegInstall(hInst, do_register ? "RegisterDll" : "UnregisterDll", &strtable); cleanup_register_strtable(&strtable);

1 0

Andrew Talbot : comctl32: Remove unused variables.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: bab7871cac297216f7bc177d9b55d8c8da06ed91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab7871cac297216f7bc177d9… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Apr 12 18:31:43 2008 +0100 comctl32: Remove unused variables. --- dlls/comctl32/comboex.c | 4 +--- dlls/comctl32/listview.c | 3 +-- dlls/comctl32/monthcal.c | 4 +--- dlls/comctl32/rebar.c | 5 ++--- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index a98243d..e79831d 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -530,13 +530,11 @@ static UINT COMBOEX_GetListboxText(COMBOEX_INFO *infoPtr, int n, LPWSTR buf) static INT COMBOEX_DeleteItem (COMBOEX_INFO *infoPtr, INT index) { - CBE_ITEMDATA const *item; - TRACE("(index=%d)\n", index); /* if item number requested does not exist then return failure */ if ((index >= infoPtr->nb_items) || (index < 0)) return CB_ERR; - if (!(item = COMBOEX_FindItem(infoPtr, index))) return CB_ERR; + if (!COMBOEX_FindItem(infoPtr, index)) return CB_ERR; /* doing this will result in WM_DELETEITEM being issued */ SendMessageW (infoPtr->hwndCombo, CB_DELETESTRING, (WPARAM)index, 0); diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index abe1470..ab819e6 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9968,10 +9968,9 @@ static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *infoPtr, WPARAM wParam, LPA HFONT hFont, hOldFont = 0; RECT rect; SIZE sz; - int len; if (!infoPtr->hwndEdit || !hdc) return 0; - len = GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); + GetWindowTextW(infoPtr->hwndEdit, buffer, sizeof(buffer)/sizeof(buffer[0])); GetWindowRect(infoPtr->hwndEdit, &rect); /* Select font to get the right dimension of the string */ diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 1c325de..a9647cd 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -442,7 +442,7 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT RECT *days=&dayrect; RECT rtoday; int i, j, m, mask, day, firstDay, weeknum, weeknum1,prevMonth; - int textHeight = infoPtr->textHeight, textWidth = infoPtr->textWidth; + int textHeight = infoPtr->textHeight; SIZE size; HBRUSH hbr; HFONT currentFont; @@ -659,13 +659,11 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT * date if necessary */ if(!(dwStyle & MCS_NOTODAY)) { - int offset = 0; if(!(dwStyle & MCS_NOTODAYCIRCLE)) { /*day is the number of days from nextmonth we put on the calendar */ MONTHCAL_CircleDay(infoPtr, hdc, day+MONTHCAL_MonthLength(infoPtr->currentMonth,infoPtr->currentYear), infoPtr->currentMonth); - offset+=textWidth; } if (!LoadStringW(COMCTL32_hModule,IDM_TODAY,buf1,countof(buf1))) { diff --git a/dlls/comctl32/rebar.c b/dlls/comctl32/rebar.c index 033b474..638acea 100644 --- a/dlls/comctl32/rebar.c +++ b/dlls/comctl32/rebar.c @@ -2848,7 +2848,6 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { LPCREATESTRUCTW cs = (LPCREATESTRUCTW) lParam; RECT wnrc1, clrc1; - HTHEME theme; if (TRACE_ON(rebar)) { GetWindowRect(infoPtr->hwndSelf, &wnrc1); @@ -2859,8 +2858,8 @@ REBAR_Create (REBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) } TRACE("created!\n"); - - if ((theme = OpenThemeData (infoPtr->hwndSelf, themeClass))) + + if (OpenThemeData (infoPtr->hwndSelf, themeClass)) { /* native seems to clear WS_BORDER when themed */ infoPtr->dwStyle &= ~WS_BORDER;

1 0

Andrew Talbot : dnsapi: Remove unused variables.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 07d73206c63c9628550a336160acd18e962e21ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=07d73206c63c9628550a33616… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Fri Apr 11 21:40:37 2008 +0100 dnsapi: Remove unused variables. --- dlls/dnsapi/record.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index d84275a..9584031 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -644,7 +644,7 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, PDNS_RECORD *diff1, PDNS_RECORD *diff2 ) { BOOL ret = TRUE; - DNS_RECORD *r, *s1, *s2, *t, *u; + DNS_RECORD *r, *t, *u; DNS_RRSET rr1, rr2; TRACE( "(%p,%p,%p,%p)\n", set1, set2, diff1, diff2 ); @@ -668,9 +668,9 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, DNS_RRSET_INIT( rr1 ); DNS_RRSET_INIT( rr2 ); - for (r = s1 = set1; (s1 = r); r = r->pNext) + for (r = set1; r; r = r->pNext) { - for (t = s2 = set2; (s2 = t); t = t->pNext) + for (t = set2; t; t = t->pNext) { u = DnsRecordCopyEx( r, r->Flags.S.CharSet, t->Flags.S.CharSet ); if (!u) goto error; @@ -684,9 +684,9 @@ BOOL WINAPI DnsRecordSetCompare( PDNS_RECORD set1, PDNS_RECORD set2, } } - for (t = s2 = set2; (s2 = t); t = t->pNext) + for (t = set2; t; t = t->pNext) { - for (r = s1 = set1; (s1 = r); r = r->pNext) + for (r = set1; r; r = r->pNext) { u = DnsRecordCopyEx( t, t->Flags.S.CharSet, r->Flags.S.CharSet ); if (!u) goto error;

1 0

Alex Villacís Lasso : user32: LoadImage(IMAGE_BITMAP ) should reject invalid BMP files (with tests).
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 1fcc4ffdfa84dd6d56f7947c43ebe1d8446b9d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fcc4ffdfa84dd6d56f7947c4… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Fri Apr 11 10:19:00 2008 -0500 user32: LoadImage(IMAGE_BITMAP) should reject invalid BMP files (with tests). --- dlls/user32/cursoricon.c | 11 ++++ dlls/user32/tests/cursoricon.c | 111 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index df6a408..153a2a4 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -2148,8 +2148,19 @@ static HBITMAP BITMAP_Load( HINSTANCE instance, LPCWSTR name, } else { + BITMAPFILEHEADER * bmfh; + if (!(ptr = map_fileW( name, NULL ))) return 0; info = (BITMAPINFO *)(ptr + sizeof(BITMAPFILEHEADER)); + bmfh = (BITMAPFILEHEADER *)ptr; + if (!( bmfh->bfType == 0x4d42 /* 'BM' */ && + bmfh->bfReserved1 == 0 && + bmfh->bfReserved2 == 0)) + { + WARN("Invalid/unsupported bitmap format!\n"); + UnmapViewOfFile( ptr ); + return 0; + } } size = bitmap_info_size(info, DIB_RGB_COLORS); diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 7ea79ad..40f3a14 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -583,6 +583,111 @@ static void test_CreateIcon(void) DeleteObject(hbmColor); } +/* Shamelessly ripped from dlls/oleaut32/tests/olepicture.c */ +/* 1x1 pixel gif */ +static const unsigned char gifimage[35] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x01,0x00,0x01,0x00,0x80,0x00,0x00,0xff,0xff,0xff, +0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x02,0x02,0x44, +0x01,0x00,0x3b +}; + +/* 1x1 pixel jpg */ +static const unsigned char jpgimage[285] = { +0xff,0xd8,0xff,0xe0,0x00,0x10,0x4a,0x46,0x49,0x46,0x00,0x01,0x01,0x01,0x01,0x2c, +0x01,0x2c,0x00,0x00,0xff,0xdb,0x00,0x43,0x00,0x05,0x03,0x04,0x04,0x04,0x03,0x05, +0x04,0x04,0x04,0x05,0x05,0x05,0x06,0x07,0x0c,0x08,0x07,0x07,0x07,0x07,0x0f,0x0b, +0x0b,0x09,0x0c,0x11,0x0f,0x12,0x12,0x11,0x0f,0x11,0x11,0x13,0x16,0x1c,0x17,0x13, +0x14,0x1a,0x15,0x11,0x11,0x18,0x21,0x18,0x1a,0x1d,0x1d,0x1f,0x1f,0x1f,0x13,0x17, +0x22,0x24,0x22,0x1e,0x24,0x1c,0x1e,0x1f,0x1e,0xff,0xdb,0x00,0x43,0x01,0x05,0x05, +0x05,0x07,0x06,0x07,0x0e,0x08,0x08,0x0e,0x1e,0x14,0x11,0x14,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e, +0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0x1e,0xff,0xc0, +0x00,0x11,0x08,0x00,0x01,0x00,0x01,0x03,0x01,0x22,0x00,0x02,0x11,0x01,0x03,0x11, +0x01,0xff,0xc4,0x00,0x15,0x00,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x08,0xff,0xc4,0x00,0x14,0x10,0x01,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xc4, +0x00,0x14,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0xff,0xc4,0x00,0x14,0x11,0x01,0x00,0x00,0x00,0x00,0x00,0x00, +0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xff,0xda,0x00,0x0c,0x03,0x01, +0x00,0x02,0x11,0x03,0x11,0x00,0x3f,0x00,0xb2,0xc0,0x07,0xff,0xd9 +}; + +/* 1x1 pixel png */ +static const unsigned char pngimage[285] = { +0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, +0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, +0xde,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, +0x13,0x01,0x00,0x9a,0x9c,0x18,0x00,0x00,0x00,0x07,0x74,0x49,0x4d,0x45,0x07,0xd5, +0x06,0x03,0x0f,0x07,0x2d,0x12,0x10,0xf0,0xfd,0x00,0x00,0x00,0x0c,0x49,0x44,0x41, +0x54,0x08,0xd7,0x63,0xf8,0xff,0xff,0x3f,0x00,0x05,0xfe,0x02,0xfe,0xdc,0xcc,0x59, +0xe7,0x00,0x00,0x00,0x00,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82 +}; + +/* 1x1 pixel bmp */ +static const unsigned char bmpimage[66] = { +0x42,0x4d,0x42,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x28,0x00, +0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x01,0x00,0x00,0x00, +0x00,0x00,0x04,0x00,0x00,0x00,0x12,0x0b,0x00,0x00,0x12,0x0b,0x00,0x00,0x02,0x00, +0x00,0x00,0x02,0x00,0x00,0x00,0xff,0xff,0xff,0x00,0xff,0xff,0xff,0x00,0x00,0x00, +0x00,0x00 +}; + +/* 2x2 pixel gif */ +static const unsigned char gif4pixel[42] = { +0x47,0x49,0x46,0x38,0x37,0x61,0x02,0x00,0x02,0x00,0xa1,0x00,0x00,0x00,0x00,0x00, +0x39,0x62,0xfc,0xff,0x1a,0xe5,0xff,0xff,0xff,0x2c,0x00,0x00,0x00,0x00,0x02,0x00, +0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b +}; + +static void test_LoadImageFile(const unsigned char * image_data, + unsigned int image_size, const char * ext, BOOL expect_success) +{ + HANDLE handle; + BOOL ret; + DWORD error, bytes_written; + char filename[64]; + + strcpy(filename, "test."); + strcat(filename, ext); + + /* Create the test image. */ + handle = CreateFileA(filename, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_NEW, + FILE_ATTRIBUTE_NORMAL, NULL); + ok(handle != INVALID_HANDLE_VALUE, "CreateFileA failed. %u\n", GetLastError()); + ret = WriteFile(handle, image_data, image_size, &bytes_written, NULL); + ok(bytes_written == image_size, "test file created improperly.\n"); + CloseHandle(handle); + + /* Load as cursor. For all tested formats, this should fail */ + SetLastError(0xdeadbeef); + handle = LoadImageA(NULL, filename, IMAGE_CURSOR, 0, 0, LR_LOADFROMFILE); + ok(handle == NULL, "LoadImage(%s) as IMAGE_CURSOR succeeded incorrectly.\n", ext); + error = GetLastError(); + ok(error == 0, "Last error: %u\n", error); + if (handle != NULL) DestroyCursor(handle); + + /* Load as icon. For all tested formats, this should fail */ + SetLastError(0xdeadbeef); + handle = LoadImageA(NULL, filename, IMAGE_ICON, 0, 0, LR_LOADFROMFILE); + ok(handle == NULL, "LoadImage(%s) as IMAGE_ICON succeeded incorrectly.\n", ext); + error = GetLastError(); + ok(error == 0, "Last error: %u\n", error); + if (handle != NULL) DestroyIcon(handle); + + /* Load as bitmap. Should succeed if bmp, fail for everything else */ + SetLastError(0xdeadbeef); + handle = LoadImageA(NULL, filename, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE); + if (expect_success) + ok(handle != NULL, "LoadImage(%s) as IMAGE_BITMAP failed.\n", ext); + else ok(handle == NULL, "LoadImage(%s) as IMAGE_BITMAP succeeded incorrectly.\n", ext); + error = GetLastError(); + ok(error == 0, "Last error: %u\n", error); + if (handle != NULL) DeleteObject(handle); + + DeleteFileA(filename); +} + static void test_LoadImage(void) { HANDLE handle; @@ -668,6 +773,12 @@ static void test_LoadImage(void) HeapFree(GetProcessHeap(), 0, icon_data); DeleteFileA("icon.ico"); + + test_LoadImageFile(bmpimage, sizeof(bmpimage), "bmp", 1); + test_LoadImageFile(gifimage, sizeof(gifimage), "gif", 0); + test_LoadImageFile(gif4pixel, sizeof(gif4pixel), "gif", 0); + test_LoadImageFile(jpgimage, sizeof(jpgimage), "jpg", 0); + test_LoadImageFile(pngimage, sizeof(pngimage), "png", 0); } static void test_DestroyCursor(void)

1 0

Alexandre Julliard : gdi32: Fix CreateCompatibleDC to reject invalid DCs.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 0482c8e81854ed52f5db2b177e0e51fec091ad1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0482c8e81854ed52f5db2b177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 12:06:24 2008 +0200 gdi32: Fix CreateCompatibleDC to reject invalid DCs. --- dlls/gdi32/dc.c | 1 + dlls/gdi32/tests/dc.c | 4 ---- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index ffd6a1b..debbde8 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -785,6 +785,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) release_dc_ptr( origDC ); if (funcs) funcs = DRIVER_get_driver( funcs ); } + else if (hdc) return 0; if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index d0ca5cf..9e0048e 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -248,15 +248,11 @@ static void test_CreateCompatibleDC(void) bRet = DeleteDC(hDC); ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); -todo_wine -{ /* Try to create a DC compatible to the deleted DC. This has to fail */ hNewDC = CreateCompatibleDC(hDC); ok(hNewDC == NULL, "CreateCompatibleDC returned %p\n", hNewDC); } -} - START_TEST(dc) { test_savedc();

1 0

Alexandre Julliard : wordpad: Don' t pass an invalid DC to CreateCompatibleDC.
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 2004d2b2f687846ca0120462c8f50e3012368dc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2004d2b2f687846ca0120462c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 12:05:57 2008 +0200 wordpad: Don't pass an invalid DC to CreateCompatibleDC. --- programs/wordpad/print.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index aa9ac71..c0cd182 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -500,7 +500,7 @@ static void add_ruler_units(HDC hdcRuler, RECT* drawRect, BOOL NewMetrics, long DeleteObject(hBitmap); } - hdc = CreateCompatibleDC(hdc); + hdc = CreateCompatibleDC(0); CmPixels = twips_to_pixels(TWIPS_PER_CM, GetDeviceCaps(hdc, LOGPIXELSX)); QuarterCmPixels = (int)((float)CmPixels / 4.0);

1 0

Colin Finck : gdi32: Add a test to demonstrate a CreateCompatibleDC problem .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: 8a2e787161fc4551d6c3dede095202c72dc7fe60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a2e787161fc4551d6c3dede0… Author: Colin Finck <mail(a)colinfinck.de> Date: Fri Apr 11 15:07:20 2008 +0200 gdi32: Add a test to demonstrate a CreateCompatibleDC problem. --- dlls/gdi32/tests/dc.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 79b6ef7..d0ca5cf 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -234,9 +234,33 @@ static void test_GdiConvertToDevmodeW(void) HeapFree(GetProcessHeap(), 0, dmW); } +static void test_CreateCompatibleDC(void) +{ + BOOL bRet; + HDC hDC; + HDC hNewDC; + + /* Create a DC compatible with the screen */ + hDC = CreateCompatibleDC(NULL); + ok(hDC != NULL, "CreateCompatibleDC returned %p\n", hDC); + + /* Delete this DC, this should succeed */ + bRet = DeleteDC(hDC); + ok(bRet == TRUE, "DeleteDC returned %u\n", bRet); + +todo_wine +{ + /* Try to create a DC compatible to the deleted DC. This has to fail */ + hNewDC = CreateCompatibleDC(hDC); + ok(hNewDC == NULL, "CreateCompatibleDC returned %p\n", hNewDC); +} + +} + START_TEST(dc) { test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW(); + test_CreateCompatibleDC(); }

1 0

Aric Stewart : user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well .
by Alexandre Julliard 14 Apr '08

14 Apr '08

Module: wine Branch: master Commit: d0cf2342df427afa6d0c5f367f83b55f578e56e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0cf2342df427afa6d0c5f367… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Apr 11 09:07:31 2008 -0500 user32: Make sure there is space for at least 6 items in a combo dropdown without forcing it to be at most 6 items as well. --- dlls/user32/combo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 14eebe8..0e66b7d 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1107,7 +1107,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) { if (nItems < 5) nDroppedHeight = (nItems+1)*nIHeight; - else + else if (nDroppedHeight < 6*nIHeight) nDroppedHeight = 6*nIHeight; } }

1 0

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