November 2017 - Wine-commits

Nikolay Sivov : mshtml: Make sure actual host length matches returned BSTR length.
by Alexandre Julliard 23 Nov '17

23 Nov '17

Module: wine Branch: master Commit: 0592537862c3b3abfcc187bf9f6e2ec9aa09b10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0592537862c3b3abfcc187bf9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 22 17:55:07 2017 +0300 mshtml: Make sure actual host length matches returned BSTR length. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllocation.c | 7 +++++-- dlls/mshtml/tests/htmllocation.c | 7 ++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c index de66ff5..59b20f6 100644 --- a/dlls/mshtml/htmllocation.c +++ b/dlls/mshtml/htmllocation.c @@ -351,13 +351,16 @@ static HRESULT WINAPI HTMLLocation_get_host(IHTMLLocation *iface, BSTR *p) if(url.nPort) { /* <hostname>:<port> */ const WCHAR format[] = {'%','u',0}; - DWORD len = url.dwHostNameLength + 1 + 5; + DWORD len, port_len; + WCHAR portW[6]; WCHAR *buf; + port_len = snprintfW(portW, sizeof(portW)/sizeof(portW[0]), format, url.nPort); + len = url.dwHostNameLength + 1 /* ':' */ + port_len; buf = *p = SysAllocStringLen(NULL, len); memcpy(buf, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); buf[url.dwHostNameLength] = ':'; - snprintfW(buf + url.dwHostNameLength + 1, 6, format, url.nPort); + memcpy(buf + url.dwHostNameLength + 1, portW, port_len * sizeof(WCHAR)); }else *p = SysAllocStringLen(url.lpszHostName, url.dwHostNameLength); diff --git a/dlls/mshtml/tests/htmllocation.c b/dlls/mshtml/tests/htmllocation.c index ee241e7..458960a 100644 --- a/dlls/mshtml/tests/htmllocation.c +++ b/dlls/mshtml/tests/htmllocation.c @@ -168,10 +168,15 @@ static void test_host(IHTMLLocation *loc, const struct location_test *test) hres = IHTMLLocation_get_host(loc, &str); ok(hres == S_OK, "%s: get_host failed: 0x%08x\n", test->name, hres); - if(hres == S_OK) + if(hres == S_OK){ + int len = test->host ? strlen(test->host) : 0; ok(str_eq_wa(str, test->host), "%s: expected retrieved host to be L\"%s\", was: %s\n", test->name, test->host, wine_dbgstr_w(str)); + ok(SysStringLen(str) == len, "%s: unexpected string length %u, expected %u\n", + test->name, SysStringLen(str), len); + } + SysFreeString(str); }

1 0

Huw Davies : ole32: Rename structure member to target device size.
by Alexandre Julliard 23 Nov '17

23 Nov '17

