Huw Davies : winealsa: Move MODM_LONGDATA to the unixlib.
Alexandre Julliard
julliard at winehq.org
Thu Mar 17 17:18:31 CDT 2022
Module: wine
Branch: master
Commit: 7819e823a6c867e9ce9f6dcd1ddcd8e03bfb5ecd
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7819e823a6c867e9ce9f6dcd1ddcd8e03bfb5ecd
Author: Huw Davies <huw at codeweavers.com>
Date: Thu Mar 17 08:14:03 2022 +0000
winealsa: Move MODM_LONGDATA to the unixlib.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/winealsa.drv/alsamidi.c | 101 +++++++++++++++++++++++++++++++++++++++++
dlls/winealsa.drv/midi.c | 106 -------------------------------------------
2 files changed, 101 insertions(+), 106 deletions(-)
diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
index 32c983ba0a3..0a3e1a80be3 100644
--- a/dlls/winealsa.drv/alsamidi.c
+++ b/dlls/winealsa.drv/alsamidi.c
@@ -651,6 +651,104 @@ static UINT midi_out_data(WORD dev_id, UINT data)
return MMSYSERR_NOERROR;
}
+static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct notify_context *notify)
+{
+ struct midi_dest *dest;
+ int len_add = 0;
+ BYTE *data, *new_data = NULL;
+ snd_seq_event_t event;
+
+ TRACE("(%04X, %p, %08X);\n", dev_id, hdr, hdr_size);
+
+ /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure
+ * but it seems to be used only for midi input.
+ * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption.
+ */
+
+ if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID;
+ dest = dests + dev_id;
+
+ if (!dest->bEnabled) return MIDIERR_NODEVICE;
+
+ if (dest->seq == NULL)
+ {
+ WARN("can't play !\n");
+ return MIDIERR_NODEVICE;
+ }
+
+ data = (BYTE*)hdr->lpData;
+
+ if (data == NULL)
+ return MIDIERR_UNPREPARED;
+ if (!(hdr->dwFlags & MHDR_PREPARED))
+ return MIDIERR_UNPREPARED;
+ if (hdr->dwFlags & MHDR_INQUEUE)
+ return MIDIERR_STILLPLAYING;
+ hdr->dwFlags &= ~MHDR_DONE;
+ hdr->dwFlags |= MHDR_INQUEUE;
+
+ /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive
+ * data, or can it also contain raw MIDI data, to be split up and sent to
+ * modShortData() ?
+ * If the latest is true, then the following WARNing will fire up
+ */
+ if (data[0] != 0xF0 || data[hdr->dwBufferLength - 1] != 0xF7)
+ {
+ WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
+ new_data = malloc(hdr->dwBufferLength + 2);
+ }
+
+ TRACE("dwBufferLength=%u !\n", hdr->dwBufferLength);
+ TRACE(" %02X %02X %02X ... %02X %02X %02X\n",
+ data[0], data[1], data[2], data[hdr->dwBufferLength-3],
+ data[hdr->dwBufferLength-2], data[hdr->dwBufferLength-1]);
+
+ switch (dest->caps.wTechnology)
+ {
+ case MOD_FMSYNTH:
+ /* FIXME: I don't think there is much to do here */
+ free(new_data);
+ break;
+ case MOD_MIDIPORT:
+ if (data[0] != 0xF0)
+ {
+ /* Send start of System Exclusive */
+ len_add = 1;
+ new_data[0] = 0xF0;
+ memcpy(new_data + 1, data, hdr->dwBufferLength);
+ WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n");
+ }
+ if (data[hdr->dwBufferLength-1] != 0xF7)
+ {
+ /* Send end of System Exclusive */
+ if (!len_add)
+ memcpy(new_data, data, hdr->dwBufferLength);
+ new_data[hdr->dwBufferLength + len_add] = 0xF7;
+ len_add++;
+ 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);
+ snd_seq_ev_set_source(&event, dest->port_out);
+ snd_seq_ev_set_subs(&event);
+ snd_seq_ev_set_sysex(&event, hdr->dwBufferLength + len_add, new_data ? new_data : data);
+ seq_lock();
+ snd_seq_event_output_direct(dest->seq, &event);
+ seq_unlock();
+ free(new_data);
+ break;
+ default:
+ WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology);
+ free(new_data);
+ return MMSYSERR_NOTENABLED;
+ }
+
+ hdr->dwFlags &= ~MHDR_INQUEUE;
+ hdr->dwFlags |= MHDR_DONE;
+ set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0);
+ return MMSYSERR_NOERROR;
+}
+
NTSTATUS midi_out_message(void *args)
{
struct midi_out_message_params *params = args;
@@ -674,6 +772,9 @@ NTSTATUS midi_out_message(void *args)
case MODM_DATA:
*params->err = midi_out_data(params->dev_id, params->param_1);
break;
+ case MODM_LONGDATA:
+ *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify);
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index dd2f3cd9040..5638dace27c 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -122,16 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg,
wDevID, wMsg, dwParam1, dwParam2);
switch (wMsg) {
- case MOM_DONE:
- case MOM_POSITIONCB:
- if (wDevID > MODM_NumDevs) return;
-
- dwCallBack = MidiOutDev[wDevID].midiDesc.dwCallback;
- uFlags = MidiOutDev[wDevID].wFlags;
- hDev = MidiOutDev[wDevID].midiDesc.hMidi;
- dwInstance = MidiOutDev[wDevID].midiDesc.dwInstance;
- break;
-
case MIM_OPEN:
case MIM_CLOSE:
case MIM_DATA:
@@ -630,100 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
return MMSYSERR_NOERROR;
}
-/**************************************************************************
- * modLongData [internal]
- */
-static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
-{
- int len_add = 0;
- BYTE *lpData, *lpNewData = NULL;
- snd_seq_event_t event;
-
- TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
-
- /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure
- * but it seems to be used only for midi input.
- * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption.
- */
-
- if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
- if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
-
- if (MidiOutDev[wDevID].seq == NULL) {
- WARN("can't play !\n");
- return MIDIERR_NODEVICE;
- }
-
- lpData = (BYTE*)lpMidiHdr->lpData;
-
- if (lpData == NULL)
- return MIDIERR_UNPREPARED;
- if (!(lpMidiHdr->dwFlags & MHDR_PREPARED))
- return MIDIERR_UNPREPARED;
- if (lpMidiHdr->dwFlags & MHDR_INQUEUE)
- return MIDIERR_STILLPLAYING;
- lpMidiHdr->dwFlags &= ~MHDR_DONE;
- lpMidiHdr->dwFlags |= MHDR_INQUEUE;
-
- /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive
- * data, or can it also contain raw MIDI data, to be split up and sent to
- * modShortData() ?
- * If the latest is true, then the following WARNing will fire up
- */
- if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) {
- WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
- lpNewData = HeapAlloc(GetProcessHeap(), 0, lpMidiHdr->dwBufferLength + 2);
- }
-
- TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength);
- TRACE(" %02X %02X %02X ... %02X %02X %02X\n",
- lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3],
- lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]);
-
- 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;
- 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 */
- 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");
- }
- snd_seq_ev_clear(&event);
- snd_seq_ev_set_direct(&event);
- snd_seq_ev_set_source(&event, MidiOutDev[wDevID].port_out);
- snd_seq_ev_set_subs(&event);
- snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData);
- seq_lock();
- snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event);
- seq_unlock();
- HeapFree(GetProcessHeap(), 0, lpNewData);
- break;
- default:
- WARN("Technology not supported (yet) %d !\n",
- MidiOutDev[wDevID].caps.wTechnology);
- HeapFree(GetProcessHeap(), 0, lpNewData);
- return MMSYSERR_NOTENABLED;
- }
-
- lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
- lpMidiHdr->dwFlags |= MHDR_DONE;
- MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L);
- return MMSYSERR_NOERROR;
-}
-
/**************************************************************************
* modPrepare [internal]
*/
@@ -886,8 +782,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
case DRVM_INIT:
ALSA_MidiInit();
return 0;
- case MODM_LONGDATA:
- return modLongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_PREPARE:
return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
case MODM_UNPREPARE:
More information about the wine-cvs
mailing list