May 2018 - Wine-commits - list.winehq.org

Francois Gouget : testbot: Scheduling jobs is the Engine's responsibility.
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: 54621055ec0ceb7a11b227e08c2905ad3ad1b740 URL: https://source.winehq.org/git/tools.git/?a=commit;h=54621055ec0ceb7a11b227e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:36 2018 +0200 testbot: Scheduling jobs is the Engine's responsibility. It already does not make sense to call ScheduleJobs() in other processes. So only call it from Engine.pl. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 6 +++++- testbot/lib/WineTestBot/Patches.pm | 7 ++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 3d1f2c1..b61db88 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -448,6 +448,8 @@ sub HandleWinePatchMLSubmission() my $ErrMessage = CreatePatches()->NewPatch($Entity); push @ErrMessages, $ErrMessage if (defined $ErrMessage); + ScheduleJobs(); + # Clean up if (!rmtree($WorkDir)) { @@ -520,6 +522,8 @@ sub HandleWinePatchWebSubmission() my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); push @ErrMessages, $ErrMessage if (defined $ErrMessage); + ScheduleJobs(); + # Clean up if (!rmtree($WorkDir)) { @@ -621,7 +625,6 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet() { CheckJobs(); - ScheduleJobs(); HandleWinePatchWebSubmission(); my $Set = CreatePendingPatchSets(); @@ -630,6 +633,7 @@ sub SafetyNet() { LogMsg "Failed to check completeness of patch series: $ErrMessage\n"; } + ScheduleJobs(); } sub PrepareSocket($) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 5edeab0..26127e9 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -147,8 +147,8 @@ sub GetTestList() Analyzes the current patch to determine which Wine tests are impacted. Then for each impacted test it creates a high priority WineTestBot::Job to run that test. This also creates the WineTestBot::Step objects for that Job, as well as the -WineTestBot::Task objects to run the test on each 'base' VM. Finally it calls -C<WineTestBot::Jobs::ScheduleJobs()> to run the new Jobs. +WineTestBot::Task objects to run the test on each 'base' VM. It is the +responsibility of the caller to arrange for rescheduling of the jobs. Note that the path to the file containing the actual patch is passed as a parameter. This is used to apply a combined patch for patch series. See @@ -341,9 +341,6 @@ sub Submit($$$) $Disposition .= $NewJob->Id; } $self->Disposition($Disposition); - - ScheduleJobs(); - return undef; }

1 0

Francois Gouget : testbot/Engine: Only reschedule once in HandleWinePatchMLSubmission().
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: 426215c272755d6cf213fcf1b51a36b99f7859f4 URL: https://source.winehq.org/git/tools.git/?a=commit;h=426215c272755d6cf213fcf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:41 2018 +0200 testbot/Engine: Only reschedule once in HandleWinePatchMLSubmission(). There is no need to reschedule after handling each patch in the staging directory. The scheduler will handle them all at once. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index b61db88..64359ae 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -431,7 +431,7 @@ sub HandleWinePatchMLSubmission() my @Entries = readdir($dh); closedir($dh); - my @ErrMessages; + my ($NewPatch, @ErrMessages); foreach my $Entry (@Entries) { # Validate file name @@ -446,9 +446,14 @@ sub HandleWinePatchMLSubmission() $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open($FullMessageFileName); my $ErrMessage = CreatePatches()->NewPatch($Entity); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); - - ScheduleJobs(); + if (defined $ErrMessage) + { + push @ErrMessages, $ErrMessage; + } + else + { + $NewPatch = 1; + } # Clean up if (!rmtree($WorkDir)) @@ -463,6 +468,7 @@ sub HandleWinePatchMLSubmission() LogMsg "Unable to delete '$FullMessageFileName': $!\n"; } } + ScheduleJobs() if ($NewPatch); return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; }

1 0

