April 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : msxml3: Fix transformation result output for stream and BSTR cases.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: wine Branch: master Commit: 52c6c6a1d192324ee4b6f3910c8834d5f5bb2151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52c6c6a1d192324ee4b6f3910… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 09:00:51 2014 +0400 msxml3: Fix transformation result output for stream and BSTR cases. --- dlls/msxml3/main.c | 3 + dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 291 ++++++++++++++++++++++++++++++++++++++----- dlls/msxml3/stylesheet.c | 20 +-- dlls/msxml3/tests/domdoc.c | 14 +-- 5 files changed, 267 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52c6c6a1d192324ee4b6f…

1 0

Nikolay Sivov : quartz: Check GetCurFile() return value (Coverity).
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: wine Branch: master Commit: 44818ce0f9bfd36e68b5da0fcb8b6ed3d4c33709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44818ce0f9bfd36e68b5da0fc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 14 09:43:40 2014 +0400 quartz: Check GetCurFile() return value (Coverity). --- dlls/quartz/filtergraph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 720ba2d..771a330 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1680,7 +1680,7 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR } /* The file has been already loaded */ - IFileSourceFilter_GetCurFile(pfile, &filename, &mt); + hr = IFileSourceFilter_GetCurFile(pfile, &filename, &mt); if (FAILED(hr)) { WARN("GetCurFile (%x)\n", hr); goto error;

1 0

Henri Verbeet : d3d9/tests: Get rid of some pointless BeginScene() checks.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: wine Branch: master Commit: 3ae4889eebe47ea2e2020e9aab36b94f5a16e092 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae4889eebe47ea2e2020e9aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 14 09:59:25 2014 +0200 d3d9/tests: Get rid of some pointless BeginScene() checks. --- dlls/d3d9/tests/device.c | 13 +- dlls/d3d9/tests/visual.c | 2701 +++++++++++++++++++++------------------------- 2 files changed, 1263 insertions(+), 1451 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ae4889eebe47ea2e2020…

1 0

Francois Gouget : testbot/TestAgent: Add getproperty and upgrade commands.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: 893a3bc6b4f5358f98bba7b196ab8739b5de966a URL: http://source.winehq.org/git/tools.git/?a=commit;h=893a3bc6b4f5358f98bba7b1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:59 2014 +0200 testbot/TestAgent: Add getproperty and upgrade commands. --- testbot/scripts/TestAgent | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index e238967..ac2c914 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -52,7 +52,7 @@ sub error(@) print STDERR "$name0:error: ", @_; } -my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); +my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, $PropName, @Rm); my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; @@ -206,6 +206,16 @@ while (@ARGV) { set_cmd($arg); } + elsif ($arg eq "getproperty") + { + set_cmd($arg); + $PropName = @ARGV ? check_opt_val($arg, $PropName) : '*'; + } + elsif ($arg eq "upgrade") + { + set_cmd($arg); + $LocalFilename = check_opt_val($arg, $LocalFilename); + } else { error("unknown command '$arg'\n"); @@ -309,8 +319,13 @@ if (defined $Usage) print " wait Waits for the specified child process on the server.\n"; print " settime Set the system time of the remote host.\n"; print " rm Deletes the specified files on the server.\n"; - print " getversion Returns the version of the server.\n"; + print " getversion Returns the protocol version.\n"; + print " getproperty <name> Retrieves and prints the specified server property, for\n"; + print " instance its architecture, 'server.arch'. One can print all the\n"; + print " properties at once by omitting the name or setting it to '*'.\n"; print " ping Makes sure the server is still alive.\n"; + print " upgrade Replaces the server executable with the specified file and\n"; + print " restarts it.\n"; print " <hostname> Is the hostname of the server.\n"; print " --port <port> Use the specified port number instead of the default one.\n"; print " --connect-timeout <timeout> Use the specified timeout (in seconds) when\n"; @@ -395,6 +410,28 @@ elsif ($Cmd eq "settime") { $Result = $TA->SetTime(); } +elsif ($Cmd eq "getproperty") +{ + $Result = $TA->GetProperties(); + if (defined $Result) + { + if ($PropName eq '*') + { + foreach my $Name (sort keys %$Result) + { + print "$Name=$Result->{$Name}\n"; + } + } + else + { + print "$Result->{$PropName}\n" if (defined $Result->{$PropName}); + } + } +} +elsif ($Cmd eq "upgrade") +{ + $Result = $TA->Upgrade($LocalFilename); +} elsif ($Cmd eq "getversion") { $Result = $TA->GetVersion();

1 0

Francois Gouget : testbot/TestAgent: Verify that only one command is specified on the command line.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: 0730c9b0632456cd5c6a36a75044c04529ba8de3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0730c9b0632456cd5c6a36a7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:54 2014 +0200 testbot/TestAgent: Verify that only one command is specified on the command line. --- testbot/scripts/TestAgent | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 4fa8f4f..e238967 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -59,6 +59,17 @@ my $RunFlags = 0; my ($Port, $ConnectTimeout, $Timeout, $Keepalive, $TunnelOpt); my $Usage; +sub set_cmd($) +{ + my ($Value) = @_; + if (defined $Cmd) + { + error("the '$Cmd' and '$Value' commands are mutually exclusive\n"); + $Usage = 2; + } + $Cmd = $Value; +} + sub check_opt_val($$) { my ($option, $val) = @_; @@ -138,7 +149,7 @@ while (@ARGV) } elsif ($arg eq "sendfile") { - $Cmd = $arg; + set_cmd($arg); $LocalFilename = check_opt_val($arg, $LocalFilename); if (!$Usage) { @@ -155,7 +166,7 @@ while (@ARGV) } elsif ($arg eq "getfile") { - $Cmd = $arg; + set_cmd($arg); $ServerFilename = check_opt_val($arg, $ServerFilename); if (!$Usage) { @@ -172,28 +183,28 @@ while (@ARGV) } elsif ($arg eq "run") { + set_cmd($arg); @Run = @ARGV; - $Cmd = $arg; last; } elsif ($arg eq "wait") { - $Cmd = $arg; + set_cmd($arg); $WaitPid = check_opt_val($arg, $WaitPid); } elsif ($arg eq "rm") { - $Cmd = $arg; + set_cmd($arg); @Rm = @ARGV; last; } elsif ($arg eq "getversion") { - $Cmd = $arg; + set_cmd($arg); } elsif ($arg eq "ping" or $arg eq "settime") { - $Cmd = $arg; + set_cmd($arg); } else {

1 0

Francois Gouget : testbot/testagentd: Add support for upgrading the TestAgent server.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: 891882fd982ed745d5fb6fb3eaaf610b661a6a27 URL: http://source.winehq.org/git/tools.git/?a=commit;h=891882fd982ed745d5fb6fb3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:45 2014 +0200 testbot/testagentd: Add support for upgrading the TestAgent server. --- testbot/lib/WineTestBot/TestAgent.pm | 100 ++++++++++++++++++++++++++ testbot/src/testagentd/platform.h | 7 ++ testbot/src/testagentd/platform_unix.c | 31 ++++++++ testbot/src/testagentd/platform_windows.c | 33 +++++++++ testbot/src/testagentd/testagentd.c | 112 ++++++++++++++++++++++++++++- 5 files changed, 281 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=891882fd982ed745d5fb…

1 0

Francois Gouget : testbot/testagentd: Add a function to simplify formatting a message.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: 5179c8ff848da8da501c773a38bd8d9c9d0818ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=5179c8ff848da8da501c773a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:36 2014 +0200 testbot/testagentd: Add a function to simplify formatting a message. --- testbot/src/testagentd/testagentd.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 230683a..d5d8dfc 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -129,31 +129,38 @@ const char* status_names[] = {"ok:", "error:", "fatal:"}; /* If true, then the current connection is in a broken state */ static int broken = 0; -/* This is a message which indicates the reason for the status */ -static char* status_msg = NULL; -static unsigned status_size = 0; -static void vset_status_msg(const char* format, va_list valist) + +static char* vformat_msg(char** buf, unsigned* size, const char* format, va_list valist) { - int len; + unsigned len; va_list args; len = 1; do { - if (len >= status_size) + if (len >= *size) { /* len does not count the trailing '\0'. So add 1 and round up * to the next 16 bytes multiple. */ - status_size = (len + 1 + 0xf) & ~0xf; - status_msg = realloc(status_msg, status_size); + *size = (len + 1 + 0xf) & ~0xf; + *buf = realloc(*buf, *size); } va_copy(args, valist); - len = vsnprintf(status_msg, status_size, format, args); + len = vsnprintf(*buf, *size, format, args); va_end(args); if (len < 0) - len = status_size * 1.1; + len = *size * 1.1; } - while (len >= status_size); + while (len >= *size); + return *buf; +} + +/* This is a message which indicates the reason for the status */ +static char* status_msg = NULL; +static unsigned status_size = 0; +static void vset_status_msg(const char* format, va_list valist) +{ + vformat_msg(&status_msg, &status_size, format, valist); if (opt_debug || status != ST_OK) fprintf(stderr, "%s%s: %s\n", status_names[status], rpc_name(rpcid), status_msg); }

1 0

Francois Gouget : testbot/testagentd: Child processes should not inherit the server's sockets ( and other file descriptors).
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: 1ed804c36b35bf4fd51876b4d02e92f64afb0fb5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1ed804c36b35bf4fd51876b4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 15:45:24 2014 +0200 testbot/testagentd: Child processes should not inherit the server's sockets (and other file descriptors). --- testbot/src/testagentd/platform_windows.c | 2 +- testbot/src/testagentd/testagentd.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 9dda56a..89e435d 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -126,7 +126,7 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects) si.hStdInput = fhs[0]; si.hStdOutput = fhs[1]; si.hStdError = fhs[2]; - if (!CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS, + if (!CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi)) { set_status(ST_ERROR, "could not run '%s': %lu", cmdline, GetLastError()); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index b8f9c57..230683a 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1067,7 +1067,7 @@ int main(int argc, char** argv) char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; - int rc, addrlen; + int rc, sockflags, addrlen; int opt_usage = 0; SOCKET master; int on = 1; @@ -1171,6 +1171,11 @@ int main(int argc, char** argv) } /* Bind to the host in a protocol neutral way */ +#ifdef SOCK_CLOEXEC + sockflags = SOCK_CLOEXEC; +#else + sockflags = 0; +#endif rc = ta_getaddrinfo(NULL, opt_port, &addresses); if (rc) { @@ -1182,7 +1187,8 @@ int main(int argc, char** argv) debug("trying family=%d\n", addrp->ai_family); if (addrp->ai_family != PF_INET) continue; - master = socket(addrp->ai_family, addrp->ai_socktype, addrp->ai_protocol); + master = socket(addrp->ai_family, addrp->ai_socktype | sockflags, + addrp->ai_protocol); if (master < 0) continue; setsockopt(master, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)); @@ -1212,6 +1218,9 @@ int main(int argc, char** argv) SOCKET client; debug("Waiting in accept()\n"); client = accept(master, NULL, NULL); +#ifdef O_CLOEXEC + fcntl(client, F_SETFL, fcntl(client, F_GETFL, 0) | O_CLOEXEC); +#endif if (client >= 0) { if (is_host_allowed(client, opt_srchost, addrlen))

1 0

Francois Gouget : testbot/testagentd: Generate debugging information when compiling.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: bffa9e544e9b676747ce58d75fea294157938a4a URL: http://source.winehq.org/git/tools.git/?a=commit;h=bffa9e544e9b676747ce58d7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Apr 14 14:46:46 2014 +0200 testbot/testagentd: Generate debugging information when compiling. This way one just has to comment out the strip commands to get binaries with useful debug information. --- testbot/src/testagentd/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/src/testagentd/Makefile b/testbot/src/testagentd/Makefile index 676d71c..5a7b735 100644 --- a/testbot/src/testagentd/Makefile +++ b/testbot/src/testagentd/Makefile @@ -13,7 +13,7 @@ $(builddir)/testagentd: testagentd.o platform_unix.o strip $@ .c.o: - gcc -Wall -c -o $@ $< + gcc -Wall -g -c -o $@ $< TestAgentd.exe: testagentd.obj platform_windows.obj @@ -22,7 +22,7 @@ TestAgentd.exe: testagentd.obj platform_windows.obj .SUFFIXES: .obj .c.obj: - $(CROSSCC32) -Wall -c -o $@ $< + $(CROSSCC32) -Wall -g -c -o $@ $< testagentd.o testagentd.obj: platform.h platform_unix.o: platform.h list.h

1 0

Alexandre Julliard : testbot: Always use the configured web host name in registration emails.
by Alexandre Julliard April 14, 2014

April 14, 2014

Module: tools Branch: master Commit: c9aca501f71e74ef3ab76eba7202f45dd2e48c37 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c9aca501f71e74ef3ab76eba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 14 19:06:41 2014 +0200 testbot: Always use the configured web host name in registration emails. --- testbot/web/Register.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/web/Register.pl b/testbot/web/Register.pl index d5eb4cd..ca82d55 100644 --- a/testbot/web/Register.pl +++ b/testbot/web/Register.pl @@ -110,8 +110,8 @@ sub OnSendRequest { $Msg .= "Remarks:\n" . $self->GetParam("Remarks") . "\n"; } - my $URL = MakeSecureURL("/admin/UserDetails.pl?Key=" . - uri_escape($self->GetParam("Name"))); + my $URL = ($UseSSL ? "https://" : "http://") . $WebHostName . + "/admin/UserDetails.pl?Key=" . uri_escape($self->GetParam("Name")); $Msg .= "\nTo approve or deny the request, please go to " . $URL; open (SENDMAIL, "|/usr/sbin/sendmail -oi -t -odq");

1 0