wine-devel March 2022

wine-devel@winehq.org

80 participants
950 discussions

[PATCH] api-ms-win-core-versionansi-l1-1-1
by David Warner 07 Mar '22

07 Mar '22

Required for Adobe DNG Converter 14+ Signed-off-by: David Warner <david.p.warner(a)gmail.com> --- dlls/apisetschema/apisetschema.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index dce332e51fb..a47a6fc4016 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -140,7 +140,7 @@ apiset api-ms-win-core-url-l1-1-0 = kernelbase.dll apiset api-ms-win-core-util-l1-1-0 = kernel32.dll apiset api-ms-win-core-version-l1-1-1 = kernelbase.dll apiset api-ms-win-core-version-private-l1-1-0 = kernelbase.dll -apiset api-ms-win-core-versionansi-l1-1-0 = kernelbase.dll +apiset api-ms-win-core-versionansi-l1-1-1 = kernelbase.dll apiset api-ms-win-core-windowsceip-l1-1-0 = kernelbase.dll apiset api-ms-win-core-windowserrorreporting-l1-1-1 = kernelbase.dll apiset api-ms-win-core-winrt-error-l1-1-1 = combase.dll -- 2.35.1

2 2

[PATCH v2 1/5] windows.media.speech: Create private header.
by Bernhard Kölbl 06 Mar '22

06 Mar '22

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/main.c | 26 +-------------- dlls/windows.media.speech/private.h | 52 +++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 25 deletions(-) create mode 100644 dlls/windows.media.speech/private.h diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index d14d06773f7..f81c1bbfedd 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -17,35 +17,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdarg.h> - -#define COBJMACROS -#include "windef.h" -#include "winbase.h" -#include "winstring.h" -#include "wine/debug.h" -#include "objbase.h" - #include "initguid.h" -#include "activation.h" - -#define WIDL_using_Windows_Foundation -#define WIDL_using_Windows_Foundation_Collections -#include "windows.foundation.h" -#define WIDL_using_Windows_Media_SpeechSynthesis -#include "windows.media.speechsynthesis.h" +#include "private.h" WINE_DEFAULT_DEBUG_CHANNEL(speech); -static const char *debugstr_hstring(HSTRING hstr) -{ - const WCHAR *str; - UINT32 len; - if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; - str = WindowsGetStringRawBuffer(hstr, &len); - return wine_dbgstr_wn(str, len); -} - struct voice_information_vector { IVectorView_VoiceInformation IVectorView_VoiceInformation_iface; diff --git a/dlls/windows.media.speech/private.h b/dlls/windows.media.speech/private.h new file mode 100644 index 00000000000..8162ca45094 --- /dev/null +++ b/dlls/windows.media.speech/private.h @@ -0,0 +1,52 @@ +/* WinRT Windows.Media.Speech private header + * + * Copyright 2022 Bernhard Kölbl + * + * 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 __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H +#define __WINE_WINDOWS_MEDIA_SPEECH_PRIVATE_H + +#include <stdarg.h> + +#define COBJMACROS +#include "windef.h" +#include "winbase.h" +#include "winstring.h" +#include "objbase.h" + +#include "activation.h" + +#define WIDL_using_Windows_Foundation +#define WIDL_using_Windows_Foundation_Collections +#include "windows.foundation.h" +#define WIDL_using_Windows_Globalization +#include "windows.globalization.h" +#define WIDL_using_Windows_Media_SpeechSynthesis +#include "windows.media.speechsynthesis.h" + +#include "wine/debug.h" + +static inline const char *debugstr_hstring(HSTRING hstr) +{ + const WCHAR *str; + UINT32 len; + if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)"; + str = WindowsGetStringRawBuffer(hstr, &len); + return wine_dbgstr_wn(str, len); +} + +#endif -- 2.35.1

2 7

[PATCH] libs: Enable WAV49 support in gsm.
by Christopher Egert 06 Mar '22

06 Mar '22

Fixes a regression introduced by 0e7fd41af953b2a9fa23cf6920fac229f2dd2e44 causing missing audio elements in the 64k intros elysian by logicoma and clean state by conspiracy. Signed-off-by: Christopher Egert <cme3000(a)gmail.com> --- libs/gsm/Makefile.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/gsm/Makefile.in b/libs/gsm/Makefile.in index 482004cab8d..36c749aa60f 100644 --- a/libs/gsm/Makefile.in +++ b/libs/gsm/Makefile.in @@ -1,5 +1,6 @@ EXTLIB = libgsm.a EXTRAINCL = -I$(srcdir)/inc +EXTRADEFS = -DWAV49 C_SRCS = \ src/add.c \ -- 2.35.1

1 0

[PATCH 1/5] windows.media.speech: Create private header.
by Bernhard Kölbl 06 Mar '22

06 Mar '22

2 8

[PATCH resend] wineboot: Don't use ai_canonname for ComputerName if it is "localhost".
by Jinoh Kang 05 Mar '22