Module: wine Branch: master Commit: 32766b5253b36b407e0a68452a292312fd65c1b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32766b5253b36b407e0a68452… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Nov 22 08:30:51 2017 +0000 ole32: Rename structure member to target device size. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 5 +++-- dlls/ole32/tests/ole2.c | 13 +++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 48453b4..0256957 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -79,7 +79,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -808,7 +809,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag if (cache_entry->fmtetc.ptd) FIXME("ptd not serialized\n"); - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = cache_entry->fmtetc.dwAspect; header.lindex = cache_entry->fmtetc.lindex; header.advf = cache_entry->advise_flags; diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 07157a7..a72985e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -143,7 +143,8 @@ typedef struct PresentationDataHeader * DWORD length; * CHAR format_name[length]; (null-terminated) */ - DWORD unknown3; /* 4, possibly TYMED_ISTREAM */ + DWORD tdSize; /* This is actually a truncated DVTARGETDEVICE, if tdSize > sizeof(DWORD) + then there are tdSize - sizeof(DWORD) more bytes before dvAspect */ DVASPECT dvAspect; DWORD lindex; DWORD advf; @@ -1279,7 +1280,7 @@ static void test_OleLoad(IStorage *pStorage) break; } - header.unknown3 = 4; + header.tdSize = sizeof(header.tdSize); header.dvAspect = DVASPECT_CONTENT; header.lindex = -1; header.advf = 1 << i; @@ -3691,7 +3692,7 @@ static void test_data_cache_save(void) hr = IStream_Write(stm, clipformat, sizeof(clipformat), NULL); ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = DVASPECT_CONTENT; hdr.lindex = -1; hdr.advf = ADVF_PRIMEFIRST; @@ -3966,8 +3967,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ ok(bytes >= 24, "read %u bytes\n", bytes); if (winetest_debug > 1) - trace("header: unknown3 %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", - header.unknown3, header.dvAspect, header.lindex, header.advf, header.unknown7, + trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", + header.tdSize, header.dvAspect, header.lindex, header.advf, header.unknown7, header.dwObjectExtentX, header.dwObjectExtentY, header.dwSize); } @@ -4049,7 +4050,7 @@ static IStorage *create_storage_from_def(const struct storage_def *stg_def) } ok(hr == S_OK, "unexpected %#x\n", hr); - hdr.unknown3 = 4; + hdr.tdSize = sizeof(hdr.tdSize); hdr.dvAspect = stg_def->stream[i].dvAspect; hdr.lindex = -1; hdr.advf = stg_def->stream[i].advf;

1 0

Francois Gouget : testbot: Always create the Task directory even if there is nothing to stage.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: tools Branch: master Commit: 14de13e34f5b8f4fe7201e2501372bed0be9c7ba URL: http://source.winehq.org/git/tools.git/?a=commit;h=14de13e34f5b8f4fe7201e25… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 22 11:24:33 2017 +0100 testbot: Always create the Task directory even if there is nothing to stage. Otherwise the Engine will have nowhere to put the error log when forking the Task's child process. This particularly impacts the Reconfig Tasks since they neither have a patch nor executable to stage. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Steps.pm | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 8c5d4ec..95c0a45 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -87,10 +87,9 @@ sub HandleStaging($$) { my ($self) = @_; - if (! $self->InStaging) - { - return undef; - } + # Always at least create the step's directory + my $StepDir = $self->CreateDir(); + return undef if (! $self->InStaging); my $FileName = $self->FileName; if ($FileName !~ m/^[0-9a-z-]+_(.*)$/) @@ -99,9 +98,7 @@ sub HandleStaging($$) } my $BaseName = $1; my $StagingFileName = "$DataDir/staging/$FileName"; - my $StepDir = $self->CreateDir(); - my $FinalFileName = "$StepDir/$BaseName"; - if (!move($StagingFileName, $FinalFileName)) + if (!move($StagingFileName, "$StepDir/$BaseName")) { return "Could not move the staging file: $!"; }

1 0

Francois Gouget : testbot/web: Allow administrators to retrieve the Engine log.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: tools Branch: master Commit: c5db3541484dfc7716c6c9614605fdb69e804a50 URL: http://source.winehq.org/git/tools.git/?a=commit;h=c5db3541484dfc7716c6c961… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 22 16:36:43 2017 +0100 testbot/web: Allow administrators to retrieve the Engine log. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/CGI/PageBase.pm | 3 + testbot/lib/WineTestBot/Log.pm | 8 +- testbot/web/admin/Log.pl | 103 +++++++++++++++++++ testbot/web/admin/SendLog.pl | 173 ++++++++++++++++++++++++++++++++ 4 files changed, 286 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/CGI/PageBase.pm b/testbot/lib/WineTestBot/CGI/PageBase.pm index 04759ca..4ae190e 100644 --- a/testbot/lib/WineTestBot/CGI/PageBase.pm +++ b/testbot/lib/WineTestBot/CGI/PageBase.pm @@ -298,6 +298,9 @@ EOF print " <li class='divider'> </li>\n"; print " <li><p><a href='", MakeSecureURL("/admin/BranchesList.pl"), "'>Branches</a></p></li>\n"; + print " <li class='divider'> </li>\n"; + print " <li><p><a href='", MakeSecureURL("/admin/Log.pl"), + "'>Engine Log</a></p></li>\n"; print " <li class='bot'> </li>\n"; } diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index 7abf2cb..f1499dd 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(&LogMsg &Time &Elapsed); +(a)EXPORT = qw(&LogMsg &OpenLog &Time &Elapsed); my $logfile; my $logprefix; @@ -58,6 +58,12 @@ sub LogMsg(@) print $logfile scalar localtime, " ", $logprefix, "[$$]: ", @_ if ($logfile); } +sub OpenLog() +{ + my $Handle; + return open($Handle, "<", "$LogDir/log") ? $Handle : undef; +} + =pod =over 12 diff --git a/testbot/web/admin/Log.pl b/testbot/web/admin/Log.pl new file mode 100644 index 0000000..b9754bd --- /dev/null +++ b/testbot/web/admin/Log.pl @@ -0,0 +1,103 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Let the administrator download an excerpt of the Engine log +# +# Copyright 2017 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +package LogPage; + +use ObjectModel::BasicPropertyDescriptor; +use ObjectModel::CGI::FreeFormPage; +use WineTestBot::Config; +use WineTestBot::Log; + +(a)LogPage::ISA = qw(ObjectModel::CGI::FreeFormPage); + +sub _initialize($$$) +{ + my ($self, $Request, $RequiredRole) = @_; + + my @PropertyDescriptors = ( + CreateBasicPropertyDescriptor("Hours", "Hours", !1, !1, "N", 2), + ); + $self->SUPER::_initialize($Request, $RequiredRole, \@PropertyDescriptors); +} + +sub GetPropertyValue($$) +{ + my ($self, $PropertyDescriptor) = @_; + + my $PropertyName = $PropertyDescriptor->GetName(); + return 1 if ($PropertyName eq "Hours"); # Provides a default value + + return $self->SUPER::GetPropertyValue($PropertyDescriptor); +} + +sub GetHeaderText($) +{ + #my ($self) = @_; + return "Specify how many hours of log messages to get."; +} + +sub GetActions($) +{ + my ($self) = @_; + + my $Actions = $self->SUPER::GetActions(); + push(@$Actions, "Download"); + + return $Actions; +} + +sub OnDownload($) +{ + my ($self) = @_; + $self->Redirect("/admin/SendLog.pl?Hours=". $self->GetParam("Hours")); # does not return + exit; +} + +sub OnAction($$) +{ + my ($self, $Action) = @_; + + return $self->OnDownload() if ($Action eq "Download"); + return $self->SUPER::OnAction($Action); +} + +sub GenerateBody($) +{ + my ($self) = @_; + + my $Log = OpenLog(); + if (defined $Log) + { + my $Size = (stat($Log))[7]; + $Size = int($Size / 1024 / 1024); + print "<div class='Content'><p>Log size: $Size MB</p></div>\n\n"; + close($Log); + } + $self->SUPER::GenerateBody(); +} + + +package main; + +my $Request = shift; + +my $LogPage = LogPage->new($Request, "admin"); +$LogPage->GeneratePage(); diff --git a/testbot/web/admin/SendLog.pl b/testbot/web/admin/SendLog.pl new file mode 100644 index 0000000..7044c33 --- /dev/null +++ b/testbot/web/admin/SendLog.pl @@ -0,0 +1,173 @@ +# -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- +# Sends an excerpt of the TestBot Engine log +# +# Copyright 2017 Francois Gouget +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + +use strict; + +use HTTP::Date; + +use Apache2::Const -compile => qw(REDIRECT); +use CGI; +use CGI::Cookie; +use URI::Escape; +use WineTestBot::Config; +use WineTestBot::CGI::Sessions; +use WineTestBot::Log; + + +sub GetStartPosition($$) +{ + my ($Log, $Hours) = @_; + + # The log file can be pretty long so do a binary search to figure out where + # the oldest log line less than $Hours old is. + my $Cutoff = time() - 3600 * $Hours; + my $Size = (stat($Log))[7]; + my ($Min, $Max) = (0, $Size); + while ($Min < $Max) + { + my $Middle = int(($Min + $Max) / 2); + seek($Log, $Middle, 0); + + # Ignore the first line which we assume is going to be incomplete (even + # if by chance it start with a timestamp there is no way to know if that + # timestamp is at the beginning of the line). Also adjust $Middle so it + # always points to the start of a line. + my $Line = <$Log>; + $Middle += length($Line); + if ($Middle >= $Size) + { + # There is no line less than $Hours old so it would make sense to + # return $Size. But instead return $Min so the administrator at + # least sees the last line. + return ($Min, 0); + } + if ($Middle >= $Max) + { + # There is only one line between $Min and $Max. Determine whether to + # include it or not. + $Middle = $Min; + seek($Log, $Middle, 0); + } + my $Current = $Middle; + while ($Line = <$Log>) + { + # Note that the log file may have lines with no timestamp + if ($Line =~ /^(\w{3} \w{3} [0-9 ]\d \d{2}:\d{2}:\d{2} \d{4}) /) + { + my $Time = str2time($1); + if ($Time < $Cutoff) + { + # This line is too old + $Current += length($Line); + if ($Current >= $Size) + { + # See the $Middle == $Size comment. Note that this may return more + # than one line. + return ($Min, 0); + } + $Min = $Current; + } + else + { + # Consider that lines with no timestamp are less than $Hours old too + $Max = $Middle; + } + last; + } + $Current += length($Line); + if ($Current >= $Max) + { + # Consider that lines with no timestamp are less than $Hours old too + $Max = $Middle; + last; + } + } + return $Min if (!defined $Line); + } + return ($Min, 1); +} + +sub PrintLog($) +{ + my ($Request) = @_; + + my $CGIObj = CGI->new($Request); + my $Hours = $CGIObj->param("Hours"); + if (!defined $Hours or $Hours !~ /^(\d\d?)$/) + { + $Request->headers_out->set("Location", "/"); + $Request->status(Apache2::Const::REDIRECT); + exit; + } + $Hours = $1; + + # Text file + $Request->content_type("text/plain"); + + my $Log = OpenLog(); + if (defined $Log) + { + binmode($Log); + if ($Hours > 0) + { + my ($Position, $Found) = GetStartPosition($Log, $Hours); + if (!$Found) + { + print "There is no log entry less than $Hours hour(s) old.\n"; + print "Here are the last few lines:\n"; + } + seek($Log, $Position, 0); + } + + binmode(STDOUT); + while (1) + { + my $Block; + my $Len = sysread($Log, $Block, 16384); + last if (!$Len); + print $Block; + } + close($Log); + } + else + { + print "Could not open the log file!\n"; + } +} + +my $Request = shift; + +my %Cookies = CGI::Cookie->fetch($Request); +my $IsAdmin; +if (defined $Cookies{"SessionId"}) +{ + my $Session = CreateSessions()->GetItem($Cookies{"SessionId"}->value); + $IsAdmin = $Session->User->HasRole("admin") if ($Session); + +} +if (!$IsAdmin) +{ + $Request->headers_out->set("Location", "/Login.pl?Target=" . uri_escape($ENV{"REQUEST_URI"})); + $Request->status(Apache2::Const::REDIRECT); + exit; +} + +PrintLog($Request); + +exit;

1 0

Alexandre Julliard : patches: Remove support for testfail files.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: tools Branch: master Commit: d60f9e51356848f7a8e805e015593a9fa61e9b60 URL: http://source.winehq.org/git/tools.git/?a=commit;h=d60f9e51356848f7a8e805e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 20:08:22 2017 +0100 patches: Remove support for testfail files. Test failures are now detected from Marvin's replies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 1 - patches/update | 5 ----- 2 files changed, 6 deletions(-) diff --git a/patches/expire b/patches/expire index 759f6c8..ba98885 100755 --- a/patches/expire +++ b/patches/expire @@ -397,7 +397,6 @@ foreach my $p (keys %patches) unlink "$dir/$file.order"; unlink "$dir/$file.review"; unlink "$dir/$file.testbot"; - unlink "$dir/$file.testfail"; unlink "$dir/OLD/$file.status"; } } diff --git a/patches/update b/patches/update index 8db8077..6f930ea 100755 --- a/patches/update +++ b/patches/update @@ -213,11 +213,6 @@ foreach my $file (readdir DIR) close LOG; } } - if (-f "$dir/$file.testfail") - { - $patch{"testbot"} = "<a href=\"data/$file.testfail\">Failed</a>"; - $patch{"testclass"} = "testbot botfail"; - } if (defined $patch{"msgid"}) { $messages{$patch{"msgid"}} = \%patch;

1 0

Alexandre Julliard : patches: Use a separate table style for the regressions page.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: tools Branch: master Commit: 94fb58ab98d8fe808d4b00c279952ea5f911c627 URL: http://source.winehq.org/git/tools.git/?a=commit;h=94fb58ab98d8fe808d4b00c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 20:06:15 2017 +0100 patches: Use a separate table style for the regressions page. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/patches.css | 2 +- patches/update-regressions | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/patches.css b/patches/patches.css index 24e8f37..4d6df8b 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -131,7 +131,7 @@ div.buglist { width: 100%; border: 1px solid #601919; } -table.main, table.legend { width: 100%; } +table.main, table.legend, table.regressions { width: 100%; } table.main { border-collapse: collapse; } table.legend ul { margin: 2px 0; } diff --git a/patches/update-regressions b/patches/update-regressions index 5e39075..5c8b362 100755 --- a/patches/update-regressions +++ b/patches/update-regressions @@ -86,7 +86,7 @@ sub read_bugs() sub print_bugs($@) { my $row = shift; - printf OUTPUT "<table class=\"main\">\n"; + printf OUTPUT "<table class=\"regressions\">\n"; foreach my $id (sort {$b <=> $a} @_) { my $regression = $regressions{$id}; @@ -135,7 +135,7 @@ printf OUTPUT "<div id=\"logo_blurb\">Wine source repository – Regressions print OUTPUT "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; printf OUTPUT "<h2>%u bisected regressions</h2>\n", $count; -print OUTPUT "<table class=\"main\"><tr><th class=\"count\">Count</th>", +print OUTPUT "<table class=\"regressions\"><tr><th class=\"count\">Count</th>", "<th style=\"width: 100%;\" class=\"author\">Author</th></tr>\n"; my $row = 0; @@ -155,7 +155,7 @@ print OUTPUT "</table></div>\n"; print OUTPUT "<div class=\"main\">\n"; printf OUTPUT "<h2>%u regressions without commit id</h2>\n", scalar @unknown; -print OUTPUT "<table class=\"main\"><tr><th class=\"id\">Id</th>", +print OUTPUT "<table class=\"regressions\"><tr><th class=\"id\">Id</th>", "<th style=\"width: 100%;\" class=\"subject\">Description</th></tr>\n"; $row = 0;

1 0

Francois Gouget : testbot: Fix compatibility with older File:: Path versions.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: tools Branch: master Commit: 12bc87810865a310f27ae0f9de991c3df8aef1e1 URL: http://source.winehq.org/git/tools.git/?a=commit;h=12bc87810865a310f27ae0f9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Nov 22 11:23:55 2017 +0100 testbot: Fix compatibility with older File::Path versions. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 4 ++-- testbot/lib/WineTestBot/Steps.pm | 4 ++-- testbot/lib/WineTestBot/Tasks.pm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index b34b31e..0144dde 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -95,7 +95,7 @@ sub CreateDir($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::make_path($Dir, mode => 0775); + mkpath($Dir, 0, 0775); return $Dir; } @@ -103,7 +103,7 @@ sub RmTree($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::remove_tree($Dir); + rmtree($Dir); } sub Status($;$) diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm index 4161f0b..8c5d4ec 100644 --- a/testbot/lib/WineTestBot/Steps.pm +++ b/testbot/lib/WineTestBot/Steps.pm @@ -72,7 +72,7 @@ sub CreateDir($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::make_path($Dir, mode => 0775); + mkpath($Dir, 0, 0775); return $Dir; } @@ -80,7 +80,7 @@ sub RmTree($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::remove_tree($Dir); + rmtree($Dir); } sub HandleStaging($$) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index efe1b21..b3b6ae3 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -71,7 +71,7 @@ sub CreateDir($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::make_path($Dir, mode => 0775); + mkpath($Dir, 0, 0775); return $Dir; } @@ -79,7 +79,7 @@ sub RmTree($) { my ($self) = @_; my $Dir = $self->GetDir(); - File::Path::remove_tree($Dir); + rmtree($Dir); } sub _SetupTask($$)

1 0

Fabian Maurer : po: Change Mono to wine-mono for clarity.
by Alexandre Julliard 22 Nov '17

22 Nov '17

1 0

Alexandre Julliard : ntdll: Delay attaching to dlls loaded because of a forwarded entry point.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: wine Branch: master Commit: ed893d3591802bb562d100b277f968be402af740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed893d3591802bb562d100b27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 13:13:35 2017 +0100 ntdll: Delay attaching to dlls loaded because of a forwarded entry point. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 820398b..70f99e6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -473,7 +473,21 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { - if (process_attach( wm, NULL ) != STATUS_SUCCESS) + if (!imports_fixup_done && current_modref) + { + WINE_MODREF **deps; + if (current_modref->nDeps) + deps = RtlReAllocateHeap( GetProcessHeap(), 0, current_modref->deps, + (current_modref->nDeps + 1) * sizeof(*deps) ); + else + deps = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*deps) ); + if (deps) + { + deps[current_modref->nDeps++] = wm; + current_modref->deps = deps; + } + } + else if (process_attach( wm, NULL ) != STATUS_SUCCESS) { LdrUnloadDll( wm->ldr.BaseAddress ); wm = NULL; @@ -906,7 +920,7 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) { int i, nb_imports; const IMAGE_IMPORT_DESCRIPTOR *imports; - WINE_MODREF *prev; + WINE_MODREF *prev, *imp; DWORD size; NTSTATUS status; ULONG_PTR cookie; @@ -940,11 +954,12 @@ static NTSTATUS fixup_imports( WINE_MODREF *wm, LPCWSTR load_path ) status = STATUS_SUCCESS; for (i = 0; i < nb_imports; i++) { - if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &wm->deps[i] )) + if (!import_dll( wm->ldr.BaseAddress, &imports[i], load_path, &imp )) { - wm->deps[i] = NULL; + imp = NULL; status = STATUS_DLL_NOT_FOUND; } + wm->deps[i] = imp; } current_modref = prev; if (wm->ldr.ActivationContext) RtlDeactivateActivationContext( 0, cookie );

