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

Francois Gouget : testbot/WineRunTask: Tweak the 'missing test failed' error for consistency.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 931e726318f92c4f71917f792756d16e03d4a28f URL: http://source.winehq.org/git/tools.git/?a=commit;h=931e726318f92c4f71917f79… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:57:29 2017 +0100 testbot/WineRunTask: Tweak the 'missing test failed' error for consistency. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index faf8314..dc9e9e6 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -556,7 +556,7 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) } elsif ($LineFailures == 0 and $SummaryFailures != 0) { - LogTaskError("Some test failed messages are missing for $Dll:$Unit\n"); + LogTaskError("$Dll:$Unit is missing some 'test failed' messages\n"); $LogFailures++; } }

1 0

Francois Gouget : winetest: Make it easier to grab the raw report.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: fa935b5fa13ce47efc02950615cc0a1579552ede URL: http://source.winehq.org/git/tools.git/?a=commit;h=fa935b5fa13ce47efc029506… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:59:35 2017 +0100 winetest: Make it easier to grab the raw report. It is now accessible from any test result page. Previously one would have had to first go to the huge full report page and scroll to the top. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/dissect | 1 + 1 file changed, 1 insertion(+) diff --git a/winetest/dissect b/winetest/dissect index a4f3f99..c2c453c 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -445,6 +445,7 @@ for (my $i = 0; $i <= $#boxes; $i++) print FILE $boxes[$i]->{next} ? "<a href=\"./$boxes[$i]->{next}.html\">next</a> | " : "next | "; print FILE "<a href=\"version.html\">info</a> | "; printf FILE "<a href=\"report.html%s\">full report</a> | ", $i ? "#$boxes[$i]->{id}" : ""; + print FILE "<a href=\"report\">raw report</a> | "; print FILE "<a href=\"..\">summary</a> | <a href=\"../..\">index</a></div>\n"; printf FILE "<div id=\"%s\" class=\"%s\">\n", $boxes[$i]->{id}, $boxes[$i]->{class};

1 0

Francois Gouget : winetest: Add 32 and 64 bit executable links to the index pages.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 9a0bacf0ed79ceef87b92d7b12e337566fb3c90c URL: http://source.winehq.org/git/tools.git/?a=commit;h=9a0bacf0ed79ceef87b92d7b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:59:55 2017 +0100 winetest: Add 32 and 64 bit executable links to the index pages. The build id normally links to website pages so having it link to the test executable is a bit surprising. Plus it cannot link to both the 32 and 64 bit binaries. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/gather | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index 10ed2da..ec6573e 100755 --- a/winetest/gather +++ b/winetest/gather @@ -695,7 +695,7 @@ EOF print OUT " | <a href=\"..\">index</a>"; print OUT "<script type=\"text/javascript\" src=\"/summary.js\"></script>\n</div>\n"; print OUT "<div class=\"main\">\n"; - print OUT "<h1>Main summary for build <a href=\"/builds/winetest-$short_build.exe\" title=\"$build\">$short_build</a></h1>\n"; + print OUT "<h1>Main summary for build $short_build</h1>\n"; print OUT "<table class=\"report\">\n$header_footer\n <tbody onDblClick=\"clone();\">\n"; } @@ -725,7 +725,19 @@ EOF } printf OUT " %s\n </tr>\n", test_links($testname, $group); } - print OUT " </tbody>\n</table>\n</div>\n$legend\n</body>\n</html>"; + print OUT <<"EOF"; + </tbody> +</table> +</div> +$legend +<div class="navbar"> +To run the tests on your Windows machine, download the <a href="/builds/winetest-$short_build.exe">32-bit winetest</a>. +If you have a 64-bit Windows OS, you can also run the <a href="/builds/winetest64-$short_build.exe">64-bit winetest</a>. +</div> +</body> +</html> +EOF + close OUT; rename "$idx_file.new", $idx_file or unlink "$idx_file.new"; }