Francois Gouget : testbot/Engine: Only reschedule once in HandleWinePatchWebSubmission().
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: 53f26742a6b329f402bcbe8e7782e7a8e32a3a4b URL: https://source.winehq.org/git/tools.git/?a=commit;h=53f26742a6b329f402bcbe8… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:46 2018 +0200 testbot/Engine: Only reschedule once in HandleWinePatchWebSubmission(). There is no need to reschedule after handling each patch in the staging directory. The scheduler will handle them all at once. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 64359ae..1775782 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -516,6 +516,7 @@ sub HandleWinePatchWebSubmission() # Add the patches in increasing WebPatchId order so that next time # $LatestWebPatchId still makes sense in case something goes wrong now + my $NewPatch; foreach my $WebPatchId (sort { $a <=> $b } @WebPatchIds) { # Create a working dir @@ -526,9 +527,14 @@ sub HandleWinePatchWebSubmission() $Parser->output_dir($WorkDir); my $Entity = $Parser->parse_open("$DataDir/webpatches/$WebPatchId"); my $ErrMessage = $Patches->NewPatch($Entity, $WebPatchId); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); - - ScheduleJobs(); + if (defined $ErrMessage) + { + push @ErrMessages, $ErrMessage; + } + else + { + $NewPatch = 1; + } # Clean up if (!rmtree($WorkDir)) @@ -537,6 +543,7 @@ sub HandleWinePatchWebSubmission() LogMsg "Unable to delete '$WorkDir': $!\n"; } } + ScheduleJobs() if ($NewPatch); return @ErrMessages ? "0". join("; ", @ErrMessages) : "1OK"; }

1 0

Francois Gouget : testbot/Engine: Only reschedule if we got a completed patch set.
by Alexandre Julliard 07 May '18

07 May '18

Module: tools Branch: master Commit: 19620e33e61a30429d509c30412db4c0ddcb43d7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=19620e33e61a30429d509c3… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 7 01:57:49 2018 +0200 testbot/Engine: Only reschedule if we got a completed patch set. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/Engine.pl | 7 ++++--- testbot/lib/WineTestBot/PendingPatchSets.pm | 14 ++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 1775782..730fd42 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -638,15 +638,16 @@ checks whether any pending patchsets are now complete and thus can be scheduled. sub SafetyNet() { CheckJobs(); + ScheduleJobs(); HandleWinePatchWebSubmission(); my $Set = CreatePendingPatchSets(); - my $ErrMessage = $Set->CheckForCompleteSet(); - if (defined($ErrMessage)) + my ($Submitted, $ErrMessage) = $Set->CheckForCompleteSet(); + if (defined $ErrMessage) { LogMsg "Failed to check completeness of patch series: $ErrMessage\n"; } - ScheduleJobs(); + ScheduleJobs() if ($Submitted); } sub PrepareSocket($) diff --git a/testbot/lib/WineTestBot/PendingPatchSets.pm b/testbot/lib/WineTestBot/PendingPatchSets.pm index c0dc56f..bfd05e4 100644 --- a/testbot/lib/WineTestBot/PendingPatchSets.pm +++ b/testbot/lib/WineTestBot/PendingPatchSets.pm @@ -94,7 +94,7 @@ sub CheckComplete($) =item C<SubmitSubset()> Combines the patches leading to the specified part in the patchset, and then -calls WineTestBot::Patch::Submit() so it gets scheduled for testing. +calls WineTestBot::Patch::Submit() to create the corresponding job. =back =cut @@ -307,29 +307,27 @@ sub CheckForCompleteSet($) { my ($self) = @_; - my $ErrMessage; + my ($Submitted, @ErrMessages); foreach my $Set (@{$self->GetItems()}) { if ($Set->CheckComplete()) { my $Patch = $Set->Parts->GetItem($Set->TotalParts)->Patch; my $SetErrMessage = $Set->Submit($Patch); - if (defined($SetErrMessage)) + if (defined $SetErrMessage) { - if (! defined($ErrMessage)) - { - $ErrMessage = $SetErrMessage; - } + push @ErrMessages, $SetErrMessage; } else { $Patch->Save(); + $Submitted = 1; } $self->DeleteItem($Set); } } - return $ErrMessage; + return ($Submitted, @ErrMessages ? join("; ", @ErrMessages) : undef); } 1;

1 0

Kyle Auble : Keep all event and wineconf photos on wiki
by Jeremy Newman 07 May '18

07 May '18

