May 2017 - Wine-Commits - list.winehq.org

Sven Hesse : d3d11/tests: Add test for the SM4 instruction continuec.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: fc945ae4e6f0b57fa927a1293f16ba38e777e7f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc945ae4e6f0b57fa927a1293… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Tue May 16 18:46:08 2017 +0200 d3d11/tests: Add test for the SM4 instruction continuec. To get fxc to output continuec_z/continuec_nz instead of an if-block with a normal continue inside, the shaders have been compiled with the /Gfa flag. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 5b85845..7db71d3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10789,6 +10789,122 @@ static void test_sm4_breakc_instruction(void) release_test_context(&test_context); } +static void test_sm4_continuec_instruction(void) +{ + struct d3d11_test_context test_context; + ID3D11DeviceContext *context; + ID3D11PixelShader *ps; + ID3D11Device *device; + HRESULT hr; + + /* To get fxc to output continuec_z/continuec_nz instead of an if-block + * with a normal continue inside, the shaders have been compiled with + * the /Gfa flag. */ + static const DWORD ps_continuec_nz_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + int i = -1; + + while (i < 255) { + ++i; + + if (i != 0) + continue; + + ++counter; + } + + if (counter == 1) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0xaadaac96, 0xbe00fdfb, 0x29356be0, 0x47e79bd6, 0x00000001, 0x00000208, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000190, 0x00000040, 0x00000064, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000003, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x01000030, 0x07000021, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x09000037, + 0x00100022, 0x00000002, 0x0010001a, 0x00000001, 0x0010001a, 0x00000001, 0x00004001, 0x00000000, + 0x05000036, 0x00100012, 0x00000002, 0x0010000a, 0x00000000, 0x05000036, 0x00100032, 0x00000000, + 0x00100046, 0x00000002, 0x05000036, 0x00100042, 0x00000000, 0x0010001a, 0x00000001, 0x03040008, + 0x0010002a, 0x00000000, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, 0x00000000, 0x00004001, + 0x00000001, 0x05000036, 0x00100032, 0x00000000, 0x00100046, 0x00000001, 0x01000016, 0x07000020, + 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x00000001, 0x08000036, 0x001020f2, + 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0304003f, 0x0010000a, + 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, 0x00000000, 0x00000000, + 0x3f800000, 0x0100003e, + + }; + static const DWORD ps_continuec_z_code[] = + { +#if 0 + float4 main() : SV_TARGET + { + uint counter = 0; + int i = -1; + + while (i < 255) { + ++i; + + if (i == 0) + continue; + + ++counter; + } + + if (counter == 255) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x0322b23d, 0x52b25dc8, 0xa625f5f1, 0x271e3f46, 0x00000001, 0x000001d0, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000158, 0x00000040, 0x00000056, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000002, 0x08000036, 0x00100032, 0x00000000, + 0x00004002, 0x00000000, 0xffffffff, 0x00000000, 0x00000000, 0x01000030, 0x07000021, 0x00100042, + 0x00000000, 0x0010001a, 0x00000000, 0x00004001, 0x000000ff, 0x03040003, 0x0010002a, 0x00000000, + 0x0700001e, 0x00100022, 0x00000001, 0x0010001a, 0x00000000, 0x00004001, 0x00000001, 0x05000036, + 0x00100042, 0x00000001, 0x0010000a, 0x00000000, 0x05000036, 0x00100072, 0x00000000, 0x00100966, + 0x00000001, 0x03000008, 0x0010002a, 0x00000000, 0x0700001e, 0x00100012, 0x00000001, 0x0010000a, + 0x00000000, 0x00004001, 0x00000001, 0x05000036, 0x00100032, 0x00000000, 0x00100046, 0x00000001, + 0x01000016, 0x07000020, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x00004001, 0x000000ff, + 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, + 0x0304003f, 0x0010000a, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x3f800000, + 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_continuec_nz_code, sizeof(ps_continuec_nz_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create continuec_nz pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + hr = ID3D11Device_CreatePixelShader(device, ps_continuec_z_code, sizeof(ps_continuec_z_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create continuec_z pixel shader, hr %#x.\n", hr); + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, 0xff00ff00, 0); + ID3D11PixelShader_Release(ps); + + release_test_context(&test_context); +} + static void test_create_input_layout(void) { D3D11_INPUT_ELEMENT_DESC layout_desc[] = @@ -18316,6 +18432,7 @@ START_TEST(d3d11) test_shader_stage_input_output_matching(); test_sm4_if_instruction(); test_sm4_breakc_instruction(); + test_sm4_continuec_instruction(); test_create_input_layout(); test_input_assembler(); test_null_sampler();

1 0

Józef Kucia : wined3d: Invalidate domain shader state regardless of ARB_clip_control support.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: wine Branch: master Commit: f6cbdd8a4c636628e7969c1eb96b64e53067f5f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6cbdd8a4c636628e7969c1eb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:32 2017 +0200 wined3d: Invalidate domain shader state regardless of ARB_clip_control support. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 78f8f94..89731e5 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2635,8 +2635,8 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context_invalidate_state(context, STATE_FRONTFACE); context_invalidate_state(context, STATE_POINTSPRITECOORDORIGIN); context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); - context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); } + context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_DOMAIN)); if (context->gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); context->render_offscreen = offscreen;

