79321: winmm: waveOutReset returns all buffers.

Dan Kegel dank at kegel.com
Mon Sep 26 13:38:42 CDT 2011


This is another case of git apply not allowing fuzz;
the patch applies with patch but not git apply:

$ patch -p1 < wor.patch
patching file dlls/winmm/waveform.c
Hunk #1 succeeded at 1671 with fuzz 2 (offset 18 lines).
Hunk #2 succeeded at 1687 (offset 17 lines).
Hunk #3 succeeded at 1695 with fuzz 1 (offset 16 lines).
Hunk #4 succeeded at 1703 (offset 16 lines).

$ git apply wor.patch
error: patch failed: dlls/winmm/waveform.c:1653
error: dlls/winmm/waveform.c: patch does not apply

I guess this is common enough that I should use  git apply -C 1:
$ git apply -C 1 wor.patch
Context reduced to (1/1) to apply fragment at 1673
Context reduced to (2/2) to apply fragment at 1696

Committed as r2639, will push to slaves later... possibly along
with a change to pull the blacklist from svn every time.

On Mon, Sep 26, 2011 at 11:31 AM,  <buildbot at kegel.com> wrote:
> This is an experimental automated build and test service.
> Please feel free to ignore this email while we work the kinks out.
>
> For more info about this message, see http://wiki.winehq.org/BuildBot
>
> The Buildbot has detected a failed build on builder runtests-default while building Wine.
> Full details are available at: http://buildbot.kegel.com/builders/runtests-default/builds/79 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting)
> BUILD FAILED: failed git
>
> Errors:
> error: patch failed: dlls/winmm/waveform.c:1653
> error: dlls/winmm/waveform.c: patch does not apply
>
>



More information about the wine-tests-results mailing list