Module: website Branch: master Commit: 6a4b94365dc077caa63ad3d4b1f2e9a7c8124495 URL: https://source.winehq.org/git/website.git/?a=commit;h=6a4b94365dc077caa63ad… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Fri May 4 18:47:04 2018 -0400 Keep all event and wineconf photos on wiki Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/misc/WineAward_2008.png | Bin 336388 -> 0 bytes images/misc/WineAward_2008_sm.png | Bin 19124 -> 0 bytes images/wineconf/wineconf_logo.jpg | Bin 6076 -> 0 bytes images/wineconf05_fei.jpg | Bin 149591 -> 0 bytes images/wineconf05_fei_thmb.jpg | Bin 21892 -> 0 bytes images/wineconf05_grp.jpg | Bin 1258517 -> 0 bytes images/wineconf05_grp_thmb.jpg | Bin 24928 -> 0 bytes images/wineconf06_grp.jpg | Bin 1030627 -> 0 bytes images/wineconf06_grp_thmb.jpg | Bin 18105 -> 0 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/misc/WineAward_2008.png b/images/misc/WineAward_2008.png deleted file mode 100644 index 69921a5..0000000 Binary files a/images/misc/WineAward_2008.png and /dev/null differ diff --git a/images/misc/WineAward_2008_sm.png b/images/misc/WineAward_2008_sm.png deleted file mode 100644 index 2748c76..0000000 Binary files a/images/misc/WineAward_2008_sm.png and /dev/null differ diff --git a/images/wineconf/wineconf_logo.jpg b/images/wineconf/wineconf_logo.jpg deleted file mode 100644 index 8b0e51d..0000000 Binary files a/images/wineconf/wineconf_logo.jpg and /dev/null differ diff --git a/images/wineconf05_fei.jpg b/images/wineconf05_fei.jpg deleted file mode 100644 index 32dfe2a..0000000 Binary files a/images/wineconf05_fei.jpg and /dev/null differ diff --git a/images/wineconf05_fei_thmb.jpg b/images/wineconf05_fei_thmb.jpg deleted file mode 100644 index 86d9eb6..0000000 Binary files a/images/wineconf05_fei_thmb.jpg and /dev/null differ diff --git a/images/wineconf05_grp.jpg b/images/wineconf05_grp.jpg deleted file mode 100644 index 7207ce2..0000000 Binary files a/images/wineconf05_grp.jpg and /dev/null differ diff --git a/images/wineconf05_grp_thmb.jpg b/images/wineconf05_grp_thmb.jpg deleted file mode 100644 index f7b4bdd..0000000 Binary files a/images/wineconf05_grp_thmb.jpg and /dev/null differ diff --git a/images/wineconf06_grp.jpg b/images/wineconf06_grp.jpg deleted file mode 100644 index 8637c5a..0000000 Binary files a/images/wineconf06_grp.jpg and /dev/null differ diff --git a/images/wineconf06_grp_thmb.jpg b/images/wineconf06_grp_thmb.jpg deleted file mode 100644 index e04014b..0000000 Binary files a/images/wineconf06_grp_thmb.jpg and /dev/null differ

1 0

Kyle Auble : Delete old distro icons & screenshots
by Jeremy Newman 07 May '18

07 May '18

