wine-commits March 2017

wine-commits@winehq.org

2 participants
717 discussions

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: 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: 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 : 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 : testbot/WineSendLog: Simplify the detection of timeout errors.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: 349eb70c3d21809d613f8f3cc15322b7a14da332 URL: http://source.winehq.org/git/tools.git/?a=commit;h=349eb70c3d21809d613f8f3c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:57:22 2017 +0100 testbot/WineSendLog: Simplify the detection of timeout errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineSendLog.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 983ae37..922811d 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -104,8 +104,7 @@ sub ReadLog($$$) $Line =~ s/[\r\n]*$//; if ($Line =~ m/${BaseName}:${TestSet} done/) { - if ($Line =~ m/${BaseName}:${TestSet} done $(\d+)$/ && - $1 eq "258") + if ($Line =~ m/${BaseName}:${TestSet} done $258$/) { $Messages[@Messages] = "The test timed out"; }

1 0

Francois Gouget : testbot: Detect the 'invalid unit test' error messages.
by Alexandre Julliard 21 Mar '17

21 Mar '17

Module: tools Branch: master Commit: aed32f045354e6bc8d88142e13c67430d86e9431 URL: http://source.winehq.org/git/tools.git/?a=commit;h=aed32f045354e6bc8d88142e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 20 23:57:08 2017 +0100 testbot: Detect the 'invalid unit test' error messages. Take them into account so we don't complain the test returns non-zero when it has no test failure. Also show these errors in the web report summary. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunTask.pl | 9 +++++++++ testbot/web/JobDetails.pl | 1 + 2 files changed, 10 insertions(+) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index fcde9f8..faf8314 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -484,6 +484,15 @@ if ($TA->GetFile($RptFileName, $FullLogFileName)) # If the failure is not for the current test unit we'll let its # developer hash it out with the polluter ;-) $CurrentIsPolluted = 1 if ($1 ne $CurrentUnit); + + $LineFailures++; + } + elsif ($Line =~ /^Fatal: test '([_a-z0-9]+)' does not exist/) + { + # This also replaces a test summary line. + $CurrentPids{0} = 1; + $SummaryFailures++; + $LineFailures++; } elsif ($Line =~ /^(?:([0-9a-f]+):)?([_.a-z0-9]+): unhandled exception [0-9a-fA-F]{8} at / or diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index c57094b..4a5596c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -350,6 +350,7 @@ sub GenerateBody($) $CurrentDll = $1; } if ($FullLog || $Line =~ m/: Test failed: / || + $Line =~ m/Fatal: test '[^']+' does not exist/ || $Line =~ m/ done $258$/ || $Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) {

1 0

