wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Jactry Zeng : wintrust: Update version to 6.1.7601.23769.
by Alexandre Julliard 22 Nov '17

22 Nov '17

Module: wine Branch: master Commit: 567ad03310314b3eee4a8cfdf11919b539109ce3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=567ad03310314b3eee4a8cfdf… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Nov 22 16:45:27 2017 +0800 wintrust: Update version to 6.1.7601.23769. Installer of Google drive will check wintrust's version to make sure Windows security update was installed. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/version.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/version.rc b/dlls/wintrust/version.rc index bcff809..773f00e 100644 --- a/dlls/wintrust/version.rc +++ b/dlls/wintrust/version.rc @@ -19,9 +19,9 @@ */ #define WINE_FILENAME_STR "wintrust.dll" -#define WINE_FILEVERSION 5,131,2195,6824 -#define WINE_FILEVERSION_STR "5.131.2195.6824" -#define WINE_PRODUCTVERSION 5,131,2195,6824 -#define WINE_PRODUCTVERSION_STR "5.131.2195.6824" +#define WINE_FILEVERSION 6,1,7601,23769 +#define WINE_FILEVERSION_STR "6.1.7601.23769" +#define WINE_PRODUCTVERSION 6,1,7601,23769 +#define WINE_PRODUCTVERSION_STR "6.1.7601.23769" #include "wine/wine_common_ver.rc"

1 0

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

22 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/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); -@EXPORT = qw(&LogMsg &Time &Elapsed); +@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; + +@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

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: 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

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

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

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

21 Nov '17

1 0

