January 2022 - Wine-Commits

Francois Gouget : testbot/SetWinLocale: Warn when a locale may not be installed.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: tools Branch: master Commit: af4c91dbc73b4afa0176d1f9e1ffeb02fa6fdbd0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=af4c91dbc73b4afa0176d1f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 11 19:21:17 2022 +0100 testbot/SetWinLocale: Warn when a locale may not be installed. 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 0c7bbc4..8d629da 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -672,7 +672,7 @@ sub GetWinKeyboardIds($) $WinKeyboardIds{$Locale} ||= $Keyboards{$Locale}; if (!$WinKeyboardIds{$Locale}) { - FatalError("could not find the $Locale LCID and keyboard ids\n"); + FatalError("could not find the $Locale LCID and keyboard ids. Maybe the locale is not installed?\n"); } my $WinLCID = uc($WinKeyboardIds{$Locale}->[0]);

1 0

Francois Gouget : testbot/TestAgent: Simplify running and waiting for a remote command.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: tools Branch: master Commit: fb6efdbd9146196406e9521aa1d1a65f1a50318c URL: https://source.winehq.org/git/tools.git/?a=commit;h=fb6efdbd9146196406e9521… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 11 19:20:06 2022 +0100 testbot/TestAgent: Simplify running and waiting for a remote command. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/TestAgent.pm | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 0aa59da..fea7e65 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -1354,6 +1354,30 @@ sub Wait($$$;$) return $Result; } +=pod +=over 12 + +=item C<RunAndWait()> + +Starts the specified command and waits for it to complete, returning its exit +code or a negative value if running or waiting for it failed. + +Note: The TestAgent-side error codes make it so that in most cases any non-zero + return value indicates that the command did not run successfully. + +=back +=cut + +sub RunAndWait($$$;$$$$$) +{ + my ($self, $Argv, $Flags, $WaitTimeout, $ServerInPath, $ServerOutPath, $ServerErrPath, $Keepalive) = @_; + + my $Pid = $self->Run($Argv, $Flags, $ServerInPath, $ServerOutPath, $ServerErrPath); + return -1 if (!$Pid); + my $Ret = $self->Wait($Pid, $WaitTimeout, $Keepalive); + return defined $Ret ? $Ret : -2; +} + sub Rm($@) { my $self = shift @_;

1 0

Francois Gouget : testbot/SetWinLocale: Use RunAndWait() to simplify the registry access.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: tools Branch: master Commit: 0641c9fbb87f1005123978bcccc33cacdd7c51e0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=0641c9fbb87f1005123978b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 11 19:20:12 2022 +0100 testbot/SetWinLocale: Use RunAndWait() to simplify the registry access. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index a6e95a2..0f624e8 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -505,6 +505,12 @@ my $TA = TestAgent->new($OptHostName, $AgentPort); # Registry helpers # +sub GetRunError($) +{ + my ($ExitCode) = @_; + return $TA->GetLastError() || "exit code $ExitCode"; +} + sub RegGetValues($;$) { my ($Key, $VName) = @_; @@ -519,17 +525,11 @@ sub RegGetValues($;$) push @$Cmd, "/ve"; } - my $Pid = $TA->Run($Cmd, 0, undef, "reg.out"); - if (!$Pid) - { - FatalError("failed to run @$Cmd\n"); - } - if (!defined $TA->Wait($Pid, 10)) - { - FatalError("@$Cmd timed out: ", $TA->GetLastError(), "\n"); - } - my $RegOut = $TA->GetFileToString("reg.out"); + my $Ret = $TA->RunAndWait($Cmd, 0, 10, undef, "reg.out"); + FatalError("failed to run @$Cmd: ", $TA->GetLastError(), "\n") if ($Ret < 0); + my $RegOut = $TA->GetFileToString("reg.out") if (!$Ret); $TA->Rm("reg.out"); + return {} if ($Ret); # Presumably the registry key does not exist my $Values = {}; foreach my $Line (split /\n/, $RegOut) @@ -560,15 +560,8 @@ sub RegSetValue($$$$) $Value = join("\\0", @$Value) if (ref($Value) eq "ARRAY"); push @$Cmd, "/t" , $Type, "/d", $Value; - my $Pid = $TA->Run($Cmd, 0); - if (!$Pid) - { - FatalError("failed to run @$Cmd\n"); - } - if (!defined $TA->Wait($Pid, 10)) - { - FatalError("@$Cmd timed out: ", $TA->GetLastError(), "\n"); - } + my $Ret = $TA->RunAndWait($Cmd, 0, 10); + FatalError("@$Cmd failed: ", GetRunError($Ret), "\n") if ($Ret); }

1 0