1 0

Francois Gouget : winetest: Remove the 'all tests' and 'all builds' links in index pages.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: b08e9ae6ae649a95a2a1c6283a9a15ab43815b97 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b08e9ae6ae649a95a2a1c628… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 00:00:08 2017 +0100 winetest: Remove the 'all tests' and 'all builds' links in index pages. They are redudant with the links in the left-most column. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 2 +- winetest/gather | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index b3fdc53..e15792c 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -218,7 +218,7 @@ EOF } } print OUT " <td class=\"links\"><a href=\"$gitweb?a=shortlog;h=$build->{name}\">shortlog</a>"; - print OUT " | <a href=\"../$build->{name}\">all tests</a></td></tr>\n"; + print OUT "</td></tr>\n"; } print OUT "</table></body></html>\n"; close OUT; diff --git a/winetest/gather b/winetest/gather index ec6573e..275ad0d 100755 --- a/winetest/gather +++ b/winetest/gather @@ -603,7 +603,7 @@ sub test_links($$) return "<td class=\"links\"><a href=\"$gitweb/?a=history;f=$source;hb=$build\" title=\"$source change history\">history</a>" . " | <a href=\"$gitweb/?a=blob;f=$source;hb=$build\" title=\"$source source code\">source</a>" . (defined($group) ? " | <a href=\"index.html#$testname\" title=\"summary of $testname results across platforms\">summary</a>" : "") . - " | <a href=\"../tests/$testname.html\" title=\"$testname results across all builds\">all builds</a></td>"; + "</td>"; } sub build_totals($)

1 0

Francois Gouget : winetest/build-index: Factorize the Git commit info and date formatting code.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 7a847041b22ff0ea3618eea0645f07b38a3b092e URL: http://source.winehq.org/git/tools.git/?a=commit;h=7a847041b22ff0ea3618eea0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 00:08:19 2017 +0100 winetest/build-index: Factorize the Git commit info and date formatting code. This clarifies the code, removes a bit of duplication and makes it easier to reuse that code elsewhere. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 59 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index e15792c..9a67d15 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -23,7 +23,6 @@ use strict; use warnings; use open ':utf8'; use CGI qw(:standard); -use POSIX qw(strftime); sub BEGIN { @@ -43,6 +42,41 @@ binmode STDOUT, ':utf8'; $ENV{GIT_DIR} = $gitdir; +sub get_build_info($) +{ + my ($build) = @_; + my ($date, $subject); + + my $commit = `git log --max-count=1 --pretty="format:%ct %s" "$build^0" 2>/dev/null` if ($build =~ /^[0-9a-f]{40}$/); + if ($commit && $commit =~ /^(\d+) (.*)$/) + { + ($date, $subject) = ($1, $2); + # Make sure the directory's mtime matches the commit time + utime $date, $date, "data/$build"; + } + else + { + $date = (stat "./data/$build")[9]; + $subject = ""; + } + return ($date, $subject); +} + +use POSIX qw(strftime); + +sub short_date($) +{ + my ($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"); my %me = (name => "Me"); @@ -81,23 +115,16 @@ foreach my $build (readdir(DIR)) next unless $build =~ /^[-.0-9a-zA-Z]+$/; next unless -f "./data/$build/index.html"; - my ($commit, $date, $subject); - $commit = `git log --max-count=1 --pretty="format:%ct %s" "$build^0" 2>/dev/null` if ($build =~ /^[0-9a-f]{40}$/); - if ($commit && $commit =~ /^(\d+) (.*)$/) + my ($date, $subject) = get_build_info($build); + if (time() - $date > 60 * 24 * 60 * 60) { - $date = $1; - $subject = $2; - # make sure the file mtime matches the commit time - utime $date, $date, "data/$build"; + # Archive builds older than 60 days + push @too_old, $build; } else { - $date = (stat "./data/$build")[9]; - $subject = ""; + push @builds, { name => $build, date => $date, subj => $subject }; } - # archive builds older than 2 months - if (time() - $date > 60 * 24 * 60 * 60) { push @too_old, $build; } - else { push @builds, { name => $build, date => $date, subj => $subject }; } } closedir(DIR); @@ -204,7 +231,7 @@ EOF next unless defined $alltests{$test}->{$build->{name}}; printf OUT " <tr><td class=\"build\"><a href=\"../%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); + printf OUT " <td class=\"date\">%s</td>", short_date($build->{date}); foreach my $group (@groups) { next unless defined $used_group{$group->{name}}; @@ -252,7 +279,7 @@ print OUT "<th colspan=\"3\">Failures</th><th></th></tr></thead>\n"; foreach my $build (@builds) { printf OUT " <tr><td class=\"build\"><a href=\"%s\" title=\"%s\">%s</a></td>\n", $build->{name}, $build->{name}, substr($build->{name},0,12); - printf OUT " <td class=\"date\">%s</td>", strftime("%b %d", gmtime($build->{date})); + printf OUT " <td class=\"date\">%s</td>", short_date($build->{date}); my ($total_runs, $total_tests, $total_errors, $total_todos); foreach my $ver (@groups) { @@ -336,7 +363,7 @@ print OUT "<table class=\"report\"><thead><tr><th class=\"date\">Date</th><th cl foreach my $err (sort { $b->{date} <=> $a->{date}; } @errors) { - printf OUT "<tr><td class=\"date\">%s</td>\n", strftime("%b %d %H:%M:%S", gmtime($err->{date})); + 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();

