wine-commits January 2009

wine-commits@winehq.org

3 participants
1348 discussions

Rob Shearman : widl: Move creation of module type into a separate function, type_new_module and give it a special FC type.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 64520ecdc7465d7fa970fb258f222d41b6d158ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=64520ecdc7465d7fa970fb258… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:34:08 2009 +0000 widl: Move creation of module type into a separate function, type_new_module and give it a special FC type. --- tools/widl/parser.y | 4 ++-- tools/widl/typelib.c | 3 ++- tools/widl/typetree.c | 9 +++++++++ tools/widl/typetree.h | 1 + tools/widl/widltypes.h | 1 + 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5a42263..bc252e8 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -918,8 +918,8 @@ interfacedec: | dispinterface ';' { $$ = $1; } ; -module: tMODULE aIDENTIFIER { $$ = make_type(0, NULL); $$->name = $2; $$->kind = TKIND_MODULE; } - | tMODULE aKNOWNTYPE { $$ = make_type(0, NULL); $$->name = $2; $$->kind = TKIND_MODULE; } +module: tMODULE aIDENTIFIER { $$ = type_new_module($2); } + | tMODULE aKNOWNTYPE { $$ = type_new_module($2); } ; modulehdr: attributes module { $$ = $2; diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index e0ef86e..979d3c7 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -209,9 +209,10 @@ unsigned short get_type_vt(type_t *t) case RPC_FC_CVSTRUCT: case RPC_FC_BOGUS_STRUCT: case RPC_FC_COCLASS: + case RPC_FC_MODULE: return VT_USERDEFINED; case 0: - return t->kind == TKIND_PRIMITIVE ? VT_VOID : VT_USERDEFINED; + return VT_VOID; default: error("get_type_vt: unknown type: 0x%02x\n", t->type); } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 67c6f8b..47ad1f5 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -70,6 +70,15 @@ type_t *type_new_alias(type_t *t, const char *name) return a; } +type_t *type_new_module(char *name) +{ + type_t *type = make_type(RPC_FC_MODULE, NULL); + type->name = name; + type->kind = TKIND_MODULE; + /* FIXME: register type to detect multiple definitions */ + return type; +} + static int compute_method_indexes(type_t *iface) { int idx; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 24a15ea..a0f819a 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -27,6 +27,7 @@ type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref, attr_list_t *attrs); type_t *type_new_alias(type_t *t, const char *name); +type_t *type_new_module(char *name); void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); void type_dispinterface_define(type_t *iface, var_list_t *props, func_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 3f06452..7a55ee7 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -35,6 +35,7 @@ typedef GUID UUID; #define TRUE 1 #define FALSE 0 +#define RPC_FC_MODULE 0xfc #define RPC_FC_COCLASS 0xfd #define RPC_FC_FUNCTION 0xfe

1 0

Rob Shearman : widl: Move duptype and alias to parser.y.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 8b326c4ff850b4b73f47a45b3efafb870ecd6e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b326c4ff850b4b73f47a45b3… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:33:52 2009 +0000 widl: Move duptype and alias to parser.y. Make duptype static and rename alias to type_new_alias. --- tools/widl/parser.y | 4 ++-- tools/widl/typelib.c | 25 ------------------------- tools/widl/typetree.c | 25 +++++++++++++++++++++++++ tools/widl/typetree.h | 4 ++++ tools/widl/widltypes.h | 3 --- 5 files changed, 31 insertions(+), 30 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index e88d093..5a42263 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -785,7 +785,7 @@ base_type: tBYTE { $$ = make_builtin($<str>1); } case RPC_FC_HYPER: if ($$->name[0] == 'h') /* hyper, as opposed to __int64 */ { - $$ = alias($$, "MIDL_uhyper"); + $$ = type_new_alias($$, "MIDL_uhyper"); $$->sign = 0; } break; @@ -1876,7 +1876,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at /* set the attributes to allow set_type to do some checks on them */ name->attrs = attrs; set_type(name, decl_spec, decl, 0); - cur = alias(name->type, name->name); + cur = type_new_alias(name->type, name->name); cur->attrs = attrs; if (is_incomplete(cur)) diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 17eaaf0..e0ef86e 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -49,31 +49,6 @@ static typelib_t *typelib; -type_t *duptype(type_t *t, int dupname) -{ - type_t *d = alloc_type(); - - *d = *t; - if (dupname && t->name) - d->name = xstrdup(t->name); - - d->orig = t; - return d; -} - -type_t *alias(type_t *t, const char *name) -{ - type_t *a = duptype(t, 0); - - a->name = xstrdup(name); - a->kind = TKIND_ALIAS; - a->attrs = NULL; - a->declarray = FALSE; - init_loc_info(&a->loc_info); - - return a; -} - int is_ptr(const type_t *t) { unsigned char c = t->type; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index c6def4b..67c6f8b 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -29,6 +29,17 @@ #include "typetree.h" #include "header.h" +type_t *duptype(type_t *t, int dupname) +{ + type_t *d = alloc_type(); + + *d = *t; + if (dupname && t->name) + d->name = xstrdup(t->name); + + return d; +} + type_t *type_new_function(var_list_t *args) { type_t *t = make_type(RPC_FC_FUNCTION, NULL); @@ -45,6 +56,20 @@ type_t *type_new_pointer(type_t *ref, attr_list_t *attrs) return t; } +type_t *type_new_alias(type_t *t, const char *name) +{ + type_t *a = duptype(t, 0); + + a->name = xstrdup(name); + a->kind = TKIND_ALIAS; + a->attrs = NULL; + a->declarray = FALSE; + a->orig = t; + init_loc_info(&a->loc_info); + + return a; +} + static int compute_method_indexes(type_t *iface) { int idx; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index d4fdf19..24a15ea 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -26,11 +26,15 @@ type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(type_t *ref, attr_list_t *attrs); +type_t *type_new_alias(type_t *t, const char *name); void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stmts); void type_dispinterface_define(type_t *iface, var_list_t *props, func_list_t *methods); void type_dispinterface_define_from_iface(type_t *dispiface, type_t *iface); void type_module_define(type_t *module, statement_list_t *stmts); +/* FIXME: shouldn't need to export this */ +type_t *duptype(type_t *t, int dupname); + static inline var_list_t *type_struct_get_fields(const type_t *type) { assert(is_struct(type->type)); diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 2bfa641..3f06452 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -436,9 +436,6 @@ type_t *alloc_type(void); void set_all_tfswrite(int val); void clear_all_offsets(void); -type_t *duptype(type_t *t, int dupname); -type_t *alias(type_t *t, const char *name); - int is_ptr(const type_t *t); int is_array(const type_t *t); int is_var_ptr(const var_t *v);

1 0

Rob Shearman : widl: Add new type_is_alias and type_get_real_type helper functions.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: cb8d3322beffa1abae2869b54ce0172c5d0fd3f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8d3322beffa1abae2869b54… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:33:43 2009 +0000 widl: Add new type_is_alias and type_get_real_type helper functions. Use type_is_alias to replace cumbersome "type->kind == TKIND_ALIAS" expressions. Use type_get_real_type to simplify some code. --- tools/widl/header.c | 14 +++++++------- tools/widl/parser.y | 32 ++++++++++++-------------------- tools/widl/typegen.c | 4 ++-- tools/widl/typelib.c | 3 ++- tools/widl/typetree.h | 13 +++++++++++++ tools/widl/write_msft.c | 2 +- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 6434512..b64f864 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -62,7 +62,7 @@ int is_ptrchain_attr(const var_t *var, enum attr_type t) { if (is_attr(type->attrs, t)) return 1; - else if (type->kind == TKIND_ALIAS) + else if (type_is_alias(type)) type = type->orig; else if (is_ptr(type)) type = type->ref; @@ -78,7 +78,7 @@ int is_aliaschain_attr(const type_t *type, enum attr_type attr) { if (is_attr(t->attrs, attr)) return 1; - else if (t->kind == TKIND_ALIAS) + else if (type_is_alias(t)) t = t->orig; else return 0; } @@ -185,8 +185,8 @@ static void write_enums(FILE *h, var_list_t *enums) int needs_space_after(type_t *t) { - return (t->kind == TKIND_ALIAS - || (!is_ptr(t) && (!is_conformant_array(t) || t->declarray))); + return (type_is_alias(t) || + (!is_ptr(t) && (!is_conformant_array(t) || t->declarray))); } void write_type_left(FILE *h, type_t *t, int declonly) @@ -194,10 +194,10 @@ void write_type_left(FILE *h, type_t *t, int declonly) if (!h) return; if (is_attr(t->attrs, ATTR_CONST) && - (t->kind == TKIND_ALIAS || t->declarray || !is_ptr(t))) + (type_is_alias(t) || t->declarray || !is_ptr(t))) fprintf(h, "const "); - if (t->kind == TKIND_ALIAS) fprintf(h, "%s", t->name); + if (type_is_alias(t)) fprintf(h, "%s", t->name); else if (t->declarray) write_type_left(h, t->ref, declonly); else { if (t->sign > 0) fprintf(h, "signed "); @@ -376,7 +376,7 @@ void check_for_additional_prototype_types(const var_list_t *list) LIST_FOR_EACH_ENTRY( v, list, const var_t, entry ) { type_t *type; - for (type = v->type; type; type = type->kind == TKIND_ALIAS ? type->orig : type->ref) { + for (type = v->type; type; type = type_is_alias(type) ? type->orig : type->ref) { const char *name = type->name; if (type->user_types_registered) continue; type->user_types_registered = 1; diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 5560dff..e88d093 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1451,7 +1451,7 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, for (ptr = *pt; ptr && !ptr_attr; ) { ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); - if (!ptr_attr && ptr->kind == TKIND_ALIAS) + if (!ptr_attr && type_is_alias(ptr)) ptr = ptr->orig; else break; @@ -1786,7 +1786,7 @@ static void add_incomplete(type_t *t) static void fix_type(type_t *t) { - if (t->kind == TKIND_ALIAS && is_incomplete(t)) { + if (type_is_alias(t) && is_incomplete(t)) { type_t *ot = t->orig; fix_type(ot); if (is_struct(ot->type) || is_union(ot->type)) @@ -2284,19 +2284,13 @@ static int is_allowed_conf_type(const type_t *type) static int is_ptr_guid_type(const type_t *type) { unsigned int align = 0; - for (;;) - { - if (type->kind == TKIND_ALIAS) - type = type->orig; - else if (is_ptr(type)) - { - type = type->ref; - break; - } - else - return FALSE; - } - return (type_memsize(type, &align) == 16); + + /* first, make sure it is a pointer to something */ + if (!is_ptr(type)) return FALSE; + + /* second, make sure it is a pointer to something of size sizeof(GUID), + * i.e. 16 bytes */ + return (type_memsize(type->ref, &align) == 16); } static void check_conformance_expr_list(const char *attr_name, const var_t *arg, const type_t *container_type, expr_list_t *expr_list) @@ -2394,7 +2388,7 @@ static void check_field_common(const type_t *container_type, is_context_handle = 1; break; } - if (type->kind == TKIND_ALIAS) + if (type_is_alias(type)) type = type->orig; else if (is_ptr(type) || is_array(type)) type = type->ref; @@ -2415,9 +2409,7 @@ static void check_remoting_fields(const var_t *var, type_t *type) const var_t *field; const var_list_t *fields = NULL; - /* find the real type */ - while (type->kind == TKIND_ALIAS) - type = type->orig; + type = type_get_real_type(type); if (type->checked) return; @@ -2456,7 +2448,7 @@ static void check_remoting_args(const var_t *func) break; if (is_attr(type->attrs, ATTR_CONTEXTHANDLE)) break; - if (type->kind == TKIND_ALIAS) + if (type_is_alias(type)) type = type->orig; else if (is_ptr(type)) { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 2ad7807..a38efa2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -467,7 +467,7 @@ static type_t *get_user_type(const type_t *t, const char **pname) return ut; } - if (t->kind == TKIND_ALIAS) + if (type_is_alias(t)) t = t->orig; else return 0; @@ -1005,7 +1005,7 @@ size_t type_memsize(const type_t *t, unsigned int *align) { size_t size = 0; - if (t->kind == TKIND_ALIAS) + if (type_is_alias(t)) size = type_memsize(t->orig, align); else if (t->declarray && is_conformant_array(t)) { diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index 446f9a5..17eaaf0 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -45,6 +45,7 @@ #include "typelib.h" #include "widltypes.h" #include "typelib_struct.h" +#include "typetree.h" static typelib_t *typelib; @@ -173,7 +174,7 @@ unsigned short get_type_vt(type_t *t) if (vt) return vt; } - if (t->kind == TKIND_ALIAS && is_attr(t->attrs, ATTR_PUBLIC)) + if (type_is_alias(t) && is_attr(t->attrs, ATTR_PUBLIC)) return VT_USERDEFINED; switch (t->type) { diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 4e887c5..d4fdf19 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -135,4 +135,17 @@ static inline expr_t *type_array_get_variance(const type_t *type) return type->details.array.length_is; } +static inline type_t *type_get_real_type(const type_t *type) +{ + if (type->kind == TKIND_ALIAS) + return type_get_real_type(type->orig); + else + return (type_t *)type; +} + +static inline int type_is_alias(const type_t *type) +{ + return (type->kind == TKIND_ALIAS); +} + #endif /* WIDL_TYPE_TREE_H */ diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index e153604..85dcb0d 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -979,7 +979,7 @@ static int encode_type( int typeinfo_offset; /* typedef'd types without public attribute aren't included in the typelib */ - while (type->typelib_idx < 0 && type->kind == TKIND_ALIAS && !is_attr(type->attrs, ATTR_PUBLIC)) + while (type->typelib_idx < 0 && type_is_alias(type) && !is_attr(type->attrs, ATTR_PUBLIC)) type = type->orig; chat("encode_type: VT_USERDEFINED - type %p name = %s type->type %d idx %d\n", type,

1 0

Rob Shearman : widl: Access array type properties through accessors instead of getting them directly .
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 200ec538352c36cb1e10e76c70ec7da56cbc0958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=200ec538352c36cb1e10e76c7… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:33:36 2009 +0000 widl: Access array type properties through accessors instead of getting them directly. Store array type properties in the details union to save a bit of memory and to make the general properties more obvious. --- tools/widl/header.c | 4 +- tools/widl/parser.y | 9 ++---- tools/widl/typegen.c | 73 +++++++++++++++++++++++++--------------------- tools/widl/typetree.h | 30 +++++++++++++++++++ tools/widl/widltypes.h | 9 ++++- tools/widl/write_msft.c | 4 +- 6 files changed, 84 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=200ec538352c36cb1e10e…

1 0

Rob Shearman : widl: Move funcs and stmts fields from type_t structure to module_details and function_details .
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 901a42b7f90a8b7f9859dba0b55e58cd4c38a6e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=901a42b7f90a8b7f9859dba0b… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:33:27 2009 +0000 widl: Move funcs and stmts fields from type_t structure to module_details and function_details. --- tools/widl/client.c | 53 ++++++++------ tools/widl/header.c | 160 +++++++++++++++++++++-------------------- tools/widl/header.h | 8 +- tools/widl/parser.h | 2 - tools/widl/parser.y | 74 +++++++------------ tools/widl/proxy.c | 182 +++++++++++++++++++++++++--------------------- tools/widl/server.c | 39 +++++----- tools/widl/typegen.c | 99 +++++++++++++------------ tools/widl/typegen.h | 16 ++-- tools/widl/typetree.c | 32 ++++++--- tools/widl/typetree.h | 1 + tools/widl/widltypes.h | 39 +++++++++-- tools/widl/write_msft.c | 60 ++++++++------- 13 files changed, 408 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=901a42b7f90a8b7f9859d…

1 0

Rob Shearman : widl: Do the consistency checks on interfaces after parsing is complete.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: b1f8560ae075757dacd466ffa4a7e54e5f0b2f59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f8560ae075757dacd466ffa… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Mon Jan 5 23:33:19 2009 +0000 widl: Do the consistency checks on interfaces after parsing is complete. --- tools/widl/parser.h | 1 - tools/widl/parser.y | 21 ++++++++++++++++----- tools/widl/typetree.c | 2 -- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 85171f7..5822984 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -45,7 +45,6 @@ void pop_import(void); int is_type(const char *name); -void check_functions(const type_t *iface); func_list_t *gen_function_list(const statement_list_t *stmts); #endif diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d9b5c3c..0f15f85 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -70,8 +70,6 @@ unsigned char pointer_default = RPC_FC_UP; static int is_object_interface = FALSE; -/* are we inside a library block? */ -static int is_inside_library = FALSE; typedef struct list typelist_t; struct typenode { @@ -140,6 +138,7 @@ static var_t *reg_const(var_t *var); static char *gen_name(void); static void check_arg(var_t *arg); +static void check_statements(const statement_list_t *stmts, int is_inside_library); static void check_all_user_types(const statement_list_t *stmts); static attr_list_t *check_iface_attrs(const char *name, attr_list_t *attrs); static attr_list_t *check_function_attrs(const char *name, attr_list_t *attrs); @@ -346,6 +345,7 @@ static statement_list_t *append_statement(statement_list_t *list, statement_t *s %% input: gbl_statements { fix_incomplete(); + check_statements($1, FALSE); check_all_user_types($1); write_header($1); write_id_data($1); @@ -433,14 +433,12 @@ libraryhdr: tLIBRARY aIDENTIFIER { $$ = $2; } ; library_start: attributes libraryhdr '{' { $$ = make_library($2, check_library_attrs($2, $1)); if (!parse_only) start_typelib($$); - is_inside_library = TRUE; } ; librarydef: library_start imp_statements '}' semicolon_opt { $$ = $1; $$->stmts = $2; if (!parse_only) end_typelib(); - is_inside_library = FALSE; } ; @@ -2540,7 +2538,7 @@ static void add_explicit_handle_if_necessary(func_t *func) } } -void check_functions(const type_t *iface) +static void check_functions(const type_t *iface, int is_inside_library) { if (is_attr(iface->attrs, ATTR_EXPLICIT_HANDLE) && iface->funcs) { @@ -2559,6 +2557,19 @@ void check_functions(const type_t *iface) } } +static void check_statements(const statement_list_t *stmts, int is_inside_library) +{ + const statement_t *stmt; + + if (stmts) LIST_FOR_EACH_ENTRY(stmt, stmts, const statement_t, entry) + { + if (stmt->type == STMT_LIBRARY) + check_statements(stmt->u.lib->stmts, TRUE); + else if (stmt->type == STMT_TYPE && stmt->u.type->type == RPC_FC_IP) + check_functions(stmt->u.type, is_inside_library); + } +} + static void check_all_user_types(const statement_list_t *stmts) { const statement_t *stmt; diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 2b56bb8..f13ec53 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -73,7 +73,6 @@ void type_interface_define(type_t *iface, type_t *inherit, statement_list_t *stm iface->details.iface->disp_methods = NULL; iface->stmts = stmts; iface->defined = TRUE; - check_functions(iface); compute_method_indexes(iface); } @@ -87,7 +86,6 @@ void type_dispinterface_define(type_t *iface, var_list_t *props, func_list_t *me iface->details.iface->disp_methods = methods; iface->stmts = NULL; iface->defined = TRUE; - check_functions(iface); compute_method_indexes(iface); }

1 0

Andrew Talbot : inkobj: Declare a variable static.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 8aeaa423ad00076b79a8b3d8e4f565cadeefd681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aeaa423ad00076b79a8b3d8e… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jan 5 22:14:22 2009 +0000 inkobj: Declare a variable static. --- dlls/inkobj/inkobj.c | 2 +- dlls/inkobj/inkobj_internal.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/inkobj/inkobj.c b/dlls/inkobj/inkobj.c index 8cddeb7..6191d7e 100644 --- a/dlls/inkobj/inkobj.c +++ b/dlls/inkobj/inkobj.c @@ -19,7 +19,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(inkobj); -LONG INKOBJ_refCount = 0; +static LONG INKOBJ_refCount; HINSTANCE INKOBJ_hInstance; /***************************************************** diff --git a/dlls/inkobj/inkobj_internal.h b/dlls/inkobj/inkobj_internal.h index cfd9b5b..3a6d8c8 100644 --- a/dlls/inkobj/inkobj_internal.h +++ b/dlls/inkobj/inkobj_internal.h @@ -30,7 +30,6 @@ #include "wine/debug.h" -extern LONG INKOBJ_refCount; extern HINSTANCE INKOBJ_hInstance; #endif /* INKOBJ_INTERNAL_H */

1 0

Dylan Smith : richedit: Avoid rewrapping all text for isolated format changes.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 28645c64d54f74283d13e4ea05b549d74029ee23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28645c64d54f74283d13e4ea0… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jan 5 13:14:41 2009 -0500 richedit: Avoid rewrapping all text for isolated format changes. When the character or paragraph format is changed the paragraph that is changed is already marked to be rewrapped, so ME_MarkAllForWrapping shouldn't be called. Since ME_RewrapRepaint uses this function, it shouldn't be called in these circumstances, since rewrapping all the text can cause noticable delays when working with a lot of text. --- dlls/riched20/editor.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c7b8f40..107dcea 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3263,7 +3263,11 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } ME_CommitUndo(editor); if (bRepaint) - ME_RewrapRepaint(editor); + { + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); + ME_Repaint(editor); + } return 1; } case EM_GETCHARFORMAT: @@ -3285,7 +3289,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, case EM_SETPARAFORMAT: { BOOL result = ME_SetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); - ME_RewrapRepaint(editor); + ME_WrapMarkedParagraphs(editor); + ME_UpdateScrollBar(editor); + ME_Repaint(editor); ME_CommitUndo(editor); return result; }

1 0

Dylan Smith : richedit: Prevent redundant rewraps when scrollbar is shown.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: 6df4148b04e18274a09967138b733b4c242d9d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df4148b04e18274a09967138… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jan 5 13:14:31 2009 -0500 richedit: Prevent redundant rewraps when scrollbar is shown. A common case for richedit controls are that a large amount of text is set initially with word wrap enabled. This causes the initially wrapping of the text, which also calculates the text length. After this the vertical scrollbar will be shown, which causes the text to be rewrapped again. After this there are two redundant rewraps that are done which this patch eliminates. --- dlls/riched20/paint.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1bfb216..f0acf4a 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1099,14 +1099,7 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) bScrollBarWillBeVisible = TRUE; } - if (bScrollBarWasVisible != bScrollBarWillBeVisible) - { - ShowScrollBar(hWnd, SB_VERT, bScrollBarWillBeVisible); - ME_MarkAllForWrapping(editor); - ME_WrapMarkedParagraphs(editor); - } - - si.nMin = 0; + si.nMin = 0; si.nMax = editor->nTotalLength; si.nPos = editor->vert_si.nPos; si.nPage = editor->sizeWindow.cy; @@ -1122,6 +1115,9 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) if (bScrollBarWillBeVisible || bScrollBarWasVisible) SetScrollInfo(hWnd, SB_VERT, &si, TRUE); } + + if (bScrollBarWasVisible != bScrollBarWillBeVisible) + ShowScrollBar(hWnd, SB_VERT, bScrollBarWillBeVisible); } int ME_GetYScrollPos(ME_TextEditor *editor)

1 0

Dylan Smith : richedit: Scroll up with less than page of text with ES_DISABLENOSCROLL.
by Alexandre Julliard 06 Jan '09

06 Jan '09

Module: wine Branch: master Commit: a16db0afc6f784faa1c1bf3d881dd5a7bc965e8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16db0afc6f784faa1c1bf3d8… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Jan 5 13:14:18 2009 -0500 richedit: Scroll up with less than page of text with ES_DISABLENOSCROLL. --- dlls/riched20/paint.c | 29 ++++++++++++++--------------- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 94a1f87..1bfb216 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -1083,7 +1083,15 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.cbSize = sizeof(si); bScrollBarWasVisible = ME_GetYScrollVisible(editor); bScrollBarWillBeVisible = editor->nTotalLength > editor->sizeWindow.cy; - + + if (editor->vert_si.nPos && !bScrollBarWillBeVisible) + { + ME_ScrollAbs(editor, 0); + /* ME_ScrollAbs will call this function, + * so nothing else needs to be done here. */ + return; + } + si.fMask = SIF_PAGE | SIF_RANGE | SIF_POS; if (GetWindowLongW(hWnd, GWL_STYLE) & ES_DISABLENOSCROLL) { @@ -1102,26 +1110,17 @@ void ME_UpdateScrollBar(ME_TextEditor *editor) si.nMax = editor->nTotalLength; si.nPos = editor->vert_si.nPos; si.nPage = editor->sizeWindow.cy; - - if (!(si.nMin == editor->vert_si.nMin && si.nMax == editor->vert_si.nMax && si.nPage == editor->vert_si.nPage)) + + if (!(si.nMin == editor->vert_si.nMin && + si.nMax == editor->vert_si.nMax && + si.nPage == editor->vert_si.nPage)) { TRACE("min=%d max=%d page=%d\n", si.nMin, si.nMax, si.nPage); editor->vert_si.nMin = si.nMin; editor->vert_si.nMax = si.nMax; editor->vert_si.nPage = si.nPage; - if (bScrollBarWillBeVisible) - { + if (bScrollBarWillBeVisible || bScrollBarWasVisible) SetScrollInfo(hWnd, SB_VERT, &si, TRUE); - } - else - { - if (bScrollBarWasVisible && !(si.fMask & SIF_DISABLENOSCROLL)) - { - SetScrollInfo(hWnd, SB_VERT, &si, TRUE); - ShowScrollBar(hWnd, SB_VERT, FALSE); - ME_ScrollAbs(editor, 0); - } - } } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2009