Akihiro Sagawa : winmm: Fix default time division value in MIDI stream.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 1d499396189e7353dfda31a84dd89bb13f2747f3
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=1d499396189e7353dfda31a84...

Author: Akihiro Sagawa 
Date:   Tue May  8 22:02:10 2018 +0900

winmm: Fix default time division value in MIDI stream.

Signed-off-by: Akihiro Sagawa 
Signed-off-by: Andrew Eikum 
Signed-off-by: Alexandre Julliard

---

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;