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

Zebediah Figura : ntdll: Handle UWOP_EPILOG directives in x86_64 unwind info.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 08fc532033d339fd820cab95abc271ebe222aa1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=08fc532033d339fd820cab95… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 16 18:31:50 2019 -0500 ntdll: Handle UWOP_EPILOG directives in x86_64 unwind info. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index cc34995..11795e5 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -396,6 +396,7 @@ struct UNWIND_INFO #define UWOP_SET_FPREG 3 #define UWOP_SAVE_NONVOL 4 #define UWOP_SAVE_NONVOL_FAR 5 +#define UWOP_EPILOG 6 #define UWOP_SAVE_XMM128 8 #define UWOP_SAVE_XMM128_FAR 9 #define UWOP_PUSH_MACHFRAME 10 @@ -484,6 +485,19 @@ static void dump_unwind_info( ULONG64 base, RUNTIME_FUNCTION *function ) case UWOP_PUSH_MACHFRAME: TRACE( "PUSH_MACHFRAME %u\n", info->opcodes[i].info ); break; + case UWOP_EPILOG: + if (info->version == 2) + { + unsigned int offset; + if (info->opcodes[i].info) + offset = info->opcodes[i].offset; + else + offset = (info->opcodes[i+1].info << 8) + info->opcodes[i+1].offset; + TRACE("epilog %p-%p\n", (char *)base + function->EndAddress - offset, + (char *)base + function->EndAddress - offset + info->opcodes[i].offset ); + i += 1; + break; + } default: FIXME( "unknown code %u\n", info->opcodes[i].code ); break; @@ -3669,6 +3683,7 @@ static int get_opcode_size( struct opcode op ) return 2 + (op.info != 0); case UWOP_SAVE_NONVOL: case UWOP_SAVE_XMM128: + case UWOP_EPILOG: return 2; case UWOP_SAVE_NONVOL_FAR: case UWOP_SAVE_XMM128_FAR: @@ -3904,6 +3919,9 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, case UWOP_PUSH_MACHFRAME: FIXME( "PUSH_MACHFRAME %u\n", info->opcodes[i].info ); break; + case UWOP_EPILOG: + if (info->version == 2) + break; /* nothing to do */ default: FIXME( "unknown code %u\n", info->opcodes[i].code ); break;

1 0

Alistair Leslie-Hughes : include: Add IDirectSoundFX interfaces.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 3994f3f1bfc52d891b024e4dc659ca6fcb2dd7ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=3994f3f1bfc52d891b024e4d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Aug 16 03:34:31 2019 +0000 include: Add IDirectSoundFX interfaces. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 351 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3994f3f1bfc52d891b02…

1 0

Zebediah Figura : ntdll: Handle version 2 unwind info on x86_64.
by Alexandre Julliard Aug. 19, 2019

Aug. 19, 2019