Vincent Povirk : gphoto2.ds: Send notifications through the DSM.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: ddbf3c6ae6bb46483af71af9faf4505d067ee837 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddbf3c6ae6bb46483af71af9f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 21 15:48:27 2017 -0600 gphoto2.ds: Send notifications through the DSM. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gphoto2.ds/gphoto2_i.h | 6 ++-- dlls/gphoto2.ds/gphoto2_main.c | 64 +++++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_i.h b/dlls/gphoto2.ds/gphoto2_i.h index edc4d91..9ab8bbb 100644 --- a/dlls/gphoto2.ds/gphoto2_i.h +++ b/dlls/gphoto2.ds/gphoto2_i.h @@ -73,12 +73,10 @@ struct gphoto2_file { /* internal information about an active data source */ struct tagActiveDS { - TW_IDENTITY identity; /* identity */ + TW_IDENTITY identity; /* identity of the data source */ + TW_IDENTITY appIdentity; /* identity of the app */ TW_UINT16 currentState; /* current state */ - TW_EVENT pendingEvent; /* pending event to be sent to - application */ TW_UINT16 twCC; /* condition code */ - HWND hwndOwner; /* window handle of the app */ HWND progressWnd; /* window handle of the scanning window */ #ifdef HAVE_GPHOTO2 diff --git a/dlls/gphoto2.ds/gphoto2_main.c b/dlls/gphoto2.ds/gphoto2_main.c index acc3aa6..2810041 100644 --- a/dlls/gphoto2.ds/gphoto2_main.c +++ b/dlls/gphoto2.ds/gphoto2_main.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(twain); +DSMENTRYPROC GPHOTO2_dsmentry; #ifdef HAVE_GPHOTO2 static char* GPHOTO2_StrDup(const char* str) @@ -295,11 +296,25 @@ static TW_UINT16 GPHOTO2_FileSystemRename (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } +static void GPHOTO2_Notify (TW_UINT16 message) +{ + GPHOTO2_dsmentry (&activeDS.identity, &activeDS.appIdentity, DG_CONTROL, DAT_NULL, message, NULL); +} + +/* DG_CONTROL/DAT_ENTRYPOINT/MSG_SET */ +static TW_UINT16 GPHOTO2_SetEntryPoint (pTW_IDENTITY pOrigin, TW_MEMREF pData) +{ + TW_ENTRYPOINT *entry = (TW_ENTRYPOINT*)pData; + + GPHOTO2_dsmentry = entry->DSM_Entry; + + return TWRC_SUCCESS; +} + /* DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT */ static TW_UINT16 GPHOTO2_ProcessEvent (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - TW_UINT16 twRC = TWRC_SUCCESS; pTW_EVENT pEvent = (pTW_EVENT) pData; TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT\n"); @@ -309,16 +324,9 @@ static TW_UINT16 GPHOTO2_ProcessEvent (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } - if (activeDS.pendingEvent.TWMessage != MSG_NULL) { - pEvent->TWMessage = activeDS.pendingEvent.TWMessage; - activeDS.pendingEvent.TWMessage = MSG_NULL; - twRC = TWRC_SUCCESS; - } else { - pEvent->TWMessage = MSG_NULL; /* no message to the application */ - twRC = TWRC_NOTDSEVENT; - } + pEvent->TWMessage = MSG_NULL; /* no message to the application */ activeDS.twCC = TWCC_SUCCESS; - return twRC; + return TWRC_NOTDSEVENT; } /* DG_CONTROL/DAT_PASSTHRU/MSG_PASSTHRU */ @@ -356,7 +364,7 @@ static TW_UINT16 GPHOTO2_PendingXfersEndXfer (pTW_IDENTITY pOrigin, } else { activeDS.currentState = 5; /* Notify the application that it can close the data source */ - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + GPHOTO2_Notify(MSG_CLOSEDSREQ); /* close any Transferring dialog */ TransferringDialogBox(activeDS.progressWnd,-1); activeDS.progressWnd = 0; @@ -502,25 +510,23 @@ static TW_UINT16 GPHOTO2_EnableDSUserInterface (pTW_IDENTITY pOrigin, activeDS.twCC = TWCC_SEQERROR; return TWRC_FAILURE; } - activeDS.hwndOwner = pUserInterface->hParent; if (pUserInterface->ShowUI) { BOOL rc; activeDS.currentState = 5; /* Transitions to state 5 */ rc = DoCameraUI(); if (!rc) { - activeDS.pendingEvent.TWMessage = MSG_CLOSEDSREQ; + GPHOTO2_Notify(MSG_CLOSEDSREQ); } else { /* FIXME: The GUI should have marked the files to download... */ - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; + GPHOTO2_Notify(MSG_XFERREADY); activeDS.currentState = 6; /* Transitions to state 6 directly */ } } else { /* no UI will be displayed, so source is ready to transfer data */ - activeDS.pendingEvent.TWMessage = MSG_XFERREADY; + GPHOTO2_Notify(MSG_XFERREADY); activeDS.currentState = 6; /* Transitions to state 6 directly */ } - activeDS.hwndOwner = pUserInterface->hParent; activeDS.twCC = TWCC_SUCCESS; return TWRC_SUCCESS; } @@ -704,6 +710,13 @@ static TW_UINT16 GPHOTO2_SourceControlHandler ( } break; + case DAT_ENTRYPOINT: + if (MSG == MSG_SET) + twRC = GPHOTO2_SetEntryPoint (pOrigin, pData); + else + twRC = TWRC_FAILURE; + break; + case DAT_EVENT: if (MSG == MSG_PROCESSEVENT) twRC = GPHOTO2_ProcessEvent (pOrigin, pData); @@ -1086,7 +1099,7 @@ GPHOTO2_GetIdentity( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { TRACE("%d cameras detected.\n", count); self->ProtocolMajor = TWON_PROTOCOLMAJOR; self->ProtocolMinor = TWON_PROTOCOLMINOR; - self->SupportedGroups = DG_CONTROL | DG_IMAGE; + self->SupportedGroups = DG_CONTROL | DG_IMAGE | DF_DS2; lstrcpynA (self->Manufacturer, "The Wine Team", sizeof(self->Manufacturer) - 1); lstrcpynA (self->ProductFamily, "GPhoto2 Camera", sizeof(self->ProductFamily) - 1); @@ -1111,6 +1124,21 @@ GPHOTO2_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { GPPortInfo info; const char *model, *port; + if (GPHOTO2_dsmentry == NULL) + { + static const WCHAR twain32W[] = {'t','w','a','i','n','_','3','2',0}; + HMODULE moddsm = GetModuleHandleW(twain32W); + + if (moddsm) + GPHOTO2_dsmentry = (void*)GetProcAddress(moddsm, "DSM_Entry"); + + if (!GPHOTO2_dsmentry) + { + ERR("can't find DSM entry point\n"); + return TWRC_FAILURE; + } + } + if (TWRC_SUCCESS != gphoto2_auto_detect()) return TWRC_FAILURE; @@ -1193,6 +1221,8 @@ GPHOTO2_OpenDS( pTW_IDENTITY pOrigin, pTW_IDENTITY self) { activeDS.pixelflavor = TWPF_CHOCOLATE; activeDS.pixeltype = TWPT_RGB; activeDS.capXferMech = TWSX_MEMORY; + activeDS.identity.Id = self->Id; + activeDS.appIdentity = *pOrigin; TRACE("OK!\n"); return TWRC_SUCCESS; }

1 0

Aric Stewart : hidclass: Properly NULL terminate device_deviceid_fmtW.
by Alexandre Julliard 21 Nov '17

21 Nov '17

Module: wine Branch: master Commit: 0e6d749a0e18d97fc999372860f37bcc1974b6d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6d749a0e18d97fc99937286… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Nov 21 14:00:00 2017 -0600 hidclass: Properly NULL terminate device_deviceid_fmtW. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index b92457f..30d1045 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); static const WCHAR device_enumeratorW[] = {'H','I','D',0}; static const WCHAR separator_W[] = {'\\',0}; static const WCHAR device_deviceid_fmtW[] = {'%','s','\\', - 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x'}; + 'v','i','d','_','%','0','4','x','&','p','i','d','_','%', '0','4','x',0}; static NTSTATUS WINAPI internalComplete(DEVICE_OBJECT *deviceObject, IRP *irp, void *context)

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
44
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 November 2017