August 2019 - Wine-commits - list.winehq.org

Zebediah Figura : d3dcompiler: Get rid of the "node" field from struct hlsl_ir_function_decl.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 32fd9ff4791e2c50a2e3ca049a85334424e87478 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32fd9ff4791e2c50a2e3ca04… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 13 10:23:31 2019 -0500 d3dcompiler: Get rid of the "node" field from struct hlsl_ir_function_decl. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 4 ++-- dlls/d3dcompiler_43/hlsl.y | 20 ++++++++++---------- dlls/d3dcompiler_43/utils.c | 4 +--- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 0506b16..d9befd1 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -712,7 +712,6 @@ enum hlsl_ir_node_type HLSL_IR_CONSTRUCTOR, HLSL_IR_DEREF, HLSL_IR_EXPR, - HLSL_IR_FUNCTION_DECL, HLSL_IR_IF, HLSL_IR_LOOP, HLSL_IR_JUMP, @@ -776,7 +775,8 @@ struct hlsl_ir_function struct hlsl_ir_function_decl { - struct hlsl_ir_node node; + struct hlsl_type *return_type; + struct source_location loc; struct wine_rb_entry entry; struct hlsl_ir_function *func; const char *semantic; diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y index 5585b89..7c14ad00 100644 --- a/dlls/d3dcompiler_43/hlsl.y +++ b/dlls/d3dcompiler_43/hlsl.y @@ -1084,28 +1084,28 @@ hlsl_prog: /* empty */ { if (decl->body && $2.decl->body) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefinition of function %s", debugstr_a($2.name)); YYABORT; } - else if (!compare_hlsl_types(decl->node.data_type, $2.decl->node.data_type)) + else if (!compare_hlsl_types(decl->return_type, $2.decl->return_type)) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "redefining function %s with a different return type", debugstr_a($2.name)); - hlsl_report_message(decl->node.loc.file, decl->node.loc.line, decl->node.loc.col, HLSL_LEVEL_NOTE, + hlsl_report_message(decl->loc.file, decl->loc.line, decl->loc.col, HLSL_LEVEL_NOTE, "%s previously declared here", debugstr_a($2.name)); YYABORT; } } - if ($2.decl->node.data_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) + if ($2.decl->return_type->base_type == HLSL_TYPE_VOID && $2.decl->semantic) { - hlsl_report_message($2.decl->node.loc.file, $2.decl->node.loc.line, - $2.decl->node.loc.col, HLSL_LEVEL_ERROR, + hlsl_report_message($2.decl->loc.file, $2.decl->loc.line, + $2.decl->loc.col, HLSL_LEVEL_ERROR, "void function with a semantic"); } @@ -1280,7 +1280,7 @@ func_prototype: var_modifiers type var_identifier '(' parameters ')' c } $$.name = $3; $$.decl->semantic = $7.semantic; - set_location(&$$.decl->node.loc, &@3); + set_location(&$$.decl->loc, &@3); } compound_statement: '{' '}' diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index d2275da..ca603e4 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1577,8 +1577,7 @@ struct hlsl_ir_function_decl *new_func_decl(struct hlsl_type *return_type, struc ERR("Out of memory.\n"); return NULL; } - decl->node.type = HLSL_IR_FUNCTION_DECL; - decl->node.data_type = return_type; + decl->return_type = return_type; decl->parameters = parameters; return decl; @@ -1775,7 +1774,6 @@ static const char *debug_node_type(enum hlsl_ir_node_type type) "HLSL_IR_CONSTRUCTOR", "HLSL_IR_DEREF", "HLSL_IR_EXPR", - "HLSL_IR_FUNCTION_DECL", "HLSL_IR_IF", "HLSL_IR_JUMP", "HLSL_IR_SWIZZLE",

1 0

Zebediah Figura : d3dcompiler: Get rid of the "node" field from struct hlsl_ir_var.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: bf31a900d1c684f6e5b3fadc9f5c13f018d83c92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf31a900d1c684f6e5b3fadc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 13 10:23:32 2019 -0500 d3dcompiler: Get rid of the "node" field from struct hlsl_ir_var. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/d3dcompiler_private.h | 14 ++++--------- dlls/d3dcompiler_43/hlsl.y | 34 +++++++++++++++---------------- dlls/d3dcompiler_43/utils.c | 26 +++++++---------------- 3 files changed, 27 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf31a900d1c684f6e5b3…

1 0

Alistair Leslie-Hughes : include: Complete dbgeng interfaces.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: a135e14790eda3aad66c0d51dc4667f4d82120bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=a135e14790eda3aad66c0d51… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 00:30:11 2019 +0000 include: Complete dbgeng interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbgeng.h | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 3 deletions(-) diff --git a/include/dbgeng.h b/include/dbgeng.h index aad4383..3eeb670 100644 --- a/include/dbgeng.h +++ b/include/dbgeng.h @@ -229,6 +229,16 @@ typedef struct _DEBUG_MODULE_PARAMETERS ULONG64 Reserved[2]; } DEBUG_MODULE_PARAMETERS, *PDEBUG_MODULE_PARAMETERS; +typedef struct _DEBUG_SYMBOL_PARAMETERS +{ + ULONG64 Module; + ULONG TypeId; + ULONG ParentSymbol; + ULONG SubElements; + ULONG Flags; + ULONG64 Reserved; +} DEBUG_SYMBOL_PARAMETERS, *PDEBUG_SYMBOL_PARAMETERS; + typedef struct _DEBUG_STACK_FRAME { ULONG64 InstructionOffset; @@ -372,7 +382,27 @@ DECLARE_INTERFACE_(IDebugBreakpoint, IUnknown) STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* IDebugBreakpoint */ - /* FIXME */ + STDMETHOD(GetId)(THIS_ PULONG id) PURE; + STDMETHOD(GetType)(THIS_ PULONG breaktype, PULONG proc) PURE; + STDMETHOD(GetAdder)(THIS_ IDebugClient **adder) PURE; + STDMETHOD(GetFlags)(THIS_ PULONG flags) PURE; + STDMETHOD(AddFlags)(THIS_ ULONG flags) PURE; + STDMETHOD(RemoveFlags)(THIS_ ULONG flags) PURE; + STDMETHOD(SetFlags)(THIS_ ULONG flags) PURE; + STDMETHOD(GetOffset)(THIS_ PULONG64 offset) PURE; + STDMETHOD(SetOffset)(THIS_ ULONG64 offset) PURE; + STDMETHOD(GetDataParameters)(THIS_ PULONG size, PULONG access) PURE; + STDMETHOD(SetDataParameters)(THIS_ ULONG size, ULONG access) PURE; + STDMETHOD(GetPassCount)(THIS_ PULONG count) PURE; + STDMETHOD(SetPassCount)(THIS_ ULONG count) PURE; + STDMETHOD(GetCurrentPassCount)(THIS_ PULONG count) PURE; + STDMETHOD(GetMatchThreadId)(THIS_ PULONG id) PURE; + STDMETHOD(SetMatchThreadId)(THIS_ ULONG thread) PURE; + STDMETHOD(GetCommand)(THIS_ PSTR buffer, ULONG buf_size, PULONG command) PURE; + STDMETHOD(SetCommand)(THIS_ PCSTR command) PURE; + STDMETHOD(GetOffsetExpression)(THIS_ PSTR buffer, ULONG buf_size, PULONG expression) PURE; + STDMETHOD(SetOffsetExpression)(THIS_ PCSTR expression) PURE; + STDMETHOD(GetParameters)(THIS_ PDEBUG_BREAKPOINT_PARAMETERS params) PURE; }; #undef INTERFACE @@ -422,7 +452,16 @@ DECLARE_INTERFACE_(IDebugSymbolGroup, IUnknown) STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* IDebugSymbolGroup */ - /* FIXME */ + STDMETHOD(GetNumberSymbols)(THIS_ PULONG number) PURE; + STDMETHOD(AddSymbol)(THIS_ PCSTR name, PULONG index) PURE; + STDMETHOD(RemoveSymbolByName)(THIS_ PCSTR name) PURE; + STDMETHOD(RemoveSymbolByIndex)(THIS_ ULONG index) PURE; + STDMETHOD(GetSymbolName)(THIS_ ULONG index, PSTR buffer, ULONG buf_size, PULONG name_size) PURE; + STDMETHOD(GetSymbolParameters)(THIS_ ULONG start, ULONG count, PDEBUG_SYMBOL_PARAMETERS params) PURE; + STDMETHOD(ExpandSymbol)(THIS_ ULONG index, BOOL expand) PURE; + STDMETHOD(OutputSymbols)(THIS_ ULONG control, ULONG flags, ULONG start, ULONG count) PURE; + STDMETHOD(WriteSymbol)(THIS_ ULONG index, PCSTR value) PURE; + STDMETHOD(OutputAsType)(THIS_ ULONG index, PCSTR type) PURE; }; #undef INTERFACE @@ -434,8 +473,30 @@ DECLARE_INTERFACE_(IDebugSymbolGroup2, IUnknown) STDMETHOD_(ULONG, AddRef)(THIS) PURE; STDMETHOD_(ULONG, Release)(THIS) PURE; /* IDebugSymbolGroup */ + STDMETHOD(GetNumberSymbols)(THIS_ PULONG number) PURE; + STDMETHOD(AddSymbol)(THIS_ PCSTR name, PULONG index) PURE; + STDMETHOD(RemoveSymbolByName)(THIS_ PCSTR name) PURE; + STDMETHOD(RemoveSymbolByIndex)(THIS_ ULONG index) PURE; + STDMETHOD(GetSymbolName)(THIS_ ULONG index, PSTR buffer, ULONG buf_size, PULONG name_size) PURE; + STDMETHOD(GetSymbolParameters)(THIS_ ULONG start, ULONG count, PDEBUG_SYMBOL_PARAMETERS params) PURE; + STDMETHOD(ExpandSymbol)(THIS_ ULONG index, BOOL expand) PURE; + STDMETHOD(OutputSymbols)(THIS_ ULONG control, ULONG flags, ULONG start, ULONG count) PURE; + STDMETHOD(WriteSymbol)(THIS_ ULONG index, PCSTR value) PURE; + STDMETHOD(OutputAsType)(THIS_ ULONG index, PCSTR type) PURE; /* IDebugSymbolGroup2 */ - /* FIXME */ + STDMETHOD(AddSymbolWide)(THIS_ PCWSTR name, PULONG index) PURE; + STDMETHOD(RemoveSymbolByNameWide)(THIS_ PCWSTR name) PURE; + STDMETHOD(GetSymbolNameWide)(THIS_ ULONG index, PWSTR buffer, ULONG buf_size, PULONG size) PURE; + STDMETHOD(WriteSymbolWide)(THIS_ ULONG index, PCWSTR value) PURE; + STDMETHOD(OutputAsTypeWide)(THIS_ ULONG index, PCWSTR type) PURE; + STDMETHOD(GetSymbolTypeName)(THIS_ ULONG index, PSTR buffer, ULONG buf_size, PULONG size) PURE; + STDMETHOD(GetSymbolTypeNameWide)(THIS_ ULONG index, PWSTR buffer, ULONG buf_size, PULONG size) PURE; + STDMETHOD(GetSymbolSize)(THIS_ ULONG index, PULONG size) PURE; + STDMETHOD(GetSymbolOffset)(THIS_ ULONG index, PULONG64 offset) PURE; + STDMETHOD(GetSymbolRegister)(THIS_ ULONG index, PULONG reg) PURE; + STDMETHOD(GetSymbolValueText)(THIS_ ULONG index, PSTR buffer, ULONG buf_size, PULONG size) PURE; + STDMETHOD(GetSymbolValueTextWide)(THIS_ ULONG index, PWSTR buffer, ULONG buf_size, PULONG size) PURE; + STDMETHOD(GetSymbolEntryInformation)(THIS_ ULONG index, PDEBUG_SYMBOL_ENTRY entry) PURE; }; #undef INTERFACE

1 0

Alistair Leslie-Hughes : include: Added tpcshrd.h.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: cd97a85e0f851ec2cedd4e3dbf234618bb02f36e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd97a85e0f851ec2cedd4e3d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 00:38:00 2019 +0000 include: Added tpcshrd.h. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/tpcshrd.h | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4b50ade..94dd8a0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -633,6 +633,7 @@ SOURCES = \ tlogstg.idl \ tmschema.h \ tom.idl \ + tpcshrd.h \ traffic.h \ transact.idl \ twain.h \ diff --git a/include/tpcshrd.h b/include/tpcshrd.h new file mode 100644 index 0000000..e1565bd --- /dev/null +++ b/include/tpcshrd.h @@ -0,0 +1,29 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * 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 + */ +#ifndef __WISPSHRD_H +#define __WISPSHRD_H + +#define WM_TABLET_DEFBASE 0x02c0 +#define WM_TABLET_MAXOFFSET 0x20 +#define WM_TABLET_ADDED (WM_TABLET_DEFBASE + 8) +#define WM_TABLET_DELETED (WM_TABLET_DEFBASE + 9) +#define WM_TABLET_FLICK (WM_TABLET_DEFBASE + 11) +#define WM_TABLET_QUERYSYSTEMGESTURESTATUS (WM_TABLET_DEFBASE + 12) + + +#endif /* __WISPSHRD_H */

1 0

Richard Pospesel : widl: Use type_function_get_args() instead of type_get_function_args().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 083032b5ef4d38c1c584210cfe220f3a5dffd484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=083032b5ef4d38c1c584210c… Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Aug 13 21:08:03 2019 -0500 widl: Use type_function_get_args() instead of type_get_function_args(). Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 2 +- tools/widl/header.c | 36 ++++++++++++++++++------------------ tools/widl/proxy.c | 12 ++++++------ tools/widl/server.c | 6 +++--- tools/widl/typegen.c | 46 +++++++++++++++++++++++----------------------- tools/widl/widltypes.h | 5 ----- tools/widl/write_msft.c | 12 ++++++------ 7 files changed, 57 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=083032b5ef4d38c1c584…

1 0

Zebediah Figura : widl: Get rid of fix_incomplete().
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: c4f5fb383bb7f28052cbbcc3c47ecbcd3aef1998 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4f5fb383bb7f28052cbbcc3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 13 21:08:04 2019 -0500 widl: Get rid of fix_incomplete(). This seems to have been broken since 0f7f7922bab; is_incomplete() will only return true for non-aliases. It could be fixed by reverting that hunk of 0f7f7922bab, but we intend rather to change the representation of aliases so that no "fixing" is needed. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ff86765..ff6ed1f 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -54,7 +54,6 @@ struct _import_t typelist_t incomplete_types = LIST_INIT(incomplete_types); -static void fix_incomplete(void); static void fix_incomplete_types(type_t *complete_type); static str_list_t *append_str(str_list_t *list, char *str); @@ -315,8 +314,7 @@ static typelib_t *current_typelib; %% -input: gbl_statements m_acf { fix_incomplete(); - check_statements($1, FALSE); +input: gbl_statements m_acf { check_statements($1, FALSE); check_all_user_types($1); write_header($1); write_id_data($1); @@ -1914,30 +1912,6 @@ void add_incomplete(type_t *t) list_add_tail(&incomplete_types, &tn->entry); } -static void fix_type(type_t *t) -{ - if (type_is_alias(t) && is_incomplete(t)) { - type_t *ot = type_alias_get_aliasee(t); - fix_type(ot); - if (type_get_type_detect_alias(ot) == TYPE_STRUCT || - type_get_type_detect_alias(ot) == TYPE_UNION || - type_get_type_detect_alias(ot) == TYPE_ENCAPSULATED_UNION) - t->details.structure = ot->details.structure; - t->defined = ot->defined; - } -} - -static void fix_incomplete(void) -{ - struct typenode *tn, *next; - - LIST_FOR_EACH_ENTRY_SAFE(tn, next, &incomplete_types, struct typenode, entry) { - fix_type(tn->type); - list_remove(&tn->entry); - free(tn); - } -} - static void fix_incomplete_types(type_t *complete_type) { struct typenode *tn, *next;

1 0

Richard Pospesel : widl: Use type_pointer_get_default_fc() in declare_var( ).
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: ebac6a6ac442d00cb63ce1753eabd9befbe7e683 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebac6a6ac442d00cb63ce175… Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Aug 13 21:08:05 2019 -0500 widl: Use type_pointer_get_default_fc() in declare_var(). Signed-off-by: Richard Pospesel <richard(a)torproject.org> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index ff6ed1f..d45e682 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1559,7 +1559,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl warning_loc_info(&v->loc_info, "%s: pointer attribute applied to interface " "pointer type has no effect\n", v->name); - if (!ptr_attr && top && (*pt)->details.pointer.def_fc != FC_RP) + if (!ptr_attr && top && type_pointer_get_default_fc(*pt) != FC_RP) { /* FIXME: this is a horrible hack to cope with the issue that we * store an offset to the typeformat string in the type object, but

1 0

Zebediah Figura : widl: Use type_function_get_args() in more places.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: a55aa54c426b60f45d316031e272c2d75974460a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a55aa54c426b60f45d316031… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 13 21:08:06 2019 -0500 widl: Use type_function_get_args() in more places. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d45e682..daff825 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2668,7 +2668,10 @@ static void check_remoting_args(const var_t *func) const char *funcname = func->name; const var_t *arg; - if (func->declspec.type->details.function->args) LIST_FOR_EACH_ENTRY( arg, func->declspec.type->details.function->args, const var_t, entry ) + if (!type_function_get_args(func->declspec.type)) + return; + + LIST_FOR_EACH_ENTRY( arg, type_function_get_args(func->declspec.type), const var_t, entry ) { const type_t *type = arg->declspec.type; @@ -2818,7 +2821,7 @@ static void check_async_uuid(type_t *iface) var_t *begin_func, *finish_func, *func = stmt->u.var, *arg; var_list_t *begin_args = NULL, *finish_args = NULL, *args; - args = func->declspec.type->details.function->args; + args = type_function_get_args(func->declspec.type); if (args) LIST_FOR_EACH_ENTRY(arg, args, var_t, entry) { if (is_attr(arg->attrs, ATTR_IN) || !is_attr(arg->attrs, ATTR_OUT)) @@ -2888,8 +2891,8 @@ static void check_all_user_types(const statement_list_t *stmts) const statement_t *stmt_func; STATEMENTS_FOR_EACH_FUNC(stmt_func, type_iface_get_stmts(stmt->u.type)) { const var_t *func = stmt_func->u.var; - if (func->declspec.type->details.function->args) - LIST_FOR_EACH_ENTRY( v, func->declspec.type->details.function->args, const var_t, entry ) + if (type_function_get_args(func->declspec.type)) + LIST_FOR_EACH_ENTRY( v, type_function_get_args(func->declspec.type), const var_t, entry ) check_for_additional_prototype_types(v->declspec.type); check_for_additional_prototype_types(type_function_get_rettype(func->declspec.type)); }

1 0

Zebediah Figura : widl: Move the "idx" parameter from struct func_details to var_t.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 8b2a065892b4010a2a31692d03c147e6fc2594c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b2a065892b4010a2a31692d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 13 21:08:07 2019 -0500 widl: Move the "idx" parameter from struct func_details to var_t. It's not a part of the type; e.g. it doesn't make sense on a function pointer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 4 ++-- tools/widl/typetree.c | 7 +++---- tools/widl/widltypes.h | 6 ++++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 6f19ff1..466c462 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -614,14 +614,14 @@ static void write_proxy(type_t *iface, unsigned int *proc_offset) if (!is_local(func->attrs)) { const var_t *cas = is_callas(func->attrs); const char *cname = cas ? cas->name : NULL; - int idx = func->declspec.type->details.function->idx; + int idx = func->func_idx; if (cname) { const statement_t *stmt2; STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface)) { const var_t *m = stmt2->u.var; if (!strcmp(m->name, cname)) { - idx = m->declspec.type->details.function->idx; + idx = m->func_idx; break; } } diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 0a8ae0f..e727d8c 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -174,7 +174,6 @@ type_t *type_new_function(var_list_t *args) t = make_type(TYPE_FUNCTION); t->details.function = xmalloc(sizeof(*t->details.function)); t->details.function->args = args; - t->details.function->idx = -1; return t; } @@ -413,9 +412,9 @@ type_t *type_new_bitfield(type_t *field, const expr_t *bits) return t; } -static int compute_method_indexes(type_t *iface) +static unsigned int compute_method_indexes(type_t *iface) { - int idx; + unsigned int idx; statement_t *stmt; if (!iface->details.iface) @@ -430,7 +429,7 @@ static int compute_method_indexes(type_t *iface) { var_t *func = stmt->u.var; if (!is_callas(func->attrs)) - func->declspec.type->details.function->idx = idx++; + func->func_idx = idx++; } return idx; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 729d712..5e0f34d 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -342,7 +342,6 @@ struct func_details { var_list_t *args; struct _var_t *retval; - int idx; }; struct iface_details @@ -460,9 +459,12 @@ struct _var_t { decl_spec_t declspec; attr_list_t *attrs; expr_t *eval; - unsigned int procstring_offset; + unsigned int typestring_offset; + /* fields specific to functions */ + unsigned int procstring_offset, func_idx; + struct _loc_info_t loc_info; /* parser-internal */

1 0

Alistair Leslie-Hughes : comctl32/listview: Don' t report current item state in change notification when state change wasn' t requested.
by Alexandre Julliard 15 Aug '19

15 Aug '19

Module: wine Branch: master Commit: 7bacd7aa387ce98acbbc5541ae9a0d091bc0bb57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7bacd7aa387ce98acbbc5541… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 14 09:42:58 2019 +0300 comctl32/listview: Don't report current item state in change notification when state change wasn't requested. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 7 ++-- dlls/comctl32/tests/listview.c | 82 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2717812..acf6f31 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4259,8 +4259,11 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL memset(&nmlv, 0, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; - nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); - nmlv.uOldState = item.state; + if (lpLVItem->mask & LVIF_STATE) + { + nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); + nmlv.uOldState = item.state; + } nmlv.uChanged = uChanged ? uChanged : lpLVItem->mask; nmlv.lParam = item.lParam; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 48612db..48cd614 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6458,6 +6458,86 @@ static void test_LVM_GETCOUNTPERPAGE(void) ok(ret, "Failed to unregister test class.\n"); } +static void test_item_state_change(void) +{ + static const DWORD styles[] = { LVS_ICON, LVS_LIST, LVS_REPORT, LVS_SMALLICON }; + LVITEMA item; + HWND hwnd; + DWORD res; + int i; + + for (i = 0; i < ARRAY_SIZE(styles); i++) + { + hwnd = create_listview_control(styles[i]); + + insert_item(hwnd, 0); + + /* LVM_SETITEMSTATE with mask */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(res, "Failed to set item state.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == LVIS_SELECTED, "got new state 0x%08x\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "got old state 0x%08x\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_STATE, "got changed 0x%08x\n", g_nmlistview.uChanged); + + /* LVM_SETITEMSTATE 0 mask */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.state = 0; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(res, "Failed to set item state.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == 0, "Unexpected new state %#x.\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == LVIS_SELECTED, "Unexpected old state %#x.\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_STATE, "Unexpected change mask %#x.\n", g_nmlistview.uChanged); + + /* LVM_SETITEM changes state */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + item.mask = LVIF_STATE; + res = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(res, "Failed to set item.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == LVIS_SELECTED, "Unexpected new state %#x.\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "Unexpected old state %#x.\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_STATE, "Unexpected change mask %#x.\n", g_nmlistview.uChanged); + + /* LVM_SETITEM no state changes */ + memset(&g_nmlistview, 0xcc, sizeof(g_nmlistview)); + memset(&item, 0, sizeof(item)); + item.lParam = 11; + item.mask = LVIF_PARAM; + res = SendMessageA(hwnd, LVM_SETITEMA, 0, (LPARAM)&item); + ok(res, "Failed to set item.\n"); + + ok(g_nmlistview.iItem == item.iItem, "Unexpected item %d.\n", g_nmlistview.iItem); + ok(g_nmlistview.iSubItem == item.iSubItem, "Unexpected subitem %d.\n", g_nmlistview.iSubItem); + ok(g_nmlistview.lParam == item.lParam, "Unexpected lParam.\n"); + ok(g_nmlistview.uNewState == 0, "Unexpected new state %#x.\n", g_nmlistview.uNewState); + ok(g_nmlistview.uOldState == 0, "Unexpected old state %#x.\n", g_nmlistview.uOldState); + ok(g_nmlistview.uChanged == LVIF_PARAM, "Unexpected change mask %#x.\n", g_nmlistview.uChanged); + + DestroyWindow(hwnd); + } +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6521,6 +6601,7 @@ START_TEST(listview) test_LVSCW_AUTOSIZE(); test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); + test_item_state_change(); if (!load_v6_module(&ctx_cookie, &hCtx)) { @@ -6565,6 +6646,7 @@ START_TEST(listview) test_LVSCW_AUTOSIZE(); test_LVN_ENDLABELEDIT(); test_LVM_GETCOUNTPERPAGE(); + test_item_state_change(); unload_v6_module(ctx_cookie, hCtx);

1 0