Module: website Branch: master Commit: 458b852f3539940178352fc15b0239dfc5329410 URL: https://source.winehq.org/git/website.git/?a=commit;h=458b852f3539940178352… Author: Kyle Auble <kyle.auble(a)zoho.com> Date: Fri May 4 18:41:43 2018 -0400 Delete old distro icons & screenshots It seems the only files here still in use are already on the wiki. We should probably move over to SVGs for the icons anyways. Signed-off-by: Kyle Auble <kyle.auble(a)zoho.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- images/distro/crossover.png | Bin 2501 -> 0 bytes images/distro/crossover_swoosh.png | Bin 23210 -> 0 bytes images/distro/de_ubuntu-ppa.png | Bin 80414 -> 0 bytes images/distro/debian.png | Bin 1253 -> 0 bytes images/distro/fr_ubuntu-ppa.png | Bin 44730 -> 0 bytes images/distro/freebsd.png | Bin 2091 -> 0 bytes images/distro/redhat.png | Bin 2634 -> 0 bytes images/distro/slackware.png | Bin 2771 -> 0 bytes images/distro/sun.png | Bin 1547 -> 0 bytes images/distro/suse.png | Bin 882 -> 0 bytes images/distro/transgaming.png | Bin 2015 -> 0 bytes images/distro/ubuntu-ppa.png | Bin 58532 -> 0 bytes images/distro/ubuntu-softwaresources1.png | Bin 48850 -> 0 bytes images/distro/ubuntu-softwaresources2.png | Bin 36288 -> 0 bytes images/distro/ubuntu.png | Bin 2037 -> 0 bytes images/distro/windows.png | Bin 1590 -> 0 bytes images/distro/winetools.png | Bin 2226 -> 0 bytes 17 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/distro/crossover.png b/images/distro/crossover.png deleted file mode 100644 index f2b1543..0000000 Binary files a/images/distro/crossover.png and /dev/null differ diff --git a/images/distro/crossover_swoosh.png b/images/distro/crossover_swoosh.png deleted file mode 100644 index 5d03e09..0000000 Binary files a/images/distro/crossover_swoosh.png and /dev/null differ diff --git a/images/distro/de_ubuntu-ppa.png b/images/distro/de_ubuntu-ppa.png deleted file mode 100644 index 7a55111..0000000 Binary files a/images/distro/de_ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/debian.png b/images/distro/debian.png deleted file mode 100644 index 65fba63..0000000 Binary files a/images/distro/debian.png and /dev/null differ diff --git a/images/distro/fr_ubuntu-ppa.png b/images/distro/fr_ubuntu-ppa.png deleted file mode 100644 index 8aed5e5..0000000 Binary files a/images/distro/fr_ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/freebsd.png b/images/distro/freebsd.png deleted file mode 100644 index 3614407..0000000 Binary files a/images/distro/freebsd.png and /dev/null differ diff --git a/images/distro/redhat.png b/images/distro/redhat.png deleted file mode 100644 index d026186..0000000 Binary files a/images/distro/redhat.png and /dev/null differ diff --git a/images/distro/slackware.png b/images/distro/slackware.png deleted file mode 100644 index 4dfd9f9..0000000 Binary files a/images/distro/slackware.png and /dev/null differ diff --git a/images/distro/sun.png b/images/distro/sun.png deleted file mode 100644 index 88c1107..0000000 Binary files a/images/distro/sun.png and /dev/null differ diff --git a/images/distro/suse.png b/images/distro/suse.png deleted file mode 100644 index 6d7c630..0000000 Binary files a/images/distro/suse.png and /dev/null differ diff --git a/images/distro/transgaming.png b/images/distro/transgaming.png deleted file mode 100644 index 6261284..0000000 Binary files a/images/distro/transgaming.png and /dev/null differ diff --git a/images/distro/ubuntu-ppa.png b/images/distro/ubuntu-ppa.png deleted file mode 100644 index d839cfc..0000000 Binary files a/images/distro/ubuntu-ppa.png and /dev/null differ diff --git a/images/distro/ubuntu-softwaresources1.png b/images/distro/ubuntu-softwaresources1.png deleted file mode 100644 index f64f15f..0000000 Binary files a/images/distro/ubuntu-softwaresources1.png and /dev/null differ diff --git a/images/distro/ubuntu-softwaresources2.png b/images/distro/ubuntu-softwaresources2.png deleted file mode 100644 index a4bdb12..0000000 Binary files a/images/distro/ubuntu-softwaresources2.png and /dev/null differ diff --git a/images/distro/ubuntu.png b/images/distro/ubuntu.png deleted file mode 100644 index 08c88e9..0000000 Binary files a/images/distro/ubuntu.png and /dev/null differ diff --git a/images/distro/windows.png b/images/distro/windows.png deleted file mode 100644 index c623437..0000000 Binary files a/images/distro/windows.png and /dev/null differ diff --git a/images/distro/winetools.png b/images/distro/winetools.png deleted file mode 100644 index f3e104e..0000000 Binary files a/images/distro/winetools.png and /dev/null differ

1 0

Zebediah Figura : strmbase: Check that the output pin supports the given media type before connecting.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: af717f342ba714807cab1207de25b9e51891f0de URL: https://source.winehq.org/git/wine.git/?a=commit;h=af717f342ba714807cab1207… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 3 23:47:12 2018 -0500 strmbase: Check that the output pin supports the given media type before connecting. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 48f2497..a3117dd 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -718,7 +718,8 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei TRACE("(%p, %p)\n", pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); - /* FIXME: call queryacceptproc */ + if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) + return hr; This->pin.pConnectedTo = pReceivePin; IPin_AddRef(pReceivePin);

1 0

