- Wine-Devel - list.winehq.org

[PATCH v2 1/4] msvcrt: Fix fmaf not to depend on rounding mode.
by Piotr Caban Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - remove nearbyint msvcr120 specific behavior and tests - it was fixed in newer version of the dll dlls/msvcrt/math.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)

1 0

[PATCH 4/4] msvcrt: Don't use fegetenv in nearbyintf.
by Piotr Caban Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-)

1 0

[PATCH 2/4] msvcrt: Don't set SSE control word in _except1.
by Piotr Caban Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] msvcrt: Fix fmaf not to depend on rounding mode.
by Piotr Caban Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/math.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)

1 0

[PATCH v2 1/5] user32/tests: Tweak window size to fix Win10 results.
by Rémi Bernon Jan. 31, 2022

Jan. 31, 2022

Fix these failures: > win.c:2445: Test failed: style 0x200000: expected !100 > win.c:2445: Test failed: style 0x300000: expected !100 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: Drop the pre-existing window removal patch, add a new patch to reduce msg test verbosity. dlls/user32/tests/win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index cb6b61e59c0..e48d7bea513 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2249,7 +2249,7 @@ static void test_mdi(void) mdi_hwndMain = CreateWindowExA(0, "MDI_parent_Class", "MDI parent window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_MAXIMIZEBOX /*| WS_VISIBLE*/, - 100, 100, CW_USEDEFAULT, CW_USEDEFAULT, + 200, 100, CW_USEDEFAULT, CW_USEDEFAULT, GetDesktopWindow(), 0, GetModuleHandleA(NULL), NULL); assert(mdi_hwndMain); -- 2.34.1

2 9

[PATCH 01/24] dxva2/tests: Avoid "misleading indentation" warnings.
by Fabian Maurer Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/dxva2/tests/dxva2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxva2/tests/dxva2.c b/dlls/dxva2/tests/dxva2.c index 5de39fe1360..d94299f0c78 100644 --- a/dlls/dxva2/tests/dxva2.c +++ b/dlls/dxva2/tests/dxva2.c @@ -356,7 +356,7 @@ static void test_device_manager(void) count = 0; hr = IDirectXVideoProcessorService_GetVideoProcessorDeviceGuids(proc_service, &video_desc, &count, &guids); - todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) + todo_wine_if(rt_formats[i] == MAKEFOURCC('A','Y','U','V')) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); if (FAILED(hr)) continue; ok(count > 0, "Unexpected device count.\n"); -- 2.35.0

8 41

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

Jan. 31, 2022

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> --- This is why UserDefaultLCID is wrong in many of the TestBot VMs :-( Unfortunately I did not find what's causing the settings to be reset, and what's the difference with changing them through the GUI. At least with this patch GetUserDefaultLCID() and GetUserGeoID() return the expected values in the tests (except when LibvirtTool triggers another reboot before taking the snapshot). --- testbot/bin/SetWinLocale | 92 ++++++++++++++++++++++++++++++++-------- 1 file changed, 74 insertions(+), 18 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 18cbfc22c5..81bb2212b1 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); + } + } } -- 2.30.2

1 0

[tools] testbot/SetWinLocale: Nls:InstallLanguage is unaffected by --system.
by Francois Gouget Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/SetWinLocale | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index 6535c49396..18cbfc22c5 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"; -- 2.30.2

1 0

[v2 PATCH 08/14] dlls/evr: use correct integral type
by Nikolay Sivov Jan. 31, 2022

Jan. 31, 2022

From: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: keeps existing formatting for declarations. dlls/evr/mixer.c | 5 +++-- dlls/evr/presenter.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index 5af5b2861b3..3d72270fc16 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -906,8 +906,9 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D const unsigned int equality_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; struct video_mixer *mixer = impl_from_IMFTransform(iface); HRESULT hr = MF_E_INVALIDMEDIATYPE; - unsigned int i, compare_flags; BOOL is_compressed = TRUE; + DWORD compare_flags; + unsigned int i; TRACE("%p, %u, %p, %#x.\n", iface, id, type, flags); @@ -1557,7 +1558,7 @@ static HRESULT WINAPI video_mixer_service_client_InitServicePointers(IMFTopology IMFTopologyServiceLookup *service_lookup) { struct video_mixer *mixer = impl_from_IMFTopologyServiceLookupClient(iface); - unsigned int count; + DWORD count; HRESULT hr; TRACE("%p, %p.\n", iface, service_lookup); diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index fd02404b7af..cf8ba20cbb8 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -282,7 +282,7 @@ static void video_presenter_reset_media_type(struct video_presenter *presenter) static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, IMFMediaType *media_type) { - unsigned int flags; + DWORD flags; HRESULT hr; if (!media_type) @@ -328,9 +328,9 @@ static HRESULT video_presenter_set_media_type(struct video_presenter *presenter, static HRESULT video_presenter_configure_output_type(struct video_presenter *presenter, const MFVideoArea *aperture, IMFMediaType *media_type) { - unsigned int size; GUID subtype; LONG stride; + DWORD size; HRESULT hr; hr = IMFMediaType_SetUINT64(media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture->Area.cx << 32 | aperture->Area.cy); @@ -1104,8 +1104,8 @@ static void video_presenter_set_mixer_rect(struct video_presenter *presenter) static HRESULT video_presenter_attach_mixer(struct video_presenter *presenter, IMFTopologyServiceLookup *service_lookup) { IMFVideoDeviceID *device_id; - unsigned int count; GUID id = { 0 }; + DWORD count; HRESULT hr; count = 1; @@ -1143,8 +1143,8 @@ static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopo IMFTopologyServiceLookup *service_lookup) { struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); - unsigned int count; HRESULT hr = S_OK; + DWORD count; TRACE("%p, %p.\n", iface, service_lookup); -- 2.34.1

1 0

[PATCH vkd3d 3/3] vkd3d-shader: Use LONG type with InterlockedIncrement.
by Alexandre Julliard Jan. 31, 2022

Jan. 31, 2022

Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 47fe3d60d27f..ae0662b83cac 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; -- 2.34.1

2 1