1 0

Francois Gouget : testbot/WineRunTask: Tweak matching for the start and done lines.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: tools Branch: master Commit: 937e1433de9d18413506991e428c5321efa62ed6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=937e1433de9d18413506991e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 17 11:23:13 2017 +0200 testbot/WineRunTask: Tweak matching for the start and done lines. Allow dll names to contain a dash as we have many such dlls in Wine. Allow garbage at the start of the done line, since we can use the current dll name to identify where it starts. But don't allow garbage at the beginning of the start line as it could interfere with the proper detection of the dll name. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 8b9afab..f6f6350 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -473,7 +473,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) my ($CurrentIsPolluted, %CurrentPids, $LogFailures); foreach my $Line (<$LogFile>) { - if ($Line =~ m%([_.a-z0-9]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) + if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) { my ($Dll, $Unit) = ($1, $2); if ($CurrentDll ne "") @@ -554,7 +554,9 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } } } - elsif ($Line =~ /^([_.a-z0-9]+):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/) + elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/ or + ($CurrentDll ne "" and + $Line =~ /(\Q$CurrentDll\E):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/)) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4);

1 0

Francois Gouget : winetest: Refresh errors.html separately from the main index.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: tools Branch: master Commit: 3430c7d94bba4789aea9766170a528b3f7b681c7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=3430c7d94bba4789aea97661… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 17 11:27:01 2017 +0200 winetest: Refresh errors.html separately from the main index. The two operations are quite independent. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-errors | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++ winetest/build-index | 41 ------------------------ winetest/winetest.cron | 1 + 3 files changed, 88 insertions(+), 41 deletions(-) diff --git a/winetest/build-errors b/winetest/build-errors new file mode 100755 index 0000000..a719fb5 --- /dev/null +++ b/winetest/build-errors @@ -0,0 +1,87 @@ +#!/usr/bin/perl +# +# Copyright 2008 Alexandre Julliard <julliard(a)winehq.org> +# +# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# This program creates the global index of rejected reports. + +use strict; +use warnings; +use open ':utf8'; +use CGI qw(:standard); + +sub BEGIN +{ + if ($0 !~ m=^/=) + { + # Turn $0 into an absolute path so it can safely be used in @INC + require Cwd; + $0 = Cwd::cwd() . "/$0"; + } + unshift @INC, $1 if ($0 =~ m=^(/.*)/[^/]+$=); +} +use vars qw/$workdir/; +require "winetest.conf"; + + +use POSIX qw(locale_h strftime); +setlocale(LC_ALL, "C"); + +sub long_date($) +{ + my ($date) = @_; + return strftime("%b %d %H:%M:%S", gmtime($date)); +} + + +# generate a table of the errors encountered during processing + +chdir($workdir) or die "could not chdir to the work directory: $!"; + +my @errors; + +opendir DIR, "queue" or die "cannot open 'queue'"; +foreach my $dir (readdir DIR) +{ + next unless $dir =~ /^err.....$/; + open ERR, "queue/$dir/error" or next; + my $msg = <ERR>; + chomp $msg; + my $date = (stat ERR)[9]; + close ERR; + push @errors, { msg => $msg, date => $date, url => "../queue/$dir/report" }; +} +closedir DIR; + +open OUT, ">data/errors.html.new" or die "cannot create 'data/errors.html.new'"; + +print OUT start_html( -title => "Errors caught during Wine test report processing", + -style => {src => "/summary.css"}, + -encoding => "utf-8" ); +print OUT "<div class=\"main\"><h2>Errors caught during Wine test report processing</h2>\n"; +print OUT "<table class=\"report\"><thead><tr><th class=\"date\">Date</th><th class=\"commitlink\">Error</th></thread>\n"; + +foreach my $err (sort { $b->{date} <=> $a->{date}; } @errors) +{ + printf OUT "<tr><td class=\"date\">%s</td>\n", long_date($err->{date}); + printf OUT "<td class=\"commitlink\"><a href=\"%s\">%s</a></td></tr>\n", $err->{url}, escapeHTML($err->{msg}); +} +print OUT "</table>", end_html(); +close OUT; + +rename "data/errors.html.new", "data/errors.html" or unlink "data/errors.html.new"; + +exit 0; diff --git a/winetest/build-index b/winetest/build-index index d30fbbb..d301f98 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -69,12 +69,6 @@ sub short_date($) return strftime("%b %d", gmtime($date)); } -sub long_date($) -{ - my ($date) = @_; - return strftime("%b %d %H:%M:%S", gmtime($date)); -} - my %w95 = (name => "Win95"); my %w98 = (name => "Win98"); @@ -335,39 +329,4 @@ close OUT; rename "data/index.html.new", "data/index.html" or unlink "data/index.html.new"; -# generate a table of the errors encountered during processing - -my @errors; - -opendir DIR, "queue" or die "cannot open 'queue'"; -foreach my $dir (readdir DIR) -{ - next unless $dir =~ /^err.....$/; - open ERR, "queue/$dir/error" or next; - my $msg = <ERR>; - chomp $msg; - my $date = (stat ERR)[9]; - close ERR; - push @errors, { msg => $msg, date => $date, url => "../queue/$dir/report" }; -} -closedir DIR; - -open OUT, ">data/errors.html.new" or die "cannot create 'data/errors.html.new'"; - -print OUT start_html( -title => "Errors caught during Wine test report processing", - -style => {src => "/summary.css"}, - -encoding => "utf-8" ); -print OUT "<div class=\"main\"><h2>Errors caught during Wine test report processing</h2>\n"; -print OUT "<table class=\"report\"><thead><tr><th class=\"date\">Date</th><th class=\"commitlink\">Error</th></thread>\n"; - -foreach my $err (sort { $b->{date} <=> $a->{date}; } @errors) -{ - printf OUT "<tr><td class=\"date\">%s</td>\n", long_date($err->{date}); - printf OUT "<td class=\"commitlink\"><a href=\"%s\">%s</a></td></tr>\n", $err->{url}, escapeHTML($err->{msg}); -} -print OUT "</table>", end_html(); -close OUT; - -rename "data/errors.html.new", "data/errors.html" or unlink "data/errors.html.new"; - exit 0; diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 4fbd5a2..45581e2 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -46,6 +46,7 @@ if [ ! -f $lock ]; then then mkdir -p data/tests old-data $tools/build-index + $tools/build-errors fi # archive old results

