November 2020 - Wine-Commits

Alexandre Julliard : msvcrt: Add floating point classification macros.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: b9002cc8c7ae16b4a61476834318bcefd638e34f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9002cc8c7ae16b4a6147683… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 10:12:34 2020 +0100 msvcrt: Add floating point classification macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 -- configure.ac | 2 -- dlls/msvcrt/math.c | 58 ++++++++++++++++++++------------------------------- dlls/msvcrt/msvcrt.h | 52 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 4 ---- include/config.h.in | 6 ------ include/msvcrt/math.h | 54 +++++++++++++++++++++++++++++++++++++++++++---- 7 files changed, 125 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9002cc8c7ae16b4a614…

1 0

Alexandre Julliard : msvcrt: Use the global musl copyright notice.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 9fa7b779f8292a3a44608cc0966c156fa2ff4faf URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fa7b779f8292a3a44608cc0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 13:45:45 2020 +0100 msvcrt: Use the global musl copyright notice. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6763b4a00dd..c27b77eca93 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -18,14 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * - * For functions copied from musl (http://www.musl-libc.org/) + * For functions copied from musl libc (http://musl.libc.org/) * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. + * Copyright 2005-2020 Rich Felker, et al. * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. * ==================================================== */

1 0

Alexandre Julliard : msvcrt: Import _copysign() from musl.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: b1bc99f02553cc7db81ecbc567690687e1b4adb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1bc99f02553cc7db81ecbc5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 17 09:57:52 2020 +0100 msvcrt: Import _copysign() from musl. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8e8324b8fbe..069a2f7f387 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -177,12 +177,15 @@ float CDECL MSVCRT__chgsignf( float num ) /********************************************************************* * _copysignf (MSVCRT.@) + * + * Copied from musl: src/math/copysignf.c */ -float CDECL MSVCRT__copysignf( float num, float sign ) +float CDECL MSVCRT__copysignf( float x, float y ) { - if (signbit(sign)) - return signbit(num) ? num : -num; - return signbit(num) ? -num : num; + union { float f; UINT32 i; } ux = { x }, uy = { y }; + ux.i &= 0x7fffffff; + ux.i |= uy.i & 0x80000000; + return ux.f; } /********************************************************************* @@ -2126,12 +2129,15 @@ int CDECL MSVCRT_fesetround(int round_mode) /********************************************************************* * _copysign (MSVCRT.@) + * + * Copied from musl: src/math/copysign.c */ -double CDECL MSVCRT__copysign(double num, double sign) +double CDECL MSVCRT__copysign( double x, double y ) { - if (signbit(sign)) - return signbit(num) ? num : -num; - return signbit(num) ? -num : num; + union { double f; UINT64 i; } ux = { x }, uy = { y }; + ux.i &= ~0ull >> 1; + ux.i |= uy.i & 1ull << 63; + return ux.f; } /*********************************************************************

1 0

Michael Stefaniuc : oleview: Inline WCHAR strings of length 1.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: d53577ef7559945f00a9ce7a0389d4d88464c240 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d53577ef7559945f00a9ce7a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:19 2020 +0100 oleview: Inline WCHAR strings of length 1. Merge some of those strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/typelib.c | 347 +++++++++++++++------------------------------ 1 file changed, 117 insertions(+), 230 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d53577ef7559945f00a9…

1 0

Michael Stefaniuc : taskschd: Use wide-char string literals.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 48e35424a65ddb89e9877e72f3a997c6e97a6617 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48e35424a65ddb89e9877e72… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Nov 17 00:55:17 2020 +0100 taskschd: Use wide-char string literals. Also merge some strings. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/folder.c | 5 +- dlls/taskschd/regtask.c | 3 +- dlls/taskschd/task.c | 297 +++++++++++++++++------------------------------- 3 files changed, 108 insertions(+), 197 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=48e35424a65ddb89e987…

1 0

Nikolay Sivov : evr/mixer: Improve GetService() handling of unsupported interfaces/services.
by Alexandre Julliard Nov. 17, 2020

Nov. 17, 2020

Module: wine Branch: master Commit: 315cf3b60fbea22092c399cdcf58654f2545cf88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=315cf3b60fbea22092c399cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 17 13:41:36 2020 +0300 evr/mixer: Improve GetService() handling of unsupported interfaces/services. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 4 +++- dlls/evr/tests/evr.c | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index ddf34d05f44..a7ce3949bec 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1650,11 +1650,13 @@ static HRESULT WINAPI video_mixer_getservice_GetService(IMFGetService *iface, RE { return IMFGetService_QueryInterface(iface, riid, obj); } + + return E_NOINTERFACE; } FIXME("Unsupported service %s, riid %s.\n", debugstr_guid(service), debugstr_guid(riid)); - return E_NOTIMPL; + return MF_E_UNSUPPORTED_SERVICE; } static const IMFGetServiceVtbl video_mixer_getservice_vtbl = diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index c83ce0374eb..60d74d1a224 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -489,6 +489,10 @@ static void test_default_mixer(void) check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoProcessor, TRUE); check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl, TRUE); check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoPositionMapper, TRUE); + check_service_interface(transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFTransform, FALSE); + + hr = MFGetService((IUnknown *)transform, &MR_VIDEO_RENDER_SERVICE, &IID_IUnknown, (void **)&unk); + ok(hr == MF_E_UNSUPPORTED_SERVICE, "Unexpected hr %#x.\n", hr); if (SUCCEEDED(MFGetService((IUnknown *)transform, &MR_VIDEO_MIXER_SERVICE, &IID_IMFVideoMixerControl2, (void **)&mixer_control2))) {

1 0

Derek Lesho : mf/session: Call session_command_complete after NotifyTopology command.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 86e6c0bc28177a3794950fe2a13b8208400b6194 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86e6c0bc28177a3794950fe2… Author: Derek Lesho <dlesho(a)codeweavers.com> Date: Mon Nov 16 15:08:38 2020 -0600 mf/session: Call session_command_complete after NotifyTopology command. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index cf351c003e7..dffd5113ff9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -2075,6 +2075,7 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, break; case SESSION_CMD_QM_NOTIFY_TOPOLOGY: IMFQualityManager_NotifyTopology(session->quality_manager, op->u.notify_topology.topology); + session_command_complete(session); break; case SESSION_CMD_SA_READY: topo_node = session_get_node_by_id(session, op->u.sa_ready.node_id);

1 0

Rémi Bernon : widl: Prefer mangled name over typedef in WinRT mode.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: a35ca92362750f8a49fc15efddc2c48caa07959e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a35ca92362750f8a49fc15ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:29 2020 +0100 widl: Prefer mangled name over typedef in WinRT mode. For types under a non-global namespace. MIDL generates prefixed mangled name for every use of enum, struct and union types. When the types are in the global namespace, the typedef name is used instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 22 ++++++++++++++-------- tools/widl/typetree.c | 2 +- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index 743d86f0ee9..015bbe2ece7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -192,7 +192,7 @@ const char *get_name(const var_t *v) return v->name; } -static void write_fields(FILE *h, var_list_t *fields) +static void write_fields(FILE *h, var_list_t *fields, enum name_type name_type) { unsigned nameless_struct_cnt = 0, nameless_struct_i = 0, nameless_union_cnt = 0, nameless_union_i = 0; const char *name; @@ -250,7 +250,7 @@ static void write_fields(FILE *h, var_list_t *fields) default: ; } - write_type_v(h, &v->declspec, TRUE, v->declonly, name, NAME_DEFAULT); + write_type_v(h, &v->declspec, TRUE, v->declonly, name, name_type); fprintf(h, ";\n"); } } @@ -322,7 +322,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i if ((ds->qualifier & TYPE_QUALIFIER_CONST) && (type_is_alias(t) || !is_ptr(t))) fprintf(h, "const "); - if (type_is_alias(t)) fprintf(h, "%s", t->name); + if (!winrt_mode && type_is_alias(t)) fprintf(h, "%s", t->name); else { switch (type_get_type_detect_alias(t)) { case TYPE_ENUM: @@ -347,9 +347,9 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i t->written = TRUE; indentation++; if (type_get_type(t) != TYPE_STRUCT) - write_fields(h, type_encapsulated_union_get_fields(t)); + write_fields(h, type_encapsulated_union_get_fields(t), name_type); else - write_fields(h, type_struct_get_fields(t)); + write_fields(h, type_struct_get_fields(t), name_type); indent(h, -1); fprintf(h, "}"); } @@ -362,7 +362,7 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i else fprintf(h, "union {\n"); t->written = TRUE; indentation++; - write_fields(h, type_union_get_cases(t)); + write_fields(h, type_union_get_cases(t), name_type); indent(h, -1); fprintf(h, "}"); } @@ -464,9 +464,13 @@ void write_type_left(FILE *h, const decl_spec_t *ds, enum name_type name_type, i break; } case TYPE_ALIAS: - /* handled elsewhere */ - assert(0); + { + const decl_spec_t *ds = type_alias_get_aliasee(t); + int in_namespace = ds && ds->type && ds->type->namespace && !is_global_namespace(ds->type->namespace); + if (!in_namespace) fprintf(h, "%s", t->name); + else write_type_left(h, ds, name_type, declonly, write_callconv); break; + } } } } @@ -801,6 +805,8 @@ static void write_generic_handle_routines(FILE *header) static void write_typedef(FILE *header, type_t *type, int declonly) { + type_t *t = type_alias_get_aliasee_type(type); + if (winrt_mode && t->namespace && !is_global_namespace(t->namespace)) return; fprintf(header, "typedef "); write_type_v(header, type_alias_get_aliasee(type), FALSE, declonly, type->name, NAME_DEFAULT); fprintf(header, ";\n"); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index e9afc6fdd28..c0547b36a96 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -82,7 +82,7 @@ const char *type_get_name(const type_t *type, enum name_type name_type) case NAME_DEFAULT: return type->name; case NAME_C: - return type->c_name; + return type->c_name ? type->c_name : type->name; } assert(0);

