winmm: Fix default time division value in MIDI stream.

Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winmm: Fix default time division value in MIDI stream.
1d499396 · Akihiro Sagawa · Alexandre Julliard · 339d9e3a · 1d499396 · 1d499396
Commit 1d499396 authored May 08, 2018 by Akihiro Sagawa Committed by Alexandre Julliard May 11, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

midi.c dlls/winmm/tests/midi.c +1 -1

winmm.c dlls/winmm/winmm.c +2 -2

No files found.
--- 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;

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