1 0

Alexandre Julliard : ntdll: Use a separate stack when starting new threads.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: wine Branch: master Commit: 9e093936e27a29993979f36c18d6c627e36bd737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e093936e27a29993979f36c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 21 13:50:43 2017 +0100 ntdll: Use a separate stack when starting new threads. Based on a patch by Sebastian Lackner. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index ce0ba68..f403b12 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -23,6 +23,7 @@ #include <assert.h> #include <stdarg.h> +#include <limits.h> #include <sys/types.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> @@ -468,6 +469,24 @@ void exit_thread( int status ) /*********************************************************************** + * thread_startup + */ +static void thread_startup( void *param ) +{ + struct startup_info *info = param; + PRTL_THREAD_START_ROUTINE func = info->entry_point; + void *arg = info->entry_arg; + + attach_dlls( (void *)1 ); + + if (TRACE_ON(relay)) + DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); + + call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); +} + + +/*********************************************************************** * start_thread * * Startup routine for a newly created thread. @@ -476,8 +495,6 @@ static void start_thread( struct startup_info *info ) { TEB *teb = info->teb; struct ntdll_thread_data *thread_data = (struct ntdll_thread_data *)&teb->GdiTebBatch; - PRTL_THREAD_START_ROUTINE func = info->entry_point; - void *arg = info->entry_arg; struct debug_info debug_info; debug_info.str_pos = debug_info.strings; @@ -486,14 +503,9 @@ static void start_thread( struct startup_info *info ) thread_data->pthread_id = pthread_self(); signal_init_thread( teb ); - server_init_thread( func ); + server_init_thread( info->entry_point ); - attach_dlls( (void *)1 ); - - if (TRACE_ON(relay)) - DPRINTF( "%04x:Starting thread proc %p (arg=%p)\n", GetCurrentThreadId(), func, arg ); - - call_thread_entry_point( (LPTHREAD_START_ROUTINE)func, arg ); + wine_switch_to_stack( thread_startup, info, teb->Tib.StackBase ); } @@ -603,8 +615,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * if ((status = virtual_alloc_thread_stack( teb, stack_reserve, stack_commit ))) goto error; pthread_attr_init( &attr ); - pthread_attr_setstack( &attr, teb->DeallocationStack, - (char *)teb->Tib.StackBase - (char *)teb->DeallocationStack ); + pthread_attr_setstacksize( &attr, PTHREAD_STACK_MIN ); pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread */ interlocked_xchg_add( &nb_threads, 1 ); if (pthread_create( &pthread_id, &attr, (void * (*)(void *))start_thread, info ))

1 0