winealsa.drv: Fix F0 and F7 byte insertion + memory leak and remove LP stuff in modLongData.
This commit is contained in:
parent
d7ac251e8d
commit
d727596a5b
|
@ -932,7 +932,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam)
|
|||
static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
|
||||
{
|
||||
int len_add = 0;
|
||||
LPBYTE lpData, lpNewData = NULL;
|
||||
BYTE *lpData, *lpNewData = NULL;
|
||||
snd_seq_event_t event;
|
||||
|
||||
TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
|
||||
|
@ -950,7 +950,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
|
|||
return MIDIERR_NODEVICE;
|
||||
}
|
||||
|
||||
lpData = (LPBYTE) lpMidiHdr->lpData;
|
||||
lpData = (BYTE*)lpMidiHdr->lpData;
|
||||
|
||||
if (lpData == NULL)
|
||||
return MIDIERR_UNPREPARED;
|
||||
|
@ -979,23 +979,23 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
|
|||
switch (MidiOutDev[wDevID].caps.wTechnology) {
|
||||
case MOD_FMSYNTH:
|
||||
/* FIXME: I don't think there is much to do here */
|
||||
HeapFree(GetProcessHeap(), 0, lpNewData);
|
||||
break;
|
||||
case MOD_MIDIPORT:
|
||||
if (lpData[0] != 0xF0) {
|
||||
/* Send start of System Exclusive */
|
||||
len_add = 1;
|
||||
lpData[0] = 0xF0;
|
||||
memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength);
|
||||
WARN("Adding missing 0xF0 marker at the beginning of "
|
||||
"system exclusive byte stream\n");
|
||||
lpNewData[0] = 0xF0;
|
||||
memcpy(lpNewData + 1, lpData, lpMidiHdr->dwBufferLength);
|
||||
WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n");
|
||||
}
|
||||
if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) {
|
||||
/* Send end of System Exclusive */
|
||||
memcpy(lpData + len_add, lpData, lpMidiHdr->dwBufferLength);
|
||||
lpNewData[lpMidiHdr->dwBufferLength + len_add - 1] = 0xF0;
|
||||
if (!len_add)
|
||||
memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength);
|
||||
lpNewData[lpMidiHdr->dwBufferLength + len_add] = 0xF7;
|
||||
len_add++;
|
||||
WARN("Adding missing 0xF7 marker at the end of "
|
||||
"system exclusive byte stream\n");
|
||||
WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n");
|
||||
}
|
||||
snd_seq_ev_clear(&event);
|
||||
snd_seq_ev_set_direct(&event);
|
||||
|
@ -1004,8 +1004,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
|
|||
TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port);
|
||||
snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData);
|
||||
snd_seq_event_output_direct(midiSeq, &event);
|
||||
if (lpNewData)
|
||||
HeapFree(GetProcessHeap(), 0, lpData);
|
||||
HeapFree(GetProcessHeap(), 0, lpNewData);
|
||||
break;
|
||||
default:
|
||||
WARN("Technology not supported (yet) %d !\n",
|
||||
|
|
Loading…
Reference in New Issue