Zebediah Figura : strmbase: Implement QueryAccept() on top of CheckMediaType() for output pins too.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: 10ff8f3082794dcda042c42645b43fadf71138a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10ff8f3082794dcda042c426… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 3 23:47:13 2018 -0500 strmbase: Implement QueryAccept() on top of CheckMediaType() for output pins too. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 4 ++-- dlls/qcap/avimux.c | 8 +++++++- dlls/qcap/smartteefilter.c | 16 ++++++++++++++-- dlls/qcap/vfwcapture.c | 8 +++++++- dlls/quartz/filesource.c | 11 +++++------ dlls/quartz/parser.c | 10 +++++----- dlls/strmbase/pin.c | 13 +++---------- dlls/strmbase/renderer.c | 2 +- dlls/strmbase/transform.c | 10 ++++------ dlls/winegstreamer/gstdemux.c | 17 ++++++++--------- dlls/wineqtdecoder/qtsplitter.c | 8 +++++++- 11 files changed, 63 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10ff8f3082794dcda042…

1 0

Zebediah Figura : strmbase: Consistently trace the BasePin object.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: c130ec5678fa325fdc00ca804f306860fd809a8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c130ec5678fa325fdc00ca80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 3 23:47:14 2018 -0500 strmbase: Consistently trace the BasePin object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 54 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 59a80bd..ef22a57 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -199,7 +199,7 @@ HRESULT WINAPI BasePinImpl_Disconnect(IPin * iface) HRESULT hr; BasePin *This = impl_from_IPin(iface); - TRACE("()\n"); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pCritSec); { @@ -224,7 +224,7 @@ HRESULT WINAPI BasePinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) HRESULT hr; BasePin *This = impl_from_IPin(iface); - TRACE("(%p)\n", ppPin); + TRACE("(%p)->(%p)\n", This, ppPin); EnterCriticalSection(This->pCritSec); { @@ -250,7 +250,7 @@ HRESULT WINAPI BasePinImpl_ConnectionMediaType(IPin * iface, AM_MEDIA_TYPE * pmt HRESULT hr; BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, pmt); + TRACE("(%p)->(%p)\n", This, pmt); EnterCriticalSection(This->pCritSec); { @@ -274,7 +274,7 @@ HRESULT WINAPI BasePinImpl_QueryPinInfo(IPin * iface, PIN_INFO * pInfo) { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, pInfo); + TRACE("(%p)->(%p)\n", This, pInfo); Copy_PinInfo(pInfo, &This->pinInfo); IBaseFilter_AddRef(pInfo->pFilter); @@ -286,7 +286,7 @@ HRESULT WINAPI BasePinImpl_QueryDirection(IPin * iface, PIN_DIRECTION * pPinDir) { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, pPinDir); + TRACE("(%p)->(%p)\n", This, pPinDir); *pPinDir = This->pinInfo.dir; @@ -297,7 +297,7 @@ HRESULT WINAPI BasePinImpl_QueryId(IPin * iface, LPWSTR * Id) { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, Id); + TRACE("(%p)->(%p)\n", This, Id); *Id = CoTaskMemAlloc((strlenW(This->pinInfo.achName) + 1) * sizeof(WCHAR)); if (!*Id) @@ -321,7 +321,7 @@ HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnu { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p)\n", This, iface, ppEnum); + TRACE("(%p)->(%p)\n", This, ppEnum); /* override this method to allow enumeration of your types */ @@ -332,7 +332,7 @@ HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, { BasePin *This = impl_from_IPin(iface); - TRACE("(%p/%p)->(%p, %p)\n", This, iface, apPin, cPin); + TRACE("(%p)->(%p, %p)\n", This, apPin, cPin); return E_NOTIMPL; /* to tell caller that all input pins connected to all output pins */ } @@ -341,7 +341,7 @@ HRESULT WINAPI BasePinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, REFER { BasePin *This = impl_from_IPin(iface); - TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); This->tStart = tStart; This->tStop = tStop; @@ -366,7 +366,7 @@ HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOI { BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppv); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); *ppv = NULL; @@ -409,7 +409,7 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const HRESULT hr; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - TRACE("(%p/%p)->(%p, %p)\n", This, iface, pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); if (!pReceivePin) @@ -489,10 +489,9 @@ HRESULT WINAPI BaseOutputPinImpl_Connect(IPin * iface, IPin * pReceivePin, const return hr; } -HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt) +HRESULT WINAPI BaseOutputPinImpl_ReceiveConnection(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { - ERR("Incoming connection on an output pin! (%p, %p)\n", pReceivePin, pmt); - + ERR("(%p)->(%p, %p) incoming connection on an output pin!\n", iface, pin, pmt); return E_UNEXPECTED; } @@ -501,7 +500,7 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) HRESULT hr; BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface); - TRACE("()\n"); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); { @@ -528,7 +527,7 @@ HRESULT WINAPI BaseOutputPinImpl_Disconnect(IPin * iface) HRESULT WINAPI BaseOutputPinImpl_EndOfStream(IPin * iface) { - TRACE("()\n"); + TRACE("(%p)->()\n", iface); /* not supposed to do anything in an output pin */ @@ -557,7 +556,7 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin *This, IMediaSa { HRESULT hr; - TRACE("(%p, %p, %p, %x)\n", ppSample, tStart, tStop, dwFlags); + TRACE("(%p)->(%p, %p, %p, %x)\n", This, ppSample, tStart, tStop, dwFlags); if (!This->pin.pConnectedTo) hr = VFW_E_NOT_CONNECTED; @@ -717,7 +716,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei HRESULT hr; IMemAllocator * pMemAlloc = NULL; - TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); if ((hr = This->pFuncsTable->base.pfnCheckMediaType(&This->pin, pmt)) != S_OK) @@ -769,7 +768,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin* iface, IPin * pRecei static HRESULT OutputPin_Init(const IPinVtbl *OutputPin_Vtbl, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, BaseOutputPin * pPinImpl) { - TRACE("\n"); + TRACE("(%p)\n", pPinImpl); /* Common attributes */ pPinImpl->pin.IPin_iface.lpVtbl = OutputPin_Vtbl; @@ -881,10 +880,9 @@ ULONG WINAPI BaseInputPinImpl_Release(IPin * iface) return refCount; } -HRESULT WINAPI BaseInputPinImpl_Connect(IPin * iface, IPin * pConnector, const AM_MEDIA_TYPE * pmt) +HRESULT WINAPI BaseInputPinImpl_Connect(IPin *iface, IPin *pin, const AM_MEDIA_TYPE *pmt) { - ERR("Outgoing connection on an input pin! (%p, %p)\n", pConnector, pmt); - + ERR("(%p)->(%p, %p) outgoing connection on an input pin!\n", iface, pin, pmt); return E_UNEXPECTED; } @@ -895,7 +893,7 @@ HRESULT WINAPI BaseInputPinImpl_ReceiveConnection(IPin * iface, IPin * pReceiveP PIN_DIRECTION pindirReceive; HRESULT hr = S_OK; - TRACE("(%p, %p)\n", pReceivePin, pmt); + TRACE("(%p)->(%p, %p)\n", This, pReceivePin, pmt); dump_AM_MEDIA_TYPE(pmt); EnterCriticalSection(This->pin.pCritSec); @@ -940,7 +938,7 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) HRESULT hr = S_OK; BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); - TRACE("(%p)\n", This); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); if (This->flushing) @@ -963,7 +961,7 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); HRESULT hr; - TRACE("() semi-stub\n"); + TRACE("(%p) semi-stub\n", This); EnterCriticalSection(This->pin.pCritSec); This->flushing = TRUE; @@ -983,7 +981,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) { BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); HRESULT hr; - TRACE("(%p)\n", This); + TRACE("(%p)->()\n", This); EnterCriticalSection(This->pin.pCritSec); This->flushing = This->end_of_stream = FALSE; @@ -1011,7 +1009,7 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME tStart, BaseInputPin *This = impl_BaseInputPin_from_IPin(iface); newsegmentargs args; - TRACE("(%s, %s, %e)\n", wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); + TRACE("(%p)->(%s, %s, %e)\n", This, wine_dbgstr_longlong(tStart), wine_dbgstr_longlong(tStop), dRate); args.tStart = This->pin.tStart = tStart; args.tStop = This->pin.tStop = tStop; @@ -1155,7 +1153,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi const BaseInputPinFuncTable* vtbl, LPCRITICAL_SECTION pCritSec, IMemAllocator *allocator, BaseInputPin * pPinImpl) { - TRACE("\n"); + TRACE("(%p)\n", pPinImpl); /* Common attributes */ pPinImpl->pin.refCount = 1;

1 0

Dmitry Timoshkov : schedsvc: Also watch for job file modifications.
by Alexandre Julliard 04 May '18

04 May '18

Module: wine Branch: master Commit: f7d1e16183c03fb058c405a027e608296ea81a05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7d1e16183c03fb058c405a0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri May 4 11:39:26 2018 +0800 schedsvc: Also watch for job file modifications. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 74 ++++++++++++++++++++++++++++++---------- dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 12 ++++++- 3 files changed, 68 insertions(+), 19 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index e7e59a4..53a18fd 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -269,15 +269,12 @@ static BOOL load_job_data(const char *data, DWORD size, AT_ENUM *info) return TRUE; } -void add_job(const WCHAR *name) +static BOOL load_job(const WCHAR *name, AT_ENUM *info) { HANDLE file, mapping; DWORD size, try; void *data; - struct job_t *job; - - job = heap_alloc_zero(sizeof(*job)); - if (!job) return; + BOOL ret = FALSE; try = 1; for (;;) @@ -304,14 +301,7 @@ void add_job(const WCHAR *name) data = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); if (data) { - if (load_job_data(data, size, &job->info)) - { - EnterCriticalSection(&at_job_list_section); - job->name = heap_strdupW(name); - job->info.JobId = current_jobid++; - list_add_tail(&at_job_list, &job->entry); - LeaveCriticalSection(&at_job_list_section); - } + ret = load_job_data(data, size, info); UnmapViewOfFile(data); } @@ -320,11 +310,39 @@ void add_job(const WCHAR *name) break; } - if (!job->info.JobId) + return ret; +} + +static void free_job_info(AT_ENUM *info) +{ + heap_free(info->Command); +} + +static void free_job(struct job_t *job) +{ + free_job_info(&job->info); + heap_free(job->name); + heap_free(job); +} + +void add_job(const WCHAR *name) +{ + struct job_t *job; + + job = heap_alloc_zero(sizeof(*job)); + if (!job) return; + + if (!load_job(name, &job->info)) { - heap_free(job->info.Command); - heap_free(job); + free_job(job); + return; } + + EnterCriticalSection(&at_job_list_section); + job->name = heap_strdupW(name); + job->info.JobId = current_jobid++; + list_add_tail(&at_job_list, &job->entry); + LeaveCriticalSection(&at_job_list_section); } static BOOL write_signature(HANDLE hfile) @@ -523,12 +541,32 @@ void remove_job(const WCHAR *name) if (job) { list_remove(&job->entry); - heap_free(job->name); - heap_free(job); + free_job(job); } LeaveCriticalSection(&at_job_list_section); } +void modify_job(const WCHAR *name) +{ + AT_ENUM info; + + if (load_job(name, &info)) + { + struct job_t *job; + + EnterCriticalSection(&at_job_list_section); + job = find_job(0, name); + if (job) + { + free_job_info(&job->info); + job->info = info; + } + else + free_job_info(&info); + LeaveCriticalSection(&at_job_list_section); + } +} + DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) { WCHAR windir[MAX_PATH]; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 215bba0..c0aa188 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -25,6 +25,7 @@ void schedsvc_auto_start(void) DECLSPEC_HIDDEN; void add_job(const WCHAR *name) DECLSPEC_HIDDEN; void remove_job(const WCHAR *name) DECLSPEC_HIDDEN; +void modify_job(const WCHAR *name) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index fb7732c..ba8de04 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -78,7 +78,8 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) memset(&info, 0, sizeof(info)); ret = ReadDirectoryChangesW(htasks, &info, sizeof(info), FALSE, - FILE_NOTIFY_CHANGE_FILE_NAME, NULL, &ov, NULL); + FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_SIZE | FILE_NOTIFY_CHANGE_LAST_WRITE, + NULL, &ov, NULL); if (!ret) break; events[0] = done_event; @@ -106,6 +107,15 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) remove_job(path); break; + case FILE_ACTION_MODIFIED: + TRACE("FILE_ACTION_MODIFIED %s\n", debugstr_w(info.data.FileName)); + + GetWindowsDirectoryW(path, MAX_PATH); + lstrcatW(path, tasksW); + lstrcatW(path, info.data.FileName); + modify_job(path); + break; + default: FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); break;

1 0