05 Mar '22

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Some Linux distros resolves the current hostname back to "localhost", so it needs to be explicitly filtered out. programs/wineboot/wineboot.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4a18265c1de..e7a508beb12 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -826,7 +826,9 @@ static void create_computer_name_keys(void) if (gethostname( buffer, sizeof(buffer) )) return; hints.ai_flags = AI_CANONNAME; - if (!getaddrinfo( buffer, NULL, &hints, &res )) name = res->ai_canonname; + if (!getaddrinfo( buffer, NULL, &hints, &res ) && + res->ai_canonname && strcasecmp(res->ai_canonname, "localhost") != 0) + name = res->ai_canonname; dot = strchr( name, '.' ); if (dot) *dot++ = 0; else dot = name + strlen(name); -- 2.31.1

1 0

[PATCH v5 00/10] Avoid performance degradation due to vDSO unmapping (#52313)
by Jinoh Kang 05 Mar '22

05 Mar '22

Commit f558741fabc116534fa598aa890ffed683a7153b removes vDSO if it conflicts with reserved ranges: Remove the AT_SYSINFO and AT_SYSINFO_EHDR values if the sysinfo page is in one of our reserved ranges. However, missing vDSO leads to performance issues on some syscalls (e.g. clock_gettime, gettimeofday) and may even lead to crash when run with some ancient C libraries that does not supply a custom signal restorer. vDSO pages can clash with reserved ranges especially in a 32-bit address space with address space layout randomization (ASLR) turned on. Recent versions of the Linux kernel introduced support for mremap()-ping vDSO pages, partly in an effort to support checkpoint restore in userspace (CRIU). Special programs that require specific memory layout constraints (such as Wine preloader) can take advantage of this support to modify the address space to meet its requirements. Changelog: - v3 -> v4: - address review comments - add more comments and documentation - v4 -> v5: - rebase onto latest master The following test script has been used to test each changes (use with git rebase --exec=...): set -e make -C ../wine64-build -j5 make -C ../wine32-build -j5 cd ../wine64-build export WINEPRELOADREMAPSTACK export WINEPRELOADREMAPVDSO for WINEPRELOADREMAPSTACK in skip never always force auto on-demand '' do for WINEPRELOADREMAPVDSO in skip never always force auto on-demand '' do ./loader/wine64 wineboot ./loader/wine wineboot done done Jinoh Kang (10): loader: Refactor argv/envp/auxv management. loader: Refactor number parsing to own function. loader: Generalise is_addr_reserved to find overlapping address ranges. loader: Explicitly munmap() the preloader's ELF EHDR. loader: Don't clobber existing memory mappings when reserving addresses. loader: Fix return type of get_auxiliary(). loader: Relocate vDSO on conflict with reserved ranges. loader: Relocate sigpage on conflict with reserved ranges in ARM. loader: Switch stack if the old stack address is in reserved range. loader: Enable all remap logic by default. loader/preloader.c | 1523 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 1407 insertions(+), 116 deletions(-) -- 2.34.1

1 10

[PATCH vkd3d v3 7/8] vkd3d-shader/hlsl: Remove redundant type check in declare_vars().
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - New in v3. Split of vkd3d-shader/hlsl: Reroute initialization towards a generic variable initializer. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 547a2ff4..c98e73f7 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1522,23 +1522,17 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t continue; } - if (type->type == HLSL_CLASS_STRUCT) - { - struct_var_initializer(ctx, statements_list, var, &v->initializer); - vkd3d_free(v); - continue; - } - if (type->type > HLSL_CLASS_LAST_NUMERIC) + if (type->type > HLSL_CLASS_LAST_NUMERIC && type->type != HLSL_CLASS_STRUCT) { FIXME("Initializers for non scalar/struct variables not supported yet.\n"); free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } - if (v->arrays.count) + + if (type->type == HLSL_CLASS_STRUCT) { - hlsl_fixme(ctx, &v->loc, "Array initializer."); - free_parse_initializer(&v->initializer); + struct_var_initializer(ctx, statements_list, var, &v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d v3 5/8] vkd3d-shader/hlsl: Properly free parse_variable_def memory.
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - Simplified, only calling vkd3d_free(v->arrays.sizes) after the data type is created. - I also spotted some leaks in gen_struct_fields() and add_typedef() so memory is also freed there. - For that reason I had to move free_parse_variable_def() before these functions. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 6a59134e..e702c234 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -668,6 +668,15 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } +static void free_parse_variable_def(struct parse_variable_def *v) +{ + free_parse_initializer(&v->initializer); + vkd3d_free(v->arrays.sizes); + vkd3d_free(v->name); + vkd3d_free((void *)v->semantic.name); + vkd3d_free(v); +} + static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; @@ -685,13 +694,14 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty if (!(field = hlsl_alloc(ctx, sizeof(*field)))) { - vkd3d_free(v); + free_parse_variable_def(v); return list; } field->type = type; for (i = 0; i < v->arrays.count; ++i) field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); field->loc = v->loc; field->name = v->name; field->semantic = v->semantic; @@ -719,7 +729,10 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!v->arrays.count) { if (!(type = hlsl_type_clone(ctx, orig_type, 0, modifiers))) + { + free_parse_variable_def(v); return false; + } } else { @@ -729,8 +742,12 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type for (i = 0; i < v->arrays.count; ++i) { if (!(type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]))) + { + free_parse_variable_def(v); return false; + } } + vkd3d_free(v->arrays.sizes); vkd3d_free((void *)type->name); type->name = v->name; @@ -747,6 +764,7 @@ static bool add_typedef(struct hlsl_ctx *ctx, DWORD modifiers, struct hlsl_type if (!ret) hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Type '%s' is already defined.", v->name); + free_parse_initializer(&v->initializer); vkd3d_free(v); } vkd3d_free(list); @@ -1369,15 +1387,6 @@ static void struct_var_initializer(struct hlsl_ctx *ctx, struct list *list, stru vkd3d_free(initializer->args); } -static void free_parse_variable_def(struct parse_variable_def *v) -{ - free_parse_initializer(&v->initializer); - vkd3d_free(v->arrays.sizes); - vkd3d_free(v->name); - vkd3d_free((void *)v->semantic.name); - vkd3d_free(v); -} - static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list) { @@ -1409,6 +1418,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t type = basic_type; for (i = 0; i < v->arrays.count; ++i) type = hlsl_new_array_type(ctx, type, v->arrays.sizes[i]); + vkd3d_free(v->arrays.sizes); if (type->type != HLSL_CLASS_MATRIX) check_invalid_matrix_modifiers(ctx, modifiers, v->loc); @@ -1468,6 +1478,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t hlsl_error(ctx, &v->loc, VKD3D_SHADER_ERROR_HLSL_MISSING_INITIALIZER, "Const variable \"%s\" is missing an initializer.", var->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } @@ -1480,6 +1491,7 @@ static struct list *declare_vars(struct hlsl_ctx *ctx, struct hlsl_type *basic_t "Variable \"%s\" was already declared in this scope.", var->name); hlsl_note(ctx, &old->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously declared here.", old->name); hlsl_free_var(var); + free_parse_initializer(&v->initializer); vkd3d_free(v); continue; } -- 2.25.1

2 1

[PATCH vkd3d v3 3/8] vkd3d-shader/hlsl: Concatenate nested initializers.
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - It seemed right to bring this patch forward before applying the braces flag. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 459ad03b..7678cf3c 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2310,6 +2310,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <function> func_prototype %type <initializer> complex_initializer +%type <initializer> complex_initializer_list %type <initializer> func_arguments %type <initializer> initializer_expr_list @@ -3114,15 +3115,28 @@ complex_initializer: $$.args[0] = node_from_list($1); $$.instrs = $1; } - | '{' initializer_expr_list '}' + | '{' complex_initializer_list '}' { $$ = $2; } - | '{' initializer_expr_list ',' '}' + | '{' complex_initializer_list ',' '}' { $$ = $2; } +complex_initializer_list: + complex_initializer + | complex_initializer_list ',' complex_initializer + { + $$ = $1; + if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + $3.args_count) * sizeof(*$$.args)))) + YYABORT; + for (unsigned int i = 0; i < $3.args_count; i++) + $$.args[$$.args_count++] = $3.args[i]; + list_move_tail($$.instrs, $3.instrs); + free_parse_initializer(&$3); + } + initializer_expr: assignment_expr -- 2.25.1

