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

Józef Kucia : wined3d: Fill whole structure in find_ds_compile_args().
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: ab27a5902d53dc3ab3b3712ec2d9a8d94a3b8da1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab27a5902d53dc3ab3b3712ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:33 2017 +0200 wined3d: Fill whole structure in find_ds_compile_args(). 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/shader.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1dd8e6d..7ee867d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3523,6 +3523,8 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 : WINED3D_SHADER_TYPE_PIXEL; args->render_offscreen = context->render_offscreen; + + args->padding = 0; } void find_gs_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f376d41..57c2a96 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1336,6 +1336,7 @@ struct ds_compile_args unsigned int output_count : 16; unsigned int next_shader_type : 3; unsigned int render_offscreen : 1; + unsigned int padding : 12; }; struct gs_compile_args

1 0

Józef Kucia : wined3d: Handle dcl_output_control_point_count instruction.
by Alexandre Julliard 17 May '17

17 May '17

Module: wine Branch: master Commit: b0d2cf8e3f0d5f79d60acc0e72ffaf72fbe5fa6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d2cf8e3f0d5f79d60acc0e7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 17 15:42:34 2017 +0200 wined3d: Handle dcl_output_control_point_count instruction. 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/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 7 +++++++ dlls/wined3d/wined3d_private.h | 13 +++++++------ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ce96085..76ec6f7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10290,7 +10290,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_INPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_INTERFACE */ NULL, /* WINED3DSIH_DCL_OUTPUT */ shader_glsl_nop, - /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ NULL, + /* WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_SIV */ shader_glsl_nop, /* WINED3DSIH_DCL_OUTPUT_TOPOLOGY */ shader_glsl_nop, /* WINED3DSIH_DCL_RESOURCE_RAW */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7ee867d..bbd6718 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1053,6 +1053,13 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); } + else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT) + { + if (shader_version.type == WINED3D_SHADER_TYPE_HULL) + shader->u.hs.output_vertex_count = ins.declaration.count; + else + FIXME("Invalid instruction %#x for shader type %#x.\n", ins.handler_idx, shader_version.type); + } else if (ins.handler_idx == WINED3DSIH_DCL_OUTPUT_TOPOLOGY) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57c2a96..70dd8ed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3708,17 +3708,18 @@ struct wined3d_vertex_shader struct wined3d_shader_attribute attributes[MAX_ATTRIBS]; }; -struct wined3d_domain_shader -{ - enum wined3d_tessellator_domain tessellator_domain; -}; - struct wined3d_hull_shader { + unsigned int output_vertex_count; enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning; }; +struct wined3d_domain_shader +{ + enum wined3d_tessellator_domain tessellator_domain; +}; + struct wined3d_geometry_shader { enum wined3d_primitive_type input_type; @@ -3782,8 +3783,8 @@ struct wined3d_shader union { struct wined3d_vertex_shader vs; - struct wined3d_domain_shader ds; struct wined3d_hull_shader hs; + struct wined3d_domain_shader ds; struct wined3d_geometry_shader gs; struct wined3d_pixel_shader ps; struct wined3d_compute_shader cs;

1 0

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

17 May '17

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 : testbot/WineRunTask: Make the test unit name checks more consistent.
by Alexandre Julliard 17 May '17

17 May '17

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

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

17 May '17

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 17 May '17

17 May '17

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

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

16 May '17

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 16 May '17

16 May '17

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

Jacek Caban : rpcrt4: Always use winsock for networking.
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: e6215938b75f6ef9c476d68ec21e9ed2a0730f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6215938b75f6ef9c476d68ec… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 16 17:47:50 2017 +0200 rpcrt4: Always use winsock for networking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/Makefile.in | 3 +- dlls/rpcrt4/rpc_transport.c | 298 +++----------------------------------------- 2 files changed, 18 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6215938b75f6ef9c476d…

1 0

Jacek Caban : rpcrt4: Use standard Wine list to store connections in RpcServerProtseq.
by Alexandre Julliard 16 May '17

16 May '17

Module: wine Branch: master Commit: 2035294d0c47ddbb35bb7f10143f25cdf3367ccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2035294d0c47ddbb35bb7f101… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 16 17:48:01 2017 +0200 rpcrt4: Use standard Wine list to store connections in RpcServerProtseq. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_binding.h | 2 +- dlls/rpcrt4/rpc_server.c | 18 ++++--- dlls/rpcrt4/rpc_server.h | 2 +- dlls/rpcrt4/rpc_transport.c | 128 ++++++++++++++++---------------------------- 4 files changed, 59 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2035294d0c47ddbb35bb7…

1 0