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

Francois Gouget : testbot/build: Use the standard MinGW compiler names in the Build.pl script.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 77322aa20f775bb2aac62ff2764f5893281ef628 URL: http://source.winehq.org/git/tools.git/?a=commit;h=77322aa20f775bb2aac62ff2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:29 2013 +0100 testbot/build: Use the standard MinGW compiler names in the Build.pl script. The same fix was applied to the Reconfig.pl script previously. --- testbot/bin/build/Build.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 21899af..2964049 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -177,7 +177,7 @@ sub BuildTestExecutable if ($NeedConfigure) { InfoMsg "Reconfigure $Bits-bit crossbuild\n"; - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-pc-mingw32"); + my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1");

1 0

Francois Gouget : testbot/build: Let make rebuild the makefiles instead of calling config.status from Build .pl.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: e3a4ae40910388d8f68afa5abf3e47e515055d31 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e3a4ae40910388d8f68afa5a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:32 2013 +0100 testbot/build: Let make rebuild the makefiles instead of calling config.status from Build.pl. --- testbot/bin/build/Build.pl | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 2964049..76e73f4 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -192,7 +192,7 @@ sub BuildTestExecutable { InfoMsg "Recreating include/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file include/Makefile:Make.vars.in:include/Makefile.in " . + " make -j$ncpus include/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -214,7 +214,7 @@ sub BuildTestExecutable { InfoMsg "Rebuilding $BaseName import lib\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file $PatchType/$BaseName/Makefile:Make.vars.in:$PatchType/$BaseName/Makefile.in " . + " make -j$ncpus $PatchType/$BaseName/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -236,7 +236,7 @@ sub BuildTestExecutable { InfoMsg "Recreating tests/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ./config.status --file $PatchType/$BaseName/tests/Makefile:Make.vars.in:$PatchType/$BaseName/tests/Makefile.in " . + " make -j$ncpus $PatchType/$BaseName/tests/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/build: Also update the makefile if one of the top-level Make.*. in files is modified.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: fcab37e192762e826bf7dd6140bd20f6a246d7ea URL: http://source.winehq.org/git/tools.git/?a=commit;h=fcab37e192762e826bf7dd61… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:36 2013 +0100 testbot/build: Also update the makefile if one of the top-level Make.*.in files is modified. --- testbot/bin/build/Build.pl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 76e73f4..dca4328 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -86,7 +86,7 @@ sub ApplyPatch ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { - if ($Line =~ m=^diff.*tests/Makefile\.in=) + if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) { $NeedMakefile = 1; }

1 0

Francois Gouget : testbot/build: Time the Build.pl operations.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: dcb4c422b20f9b495fe701c06abb431a3bad2652 URL: http://source.winehq.org/git/tools.git/?a=commit;h=dcb4c422b20f9b495fe701c0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:31:39 2013 +0100 testbot/build: Time the Build.pl operations. --- testbot/bin/build/Build.pl | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index dca4328..ef3fece 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -179,7 +179,7 @@ sub BuildTestExecutable InfoMsg "Reconfigure $Bits-bit crossbuild\n"; my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); system("( cd $DataDir/build-mingw$Bits && set -x && " . - " ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . + " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -192,7 +192,7 @@ sub BuildTestExecutable { InfoMsg "Recreating include/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus include/Makefile " . + " time make -j$ncpus include/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -201,7 +201,7 @@ sub BuildTestExecutable } system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus include " . + " time make -j$ncpus include " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -214,7 +214,7 @@ sub BuildTestExecutable { InfoMsg "Rebuilding $BaseName import lib\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus $PatchType/$BaseName/Makefile " . + " time make -j$ncpus $PatchType/$BaseName/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -223,7 +223,7 @@ sub BuildTestExecutable else { system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . + " time make -j$ncpus -C $PatchType/$BaseName lib$BaseName.a " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -236,7 +236,7 @@ sub BuildTestExecutable { InfoMsg "Recreating tests/Makefile\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus $PatchType/$BaseName/tests/Makefile " . + " time make -j$ncpus $PatchType/$BaseName/tests/Makefile " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -249,7 +249,7 @@ sub BuildTestExecutable { InfoMsg "Making build dependencies\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus __builddeps__ " . + " time make -j$ncpus __builddeps__ " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) { @@ -269,7 +269,7 @@ sub BuildTestExecutable InfoMsg "Making test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . - " make -j$ncpus -C $TestsDir " . + " time make -j$ncpus -C $TestsDir " . ") >>$LogDir/Build.log 2>&1"); if ($? != 0) {

1 0

Francois Gouget : testbot/TestAgent: Quote the unknown command to avoid ambiguity.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 55a4611ff48ca27d8aea736a91e210b5bb27f4ad URL: http://source.winehq.org/git/tools.git/?a=commit;h=55a4611ff48ca27d8aea736a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:36:13 2013 +0100 testbot/TestAgent: Quote the unknown command to avoid ambiguity. --- testbot/scripts/TestAgent | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 521e741..897ca81 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -188,7 +188,7 @@ while (@ARGV) } else { - error("unknown command $arg\n"); + error("unknown command '$arg'\n"); $Usage = 2; } }

1 0

Francois Gouget : testbot/TestAgent: Provide command-line access to the wait RPC.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: ea0744c7908dd06db7bf6c5b4518ae832cd5d993 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ea0744c7908dd06db7bf6c5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:37:06 2013 +0100 testbot/TestAgent: Provide command-line access to the wait RPC. --- testbot/scripts/TestAgent | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 897ca81..bb7dd14 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -53,7 +53,7 @@ sub error(@) } my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); -my (@Run, $RunIn, $RunOut, $RunErr); +my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; my ($Port, $ConnectTimeout, $Timeout, $TunnelOpt); @@ -172,6 +172,11 @@ while (@ARGV) $Cmd = $arg; last; } + elsif ($arg eq "wait") + { + $Cmd = $arg; + $WaitPid = check_opt_val($arg, $WaitPid); + } elsif ($arg eq "rm") { $Cmd = $arg; @@ -216,6 +221,25 @@ if (!defined $Usage) error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; } + elsif ($Cmd eq "wait") + { + my $oldwarn = $SIG{__WARN__}; + $SIG{__WARN__} = sub { die $_[0] }; + my $bad = eval { $WaitPid < 0 }; + if (defined $oldwarn) + { + $SIG{__WARN__} = $oldwarn; + } + else + { + delete $SIG{__WARN__}; + } + if ($bad or $@) + { + error("the pid '$WaitPid' is invalid\n"); + $Usage = 2; + } + } elsif ($Cmd eq "rm" and !@Rm) { error("you must specify the server files to delete\n"); @@ -243,6 +267,7 @@ if (defined $Usage) print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n"; print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; print "or $name0 [options] <hostname> run <command> <arguments>\n"; + print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; print "or $name0 [options] <hostname> [ping|version]\n"; print "\n"; @@ -264,6 +289,7 @@ if (defined $Usage) print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; print " specified server file.\n"; print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; + print " wait Waits for the specified child process on the server.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the version of the server.\n"; print " ping Makes sure the server is still alive.\n"; @@ -318,6 +344,11 @@ elsif ($Cmd eq "run") } } } +elsif ($Cmd eq "wait") +{ + $Result = $TA->Wait($WaitPid, $Timeout); + print "Child exit status: $Result\n" if (defined $Result); +} elsif ($Cmd eq "rm") { $Result = $TA->Rm(@Rm);

1 0

Francois Gouget : testbot/testagentd: Sanity check the list sizes.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: b48ed0abc3eeafe5639223576b3ab246af226c20 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b48ed0abc3eeafe563922357… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:37:51 2013 +0100 testbot/testagentd: Sanity check the list sizes. This heuristic normally lets us detect and drop connections that use the wrong protocol. --- testbot/src/testagentd/testagentd.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 75782c4..e99dcb4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -387,10 +387,17 @@ static int skip_entries(SOCKET client, uint32_t count) static int recv_list_size(SOCKET client, uint32_t *u32) { - int success = recv_raw_uint32(client, u32); - if (success) - debug(" recv_list_size() -> %u\n", *u32); - return success; + if (!recv_raw_uint32(client, u32)) + return 0; + debug(" recv_list_size() -> %u\n", *u32); + + if (*u32 >= 1048576) + { + /* The client is in fact most likely not speaking the right protocol */ + set_status(ST_FATAL, "the list size is too big (%d)", *u32); + return 0; + } + return 1; } static int expect_list_size(SOCKET client, uint32_t expected)

1 0

Francois Gouget : testbot/web: Make JobDetails. pl handle empty err logs correctly.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 0c329e178170c6c489ca98198f2958b8d0c30c5c URL: http://source.winehq.org/git/tools.git/?a=commit;h=0c329e178170c6c489ca9819… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:45 2013 +0100 testbot/web: Make JobDetails.pl handle empty err logs correctly. The task scripts used to create the err log and then delete it if it was empty. However the Task module now redirects the script's stderr to the err log to help diagnose script bugs (e.g. perl errors). That means the script must only append to the err log and should certainly not delete it. So JobDetails.pl should now be able to deal with empty err logs. --- testbot/web/JobDetails.pl | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 11bb122..a751f11 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -410,22 +410,25 @@ sub GenerateBody if (open ERRFILE, "<$ErrName") { - if (! $First) - { - print "</code></pre>\n"; - $First = 1; - } + $CurrentDll = "*err*"; while (defined($Line = <ERRFILE>)) { $HasLogEntries = 1; chomp($Line); - if ($First) + if ($PrintedDll ne $CurrentDll) { - print "<br>\n"; - print "<pre><code>"; - $First = !1; + if ($First) + { + $First = !1; + } + else + { + print "</code></pre>\n"; + } + $PrintedDll = $CurrentDll; } - print $self->escapeHTML($Line), "\n"; + print "<br>\n"; + print "<pre><code>", $self->escapeHTML($Line), "\n"; } close ERRFILE; }

1 0

Francois Gouget : testbot/web: Remove some dead code in JobDetails.pl.
by Alexandre Julliard 27 Mar '13

27 Mar '13

Module: tools Branch: master Commit: 508205dfe36c288ee6ec510e252a4585e5b8df8f URL: http://source.winehq.org/git/tools.git/?a=commit;h=508205dfe36c288ee6ec510e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:55 2013 +0100 testbot/web: Remove some dead code in JobDetails.pl. --- testbot/web/JobDetails.pl | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a751f11..651335c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -360,7 +360,6 @@ sub GenerateBody my $First = 1; my $CurrentDll = ""; my $PrintedDll = ""; - my $Crashed = !1; my $Line; while (defined($Line = <LOGFILE>)) { @@ -392,10 +391,6 @@ sub GenerateBody print "<pre><code>"; $First = !1; } - if ($Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) - { - $Crashed = 1; - } if (! $FullLog && $Line =~ m/^[^:]+:([^ ]+) done $258$/) { print "$1: Timeout\n";

1 0

Jacek Caban : urlmon: Fixed handling URIs with implicit file scheme in CoInternetCombineUrlEx.
by Alexandre Julliard 26 Mar '13

26 Mar '13

Module: wine Branch: master Commit: 79b7c1108e3a0c8626799a20492e6c1daecfd928 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79b7c1108e3a0c8626799a204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 11:34:12 2013 +0100 urlmon: Fixed handling URIs with implicit file scheme in CoInternetCombineUrlEx. --- dlls/urlmon/tests/uri.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 4 +- 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index bc6d1be..e5faa81 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -360,6 +360,31 @@ static const uri_properties uri_tests[] = { {URLZONE_INVALID,E_NOTIMPL,FALSE} } }, + { "file:///z:/test dir/README.txt", 0, S_OK, FALSE, + { + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {".txt",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/z:/test%20dir/README.txt",S_OK}, + {"/z:/test%20dir/README.txt",S_OK}, + {"",S_FALSE}, + {"file:///z:/test dir/README.txt",S_OK}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } + }, { "urn:nothing:should:happen here", 0, S_OK, FALSE, { {"urn:nothing:should:happen here",S_OK,FALSE}, @@ -6926,7 +6951,62 @@ static const uri_combine_test uri_combine_tests[] = { {URL_SCHEME_HTTP,S_OK}, {URLZONE_INVALID,E_NOTIMPL} } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } + }, + { "http://google.com/test",0, + "c:\\test\\", Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, + 0,S_OK,FALSE, + { + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"file:///c:/test/",S_OK}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"",S_FALSE}, + {"/c:/test/",S_OK}, + {"/c:/test/",S_OK}, + {"",S_FALSE}, + {"c:\\test\\",S_OK,FALSE,"file:///c:/test/"}, + {"file",S_OK}, + {"",S_FALSE}, + {"",S_FALSE} + }, + { + {Uri_HOST_UNKNOWN,S_OK}, + {0,S_FALSE}, + {URL_SCHEME_FILE,S_OK}, + {URLZONE_INVALID,E_NOTIMPL} + } } + }; typedef struct _uri_parse_test { diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 42cfe71..0f6ee31 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -6461,7 +6461,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result, return E_OUTOFMEMORY; } - parse_uri(&data, 0); + parse_uri(&data, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME); hr = Uri_Construct(NULL, (void**)&ret); if(FAILED(hr)) { @@ -6800,7 +6800,7 @@ HRESULT WINAPI CoInternetCombineUrlEx(IUri *pBaseUri, LPCWSTR pwzRelativeUrl, DW } } - hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE, 0, &relative); + hr = CreateUri(pwzRelativeUrl, Uri_CREATE_ALLOW_RELATIVE|Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &relative); if(FAILED(hr)) { *ppCombinedUri = NULL; return hr;

1 0