Michał Wiernowolski : winealsa: Improved handling of SysEx MIDI messages.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Apr 25 07:06:30 CDT 2007
Module: wine
Branch: master
Commit: a45ffebee4e00cff08f3a7c9f1bc6fe5265ef6b6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45ffebee4e00cff08f3a7c9f1bc6fe5265ef6b6
Author: Michał Wiernowolski <mihalw at gmail.com>
Date: Tue Apr 24 20:47:16 2007 +0200
winealsa: Improved handling of SysEx MIDI messages.
---
dlls/winealsa.drv/midi.c | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 09018aa..90d52e6 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -351,17 +351,19 @@ static DWORD WINAPI midRecThread(LPVOID arg)
LPBYTE ptr = (BYTE*) ev->data.ext.ptr;
LPMIDIHDR lpMidiHdr;
- /* FIXME: Should handle sysex greater that a single buffer */
+ /* FIXME: Should handle sysex greater than lpMidiHdr->dwBufferLength */
EnterCriticalSection(&crit_sect);
if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) {
- if (len <= lpMidiHdr->dwBufferLength) {
- lpMidiHdr->dwBytesRecorded = len;
- memcpy(lpMidiHdr->lpData, ptr, len);
- lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
- lpMidiHdr->dwFlags |= MHDR_DONE;
- MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext;
- if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime) != MMSYSERR_NOERROR)
- WARN("Couldn't notify client\n");
+ if (lpMidiHdr->dwBytesRecorded + len <= lpMidiHdr->dwBufferLength) {
+ memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr, len);
+ lpMidiHdr->dwBytesRecorded += len;
+ if (*(ptr + (len-1)) == 0xF7) {
+ lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
+ lpMidiHdr->dwFlags |= MHDR_DONE;
+ MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext;
+ if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime) != MMSYSERR_NOERROR)
+ WARN("Couldn't notify client\n");
+ }
} else
FIXME("No enough space in the buffer to store sysex!\n");
} else
More information about the wine-cvs
mailing list