November 2018 - Wine-commits

Francois Gouget : testbot/testagentd: Add --show-restarts to the usage message.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: tools Branch: master Commit: d192bfcdc2c0781761aa43711340787d95bfe094 URL: https://source.winehq.org/git/tools.git/?a=commit;h=d192bfcdc2c0781761aa437… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 23 16:24:41 2018 +0100 testbot/testagentd: Add --show-restarts to the usage message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/src/testagentd/testagentd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index b4a26fc..b81f7fa 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1430,7 +1430,7 @@ int main(int argc, char** argv) } if (opt_usage) { - printf("Usage: %s [--debug] [--detach] [--help] PORT [SRCHOST]\n", name0); + printf("Usage: %s [--debug] [--detach] [--help] [--show-restarts] PORT [SRCHOST]\n", name0); printf("\n"); printf("Provides a simple way to send/receive files and to run scripts on this host.\n"); printf("\n");

1 0

Francois Gouget : testbot: Log $LANG before running the tests.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: tools Branch: master Commit: e3d8d807d302eef71cd94f9f0de3e92ec640cec6 URL: https://source.winehq.org/git/tools.git/?a=commit;h=e3d8d807d302eef71cd94f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 23 16:25:58 2018 +0100 testbot: Log $LANG before running the tests. It is useful to know the exact locale the tests were run with, particularly since the TestBot may have modified it to add the codeset. In particular this helps diagnosis in case Wine does not recognize the locale (i.e. if WineTest still shows 0409). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/WineTest.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1f083c2..23da718 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -86,6 +86,7 @@ sub SetupTest($$) my $BaseName = SetupWineEnvironment($Mission); InfoMsg "\nRunning $Test in the $BaseName Wine\n"; + InfoMsg "LANG=$ENV{LANG}\n"; return $BaseName; }

1 0

Francois Gouget : testbot/web: Highlight the LANG and 'Running the tests/ WineTest' lines.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: tools Branch: master Commit: 83cc93819be05ba8273a93ae43e8b96cc8dd9022 URL: https://source.winehq.org/git/tools.git/?a=commit;h=83cc93819be05ba8273a93a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 23 16:27:22 2018 +0100 testbot/web: Highlight the LANG and 'Running the tests/WineTest' lines. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index fee4278..b75607a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -130,6 +130,8 @@ sub GetLogLineCategory($) if (# Build messages $Line =~ /^\+ \S/ or + $Line =~ /^LANG=/ or + $Line =~ /^Running (?:the tests|WineTest) / or $Line =~ /^Task: (?:ok|tests)/) { return "info";

1 0

Francois Gouget : testbot: Tweak the locale display names.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: tools Branch: master Commit: b745774ef8c4e24e310c5837a45dec79e957c032 URL: https://source.winehq.org/git/tools.git/?a=commit;h=b745774ef8c4e24e310c583… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 23 16:21:06 2018 +0100 testbot: Tweak the locale display names. Omit the country name when the default is obvious and shorten some exceedingly long ones. Manually decode the Konkani language name since code2language() does not seem to know about it. Show the locale modifier if any to distinguish between cyrillic and latin versions of some languages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Utils.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index a80f809..6783c51 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -109,10 +109,26 @@ sub BuildEMailRecipient($$) sub LocaleName($) { my ($Locale) = @_; + $Locale ||= "en_US"; # default - if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.|$)/) + if ($Locale =~ /^([a-z]+)_([A-Z]+)(?:\.[A-Z0-9-]+)?(?:@([a-z]+))?$/) { - return (code2language($1) || $1) .":". (code2country($2) || $2); + my ($Lang, $Country, $Modifier) = ($1, $2, $3); + my $Name = $Lang eq "kok" ? "Konkani" : + (code2language($Lang) || $Lang); + $Name =~ s/ \(.*$//; + + if (uc($Lang) ne $Country) + { + my $CountryName = $Country eq "US" ? "USA" : + $Country eq "GB" ? "Great Britain" : + (code2country($Country) || $Country); + $CountryName =~ s/(?:, | \().*$//; + $Name .= ":$CountryName"; + } + + $Name .= " ($Modifier)" if ($Modifier); + return $Name; } return $Locale; }

1 0

Francois Gouget : testbot/web: Show the log filename as a tooltip on the JobDetails page.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: tools Branch: master Commit: 45df3d767a8ced3c2beb6bd05cbd37001cc027ac URL: https://source.winehq.org/git/tools.git/?a=commit;h=45df3d767a8ced3c2beb6bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 23 16:21:54 2018 +0100 testbot/web: Show the log filename as a tooltip on the JobDetails page. The log filename contains the abbreviated locale if it is not the default. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index de2f9cc..9ab5006 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -304,8 +304,9 @@ sub GenerateMoreInfoLink($$$$;$) my ($self, $LinkKey, $Label, $Set, $Value) = @_; my ($Action, $Url) = $self->GetMoreInfoLink($LinkKey, $Label, $Set, $Value); + my $Title = ($Value =~ /^(.*)\.report$/) ? " title='$1'" : ""; - my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'>$Action $Label</a>"; + my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'$Title>$Action $Label</a>"; if ($Action eq "Hide") { $Html = "<span class='TaskMoreInfoSelected'>$Html</span>";