1 0

Francois Gouget : winetest/build-index: The system locale should not impact the date formatting code.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 6c5dbad3630f5860e8fb0bbea56e335f638d2c99 URL: http://source.winehq.org/git/tools.git/?a=commit;h=6c5dbad3630f5860e8fb0bbe… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Mar 21 00:08:41 2017 +0100 winetest/build-index: The system locale should not impact the date formatting code. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/winetest/build-index b/winetest/build-index index 9a67d15..e811b62 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -62,7 +62,8 @@ sub get_build_info($) return ($date, $subject); } -use POSIX qw(strftime); +use POSIX qw(locale_h strftime); +setlocale(LC_ALL, "C"); sub short_date($) {

1 0

Zhenbo Li : quartz: Remove an unnecessary if.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 1f765fb0bb1197a925945365e5eca6fbf8e2153d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f765fb0bb1197a925945365e… Author: Zhenbo Li <litimetal(a)gmail.com> Date: Mon Mar 20 13:16:31 2017 +0800 quartz: Remove an unnecessary if. Signed-off-by: Zhenbo Li <litimetal(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 92c30c1..f9bc47b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1542,8 +1542,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw if (FAILED(hr)) return hr; - if (SUCCEEDED(hr)) - hr = IBaseFilter_EnumPins(preader, &penumpins); + hr = IBaseFilter_EnumPins(preader, &penumpins); if (SUCCEEDED(hr)) { while (IEnumPins_Next(penumpins, 1, &ppinreader, NULL) == S_OK)

1 0

Jacek Caban : server: Store connected pipe_end in pipe_end struct.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 316112e3b471b7879e1090c12300f39da6068856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316112e3b471b7879e1090c12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 15 23:25:25 2017 +0100 server: Store connected pipe_end in pipe_end struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/server/named_pipe.c b/server/named_pipe.c index 6861e0f..55febd7 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -70,6 +70,7 @@ struct pipe_end struct object obj; /* object header */ struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ + struct pipe_end *connection; /* the other end of the pipe */ }; struct pipe_server @@ -368,6 +369,19 @@ static void notify_empty( struct pipe_server *server ) fd_async_wake_up( server->pipe_end.fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); } +static void pipe_end_disconnect( struct pipe_end *pipe_end, unsigned int status ) +{ + struct pipe_end *connection = pipe_end->connection; + + pipe_end->connection = NULL; + + if (connection) + { + connection->connection = NULL; + pipe_end_disconnect( connection, status ); + } +} + static void do_disconnect( struct pipe_server *server ) { /* we may only have a server fd, if the client disconnected */ @@ -390,6 +404,8 @@ static void pipe_server_destroy( struct object *obj) assert( obj->ops == &pipe_server_ops ); + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_BROKEN ); + if (server->pipe_end.fd) { notify_empty( server ); @@ -417,6 +433,8 @@ static void pipe_client_destroy( struct object *obj) assert( obj->ops == &pipe_client_ops ); + pipe_end_disconnect( &client->pipe_end, STATUS_PIPE_BROKEN ); + if (server) { notify_empty( server ); @@ -641,6 +659,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct notify_empty( server ); /* dump the client and server fds - client loses all waiting data */ + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); do_disconnect( server ); server->client->server = NULL; server->client = NULL; @@ -648,6 +667,7 @@ static obj_handle_t pipe_server_ioctl( struct fd *fd, ioctl_code_t code, struct break; case ps_wait_disconnect: assert( !server->client ); + pipe_end_disconnect( &server->pipe_end, STATUS_PIPE_DISCONNECTED ); do_disconnect( server ); set_server_state( server, ps_wait_connect ); break; @@ -678,6 +698,7 @@ static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags ) { pipe_end->fd = NULL; pipe_end->flags = pipe_flags; + pipe_end->connection = NULL; } static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options, @@ -829,6 +850,11 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc release_object( client ); client = NULL; } + if (client) + { + server->pipe_end.connection = &client->pipe_end; + client->pipe_end.connection = &server->pipe_end; + } } release_object( server ); return &client->pipe_end.obj;