2 1

[PATCH vkd3d v3 2/8] vkd3d-shader/hlsl: Add default writemask for matrix stores.
by Francisco Casas 05 Mar '22

05 Mar '22

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- v3: - This patch is new. - While we don't use the default writemask for matrices (yet), I think it is good for consistency, since we are getting rid of the type_is_single_reg() function. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 00a374b4..5152aec4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -527,9 +527,13 @@ struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *nam return var; } -static bool type_is_single_reg(const struct hlsl_type *type) +static unsigned int type_default_writemask(const struct hlsl_type *type) { - return type->type == HLSL_CLASS_SCALAR || type->type == HLSL_CLASS_VECTOR; + if (type->type == HLSL_CLASS_MATRIX && hlsl_type_is_row_major(type)) + return (1 << type->dimy) - 1; + if (type->type <= HLSL_CLASS_LAST_NUMERIC) + return (1 << type->dimx) - 1; + return 0; } struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *var, struct hlsl_ir_node *offset, @@ -537,8 +541,8 @@ struct hlsl_ir_store *hlsl_new_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *v { struct hlsl_ir_store *store; - if (!writemask && type_is_single_reg(rhs->data_type)) - writemask = (1 << rhs->data_type->dimx) - 1; + if (!writemask) + writemask = type_default_writemask(rhs->data_type); if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; -- 2.25.1

2 1

← Newer
1
...
78
79
80
81
82
83
84
...
95
Older →

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-devel March 2022