1 0

Francois Gouget : testbot: The locale modifier must come after the codeset.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: tools Branch: master Commit: b7d1d31ffa1006aa87d1296251b1436cde75345e URL: https://source.winehq.org/git/tools.git/?a=commit;h=b7d1d31ffa1006aa87d1296… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 23 16:22:09 2018 +0100 testbot: The locale modifier must come after the codeset. This fixes SetupWineEnvironment() so it adds the default '.UTF-8' in the right place. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/Build/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 4dda8d5..0f1ddb0 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -337,7 +337,7 @@ sub SetupWineEnvironment($) my $Lang = $Mission->{lang} || "en_US"; if ($Lang =~ /^[a-zA-Z0-9\(a)_.-]+$/) { - $Lang .= ".UTF-8" if ($Lang !~ /\./); + $Lang =~ s/((a)[a-z]*$|$)/.UTF-8$1/ if ($Lang !~ /\./); $ENV{LANG} = $Lang; }

1 0

Francois Gouget : testbot/web: Fix the check for which log to show in full.
by Alexandre Julliard 23 Nov '18

23 Nov '18

Module: tools Branch: master Commit: f849bddb5f67e19f8a917b59ce6182888f82813a URL: https://source.winehq.org/git/tools.git/?a=commit;h=f849bddb5f67e19f8a917b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Nov 23 16:23:14 2018 +0100 testbot/web: Fix the check for which log to show in full. The name of the current log has been decoded so it should not be compared to a uri_escape()'d log filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 9ab5006..6c8c7ce 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -247,7 +247,7 @@ sub InitMoreInfo($) foreach my $Log (@{GetLogFileNames($TaskDir, 1)}) { push @{$More->{$Key}->{Logs}}, $Log; - $More->{$Key}->{Full} = $Log if (uri_escape($Log) eq $Value); + $More->{$Key}->{Full} = $Log if ($Log eq $Value); } $More->{$Key}->{Full} ||= ""; }

1 0

Henri Verbeet : d3d9: Do not add map access indiscriminately in d3d9_device_create_surface().
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: 84f64598441ea59f83cc49ac471119312cdbd4db URL: https://source.winehq.org/git/wine.git/?a=commit;h=84f64598441ea59f83cc49ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 15:21:04 2018 +0330 d3d9: Do not add map access indiscriminately in d3d9_device_create_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 +-- dlls/d3d9/tests/device.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index eed3a04..0dec4ce 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1399,8 +1399,7 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width if (pool == D3DPOOL_SCRATCH) desc.usage |= WINED3DUSAGE_SCRATCH; desc.bind_flags = wined3d_bind_flags_from_d3d9_usage(usage); - desc.access = wined3daccess_from_d3dpool(pool, usage) - | WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; + desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; desc.height = height; desc.depth = 1; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index cb38aea..6edf2b3 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12877,11 +12877,9 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_2D - && surface_types[i].type != SURFACE_CUBE) - ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DSurface9_UnlockRect(surface); - todo_wine_if(expected_hr != D3D_OK && surface_types[i].type != SURFACE_CUBE) + todo_wine_if(expected_hr != D3D_OK && surface_types[i].type == SURFACE_2D) ok(hr == expected_hr, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture)))

1 0

Henri Verbeet : d3d9/tests: Add a d3d9ex resource access test.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: 5cc3b710c83b3e1529340877c6da7f29d9501fcd URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc3b710c83b3e1529340877… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 15:21:05 2018 +0330 d3d9/tests: Add a d3d9ex resource access test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 460 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 460 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc3b710c83b3e152934…

1 0

Henri Verbeet : d3d9: Disallow creating managed vertex buffers on d3d9ex devices.
by Alexandre Julliard 22 Nov '18

22 Nov '18

Module: wine Branch: master Commit: b4590d336801f5dd4f1b1ba7a9a25ca43a7d68c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4590d336801f5dd4f1b1ba7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 15:21:06 2018 +0330 d3d9: Disallow creating managed vertex buffers on d3d9ex devices. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 6 ++++++ dlls/d3d9/tests/d3d9ex.c | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 4b0b392..557ec91 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -283,6 +283,12 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * return D3DERR_INVALIDCALL; } + if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended) + { + WARN("Managed resources are not supported by d3d9ex devices.\n"); + return D3DERR_INVALIDCALL; + } + /* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */ if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) return D3DERR_INVALIDCALL; diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 0c46394..759790c 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4533,10 +4533,9 @@ static void test_resource_access(void) hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb, NULL); - todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED) - ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED - || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED + || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue;

1 0