[PATCH] winmm: Fix default time division value in MIDI stream.
Andrew Eikum
aeikum at codeweavers.com
Fri May 11 12:49:34 CDT 2018
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
On Tue, May 08, 2018 at 10:02:10PM +0900, Akihiro Sagawa wrote:
> Signed-off-by: Akihiro Sagawa <sagawa.aki at gmail.com>
> ---
> dlls/winmm/tests/midi.c | 2 +-
> dlls/winmm/winmm.c | 4 ++--
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c
> index 97cef2d..b0efe16 100644
> --- a/dlls/winmm/tests/midi.c
> +++ b/dlls/winmm/tests/midi.c
> @@ -565,7 +565,7 @@ static void test_midiStream(UINT udev, HWND hwnd)
> midiprop.tdiv.cbStruct = sizeof(midiprop.tdiv);
> rc = midiStreamProperty(hm, (void*)&midiprop, MIDIPROP_GET|MIDIPROP_TIMEDIV);
> ok(!rc, "midiStreamProperty TIMEDIV rc=%s\n", mmsys_error(rc));
> - todo_wine ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv);
> + ok(24==LOWORD(midiprop.tdiv.dwTimeDiv), "default stream time division %u\n", midiprop.tdiv.dwTimeDiv);
>
> memset(&mhdr, 0, sizeof(mhdr));
> mhdr.dwUser = 0x56FA552C;
> diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c
> index faeb474..58a7672 100644
> --- a/dlls/winmm/winmm.c
> +++ b/dlls/winmm/winmm.c
> @@ -1277,8 +1277,8 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID,
> if (!lpMidiStrm)
> return MMSYSERR_NOMEM;
>
> - lpMidiStrm->dwTempo = 500000;
> - lpMidiStrm->dwTimeDiv = 480; /* 480 is 120 quarter notes per minute *//* FIXME ??*/
> + lpMidiStrm->dwTempo = 500000; /* micro seconds per quarter note, i.e. 120 BPM */
> + lpMidiStrm->dwTimeDiv = 24; /* ticks per quarter note */
> lpMidiStrm->dwPositionMS = 0;
>
> mosm.dwStreamID = (DWORD)lpMidiStrm;
>
More information about the wine-devel
mailing list