Francois Gouget : testbot/SetWinLocale: Add the en-US keyboard layout.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: tools Branch: master Commit: 3ac32b645bc72e82ec81b4972282ab71ee12c4a4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=3ac32b645bc72e82ec81b49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 11 19:20:49 2022 +0100 testbot/SetWinLocale: Add the en-US keyboard layout. 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 8d629da..b2da673 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -196,7 +196,7 @@ my %Keyboards = ( "dv-MV" => ["0465:00000465"], # Divehi - Maldives "el-GR" => ["0408:00000408"], # Greek - Greece "en-GB" => ["0809:00000809"], # English - Great Britain - "en-US" => undef, # English - United States + "en-US" => ["0409:00000409"], # English - United States "es-ES" => ["0c0a:0000040a"], # Spanish - Spain "et-EE" => ["0425:00000425"], # Estonian - Estonia "eu-ES" => ["042d:0000040a"], # Basque - Basque

1 0

Francois Gouget : testbot/SetWinLocale: Windows omits the country for some locales.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: tools Branch: master Commit: b2f1c4ab239a65a1c845270d64662ce0041563c4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b2f1c4ab239a65a1c845270… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 11 19:21:07 2022 +0100 testbot/SetWinLocale: Windows omits the country for some locales. For instance one finds the hi-IN information in the "User Profile\hi" subkey. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index b2da673..a6e95a2 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -663,6 +663,12 @@ sub GetWinKeyboardIds($) # Look for that locale's keyboard id. # Its first component is the locale's LCID. my $Values = RegGetValues("$HKCU_USER_PROFILE\\$Locale", "*:*"); + if (!%$Values) + { + my $Lang = $Locale; + $Lang =~ s/-.*$//; + $Values = RegGetValues("$HKCU_USER_PROFILE\\$Lang", "*:*"); + } foreach my $VName (keys %$Values) { next if ($VName !~ /^[0-9A-F]{4}:/);

1 0

Francois Gouget : testbot/SetWinLocale: Add and correct some country codes.
by Alexandre Julliard Jan. 11, 2022

Jan. 11, 2022

Module: tools Branch: master Commit: 49ec8c22eb9438bbe03656efd6bbd89c71c1cf06 URL: https://source.winehq.org/git/tools.git/?a=commit;h=49ec8c22eb9438bbe03656e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jan 11 19:21:28 2022 +0100 testbot/SetWinLocale: Add and correct some country codes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/SetWinLocale | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale index c8f681a..0c7bbc4 100755 --- a/testbot/bin/SetWinLocale +++ b/testbot/bin/SetWinLocale @@ -98,12 +98,18 @@ sub FatalError(@) # Country and keyboard tables # +# Map the two-letter country identifier to the Windows country code used in +# the registry. Note that this does not match the CTRY_XXX codes! my %Countries = ( + "AD" => 8, # Andorra + "AE" => 224, # United Arab Emirates "AF" => 3, # Afganistan "AL" => 6, # Albania + "DZ" => 4, # Algeria "AM" => 7, # Armenia "AR" => 11, # Argentina "AT" => 14, # Austria + "AU" => 12, # Australia "AZ" => 5, # Azerbaijan "BA" => 25, # Bosnia and Herzegovina "BE" => 21, # Belgium @@ -114,7 +120,7 @@ my %Countries = ( "CA" => 39, # Canada "CH" => 223, # Switzerland "CN" => 45, # China - "CX" => 12, # Australia + "CX" => 309, # Christmas Island "CZ" => 75, # Czech Republic "DE" => 94, # Germany "DK" => 61, # Denmark

1 0

Nikolay Sivov : d3d11: Always initialize out view pointer in CreateRenderTargetView().
by Alexandre Julliard Jan. 10, 2022

Jan. 10, 2022

Module: wine Branch: master Commit: df8ef3a54fa87802932343cf8ad4e48fee375526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df8ef3a54fa87802932343cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jan 8 16:03:08 2022 +0300 d3d11: Always initialize out view pointer in CreateRenderTargetView(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51195 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 4 ++++ dlls/d3d11/device.c | 4 ++++ dlls/d3d11/tests/d3d11.c | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d7fc9efa901..ca12f185ec5 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2939,8 +2939,10 @@ static void test_create_rendertarget_view(void) if (!enable_debug_layer) { + rtview = (void *)0xdeadbeef; hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); } expected_refcount = get_refcount(device) + 1; @@ -3057,8 +3059,10 @@ static void test_create_rendertarget_view(void) } get_rtv_desc(&rtv_desc, &invalid_desc_tests[i].rtv_desc); + rtview = (void *)0xdeadbeef; hr = ID3D10Device_CreateRenderTargetView(device, texture, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); ID3D10Resource_Release(texture); } diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 546449037ce..626e4889708 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3334,6 +3334,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRenderTargetView(ID3D11Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; @@ -5957,6 +5959,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Devic TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + *view = NULL; + if (!resource) return E_INVALIDARG; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index a76e5fa1295..b8fa462dc39 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -4050,8 +4050,10 @@ static void test_create_rendertarget_view(void) if (!enable_debug_layer) { + rtview = (void *)0xdeadbeef; hr = ID3D11Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); } expected_refcount = get_refcount(device) + 1; @@ -4168,8 +4170,10 @@ static void test_create_rendertarget_view(void) } get_rtv_desc(&rtv_desc, &invalid_desc_tests[i].rtv_desc); + rtview = (void *)0xdeadbeef; hr = ID3D11Device_CreateRenderTargetView(device, texture, &rtv_desc, &rtview); ok(hr == E_INVALIDARG, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(!rtview, "Unexpected pointer %p.\n", rtview); ID3D11Resource_Release(texture); }

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard Jan. 10, 2022

