system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-19 12:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

winmm: Fix MEVT_LONGMSG handling in MIDI stream.

Browse source 
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>
This commit is contained in:
Akihiro Sagawa 2018-04-05 00:41:24 +09:00 committed by Alexandre Julliard
parent cc78101fea
commit 185d98bbfd
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/winmm/tests/midi.c
View file

@ -819,7 +819,7 @@ static void test_midiStream(UINT udev, HWND hwnd)
e->dwEvent = MEVT_F_LONG | sizeof(SysEx_volume_off);
memcpy(&e->dwParms[0], SysEx_volume_off, sizeof(SysEx_volume_off));
p += sizeof(MIDISHORTEVENT) + ROUNDUP4(sizeof(SysEx_volume_off));
/* Note On (FIXME: we shouldn't hear this voice due to volume settings) */
/* Note On (We can't hear this voice due to volume settings) */
e = (MIDIEVENT *)p;
e->dwEvent = MEVT_F_SHORT | 0x6F4593; /* note #69 */
p += sizeof(MIDISHORTEVENT);

12
dlls/winmm/winmm.c
View file

@ -1169,8 +1169,16 @@ start_header:
/* do nothing, skip bytes */
break;
case MEVT_LONGMSG:
midiOutLongMsg(lpMidiStrm->hDevice, lpMidiStrm->lpMidiHdr, MEVT_EVENTPARM(me->dwEvent));
break;
{
MIDIHDR mh;
memset(&mh, 0, sizeof(mh));
mh.lpData = (LPSTR)me->dwParms;
mh.dwBufferLength = MEVT_EVENTPARM(me->dwEvent);
midiOutPrepareHeader(lpMidiStrm->hDevice, &mh, sizeof(mh));
midiOutLongMsg(lpMidiStrm->hDevice, &mh, sizeof(mh));
midiOutUnprepareHeader(lpMidiStrm->hDevice, &mh, sizeof(mh));
break;
}
case MEVT_NOP:
break;
case MEVT_SHORTMSG: