January 2022 - Wine-Commits

Alexandre Julliard : vkd3d-shader: Consistently use uint32_t for pointers to shader data.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: vkd3d Branch: master Commit: e21928f6ee026b2ec12ce70f37c220bf774b1c83 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e21928f6ee026b2ec12ce70… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 11:51:03 2022 +0100 vkd3d-shader: Consistently use uint32_t for pointers to shader data. Mixing uint32_t and DWORD pointers causes warnings on Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 50 ++++++++++++++++---------------- libs/vkd3d-shader/vkd3d_shader_private.h | 4 +-- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 4d37731..d28c303 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -87,7 +87,7 @@ struct vkd3d_shader_src_param_entry struct vkd3d_shader_sm4_parser { - const DWORD *start, *end; + const uint32_t *start, *end; unsigned int output_map[MAX_REG_OUTPUT]; @@ -252,7 +252,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, u { struct vkd3d_shader_semantic *semantic = &ins->declaration.semantic; enum vkd3d_sm4_resource_type resource_type; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; enum vkd3d_sm4_data_type data_type; enum vkd3d_data_type reg_data_type; DWORD components; @@ -297,7 +297,7 @@ static void shader_sm4_read_dcl_resource(struct vkd3d_shader_instruction *ins, u static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_src_param(priv, &tokens, end, VKD3D_DATA_FLOAT, &ins->declaration.cb.src); shader_sm4_set_descriptor_register_range(priv, &ins->declaration.cb.src.reg, &ins->declaration.cb.range); @@ -323,7 +323,7 @@ static void shader_sm4_read_dcl_constant_buffer(struct vkd3d_shader_instruction static void shader_sm4_read_dcl_sampler(struct vkd3d_shader_instruction *ins, uint32_t opcode, uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; ins->flags = (opcode_token & VKD3D_SM4_SAMPLER_MODE_MASK) >> VKD3D_SM4_SAMPLER_MODE_SHIFT; if (ins->flags & ~VKD3D_SM4_SAMPLER_COMPARISON) @@ -342,7 +342,7 @@ static void shader_sm4_read_dcl_index_range(struct vkd3d_shader_instruction *ins } static void shader_sm4_read_dcl_output_topology(struct vkd3d_shader_instruction *ins, uint32_t opcode, - uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { enum vkd3d_sm4_output_primitive_type primitive_type; @@ -495,7 +495,7 @@ static void shader_sm5_read_dcl_hs_max_tessfactor(struct vkd3d_shader_instructio } static void shader_sm5_read_dcl_thread_group(struct vkd3d_shader_instruction *ins, uint32_t opcode, - uint32_t opcode_token, const DWORD *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) + uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { ins->declaration.thread_group_size.x = *tokens++; ins->declaration.thread_group_size.y = *tokens++; @@ -506,7 +506,7 @@ static void shader_sm5_read_dcl_uav_raw(struct vkd3d_shader_instruction *ins, ui const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -518,7 +518,7 @@ static void shader_sm5_read_dcl_uav_structured(struct vkd3d_shader_instruction * uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_UAV, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -553,7 +553,7 @@ static void shader_sm5_read_dcl_resource_structured(struct vkd3d_shader_instruct uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_structured_resource *resource = &ins->declaration.structured_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -567,7 +567,7 @@ static void shader_sm5_read_dcl_resource_raw(struct vkd3d_shader_instruction *in uint32_t opcode_token, const uint32_t *tokens, unsigned int token_count, struct vkd3d_shader_sm4_parser *priv) { struct vkd3d_shader_raw_resource *resource = &ins->declaration.raw_resource; - const DWORD *end = &tokens[token_count]; + const uint32_t *end = &tokens[token_count]; shader_sm4_read_dst_param(priv, &tokens, end, VKD3D_DATA_RESOURCE, &resource->resource.reg); shader_sm4_set_descriptor_register_range(priv, &resource->resource.reg.reg, &resource->resource.range); @@ -1465,7 +1465,7 @@ static void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, stru const uint32_t **ptr = &parser->ptr; unsigned int i, len; size_t remaining; - const DWORD *p; + const uint32_t *p; DWORD precise; list_move_head(&sm4->src_free, &sm4->src); @@ -1692,7 +1692,7 @@ static bool require_space(size_t offset, size_t count, size_t size, size_t data_ return !count || (data_size - offset) / count >= size; } -static void read_dword(const char **ptr, DWORD *d) +static void read_dword(const char **ptr, uint32_t *d) { memcpy(d, *ptr, sizeof(*d)); *ptr += sizeof(*d); @@ -1700,14 +1700,14 @@ static void read_dword(const char **ptr, DWORD *d) static void read_float(const char **ptr, float *f) { - STATIC_ASSERT(sizeof(float) == sizeof(DWORD)); - read_dword(ptr, (DWORD *)f); + STATIC_ASSERT(sizeof(float) == sizeof(uint32_t)); + read_dword(ptr, (uint32_t *)f); } static void skip_dword_unknown(const char **ptr, unsigned int count) { unsigned int i; - DWORD d; + uint32_t d; WARN("Skipping %u unknown DWORDs:\n", count); for (i = 0; i < count; ++i) @@ -1744,11 +1744,11 @@ static int parse_dxbc(const char *data, size_t data_size, uint32_t checksum[4], calculated_checksum[4]; const char *ptr = data; int ret = VKD3D_OK; - DWORD chunk_count; - DWORD total_size; + uint32_t chunk_count; + uint32_t total_size; unsigned int i; - DWORD version; - DWORD tag; + uint32_t version; + uint32_t tag; if (data_size < VKD3D_DXBC_HEADER_SIZE) { @@ -1803,9 +1803,9 @@ static int parse_dxbc(const char *data, size_t data_size, for (i = 0; i < chunk_count; ++i) { - DWORD chunk_tag, chunk_size; + uint32_t chunk_tag, chunk_size; const char *chunk_ptr; - DWORD chunk_offset; + uint32_t chunk_offset; read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); @@ -1847,7 +1847,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, struct vkd3d_shader_signature_element *e; const char *ptr = data; unsigned int i; - DWORD count; + uint32_t count; if (!require_space(0, 2, sizeof(DWORD), data_size)) { @@ -1877,7 +1877,7 @@ static int shader_parse_signature(DWORD tag, const char *data, DWORD data_size, for (i = 0; i < count; ++i) { - DWORD name_offset, mask; + uint32_t name_offset, mask; if (has_stream_index) read_dword(&ptr, &e[i].stream_index); @@ -1998,7 +1998,7 @@ static int shdr_handler(const char *data, DWORD data_size, DWORD tag, void *cont case TAG_SHEX: if (desc->byte_code) FIXME("Multiple shader code chunks.\n"); - desc->byte_code = (const DWORD *)data; + desc->byte_code = (const uint32_t *)data; desc->byte_code_size = data_size; break; @@ -2355,7 +2355,7 @@ static int shader_parse_root_parameters(struct root_signature_parser_context *co } static int shader_parse_root_parameters1(struct root_signature_parser_context *context, - DWORD offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) + uint32_t offset, DWORD count, struct vkd3d_shader_root_parameter1 *parameters) { const char *ptr; unsigned int i; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 9cd26d7..1de67f4 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -638,7 +638,7 @@ struct vkd3d_shader_version struct vkd3d_shader_immediate_constant_buffer { unsigned int vec4_count; - DWORD data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; + uint32_t data[MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE]; }; struct vkd3d_shader_indexable_temp @@ -762,7 +762,7 @@ enum vkd3d_shader_input_sysval_semantic struct vkd3d_shader_desc { - const DWORD *byte_code; + const uint32_t *byte_code; size_t byte_code_size; struct vkd3d_shader_signature input_signature; struct vkd3d_shader_signature output_signature;

1 0

Alexandre Julliard : vkd3d-shader: Use LONG type with InterlockedIncrement.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: vkd3d Branch: master Commit: 7710f5deaf05b2c2c76b89fa2cf61a3f767af5bb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7710f5deaf05b2c2c76b89f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 31 11:51:58 2022 +0100 vkd3d-shader: Use LONG type with InterlockedIncrement. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 47fe3d6..ae0662b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -308,7 +308,7 @@ void set_u32(struct vkd3d_bytecode_buffer *buffer, size_t offset, uint32_t value static void vkd3d_shader_dump_blob(const char *path, const char *prefix, const char *suffix, const void *data, size_t size) { - static int shader_id = 0; + static LONG shader_id = 0; char filename[1024]; unsigned int id; FILE *f;

1 0

Alexandre Julliard : Update favicon.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: website Branch: master Commit: b79f87d1e7850b3b3b6254266bc0d76f5e8ac7d6 URL: https://source.winehq.org/git/website.git/?a=commit;h=b79f87d1e7850b3b3b625… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 30 13:34:28 2022 +0100 Update favicon. Extracted from oic_winelogo.svg. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52088 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- favicon.ico | Bin 1150 -> 5430 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/favicon.ico b/favicon.ico index 3a71334b..0f5814c9 100644 Binary files a/favicon.ico and b/favicon.ico differ

1 0

Alexandre Julliard : packaging: Remove Ubuntu 21.04.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: tools Branch: master Commit: 02d3b1e3417c821dba516c2b1f5f4ca585bb4ac9 URL: https://source.winehq.org/git/tools.git/?a=commit;h=02d3b1e3417c821dba516c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jan 29 09:51:12 2022 +0100 packaging: Remove Ubuntu 21.04. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- packaging/obs/apt-mirror.cfg | 4 ---- packaging/obs/obs-sync | 3 +-- packaging/obs/rsync-filter | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/packaging/obs/apt-mirror.cfg b/packaging/obs/apt-mirror.cfg index 186f65a..079a68a 100644 --- a/packaging/obs/apt-mirror.cfg +++ b/packaging/obs/apt-mirror.cfg @@ -34,10 +34,6 @@ deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUb deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ -deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ - deb-amd64 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-i386 https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ deb-src https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_… ./ diff --git a/packaging/obs/obs-sync b/packaging/obs/obs-sync index 71844e9..b0ec672 100755 --- a/packaging/obs/obs-sync +++ b/packaging/obs/obs-sync @@ -184,7 +184,7 @@ publish_files () cd $basedir -distros="34 35 buster bullseye bookworm bionic focal hirsute impish" +distros="34 35 buster bullseye bookworm bionic focal impish" dry_run= build=1 @@ -243,7 +243,6 @@ do bookworm) add_deb debian $i Debian_Testing_standard testing ;; bionic) add_deb ubuntu $i xUbuntu_18.04 ;; focal) add_deb ubuntu $i xUbuntu_20.04 ;; - hirsute) add_deb ubuntu $i xUbuntu_21.04 ;; impish) add_deb ubuntu $i xUbuntu_21.10 ;; *) echo "Unknown distro $i"; exit 1 ;; esac diff --git a/packaging/obs/rsync-filter b/packaging/obs/rsync-filter index 8541204..7b8299e 100644 --- a/packaging/obs/rsync-filter +++ b/packaging/obs/rsync-filter @@ -18,7 +18,6 @@ + /ubuntu/dists + /ubuntu/dists/bionic + /ubuntu/dists/focal -+ /ubuntu/dists/hirsute + /ubuntu/dists/impish - /ubuntu/dists/* - /ubuntu/*

1 0

Francois Gouget : testbot/SetWinLocale: Re-set --locale if it does not stick after the reboot.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: tools Branch: master Commit: c5fbcedc611d5fcde1fba64fcf98a4f571be480f URL: https://source.winehq.org/git/tools.git/?a=commit;h=c5fbcedc611d5fcde1fba64… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 31 16:06:32 2022 +0100 testbot/SetWinLocale: Re-set --locale if it does not stick after the reboot. On Windows 10 21H1 some process typically resets the --locale and --country some time after the login (except when they are changed through the GUI)!!! So wait for the reset to happen and set them again so they are as expected at least until the next reboot :-( Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 92 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 18cbfc2..81bb221 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -41,6 +41,8 @@ use WineTestBot::Log; use WineTestBot::TestAgent; use WineTestBot::Utils; +my $HKCU_INTERNATIONAL = "HKCU\\Control Panel\\International"; +my $HKCU_GEO = "HKCU\\Control Panel\\International\\Geo"; my $HKCU_USER_PROFILE = "HKCU\\Control Panel\\International\\User Profile"; @@ -499,12 +501,18 @@ if (defined $Usage) print " ISO 639-1 language code and CC an ISO 3166-1 alpha-2 country\n"; print " code.\n"; print " --locale LOC Specifies the user formats (see --defaults).\n"; + print " . Windows 10 may reset this setting a few seconds after a\n"; + print " the next log in. Thus one should not expect this change to\n"; + print " persist after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Region -> Regional\n"; print " format.\n"; print " . APIs: GetUserDefaultLCID().\n"; print " . Powershell: Set-Culture LOC\n"; print " --country CTY Specifies the location using only the country part of the\n"; print " Windows locale (see --defaults).\n"; + print " . Windows 10 may reset this setting a few seconds after a\n"; + print " the next log in. Thus one should not expect this change to\n"; + print " persist after a reboot.\n"; print " . Windows 10 GUI: Time & language -> Region -> Country.\n"; print " . APIs: GetUserGeoID().\n"; print " . Powershell: Set-WinHomeLocation -GeoId CTY-ID\n"; @@ -555,9 +563,10 @@ if (defined $Usage) print " . Powershell (Windows 11+): Copy-UserInternationalSettingsToSystem -NewUser \$True\n"; print " . Intl.cpl: CopySettingsToDefaultUserAcct='true'\n"; print " --no-def-copy Do not copy the current locales to the default user account.\n"; - print " --no-reboot Do not reboot Windows. Some locale changes only take effect\n"; - print " after a reboot so this option should only be used for\n"; - print " debugging.\n"; + print " --no-reboot Do not reboot Windows. Some locale changes will only take\n"; + print " effect after the next reboot. This will also prevent working\n"; + print " around cases where some locale changes do not stick after a\n"; + print " reboot. So this should only be used for debugging.\n"; print " --debug Show more detailed information about progress.\n"; print " --help Shows this usage message.\n"; exit 0; @@ -713,9 +722,10 @@ sub ShowWinSettings($) print "InputMethod (--keyboard) = ", Value2Str($Settings->{DefInputMethod}), "\n"; } +my $InitialSettings = GetWinSettings(); if ($OptShow) { - ShowWinSettings(GetWinSettings()); + ShowWinSettings($InitialSettings); Cleanup(); exit(0); } @@ -814,24 +824,32 @@ $OptKeyboard ||= $OptDefault; # -# Change the Windows locale +# Helper to change the Windows locales # -my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", - "$name0.ps1", "locales", $OptLocale || ".", $CountryId || ".", - $OptSystem || ".", $OptUTF8 ? "true" : "false", $OptMUI || ".", - $KeyboardIds ? $KeyboardIds->[0] : ".", - $OptSysCopy ? "true" : "false", $OptDefCopy ? "true" : "false"]; -Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); -my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); -FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); -my $Out = $TA->GetFileToString("$name0.out"); -foreach my $Line (split /\n/, $Out || "") +sub SetWinLocales($$$$$$$$) { - $Line =~ s/\r$//; - Info("$Line\n"); + my ($SysCopy, $DefCopy, $Locale, $CountryId, $System, $UTF8, $MUI, $KeyboardIds) = @_; + + my $Cmd = ["powershell.exe", "-ExecutionPolicy", "ByPass", "-File", + "$name0.ps1", "locales", $Locale || ".", $CountryId || ".", + $System || ".", $UTF8 ? "true" : "false", $MUI || ".", + $KeyboardIds ? $KeyboardIds->[0] : ".", + $SysCopy ? "true" : "false", $DefCopy ? "true" : "false"]; + Debug(Elapsed($Start), " Running: ", join(" ", @$Cmd), "\n"); + my $Ret = $TA->RunAndWait($Cmd, 0, 30, undef, "$name0.out", "$name0.out"); + FatalError("$name0.ps1 locales failed: ", $TA->GetLastError(), "\n") if ($Ret < 0); + my $Out = $TA->GetFileToString("$name0.out"); + foreach my $Line (split /\n/, $Out || "") + { + $Line =~ s/\r$//; + Info("$Line\n"); + } } +SetWinLocales($OptSysCopy, $OptDefCopy, $OptLocale, $CountryId, + $OptSystem, $OptUTF8, $OptMUI, $KeyboardIds); + # # Reboot to finalize the changes @@ -839,7 +857,7 @@ foreach my $Line (split /\n/, $Out || "") if ($OptReboot) { - $Cmd = ["shutdown.exe", "/r", "/t", "0"]; + my $Cmd = ["shutdown.exe", "/r", "/t", "0"]; Debug(Elapsed($Start), " Rebooting: ", join(" ", @$Cmd), "\n"); $TA->Run($Cmd, 0); # Note that we cannot wait for this command since it reboots Windows @@ -853,6 +871,44 @@ if ($OptReboot) { FatalError("could not reconnect to $OptHostName after the reboot: ", $TA->GetLastError(), "\n"); } + + # Skip this check on pre-Windows 10 versions, i.e. those that don't have + # 'CountryName' and if the settings were not changed in the first place. + if ($InitialSettings->{CountryName} and + (($OptLocale and $InitialSettings->{Locale} ne $OptLocale) or + ($OptCountry and $InitialSettings->{Country} ne $CountryId))) + { + # On Windows 10 21H1 some process typically resets the --locale and + # --country some time after the login!!! + # This also happens when making the change through the Powershell's + # Set-Culture and Set-WinHomeLocation calls, but not when manually going + # through the GUI. + # So wait for the reset to happen and re-set them :-( + my $Expected = $OptLocale ? "--locale $OptLocale" : ""; + $Expected .= !$OptCountry ? "" : (($Expected ? " and " : "") . ("--country $OptCountry")); + Debug(Elapsed($Start), " Expecting $Expected to get reverted\n"); + foreach (1..30) + { + my $Reverted; + if ($OptCountry) + { + my $Nation = RegGetValue($HKCU_GEO, "Nation"); + $Reverted = "--country $Nation" if ($Nation ne $CountryId); + } + else + { + my $LocaleName = RegGetValue($HKCU_INTERNATIONAL, "LocaleName"); + $Reverted = "--locale $LocaleName" if ($LocaleName ne $OptLocale); + } + if ($Reverted) + { + Warning("$Expected got reverted to $Reverted. Setting them again but this will not stick across reboots\n"); + SetWinLocales(undef, undef, $OptLocale, $CountryId, undef, undef, undef, undef); + last; + } + sleep(2); + } + } }

1 0

Francois Gouget : testbot/SetWinLocale: Nls:InstallLanguage is unaffected by --system.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: tools Branch: master Commit: a369e34e4e9ed61193e77c0a3d02be9581877f8e URL: https://source.winehq.org/git/tools.git/?a=commit;h=a369e34e4e9ed61193e77c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 31 15:53:08 2022 +0100 testbot/SetWinLocale: Nls:InstallLanguage is unaffected by --system. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 6535c49..18cbfc2 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -690,8 +690,8 @@ sub ShowWinSettings($) print "\n"; print "System settings:\n"; print "Nls:Language (--system) = ", Value2Str($Settings->{SysLanguage}), "\n"; - print "Nls:InstallLang (--system) = ", Value2Str($Settings->{SysInstallLang}), "\n"; print "Nls:Locale (--system) = ", Value2Str($Settings->{SysLocale}), "\n"; + print "Nls:InstallLang = ", Value2Str($Settings->{SysInstallLang}), "\n"; print "ACP (--utf8) = ", Value2Str($Settings->{ACP}), "\n"; print "MACCP (--utf8) = ", Value2Str($Settings->{MACCP}), "\n"; print "OEMCP (--utf8) = ", Value2Str($Settings->{OEMCP}), "\n";

1 0

Francois Gouget : testbot/SetWinLocale: Take --reboot into account when checking the results.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Module: tools Branch: master Commit: d003d1096624d1e3c8851861051400624f4b73a8 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d003d1096624d1e3c885186… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jan 31 15:07:10 2022 +0100 testbot/SetWinLocale: Take --reboot into account when checking the results. Don't complain about settings that are only modified after a reboot if none took place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 2ff8348..6535c49 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -904,7 +904,19 @@ if ($OptUTF8) } if ($OptMUI) { - CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($OptReboot) + { + CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI"); + if ($Settings->{PreferredUILanguagesPending}) + { + Error("PreferredUILanguagesPending should not be set for --mui $OptMUI\n"); + $Success = 0; + } + } + else + { + CheckSetting($Settings, "PreferredUILanguagesPending", $OptMUI, "for --mui $OptMUI"); + } } if ($KeyboardIds) { @@ -923,7 +935,7 @@ if ($OptSysCopy) CheckSetting($Settings, "DefCountry", $CountryId, "for --country $OptCountry"); CheckSetting($Settings, "DefCountryName", $OptCountry, "for --country $OptCountry"); } - if ($OptMUI) + if ($OptMUI and $OptReboot) { CheckSetting($Settings, "DefMachinePreferredUILanguages", $OptMUI, "for --mui $OptMUI"); } @@ -932,6 +944,13 @@ if ($OptSysCopy) CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1); } } +if (!$OptReboot and ($OptSystem or $OptMUI)) +{ + my @Pending; + push @Pending, "--system $OptSystem" if ($OptSystem); + push @Pending, "--mui $OptMUI" if ($OptMUI); + Warning(join(" ", "the", @Pending, "changes are still pending\n")); +} Cleanup(); exit(1) if (!$Success);

1 0

CJ Silver : WWN Issue 410
by Jeremy Newman Jan. 28, 2022

Jan. 28, 2022

Module: website Branch: master Commit: 02ab9dc8705e915dce027243e3cf34b398fa67f8 URL: https://source.winehq.org/git/website.git/?a=commit;h=02ab9dc8705e915dce027… Author: CJ Silver <cjsilver(a)codeweavers.com> Date: Fri Jan 28 15:46:51 2022 -0600 WWN Issue 410 --- news/en/2022012802.xml | 18 ++ wwn/en/wn20220128_410.xml | 472 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 490 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=02ab9dc8705e915dc…

1 0

Alexandre Julliard : Wine release 7.1
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: website Branch: master Commit: b7e7cc906aa85f31cc49cd5e6dc4633caee4c30d URL: https://source.winehq.org/git/website.git/?a=commit;h=b7e7cc906aa85f31cc49c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 21:29:57 2022 +0100 Wine release 7.1 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022012801.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/news/en/2022012801.xml b/news/en/2022012801.xml new file mode 100644 index 00000000..72a10388 --- /dev/null +++ b/news/en/2022012801.xml @@ -0,0 +1,18 @@ +<news> +<date>January 28, 2022</date> +<title>Wine 7.1 Released</title> +<body> + The Wine development release 7.1 is now available. + <a href="{$root}/announce/7.1">What's new</a> in this release: +<ul> + <li>Vulkan 1.3 support.</li> + <li>A number of theming fixes.</li> + <li>WebSocket improvements.</li> + <li>Improved cursor clipping on macOS.</li> + <li>IDL compiler fixes for C++.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.1.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

Tag wine-7.1 : Alexandre Julliard : Release 7.1
by Alexandre Julliard Jan. 28, 2022

Jan. 28, 2022

Module: wine Branch: refs/tags/wine-7.1 Tag: 0201e7bb92a01cfa3a5a5f5551a98844b0ae8e74 URL: https://source.winehq.org/git/wine.git/?a=tag;h=0201e7bb92a01cfa3a5a5f5551a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 21:27:46 2022 +0100 Release 7.1

1 0