Jan. 10, 2022

Module: wine Branch: master Commit: 695c320507f89539378b93bcf8221b1bc8965325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=695c320507f89539378b93bc… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Jan 10 13:50:08 2022 +0100 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/po/de.po b/po/de.po index 81502ef5da0..bcf84359f70 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-10-21 09:30+0200\n" +"PO-Revision-Date: 2022-01-10 13:49+0200\n" "Last-Translator: Julian Rüger <jr98(a)gmx.net>\n" "Language-Team: German\n" "Language: de\n" @@ -10555,22 +10555,16 @@ msgid "(UTC+00:00) Dublin, Edinburgh, Lisbon, London" msgstr "(UTC+00:00) Dublin, Edinburgh, Lissabon, London" #: dlls/tzres/tzres.rc:342 -#, fuzzy -#| msgid "Sudan Standard Time" msgid "South Sudan Standard Time" -msgstr "Sudan Normalzeit" +msgstr "Südsudan Normalzeit" #: dlls/tzres/tzres.rc:343 -#, fuzzy -#| msgid "Sudan Daylight Time" msgid "South Sudan Daylight Time" -msgstr "Sudan Sommerzeit" +msgstr "Südsudan Sommerzeit" #: dlls/tzres/tzres.rc:344 -#, fuzzy -#| msgid "(UTC+02:00) Jerusalem" msgid "(UTC+02:00) Juba" -msgstr "(UTC+02:00) Jerusalem" +msgstr "(UTC+02:00) Juba" #: dlls/tzres/tzres.rc:102 msgid "Central Asia Standard Time" @@ -13296,13 +13290,11 @@ msgstr "" #: programs/chcp.com/chcp.rc:28 msgid "Active code page: %1!u!\n" -msgstr "" +msgstr "Aktive Codepage: %1!u!\n" #: programs/chcp.com/chcp.rc:29 -#, fuzzy -#| msgid "Invalid message.\n" msgid "Invalid code page\n" -msgstr "Ungültige Nachricht.\n" +msgstr "Ungültige Codepage.\n" #: programs/chcp.com/chcp.rc:33 msgid "" @@ -13315,6 +13307,14 @@ msgid "" " Type CHCP without a number to display the active console code page.\n" "\n" msgstr "" +"CHCP [Nummer]\n" +"\n" +" Zeigt die aktive Codepage an oder ändert sie.\n" +"\n" +" Nummer Die Konsolencodepage, die aktiviert werden soll.\n" +"\n" +" CHCP ohne Angabe einer Nummer zeigt die aktive Codepage an.\n" +"\n" #: programs/clock/clock.rc:32 msgid "Ana&log" @@ -14498,7 +14498,7 @@ msgstr "IPv6-Adresse" #: programs/ipconfig/ipconfig.rc:38 msgid "Primary DNS suffix" -msgstr "" +msgstr "Primäres DNS-Suffix" #: programs/msinfo32/msinfo32.rc:28 msgid "System Information"

1 0

Stefan Dösinger : d3d8/tests: Reduce precision in test_filling_convention.
by Alexandre Julliard Jan. 10, 2022

Jan. 10, 2022

Module: wine Branch: master Commit: e0434bce9090b7064b2fd4d301bdf18de6bf2158 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0434bce9090b7064b2fd4d3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Jan 10 11:00:47 2022 +0300 d3d8/tests: Reduce precision in test_filling_convention. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 29baf07398c..3c61426e17f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11330,8 +11330,10 @@ static void test_filling_convention(void) }; /* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; const struct { struct vec3 position;

1 0

Alex Henrie : d3d10/tests: Increase size of array expected_i_a in test_scalar_array_methods (cppcheck).
by Alexandre Julliard Jan. 10, 2022

Jan. 10, 2022

Module: wine Branch: master Commit: e17ad3d6cb95515d22e3522ebc1af8ff863e2731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e17ad3d6cb95515d22e3522e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Dec 22 01:52:04 2021 -0700 d3d10/tests: Increase size of array expected_i_a in test_scalar_array_methods (cppcheck). This array is accessed at index 5 on line 5138. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ddc24d66e20..51675bcdab3 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -4974,7 +4974,7 @@ static void test_scalar_array_methods(ID3D10EffectScalarVariable *var, D3D10_SHA const char *name) { float set_f[2], ret_f[2], expected_f; - int set_i[6], ret_i[6], expected_i, expected_i_a[2]; + int set_i[6], ret_i[6], expected_i, expected_i_a[6]; BOOL set_b[2], ret_b[2], expected_b, expected_b_a[6]; unsigned int i; HRESULT hr;

1 0