Module: wine Branch: master Commit: 7ea3a147929533566f9ea8c4e1850879e5b011d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ea3a147929533566f9ea8c4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 16 18:31:49 2019 -0500 ntdll: Handle version 2 unwind info on x86_64. It seems this is identical to version 1, but with an additional UWOP_EPILOG opcode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 886d697..cc34995 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3840,7 +3840,7 @@ PVOID WINAPI RtlVirtualUnwind( ULONG type, ULONG64 base, ULONG64 pc, info = (struct UNWIND_INFO *)((char *)base + function->UnwindData); handler_data = (union handler_data *)&info->opcodes[(info->count + 1) & ~1]; - if (info->version != 1) + if (info->version != 1 && info->version != 2) { FIXME( "unknown unwind info version %u at %p\n", info->version, info ); return NULL;

1 0

Alexandre Julliard : Wine release 4.14
by Alexandre Julliard Aug. 16, 2019

Aug. 16, 2019

Module: website Branch: master Commit: 1c3a0f22cde9fb2eec78908ee3de34c4b7d5f00e URL: https://source.winehq.org/git/website.git/?a=commit;h=1c3a0f22cde9fb2eec789… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 17 00:31:07 2019 +0200 Wine release 4.14 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2019081701.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/news/en/2019081701.xml b/news/en/2019081701.xml new file mode 100644 index 0000000..bf71862 --- /dev/null +++ b/news/en/2019081701.xml @@ -0,0 +1,15 @@ +<news> +<date>August 17, 2019</date> +<title>Wine 4.14 Released</title> +<body> + The Wine development release 4.14 is now available. + <a href="{$root}/announce/4.14">What's new</a> in this release: +<ul> + <li>New version of the Mono engine with upstream updates.</li> + <li>PE dlls no longer rely on the MinGW runtime.</li> + <li>Exception handling fixes on ARM64.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/4.x/wine-4.14.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Henri Verbeet : wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data().
by Alexandre Julliard Aug. 16, 2019

Aug. 16, 2019

Module: wine Branch: master Commit: 1419a06819234f585fcb67a79998148209b83539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1419a06819234f585fcb67a7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 01:49:39 2019 +0430 wined3d: Merge wined3d_texture_upload_data() and wined3d_texture_gl_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 148 +++++++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 4 -- 2 files changed, 67 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1419a06819234f585fcb…

1 0

Richard Pospesel : widl: Pass a decl_spec_t to type_new_alias().
by Alexandre Julliard Aug. 16, 2019

Aug. 16, 2019

Module: wine Branch: master Commit: f131795b30476ed2483649c49501dd00a97a8119 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f131795b30476ed2483649c4… Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Aug 15 20:13:21 2019 -0500 widl: Pass a decl_spec_t to type_new_alias(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 8 +++++--- tools/widl/typetree.c | 4 ++-- tools/widl/typetree.h | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f35d671..038b407 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1188,7 +1188,8 @@ static void decl_builtin_basic(const char *name, enum type_basic_type type) static void decl_builtin_alias(const char *name, type_t *t) { - reg_type(type_new_alias(t, name), name, NULL, 0); + const decl_spec_t ds = {.type = t}; + reg_type(type_new_alias(&ds, name), name, NULL, 0); } void init_types(void) @@ -1802,7 +1803,8 @@ static declarator_t *make_declarator(var_t *var) static type_t *make_safearray(type_t *type) { - const decl_spec_t ds = {.type = type_new_alias(type, "SAFEARRAY")}; + decl_spec_t ds = {.type = type}; + ds.type = type_new_alias(&ds, "SAFEARRAY"); return type_new_array(NULL, &ds, TRUE, 0, NULL, NULL, FC_RP); } @@ -1975,7 +1977,7 @@ static type_t *reg_typedefs(decl_spec_t *decl_spec, declarator_list_t *decls, at cur->loc_info.line_number); name = declare_var(attrs, decl_spec, decl, 0); - cur = type_new_alias(name->declspec.type, name->name); + cur = type_new_alias(&name->declspec, name->name); cur->attrs = attrs; if (is_incomplete(cur)) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 3e9ac89..ef9a669 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -184,13 +184,13 @@ type_t *type_new_pointer(unsigned char pointer_default, type_t *ref, attr_list_t return t; } -type_t *type_new_alias(type_t *t, const char *name) +type_t *type_new_alias(const decl_spec_t *t, const char *name) { type_t *a = make_type(TYPE_ALIAS); a->name = xstrdup(name); a->attrs = NULL; - a->details.alias.aliasee.type = t; + a->details.alias.aliasee = *t; init_loc_info(&a->loc_info); return a; diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 9453e9d..6377614 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -31,7 +31,7 @@ enum name_type { type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(unsigned char pointer_default, type_t *ref, attr_list_t *attrs); -type_t *type_new_alias(type_t *t, const char *name); +type_t *type_new_alias(const decl_spec_t *t, const char *name); type_t *type_new_module(char *name); type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is,

1 0

Henri Verbeet : wined3d: Map/unmap bo addresses through the adapter.
by Alexandre Julliard Aug. 16, 2019

Aug. 16, 2019

Module: wine Branch: master Commit: 400a0dcc8b6b27dc05c71f798c35120cdc9e440d URL: https://source.winehq.org/git/wine.git/?a=commit;h=400a0dcc8b6b27dc05c71f79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 16 01:49:38 2019 +0430 wined3d: Map/unmap bo addresses through the adapter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 14 +++++++++ dlls/wined3d/adapter_vk.c | 21 ++++++++++++++ dlls/wined3d/directx.c | 21 ++++++++++++++ dlls/wined3d/surface.c | 61 ++++++++++++++------------------------- dlls/wined3d/texture.c | 65 ++++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 16 +++++++++++ 6 files changed, 120 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=400a0dcc8b6b27dc05c7…

1 0

Tag wine-4.14 : Alexandre Julliard : Release 4.14
by Alexandre Julliard Aug. 16, 2019

Aug. 16, 2019

Module: wine Branch: refs/tags/wine-4.14 Tag: ffbaee31a5fef66131de886879787cbbb4dfbcf2 URL: https://source.winehq.org/git/wine.git/?a=tag;h=ffbaee31a5fef66131de8868797… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 17 00:26:16 2019 +0200 Release 4.14

1 0

Alexandre Julliard : Release 4.14.
by Alexandre Julliard Aug. 16, 2019

Aug. 16, 2019

Module: wine Branch: master Commit: c1e8334735f20770b6c3bf2f98112bb853f5b891 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1e8334735f20770b6c3bf2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Aug 17 00:26:16 2019 +0200 Release 4.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 525 ++++++++++++++++++++++++++++++++++++++++---------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 351 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1e8334735f20770b6c3…

1 0

Richard Pospesel : widl: Pass a decl_spec_t to type_new_array().
by Alexandre Julliard Aug. 16, 2019

Aug. 16, 2019

Module: wine Branch: master Commit: d4dfbb630f0a536a4054df6254615b9efc0bb946 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4dfbb630f0a536a4054df62… Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Aug 15 20:13:20 2019 -0500 widl: Pass a decl_spec_t to type_new_array(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 10 +++++----- tools/widl/typetree.c | 5 +++-- tools/widl/typetree.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index df3d78f..f35d671 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1622,11 +1622,11 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl error_loc("%s: cannot specify size_is for an already sized array\n", v->name); else *ptype = type_new_array((*ptype)->name, - type_array_get_element_type(*ptype), FALSE, + type_array_get_element(*ptype), FALSE, 0, dim, NULL, FC_RP); } else if (is_ptr(*ptype)) - *ptype = type_new_array((*ptype)->name, type_pointer_get_ref_type(*ptype), TRUE, + *ptype = type_new_array((*ptype)->name, type_pointer_get_ref(*ptype), TRUE, 0, dim, NULL, pointer_default); else error_loc("%s: size_is attribute applied to illegal type\n", v->name); @@ -1648,7 +1648,7 @@ static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, const decl if (is_array(*ptype)) { *ptype = type_new_array((*ptype)->name, - type_array_get_element_type(*ptype), + type_array_get_element(*ptype), type_array_is_decl_as_ptr(*ptype), type_array_get_dim(*ptype), type_array_get_conformance(*ptype), @@ -1802,8 +1802,8 @@ static declarator_t *make_declarator(var_t *var) static type_t *make_safearray(type_t *type) { - return type_new_array(NULL, type_new_alias(type, "SAFEARRAY"), TRUE, 0, - NULL, NULL, FC_RP); + const decl_spec_t ds = {.type = type_new_alias(type, "SAFEARRAY")}; + return type_new_array(NULL, &ds, TRUE, 0, NULL, NULL, FC_RP); } static typelib_t *make_library(const char *name, const attr_list_t *attrs) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index ae3f375..3e9ac89 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -217,7 +217,7 @@ type_t *type_new_coclass(char *name) } -type_t *type_new_array(const char *name, type_t *element, int declptr, +type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is, unsigned char ptr_default_fc) { @@ -229,7 +229,8 @@ type_t *type_new_array(const char *name, type_t *element, int declptr, t->details.array.size_is = size_is; else t->details.array.dim = dim; - t->details.array.elem.type = element; + if (element) + t->details.array.elem = *element; t->details.array.ptr_def_fc = ptr_default_fc; return t; } diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index d5f28fe..9453e9d 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -33,7 +33,7 @@ type_t *type_new_function(var_list_t *args); type_t *type_new_pointer(unsigned char pointer_default, 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); -type_t *type_new_array(const char *name, type_t *element, int declptr, +type_t *type_new_array(const char *name, const decl_spec_t *element, int declptr, unsigned int dim, expr_t *size_is, expr_t *length_is, unsigned char ptr_default_fc); type_t *type_new_basic(enum type_basic_type basic_type);

1 0