1 0

Francois Gouget : winetest: Run build-index and/or build-errors as needed.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: tools Branch: master Commit: f7b0a4cc7e3a7f48a4f987ef4907ac753f5ff692 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f7b0a4cc7e3a7f48a4f987ef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 17 11:27:08 2017 +0200 winetest: Run build-index and/or build-errors as needed. If a report has been accepted then run both gather and build-index to refresh the index files. If a report has been rejected run build-errors to update errors.html. And if there is nothing new both can be skipped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/winetest.cron | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 45581e2..6b59f4f 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -39,15 +39,29 @@ if [ ! -f $lock ]; then touch $lock cd $workdir - while $tools/dissect; [ $? -eq 0 -o $? -eq 1 ]; do true; done - updated=0 - while $tools/gather; do updated=1; done - if [ $updated -eq 1 -o ! -d data/tests -o ! -d old-data ] + refresh_index="" + refresh_errors="" + while true + do + $tools/dissect + case $? in + 0) refresh_index=1 ;; + 1) refresh_errors=1 ;; + *) break ;; + esac + done + if [ -n "$refresh_index" ] + then + while $tools/gather; do true; done + fi + if [ ! -d data/tests -o ! -d old-data ] then mkdir -p data/tests old-data - $tools/build-index - $tools/build-errors + refresh_index=1 + refresh_errors=1 fi + [ -n "$refresh_index" ] && $tools/build-index + [ -n "$refresh_errors" ] && $tools/build-errors # archive old results (

