October 2012 - Wine-commits

Francois Gouget : testbot/lib: Use IO::Socket::INET as a fallback for IO:: Socket::IP.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: c1c9d2d028e2d9b04527a71205d2634d53c4c321 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1c9d2d028e2d9b04527a712… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:14:06 2012 +0200 testbot/lib: Use IO::Socket::INET as a fallback for IO::Socket::IP. The latter provides transparent support for IPv6 but is missing on older Linux distributions. --- testbot/doc/INSTALL.txt | 2 +- testbot/lib/WineTestBot/TestAgent.pm | 29 +++++++++++++++++++++++------ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 1cbfd83..b01aa48 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -8,7 +8,7 @@ Dependencies: - Sendmail - Sys::Virt (libsys-virt-perl, see http://libvirt.org/) - Image::Magick (perlmagick) -- IO::Socket::IP (libio-socket-ip-perl) +- Optional: IO::Socket::IP (for IPv6, libio-socket-ip-perl) MySQL setup: - Create a new 'winetestbot' database and its tables using the diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 513b50f..7b6eb56 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -21,14 +21,33 @@ package TestAgent; use strict; -use IO::Socket::IP; - use WineTestBot::Config; use WineTestBot::Log; my $DONE_READING = 0; my $DONE_WRITING = 1; + +sub create_ip_socket(@) +{ + my $socket; + eval { $socket = IO::Socket::IP->new(@_); }; + return $socket; +} + +sub create_inet_socket(@) +{ + return IO::Socket::INET->new(@_); +} + +my $create_socket = \&create_ip_socket; +eval "use IO::Socket::IP"; +if ($@) +{ + use IO::Socket::INET; + $create_socket = \&create_inet_socket; +} + sub _Connect($;$) { my ($Hostname, $Timeout) = @_; @@ -38,10 +57,8 @@ sub _Connect($;$) while (1) { my $ConnectTimeout = $Timeout < 30 ? $Timeout : 30; - my $socket = IO::Socket::IP->new(PeerHost => $Hostname, - PeerPort => $AgentPort, - Type => SOCK_STREAM, - Timeout => $ConnectTimeout); + my $socket = &$create_socket(PeerHost => $Hostname, PeerPort => $AgentPort, + Type => SOCK_STREAM, Timeout => $ConnectTimeout); return $socket if ($socket); $Timeout = $Deadline - time();

1 0

Francois Gouget : testbot/lib: Standardize a few LogMsg statements.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: d1dbbfc9d7bee8ddd0d1ccf3d8201f97fdad66bf URL: http://source.winehq.org/git/tools.git/?a=commit;h=d1dbbfc9d7bee8ddd0d1ccf3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 18:35:17 2012 +0200 testbot/lib: Standardize a few LogMsg statements. --- testbot/lib/WineTestBot/TestAgent.pm | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index 7b6eb56..f2fa888 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -138,7 +138,7 @@ sub _Copy($$) sub SendFile($$$) { my ($Hostname, $HostPathName, $GuestPathName) = @_; - LogMsg("SendFile $HostPathName -> $Hostname $GuestPathName\n"); + LogMsg "SendFile $HostPathName -> $Hostname $GuestPathName\n"; my $fh; if (!open($fh, "<", $HostPathName)) @@ -171,7 +171,7 @@ sub SendFile($$$) sub GetFile($$$) { my ($Hostname, $GuestPathName, $HostPathName) = @_; - LogMsg("GetFile $Hostname $GuestPathName -> $HostPathName\n"); + LogMsg "GetFile $Hostname $GuestPathName -> $HostPathName\n"; my $fh; if (!open($fh, ">", $HostPathName)) @@ -227,7 +227,7 @@ sub GetFile($$$) sub RunScript($$$) { my ($Hostname, $ScriptText, $Timeout) = @_; - LogMsg("RunScript $Hostname ", ($Timeout || 0), " [$ScriptText]\n"); + LogMsg "RunScript $Hostname ", ($Timeout || 0), " [$ScriptText]\n"; my $Err; my $nc = _Connect($Hostname);

1 0

Francois Gouget : testbot/web: Link the Patches page to the corresponding job details pages.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: 894854ea0711fe9646fb048cda83bbda2a7f512b URL: http://source.winehq.org/git/tools.git/?a=commit;h=894854ea0711fe9646fb048c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:14:01 2012 +0200 testbot/web: Link the Patches page to the corresponding job details pages. --- testbot/web/PatchesList.pl | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/testbot/web/PatchesList.pl b/testbot/web/PatchesList.pl index 0936019..4e3437a 100644 --- a/testbot/web/PatchesList.pl +++ b/testbot/web/PatchesList.pl @@ -20,6 +20,7 @@ use strict; package PatchesListPage; +use URI::Escape; use ObjectModel::PropertyDescriptor; use ObjectModel::CGI::CollectionPage; use WineTestBot::Patches; @@ -78,6 +79,25 @@ sub GeneratePage $self->SUPER::GeneratePage(@_); } +sub GenerateDataCell +{ + my $self = shift; + my ($CollectionBlock, $Item, $PropertyDescriptor, $DetailsPage) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + if ($PropertyName eq "Disposition" and $Item->Disposition =~ /job ([0-9]+)$/) + { + my $JobId = $1; + my $URI = "/JobDetails.pl?Key=" . uri_escape($JobId); + print "<td><a href='" . $self->escapeHTML($URI) . "'>" . + "Job " . $self->escapeHTML($JobId) . "</a></td>\n"; + } + else + { + $self->SUPER::GenerateDataCell(@_); + } +} + package main; my $Request = shift;

1 0

Francois Gouget : testbot/VMs: Tweak the sort order so retired and deleted VMs are last.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: 7eb5ce4728a04a39a4203d9c6518d85ecd5cdb16 URL: http://source.winehq.org/git/tools.git/?a=commit;h=7eb5ce4728a04a39a4203d9c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:14:18 2012 +0200 testbot/VMs: Tweak the sort order so retired and deleted VMs are last. --- testbot/lib/WineTestBot/VMs.pm | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index a356e98..734a58d 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -601,20 +601,19 @@ sub SortKeysBySortOrder my $self = shift; my $Keys = $_[0]; + # Sort retired and deleted VMs last + my %RoleOrders = ("retired" => 1, "deleted" => 2); + my %SortOrder; foreach my $Key (@$Keys) { my $Item = $self->GetItem($Key); - $SortOrder{$Key} = [$Item->Role, $Item->SortOrder]; + $SortOrder{$Key} = [$RoleOrders{$Item->Role} || 0, $Item->SortOrder]; } my @SortedKeys = sort { my ($soa, $sob) = ($SortOrder{$a}, $SortOrder{$b}); - # Sort deleted VMs last - return 1 if (@$soa[0] eq "deleted"); - return -1 if (@$sob[0] eq "deleted"); - # Otherwise follow the SortOrder key - return @$soa[1] <=> @$sob[1]; + return @$soa[0] <=> @$sob[0] || @$soa[1] <=> @$sob[1]; } @$Keys; return \@SortedKeys; }

1 0

Francois Gouget : testbot/web: Make it possible for web pages to set their page title.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: c1d75ee839c357dfb32b2ce0b13e39fb7daa4011 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c1d75ee839c357dfb32b2ce0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:14:57 2012 +0200 testbot/web: Make it possible for web pages to set their page title. Previously they could set their header but not the label that appears in the Web browser's tab or title bar. --- testbot/lib/ObjectModel/CGI/Page.pm | 14 ++++++++++++++ testbot/lib/WineTestBot/CGI/PageBase.pm | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/Page.pm b/testbot/lib/ObjectModel/CGI/Page.pm index a21ad36..0661519 100644 --- a/testbot/lib/ObjectModel/CGI/Page.pm +++ b/testbot/lib/ObjectModel/CGI/Page.pm @@ -102,6 +102,20 @@ sub SetCookies $self->{PageBase}->SetCookies($self); } +sub GetPageTitle +{ + my $self = shift; + + return $self->{PageBase}->GetPageTitle($self); +} + +sub GetTitle +{ + my $self = shift; + + return undef; +} + sub GenerateHeader { my $self = shift; diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 141833f..5439ebf 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -195,16 +195,28 @@ sub SetCookies } } +sub GetPageTitle +{ + my $self = shift; + my $Page = $_[0]; + + my $Title = $Page->GetTitle() || ""; + $Title .= " - " if ($Title ne ""); + $Title .= "${ProjectName} Test Bot"; + return $Title; +} + sub GenerateHeader { my $self = shift; my $Page = $_[0]; + my $Title = $Page->CGI->escapeHTML($Page->GetPageTitle()); print <<EOF; <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> <html> <head> - <title>${ProjectName} Test Bot</title> + <title>$Title</title> <link rel='icon' href='/${ProjectName}FavIcon.png' type='image/png'> <link rel='shortcut icon' href='/${ProjectName}FavIcon.png' type='image/png'> <link rel='stylesheet' href='/${ProjectName}TestBot.css' type='text/css' media='screen'>

1 0

Francois Gouget : testbot/web: Give better titles to the job details pages.
by Alexandre Julliard 25 Oct '12

25 Oct '12

Module: tools Branch: master Commit: 41b35e60772c4c7abfc0a720e0e6a22f7df2d12b URL: http://source.winehq.org/git/tools.git/?a=commit;h=41b35e60772c4c7abfc0a720… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 25 19:15:06 2012 +0200 testbot/web: Give better titles to the job details pages. In particular show the job remarks field which is usually the patch subject line. Also arrange for this subject line to be visible in the Web browser's tab label. --- testbot/web/JobDetails.pl | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 50512b0..ea07014 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -39,22 +39,32 @@ sub _initialize { $JobId = $self->GetParam("JobId"); } - my $Job = CreateJobs()->GetItem($JobId); - if (! defined($Job)) + $self->{Job} = CreateJobs()->GetItem($JobId); + if (!defined $self->{Job}) { $self->Redirect("/index.pl"); } + $self->{JobId} = $JobId; - $self->{JobId} = $Job->Id; + $self->SUPER::_initialize(@_, CreateStepsTasks($self->{Job})); +} + +sub GetPageTitle() +{ + my $self = shift; - $self->SUPER::_initialize(@_, CreateStepsTasks($Job)); + my $PageTitle = $self->{Job}->Remarks; + $PageTitle =~ s/^[[]wine-patches[]] //; + $PageTitle = "Job " . $self->{JobId} if ($PageTitle eq ""); + $PageTitle .= " - ${ProjectName} Test Bot"; + return $PageTitle; } sub GetTitle() { my $self = shift; - return "Job " . $self->{JobId}; + return "Job " . $self->{JobId} . " - " . $self->{Job}->Remarks; } sub DisplayProperty

1 0

André Hentschel : windowscodecs: Fix copy-paste error (coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 8683250033e3c728b6f9ee9d03980fc4c874b214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8683250033e3c728b6f9ee9d0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:15 2012 +0200 windowscodecs: Fix copy-paste error (coverity). --- dlls/windowscodecs/regsvr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 626887f..e424819 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -817,7 +817,7 @@ static HRESULT register_metadatareaders(struct regsvr_metadatareader const *list if (res != ERROR_SUCCESS) goto error_close_clsid_key; } - if (list->vendor) { + if (list->metadata_format) { StringFromGUID2(list->metadata_format, buf, 39); res = RegSetValueExW(clsid_key, metadataformat_valuename, 0, REG_SZ, (CONST BYTE*)(buf), 78);

1 0

André Hentschel : netapi32: Fix copy-paste error ( coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 0b05d4cab1fd557df39187676e836eed4f70191a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b05d4cab1fd557df39187676… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:10 2012 +0200 netapi32: Fix copy-paste error (coverity). --- dlls/netapi32/nbt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 404fbd9..3cd8a61 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1003,7 +1003,7 @@ static UCHAR NetBTCall(void *adapt, PNCB ncb, void **sess) setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, (char*)&timeout, sizeof(timeout)); } - if (ncb->ncb_rto > 0) + if (ncb->ncb_sto > 0) { timeout = ncb->ncb_sto * 500; setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char*)&timeout,

1 0

André Hentschel : rpcrt4: Fix copy-paste error ( coverity).
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: c60a0b857d70ba918b8bf8d085977fea59523c9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c60a0b857d70ba918b8bf8d08… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 24 19:27:23 2012 +0200 rpcrt4: Fix copy-paste error (coverity). --- dlls/rpcrt4/ndr_stubless.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index d7a81bd..9c07f4e 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -853,7 +853,7 @@ LONG_PTR CDECL ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORMAT_STRING pForma if (comm_fault_offsets->FaultOffset == -1) fault_status = (ULONG *)&RetVal; else if (comm_fault_offsets->FaultOffset >= 0) - fault_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->CommOffset); + fault_status = *(ULONG **)ARG_FROM_OFFSET(stubMsg.StackTop, comm_fault_offsets->FaultOffset); else fault_status = NULL;

1 0

Jason Edmeades : cmd: Correct for /f string and command set handling.
by Alexandre Julliard 24 Oct '12

24 Oct '12

Module: wine Branch: master Commit: 182c5459b02f1154712afb219a8384e661effc65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182c5459b02f1154712afb219… Author: Jason Edmeades <jason(a)edmeades.me.uk> Date: Tue Oct 23 00:28:18 2012 +0100 cmd: Correct for /f string and command set handling. --- programs/cmd/builtins.c | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6e252fe..721a1b7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2039,6 +2039,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { (forf_usebackq && *itemStart != '\''))) { HANDLE input; + WCHAR *itemparm; WINE_TRACE("Processing for filespec from item %d '%s'\n", itemNum, wine_dbgstr_w(item)); @@ -2049,12 +2050,13 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { (!forf_usebackq && *itemStart == '\'')) { /* Use itemstart because the command is the whole set, not just the first token */ - input = WCMD_forf_getinputhandle(forf_usebackq, itemStart, TRUE); + itemparm = itemStart; } else { /* Use item because the file to process is just the first item in the set */ - input = WCMD_forf_getinputhandle(forf_usebackq, item, FALSE); + itemparm = item; } + input = WCMD_forf_getinputhandle(forf_usebackq, itemparm, (itemparm==itemStart)); /* Process the input file */ if (input == INVALID_HANDLE_VALUE) { @@ -2074,6 +2076,12 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { CloseHandle (input); } + /* When we have processed the item as a whole command, abort future set processing */ + if (itemparm==itemStart) { + thisSet = NULL; + break; + } + /* Filesets - A string literal */ } else if (doFileset && ((!forf_usebackq && *itemStart == '"') || (forf_usebackq && *itemStart == '\''))) { @@ -2082,6 +2090,10 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { strcpyW(buffer, item); WCMD_parse_line(cmdStart, firstCmd, &cmdEnd, variable, buffer, &doExecuted, &forf_skip, forf_eol); + + /* Only one string can be supplied in the whole set, abort future set processing */ + thisSet = NULL; + break; } WINE_TRACE("Post-command, cmdEnd = %p\n", cmdEnd); @@ -2089,7 +2101,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { } /* Move onto the next set line */ - thisSet = thisSet->nextcommand; + if (thisSet) thisSet = thisSet->nextcommand; } /* If /L is provided, now run the for loop */

1 0