1 0

Jacek Caban : server: Store buffer size in pipe_end.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: c5afc9f9b61e6f8ef36f9c3971e3b1c3bdbf12e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5afc9f9b61e6f8ef36f9c397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 15 23:25:31 2017 +0100 server: Store buffer size in pipe_end. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 55febd7..a75f70b 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -71,6 +71,7 @@ struct pipe_end struct fd *fd; /* pipe file descriptor */ unsigned int flags; /* pipe flags */ struct pipe_end *connection; /* the other end of the pipe */ + data_size_t buffer_size;/* size of buffered data that doesn't block caller */ }; struct pipe_server @@ -694,11 +695,12 @@ static struct pipe_server *get_pipe_server_obj( struct process *process, return (struct pipe_server *) obj; } -static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags ) +static void init_pipe_end( struct pipe_end *pipe_end, unsigned int pipe_flags, data_size_t buffer_size ) { pipe_end->fd = NULL; pipe_end->flags = pipe_flags; pipe_end->connection = NULL; + pipe_end->buffer_size = buffer_size; } static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned int options, @@ -714,7 +716,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned server->client = NULL; server->flush_poll = NULL; server->options = options; - init_pipe_end( &server->pipe_end, pipe_flags ); + init_pipe_end( &server->pipe_end, pipe_flags, pipe->insize ); list_add_head( &pipe->servers, &server->entry ); grab_object( pipe ); @@ -728,7 +730,7 @@ static struct pipe_server *create_pipe_server( struct named_pipe *pipe, unsigned return server; } -static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags ) +static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int pipe_flags, data_size_t buffer_size ) { struct pipe_client *client; @@ -738,7 +740,7 @@ static struct pipe_client *create_pipe_client( unsigned int flags, unsigned int client->server = NULL; client->flags = flags; - init_pipe_end( &client->pipe_end, pipe_flags ); + init_pipe_end( &client->pipe_end, pipe_flags, buffer_size ); return client; } @@ -802,7 +804,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc return NULL; } - if ((client = create_pipe_client( options, pipe->flags ))) + if ((client = create_pipe_client( options, pipe->flags, pipe->outsize ))) { if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) {

1 0

Jacek Caban : server: Introduce server-side I/O mode for named pipes.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: a8023d300cd9bb99a99d29a44c02e586d10756b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8023d300cd9bb99a99d29a44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 15 23:25:38 2017 +0100 server: Introduce server-side I/O mode for named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 45 +++++++++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index a75f70b..0f6cf3d 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -277,6 +277,12 @@ static const struct fd_ops named_pipe_device_fd_ops = default_fd_reselect_async /* reselect_async */ }; +/* Returns if we handle I/O via server calls. Currently disabled. */ +static int use_server_io( struct pipe_end *pipe_end ) +{ + return 0; /* FIXME */ +} + static void named_pipe_dump( struct object *obj, int verbose ) { fputs( "Named pipe\n", stderr ); @@ -394,7 +400,8 @@ static void do_disconnect( struct pipe_server *server ) server->client->pipe_end.fd = NULL; } assert( server->pipe_end.fd ); - shutdown( get_unix_fd( server->pipe_end.fd ), SHUT_RDWR ); + if (!use_server_io( &server->pipe_end )) + shutdown( get_unix_fd( server->pipe_end.fd ), SHUT_RDWR ); release_object( server->pipe_end.fd ); server->pipe_end.fd = NULL; } @@ -539,6 +546,9 @@ static int pipe_data_remaining( struct pipe_server *server ) assert( server->client ); + if (use_server_io( &server->pipe_end )) + return 0; + fd = get_unix_fd( server->client->pipe_end.fd ); if (fd < 0) return 0; @@ -590,7 +600,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, struct async *async, int b handle = pipe_end_flush( &server->pipe_end, async, blocking ); /* there's no unix way to be alerted when a pipe becomes empty, so resort to polling */ - if (handle && !server->flush_poll) + if (handle && !use_server_io( &server->pipe_end ) && !server->flush_poll) server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server ); return handle; } @@ -806,7 +816,22 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc if ((client = create_pipe_client( options, pipe->flags, pipe->outsize ))) { - if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) + if (use_server_io( &server->pipe_end )) + { + client->pipe_end.fd = alloc_pseudo_fd( &pipe_client_fd_ops, &client->pipe_end.obj, options ); + if (client->pipe_end.fd) + { + set_fd_signaled( client->pipe_end.fd, 1 ); + server->pipe_end.fd = (struct fd *)grab_object( server->ioctl_fd ); + set_no_fd_status( server->ioctl_fd, STATUS_BAD_DEVICE_TYPE ); + } + else + { + release_object( client ); + client = NULL; + } + } + else if (!socketpair( PF_UNIX, SOCK_STREAM, 0, fds )) { assert( !server->pipe_end.fd ); @@ -831,14 +856,7 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc server->pipe_end.fd = create_anonymous_fd( &pipe_server_fd_ops, fds[0], &server->pipe_end.obj, server->options ); if (client->pipe_end.fd && server->pipe_end.fd) { - allow_fd_caching( client->pipe_end.fd ); - allow_fd_caching( server->pipe_end.fd ); fd_copy_completion( server->ioctl_fd, server->pipe_end.fd ); - if (server->state == ps_wait_open) - fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); - set_server_state( server, ps_connected_server ); - server->client = client; - client->server = server; } else { @@ -854,6 +872,13 @@ static struct object *named_pipe_open_file( struct object *obj, unsigned int acc } if (client) { + allow_fd_caching( client->pipe_end.fd ); + allow_fd_caching( server->pipe_end.fd ); + if (server->state == ps_wait_open) + fd_async_wake_up( server->ioctl_fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); + set_server_state( server, ps_connected_server ); + server->client = client; + client->server = server; server->pipe_end.connection = &client->pipe_end; client->pipe_end.connection = &server->pipe_end; }

1 0