1 0

Francois Gouget : testbot/WineRunTask: Make the test unit name checks more consistent.
by Alexandre Julliard May 17, 2017

May 17, 2017

Module: tools Branch: master Commit: 492fed7e4520da8f9fdd126aabecab493e7c0058 URL: http://source.winehq.org/git/tools.git/?a=commit;h=492fed7e4520da8f9fdd126a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 17 11:23:24 2017 +0200 testbot/WineRunTask: Make the test unit name checks more consistent. They are now centralized in CheckUnit(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index f6f6350..5f9d4f3 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -471,6 +471,24 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # care about the todos and skips my ($CurrentDll, $CurrentUnit, $LineFailures, $SummaryFailures) = ("", "", 0, 0); my ($CurrentIsPolluted, %CurrentPids, $LogFailures); + + sub CheckUnit($$) + { + my ($Unit, $Type) = @_; + if ($Unit eq $CurrentUnit) + { + $IsWineTest = 1; + } + # To avoid issuing many duplicate errors, + # only report the first misplaced message. + elsif ($IsWineTest and !$CurrentIsPolluted) + { + LogTaskError("$CurrentDll:$CurrentUnit contains a misplaced $Type message for $Unit\n"); + $LogFailures++; + $CurrentIsPolluted = 1; + } + } + foreach my $Line (<$LogFile>) { if ($Line =~ m%^([_.a-z0-9-]+):([_a-z0-9]*) start (?:-|[/_.a-z0-9]+) (?:-|[.0-9a-f]+)\r?$%) @@ -487,17 +505,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) ($CurrentUnit ne "" and $Line =~ /($CurrentUnit)\.c:\d+: Test (?:failed|succeeded inside todo block): /)) { - my $Unit = $1; - if ($Unit eq $CurrentUnit) - { - $IsWineTest = 1; - } - else - { - # If the failure is not for the current test unit we'll - # let its developer hash it out with the polluter ;-) - $CurrentIsPolluted = 1; - } + CheckUnit($1, "failure"); $LineFailures++; } elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) @@ -520,19 +528,15 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # This also replaces a test summary line. $CurrentPids{$Pid || 0} = 1; $SummaryFailures++; - $IsWineTest = 1; - } - else - { - $CurrentIsPolluted = 1; } + CheckUnit($Unit, "unhandled exception"); $LineFailures++; } elsif ($Line =~ /^(?:([0-9a-f]+):)?([_a-z0-9]+): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./ or ($CurrentUnit ne "" and $Line =~ /(?:([0-9a-f]+):)?($CurrentUnit): \d+ tests? executed $(\d+) marked as todo, (\d+) failures?$, \d+ skipped\./)) { - my ($Pid, $Unit, $Todo, $Failures) = ($1, $2, $3, $4); + my ($Pid, $Unit, $Todos, $Failures) = ($1, $2, $3, $4); # Dlls that have only one test unit will run it even if there is # no argument. Also TestLauncher uses the wrong name in its test @@ -546,12 +550,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } else { - $CurrentIsPolluted = 1; - if ($IsWineTest and ($Todo or $Failures)) - { - LogTaskError("$CurrentDll:$CurrentUnit contains a misplaced test summary line for $Unit\n"); - $LogFailures++; - } + CheckUnit($Unit, "test summary") if ($Todos or $Failures); } } elsif ($Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*)(?::([0-9a-f]+))? done $(-?\d+)$(?:\r?$| in)/ or

1 0

Piotr Caban : user32: Test clipboard sequence number for synthesized data.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 1e9d40e6019082a16b4c1b5a9feb4898618bf331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e9d40e6019082a16b4c1b5a9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 17:57:59 2017 +0200 user32: Test clipboard sequence number for synthesized data. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 02cd7b3..367d337 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -597,7 +597,7 @@ static void test_synthesized(void) HGLOBAL h, htext; HENHMETAFILE emf; BOOL r; - UINT cf, i, j, count, rendered; + UINT cf, i, j, count, rendered, seq, old_seq; HANDLE data; HWND hwnd; @@ -762,10 +762,14 @@ static void test_synthesized(void) ok(cf == tests[i].expected[j], "%u.%u: got %04x instead of %04x\n", i, j, cf, tests[i].expected[j] ); if (cf != tests[i].expected[j]) break; + old_seq = GetClipboardSequenceNumber(); data = GetClipboardData( cf ); ok(data != NULL || broken( tests[i].format == CF_DIBV5 && cf == CF_DIB ), /* >= Vista */ "%u: couldn't get data, cf %04x err %d\n", i, cf, GetLastError()); + seq = GetClipboardSequenceNumber(); + todo_wine_if(cf != tests[i].format && cf != CF_LOCALE) + ok(seq == old_seq, "sequence changed (test %d %d)\n", i, cf); switch (cf) { case CF_LOCALE:

1 0

Piotr Caban : user32: Test clipboard sequence number for delayed rendered data.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 66c7b37a9819195d40f5ab053268548c4370fb06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66c7b37a9819195d40f5ab053… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 17:58:04 2017 +0200 user32: Test clipboard sequence number for delayed rendered data. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 78 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 367d337..434a325 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -877,6 +877,13 @@ static void test_synthesized(void) DestroyWindow( hwnd ); } +static DWORD WINAPI clipboard_render_data_thread(void *param) +{ + HANDLE handle = SetClipboardData( CF_UNICODETEXT, create_textW() ); + ok( handle != 0, "SetClipboardData failed: %d\n", GetLastError() ); + return 0; +} + static CRITICAL_SECTION clipboard_cs; static HWND next_wnd; static UINT wm_drawclipboard; @@ -885,6 +892,7 @@ static UINT wm_destroyclipboard; static UINT wm_renderformat; static UINT nb_formats; static BOOL cross_thread; +static BOOL do_render_format; static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -917,6 +925,27 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA case WM_RENDERFORMAT: ok( !wm_renderformat, "multiple WM_RENDERFORMAT %04x / %04lx\n", wm_renderformat, wp ); wm_renderformat = wp; + + if (do_render_format) + { + UINT seq, old_seq; + HANDLE handle; + + old_seq = GetClipboardSequenceNumber(); + handle = SetClipboardData( CF_TEXT, create_textA() ); + ok( handle != 0, "SetClipboardData failed: %d\n", GetLastError() ); + seq = GetClipboardSequenceNumber(); + todo_wine ok( seq == old_seq, "sequence changed\n" ); + old_seq = seq; + + handle = CreateThread( NULL, 0, clipboard_render_data_thread, NULL, 0, NULL ); + ok( handle != NULL, "CreateThread failed: %d\n", GetLastError() ); + ok( WaitForSingleObject(handle, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n" ); + CloseHandle( handle ); + seq = GetClipboardSequenceNumber(); + todo_wine ok( seq == old_seq, "sequence changed\n" ); + } + break; case WM_CLIPBOARDUPDATE: ok( msg_flags == ISMEX_NOSEND, "WM_CLIPBOARDUPDATE wrong flags %x\n", msg_flags ); @@ -951,6 +980,19 @@ static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARA return DefWindowProcA(hwnd, msg, wp, lp); } +static void get_clipboard_data_process(void) +{ + HANDLE data; + BOOL r; + + r = OpenClipboard(0); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + data = GetClipboardData( CF_UNICODETEXT ); + ok( data != NULL, "GetClipboardData failed: %d\n", GetLastError()); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); +} + static DWORD WINAPI clipboard_thread(void *param) { HWND ret, win = param; @@ -1199,14 +1241,16 @@ static DWORD WINAPI clipboard_thread(void *param) fmt = SendMessageA( win, WM_USER+4, 0, 0 ); ok( fmt == CF_UNICODETEXT, "WM_RENDERFORMAT received %04x\n", fmt ); + do_render_format = TRUE; handle = GetClipboardData( CF_OEMTEXT ); - ok( !handle, "got data for CF_OEMTEXT\n" ); + ok( handle != NULL, "didn't get data for CF_OEMTEXT\n" ); fmt = SendMessageA( win, WM_USER+4, 0, 0 ); ok( fmt == CF_UNICODETEXT, "WM_RENDERFORMAT received %04x\n", fmt ); + do_render_format = FALSE; SetClipboardData( CF_WAVE, 0 ); seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); + todo_wine ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); old_seq = seq; if (!cross_thread) { @@ -1463,6 +1507,31 @@ static DWORD WINAPI clipboard_thread(void *param) fmt = SendMessageA( win, WM_USER+4, 0, 0 ); ok( !fmt, "WM_RENDERFORMAT received\n" ); + if (cross_thread) + { + r = OpenClipboard( win ); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + SetClipboardData( CF_TEXT, 0 ); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + + do_render_format = TRUE; + old_seq = GetClipboardSequenceNumber(); + run_process( "get_clipboard_data" ); + seq = GetClipboardSequenceNumber(); + todo_wine ok( seq == old_seq, "sequence changed\n" ); + do_render_format = FALSE; + + count = SendMessageA( win, WM_USER+1, 0, 0 ); + todo_wine ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); + count = SendMessageA( win, WM_USER+2, 0, 0 ); + todo_wine ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); + fmt = SendMessageA( win, WM_USER+4, 0, 0 ); + ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); + } + r = PostMessageA(win, WM_USER, 0, 0); ok(r, "PostMessage failed: %d\n", GetLastError()); @@ -2391,6 +2460,11 @@ START_TEST(clipboard) test_string_data_process( atoi( argv[3] )); return; } + if (argc == 3 && !strcmp( argv[2], "get_clipboard_data" )) + { + get_clipboard_data_process( ); + return; + } test_RegisterClipboardFormatA(); test_ClipboardOwner();

1 0

Piotr Caban : user32: Don' t load GetClipboardSequenceNumber dynamically in tests.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 61d78205d2a885a71498a530de48426ef12631b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d78205d2a885a71498a530d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 16 17:57:53 2017 +0200 user32: Don't load GetClipboardSequenceNumber dynamically in tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 178 ++++++++++++++---------------------------- 1 file changed, 58 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61d78205d2a885a71498a…

1 0

Akihiro Sagawa : crypt32: Use isspaceW() instead of isspace() for WCHARs.
by Alexandre Julliard May 16, 2017

May 16, 2017

Module: wine Branch: master Commit: 71e61520772ed3829538758ad2c329b6f27aa6aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=71e61520772ed3829538758ad… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 17 00:00:09 2017 +0900 crypt32: Use isspaceW() instead of isspace() for WCHARs. Found with Coccinelle. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 3fa5a97..1daf29f 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1058,7 +1058,7 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, else { str = token.end; - while (isspace(*str)) + while (isspaceW(*str)) str++; if (*str != '=') {

1 0