1 0

Georg Lehmann : winevulkan: Initialize Vulkan in native_vkGetInstanceProcAddrWINE.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 80fcfbc25a6ae1edd15f77dae95c0c1a12456610 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fcfbc25a6ae1edd15f77da… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Nov 6 17:06:30 2020 +0100 winevulkan: Initialize Vulkan in native_vkGetInstanceProcAddrWINE. In the past this was done in DllMain, the removal broke winelib applications. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 8e369d95f47..b0a8559fe2c 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -2053,6 +2053,10 @@ static void *wine_vk_get_global_proc_addr(const char *name) */ void *native_vkGetInstanceProcAddrWINE(VkInstance instance, const char *name) { + wine_vk_init_once(); + if (!vk_funcs) + return NULL; + return vk_funcs->p_vkGetInstanceProcAddr(instance, name); }

1 0

Rémi Bernon : widl: Support repetition for some attributes.
by Alexandre Julliard Nov. 16, 2020

Nov. 16, 2020

Module: wine Branch: master Commit: 92eb5ef5a1ada34853b57626b4e5201010decc21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92eb5ef5a1ada34853b57626… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Nov 4 19:49:27 2020 +0100 widl: Support repetition for some attributes. Some attributes can be specified multiple times, this is the case for instance for "custom" attribute, as well as WinRT "static". Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: PuetzKevinA(a)JohnDeere.com Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 249 +++++++++++++++++++++++++++------------------------- 1 file changed, 127 insertions(+), 122 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92eb5ef5a1ada34853b5…

1 0