Hugh McMaster : regedit: Re-implement processRegLinesW().
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: 6b6e2cb92448dff4420a767abc43af50247b8f68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6e2cb92448dff4420a767ab… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Mar 16 12:05:00 2017 +0000 regedit: Re-implement processRegLinesW(). Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 163 +++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 102 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 25c0240..a88f632 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -793,120 +793,79 @@ static void processRegLinesA(FILE *in, char* first_chars) HeapFree(GetProcessHeap(), 0, buf); } -static void processRegLinesW(FILE *in) +static WCHAR *get_lineW(FILE *fp) { - WCHAR* buf = NULL; /* line read from input stream */ - ULONG lineSize = REG_VAL_BUF_SIZE; - size_t CharsInBuf = -1; + static size_t size; + static WCHAR *buf, *next; + WCHAR *line; - WCHAR* s; /* The pointer into buf for where the current fgets should read */ - WCHAR* line; /* The start of the current line */ - - buf = HeapAlloc(GetProcessHeap(), 0, lineSize * sizeof(WCHAR)); - CHECK_ENOUGH_MEMORY(buf); - - s = buf; - line = buf; - - while(!feof(in)) { - size_t size_remaining; - int size_to_get; - WCHAR *s_eol = NULL; /* various local uses */ + if (!size) + { + size = REG_VAL_BUF_SIZE; + buf = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(buf); + *buf = 0; + next = buf; + } + line = next; - /* Do we need to expand the buffer ? */ - assert (s >= buf && s <= buf + lineSize); - size_remaining = lineSize - (s-buf); - if (size_remaining < 2) /* room for 1 character and the \0 */ + while (next) + { + static const WCHAR line_endings[] = {'\r','\n',0}; + WCHAR *p = strpbrkW(line, line_endings); + if (!p) { - WCHAR *new_buffer; - size_t new_size = lineSize + (REG_VAL_BUF_SIZE / sizeof(WCHAR)); - if (new_size > lineSize) /* no arithmetic overflow */ - new_buffer = HeapReAlloc (GetProcessHeap(), 0, buf, new_size * sizeof(WCHAR)); - else - new_buffer = NULL; - CHECK_ENOUGH_MEMORY(new_buffer); - buf = new_buffer; + size_t len, count; + len = strlenW(next); + memmove(buf, next, (len + 1) * sizeof(WCHAR)); + if (size - len < 3) + { + WCHAR *new_buf = HeapReAlloc(GetProcessHeap(), 0, buf, (size * 2) * sizeof(WCHAR)); + CHECK_ENOUGH_MEMORY(new_buf); + buf = new_buf; + size *= 2; + } + if (!(count = fread(buf + len, sizeof(WCHAR), size - len - 1, fp))) + { + next = NULL; + return buf; + } + buf[len + count] = 0; + next = buf; line = buf; - s = buf + lineSize - size_remaining; - lineSize = new_size; - size_remaining = lineSize - (s-buf); + continue; } - - /* Get as much as possible into the buffer, terminated either by - * eof, error or getting the maximum amount. Abort on error. - */ - size_to_get = (size_remaining > INT_MAX ? INT_MAX : size_remaining); - - CharsInBuf = fread(s, sizeof(WCHAR), size_to_get - 1, in); - s[CharsInBuf] = 0; - - if (CharsInBuf == 0) { - if (ferror(in)) { - perror ("While reading input"); - exit (IO_ERROR); - } else { - assert (feof(in)); - *s = '\0'; - /* It is not clear to me from the definition that the - * contents of the buffer are well defined on detecting - * an eof without managing to read anything. - */ - } + next = p + 1; + if (*p == '\r' && *(p + 1) == '\n') next++; + *p = 0; + if (*(p - 1) == '\\') + { + *(--p) = 0; + while (*next && (*next == ' ' || *next == '\t')) next++; + memmove(p, next, (strlenW(next) + 1) * sizeof(WCHAR)); + next = line; + continue; } - - /* If we didn't read the eol nor the eof go around for the rest */ - while(1) + if (*line == ';' || *line == '#') { - const WCHAR line_endings[] = {'\r','\n',0}; - s_eol = strpbrkW(line, line_endings); - - if(!s_eol) { - /* Move the stub of the line to the start of the buffer so - * we get the maximum space to read into, and so we don't - * have to recalculate 'line' if the buffer expands */ - MoveMemory(buf, line, (strlenW(line)+1) * sizeof(WCHAR)); - line = buf; - s = strchrW(line, '\0'); - break; - } - - /* If it is a comment line then discard it and go around again */ - if (*line == '#' || *line == ';') { - if (*s_eol == '\r' && *(s_eol+1) == '\n') - line = s_eol + 2; - else - line = s_eol + 1; - continue; - } - - /* If there is a concatenating \\ then go around again */ - if (*(s_eol-1) == '\\') { - WCHAR* NextLine = s_eol + 1; - - if(*s_eol == '\r' && *(s_eol+1) == '\n') - NextLine++; - - while(*(NextLine+1) == ' ' || *(NextLine+1) == '\t') - NextLine++; - - MoveMemory(s_eol - 1, NextLine, (CharsInBuf - (NextLine - s) + 1)*sizeof(WCHAR)); - CharsInBuf -= NextLine - s_eol + 1; - continue; - } - - /* Remove any line feed. Leave s_eol on the last \0 */ - if (*s_eol == '\r' && *(s_eol + 1) == '\n') - *s_eol++ = '\0'; - *s_eol = '\0'; - - processRegEntry(line, TRUE); - line = s_eol + 1; + line = next; + continue; } + return line; } + HeapFree( GetProcessHeap(), 0, buf ); + size = 0; + return NULL; +} - closeKey(); +static void processRegLinesW(FILE *fp) +{ + WCHAR *line; - HeapFree(GetProcessHeap(), 0, buf); + while ((line = get_lineW(fp))) + processRegEntry(line, TRUE); + + closeKey(); } /******************************************************************************

1 0

Jacek Caban : server: Use no_fd_queue_async for named pipe ends in server I/O mode.
by Alexandre Julliard 20 Mar '17

20 Mar '17

Module: wine Branch: master Commit: ae5684479e4936a47036679f3b4badb63d4769b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae5684479e4936a47036679f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 15 23:25:42 2017 +0100 server: Use no_fd_queue_async for named pipe ends in server I/O mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/named_pipe.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/named_pipe.c b/server/named_pipe.c index 0f6cf3d..8113b18 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -143,6 +143,9 @@ static const struct object_ops named_pipe_ops = named_pipe_destroy /* destroy */ }; +/* common server and client pipe end functions */ +static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ); + /* server end functions */ static void pipe_server_dump( struct object *obj, int verbose ); static struct fd *pipe_server_get_fd( struct object *obj ); @@ -183,7 +186,7 @@ static const struct fd_ops pipe_server_fd_ops = no_fd_write, /* write */ pipe_server_flush, /* flush */ pipe_server_ioctl, /* ioctl */ - default_fd_queue_async, /* queue_async */ + pipe_end_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -226,7 +229,7 @@ static const struct fd_ops pipe_client_fd_ops = no_fd_write, /* write */ pipe_client_flush, /* flush */ default_fd_ioctl, /* ioctl */ - default_fd_queue_async, /* queue_async */ + pipe_end_queue_async, /* queue_async */ default_fd_reselect_async /* reselect_async */ }; @@ -611,6 +614,13 @@ static obj_handle_t pipe_client_flush( struct fd *fd, struct async *async, int b return 0; } +static void pipe_end_queue_async( struct fd *fd, struct async *async, int type, int count ) +{ + struct pipe_end *pipe_end = get_fd_user( fd ); + if (use_server_io( pipe_end )) no_fd_queue_async( fd, async, type, count ); + else default_fd_queue_async( fd, async, type, count ); +} + static inline int is_overlapped( unsigned int options ) { return !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT));

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

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

← Newer
1
...
30
31
32
33
34
35
36
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2017