wine-devel March 2022

wine-devel@winehq.org

80 participants
950 discussions

[PATCH 6/6] winealsa: Move the midi event handlers to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

The MIM_DATA and MIM_LONGDATA notifications are sent via the notification thread. The midi_handle_event syscall is temporary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 2 +- dlls/winealsa.drv/alsamidi.c | 172 +++++++++++++++++++++++++++++++++-- dlls/winealsa.drv/midi.c | 129 +------------------------- dlls/winealsa.drv/unixlib.h | 4 +- 4 files changed, 167 insertions(+), 140 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 5b592986c06..b18588ab1c0 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2451,6 +2451,6 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_notify_wait, midi_seq_lock, /* temporary */ - midi_in_lock, midi_seq_open, + midi_handle_event, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index e10779f63a1..30c46eee64d 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -72,6 +72,9 @@ static int port_in = -1; static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; static BOOL notify_quit; +#define NOTIFY_BUFFER_SIZE 64 + 1 /* + 1 for the sentinel */ +static struct notify_context notify_buffer[NOTIFY_BUFFER_SIZE]; +static struct notify_context *notify_read = notify_buffer, *notify_write = notify_buffer; static void seq_lock(void) { @@ -101,14 +104,6 @@ static void in_buffer_unlock(void) pthread_mutex_unlock(&in_buffer_mutex); } -NTSTATUS midi_in_lock(void *args) -{ - if (args) in_buffer_lock(); - else in_buffer_unlock(); - - return STATUS_SUCCESS; -} - static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -123,11 +118,49 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +/* + * notify buffer: The notification ring buffer is implemented so that + * there is always at least one unused sentinel before the current + * read position in order to allow detection of the full vs empty + * state. + */ +static struct notify_context *notify_buffer_next(struct notify_context *notify) +{ + if (++notify >= notify_buffer + ARRAY_SIZE(notify_buffer)) + notify = notify_buffer; + + return notify; +} + +static void notify_buffer_add(struct notify_context *notify) +{ + struct notify_context *next = notify_buffer_next(notify_write); + + if (next == notify_read) /* buffer is full - we can't issue a WARN() in a non-Win32 thread */ + notify_read = notify_buffer_next(notify_read); /* drop the oldest notification */ + *notify_write = *notify; + notify_write = next; +} + +static BOOL notify_buffer_empty(void) +{ + return notify_read == notify_write; +} + +static BOOL notify_buffer_remove(struct notify_context *notify) +{ + if (notify_buffer_empty()) return FALSE; + + *notify = *notify_read; + notify_read = notify_buffer_next(notify_read); + return TRUE; +} + static void notify_post(struct notify_context *notify) { pthread_mutex_lock(&notify_mutex); - if (notify) FIXME("Not yet handled\n"); + if (notify) notify_buffer_add(notify); else notify_quit = TRUE; pthread_cond_signal(&notify_cond); @@ -889,6 +922,124 @@ static UINT midi_out_reset(WORD dev_id) return MMSYSERR_NOERROR; } +static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) +{ + UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; + struct notify_context notify; + MIDIHDR *hdr; + + in_buffer_lock(); + + while (len) + { + hdr = src->lpQueueHdr; + if (!hdr) break; + + copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); + memcpy(hdr->lpData + hdr->dwBytesRecorded, data + pos, copy_len); + hdr->dwBytesRecorded += copy_len; + len -= copy_len; + pos += copy_len; + + if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || + (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xF7)) + { /* buffer full or end of sysex message */ + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(&notify, src, src - srcs, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); + notify_post(&notify); + } + } + + in_buffer_unlock(); +} + +static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) +{ + UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; + struct notify_context notify; + + switch (ev->type) + { + case SND_SEQ_EVENT_NOTEOFF: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; + break; + case SND_SEQ_EVENT_NOTEON: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; + break; + case SND_SEQ_EVENT_KEYPRESS: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CONTROLLER: + data = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PITCHBEND: + value = ev->data.control.value + 0x2000; + data = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PGMCHANGE: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CHANPRESS: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CLOCK: + data = 0xF8; + break; + case SND_SEQ_EVENT_START: + data = 0xFA; + break; + case SND_SEQ_EVENT_CONTINUE: + data = 0xFB; + break; + case SND_SEQ_EVENT_STOP: + data = 0xFC; + break; + case SND_SEQ_EVENT_SONGPOS: + data = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; + break; + case SND_SEQ_EVENT_SONGSEL: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; + break; + case SND_SEQ_EVENT_RESET: + data = 0xFF; + break; + case SND_SEQ_EVENT_QFRAME: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; + break; + case SND_SEQ_EVENT_SENSING: + /* Noting to do */ + break; + } + + if (data != 0) + { + set_in_notify(&notify, src, src - srcs, MIM_DATA, data, current_time); + notify_post(&notify); + } +} + +NTSTATUS midi_handle_event(void *args) +{ + snd_seq_event_t *ev = args; + struct midi_src *src; + + /* Find the target device */ + for (src = srcs; src < srcs + num_srcs; src++) + if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) + break; + if ((src == srcs + num_srcs) || (src->state != 1)) + return STATUS_SUCCESS; + + if (ev->type == SND_SEQ_EVENT_SYSEX) + handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); + else + handle_regular_event(src, ev); + + return STATUS_SUCCESS; +} + static UINT midi_in_add_buffer(WORD dev_id, MIDIHDR *hdr, UINT hdr_size) { struct midi_src *src; @@ -1131,10 +1282,11 @@ NTSTATUS midi_notify_wait(void *args) pthread_mutex_lock(&notify_mutex); - while (!notify_quit) + while (!notify_quit && notify_buffer_empty()) pthread_cond_wait(&notify_cond, &notify_mutex); *params->quit = notify_quit; + if (!notify_quit) notify_buffer_remove(params->notify); pthread_mutex_unlock(&notify_mutex); diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 77ab9720bcc..8009b23ce3d 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -67,16 +67,6 @@ static void seq_unlock(void) ALSA_CALL(midi_seq_lock, (void *)(UINT_PTR)0); } -static void in_buffer_lock(void) -{ - ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)1); -} - -static void in_buffer_unlock(void) -{ - ALSA_CALL(midi_in_lock, (void *)(UINT_PTR)0); -} - static void notify_client(struct notify_context *notify) { TRACE("dev_id = %d msg = %d param1 = %04lX param2 = %04lX\n", notify->dev_id, notify->msg, notify->param_1, notify->param_2); @@ -122,11 +112,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, switch (wMsg) { case MIM_OPEN: case MIM_CLOSE: - case MIM_DATA: - case MIM_LONGDATA: - case MIM_ERROR: - case MIM_LONGERROR: - case MIM_MOREDATA: if (wDevID > MIDM_NumDevs) return; dwCallBack = MidiInDev[wDevID].midiDesc.dwCallback; @@ -170,117 +155,6 @@ static int midiCloseSeq(void) return 0; } -static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) -{ - UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; - MIDIHDR *hdr; - - in_buffer_lock(); - - while (len) - { - hdr = src->lpQueueHdr; - if (!hdr) break; - - copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); - memcpy(hdr->lpData + hdr->dwBytesRecorded, data + pos, copy_len); - hdr->dwBytesRecorded += copy_len; - len -= copy_len; - pos += copy_len; - - if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || - (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xF7)) - { /* buffer full or end of sysex message */ - src->lpQueueHdr = hdr->lpNext; - hdr->dwFlags &= ~MHDR_INQUEUE; - hdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); - } - } - - in_buffer_unlock(); -} - -static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) -{ - UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; - - switch (ev->type) - { - case SND_SEQ_EVENT_NOTEOFF: - data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; - break; - case SND_SEQ_EVENT_NOTEON: - data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; - break; - case SND_SEQ_EVENT_KEYPRESS: - data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CONTROLLER: - data = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PITCHBEND: - value = ev->data.control.value + 0x2000; - data = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PGMCHANGE: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CHANPRESS: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CLOCK: - data = 0xF8; - break; - case SND_SEQ_EVENT_START: - data = 0xFA; - break; - case SND_SEQ_EVENT_CONTINUE: - data = 0xFB; - break; - case SND_SEQ_EVENT_STOP: - data = 0xFC; - break; - case SND_SEQ_EVENT_SONGPOS: - data = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; - break; - case SND_SEQ_EVENT_SONGSEL: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; - break; - case SND_SEQ_EVENT_RESET: - data = 0xFF; - break; - case SND_SEQ_EVENT_QFRAME: - data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; - break; - case SND_SEQ_EVENT_SENSING: - /* Noting to do */ - break; - } - - if (data != 0) - { - MIDI_NotifyClient(src - MidiInDev, MIM_DATA, data, current_time); - } -} - -static void handle_midi_event(snd_seq_event_t *ev) -{ - struct midi_src *src; - - /* Find the target device */ - for (src = MidiInDev; src < MidiInDev + MIDM_NumDevs; src++) - if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) - break; - if ((src == MidiInDev + MIDM_NumDevs) || (src->state != 1)) - return; - - if (ev->type == SND_SEQ_EVENT_SYSEX) - handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); - else - handle_regular_event(src, ev); -} - static DWORD WINAPI midRecThread(void *arg) { snd_seq_t *midi_seq = arg; @@ -320,7 +194,7 @@ static DWORD WINAPI midRecThread(void *arg) seq_unlock(); if (ev) { - handle_midi_event(ev); + ALSA_CALL(midi_handle_event, ev); snd_seq_free_event(ev); } @@ -571,6 +445,7 @@ static DWORD WINAPI notify_thread(void *p) { ALSA_CALL(midi_notify_wait, &params); if (quit) break; + if (notify.send_notify) notify_client(&notify); } return 0; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 68ab650d2f6..46f256a1c6a 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -310,8 +310,8 @@ enum alsa_funcs alsa_midi_notify_wait, alsa_midi_seq_lock, /* temporary */ - alsa_midi_in_lock, alsa_midi_seq_open, + alsa_midi_handle_event, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; @@ -321,8 +321,8 @@ NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; -NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_handle_event(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH 5/6] winealsa: Add helpers to handle regular and sysex events.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 207 ++++++++++++++++++++------------------- 1 file changed, 104 insertions(+), 103 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index ca31def8d16..77ab9720bcc 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -170,114 +170,115 @@ static int midiCloseSeq(void) return 0; } +static void handle_sysex_event(struct midi_src *src, BYTE *data, UINT len) +{ + UINT pos = 0, copy_len, current_time = NtGetTickCount() - src->startTime; + MIDIHDR *hdr; + + in_buffer_lock(); + + while (len) + { + hdr = src->lpQueueHdr; + if (!hdr) break; + + copy_len = min(len, hdr->dwBufferLength - hdr->dwBytesRecorded); + memcpy(hdr->lpData + hdr->dwBytesRecorded, data + pos, copy_len); + hdr->dwBytesRecorded += copy_len; + len -= copy_len; + pos += copy_len; + + if ((hdr->dwBytesRecorded == hdr->dwBufferLength) || + (*(BYTE*)(hdr->lpData + hdr->dwBytesRecorded - 1) == 0xF7)) + { /* buffer full or end of sysex message */ + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + MIDI_NotifyClient(src - MidiInDev, MIM_LONGDATA, (DWORD_PTR)hdr, current_time); + } + } + + in_buffer_unlock(); +} + +static void handle_regular_event(struct midi_src *src, snd_seq_event_t *ev) +{ + UINT data = 0, value, current_time = NtGetTickCount() - src->startTime; + + switch (ev->type) + { + case SND_SEQ_EVENT_NOTEOFF: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; + break; + case SND_SEQ_EVENT_NOTEON: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; + break; + case SND_SEQ_EVENT_KEYPRESS: + data = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CONTROLLER: + data = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PITCHBEND: + value = ev->data.control.value + 0x2000; + data = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; + break; + case SND_SEQ_EVENT_PGMCHANGE: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CHANPRESS: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; + break; + case SND_SEQ_EVENT_CLOCK: + data = 0xF8; + break; + case SND_SEQ_EVENT_START: + data = 0xFA; + break; + case SND_SEQ_EVENT_CONTINUE: + data = 0xFB; + break; + case SND_SEQ_EVENT_STOP: + data = 0xFC; + break; + case SND_SEQ_EVENT_SONGPOS: + data = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; + break; + case SND_SEQ_EVENT_SONGSEL: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; + break; + case SND_SEQ_EVENT_RESET: + data = 0xFF; + break; + case SND_SEQ_EVENT_QFRAME: + data = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; + break; + case SND_SEQ_EVENT_SENSING: + /* Noting to do */ + break; + } + + if (data != 0) + { + MIDI_NotifyClient(src - MidiInDev, MIM_DATA, data, current_time); + } +} + static void handle_midi_event(snd_seq_event_t *ev) { - WORD wDevID; + struct midi_src *src; /* Find the target device */ - for (wDevID = 0; wDevID < MIDM_NumDevs; wDevID++) - if ( (ev->source.client == MidiInDev[wDevID].addr.client) && (ev->source.port == MidiInDev[wDevID].addr.port) ) - break; - if ((wDevID == MIDM_NumDevs) || (MidiInDev[wDevID].state != 1)) - FIXME("Unexpected event received, type = %x from %d:%d\n", ev->type, ev->source.client, ev->source.port); - else { - DWORD dwTime, toSend = 0; - int value = 0; - /* FIXME: Should use ev->time instead for better accuracy */ - dwTime = GetTickCount() - MidiInDev[wDevID].startTime; - TRACE("Event received, type = %x, device = %d\n", ev->type, wDevID); - switch(ev->type) - { - case SND_SEQ_EVENT_NOTEOFF: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_OFF | ev->data.control.channel; - break; - case SND_SEQ_EVENT_NOTEON: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_ON | ev->data.control.channel; - break; - case SND_SEQ_EVENT_KEYPRESS: - toSend = (ev->data.note.velocity << 16) | (ev->data.note.note << 8) | MIDI_CMD_NOTE_PRESSURE | ev->data.control.channel; + for (src = MidiInDev; src < MidiInDev + MIDM_NumDevs; src++) + if ((ev->source.client == src->addr.client) && (ev->source.port == src->addr.port)) break; - case SND_SEQ_EVENT_CONTROLLER: - toSend = (ev->data.control.value << 16) | (ev->data.control.param << 8) | MIDI_CMD_CONTROL | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PITCHBEND: - value = ev->data.control.value + 0x2000; - toSend = (((value >> 7) & 0x7f) << 16) | ((value & 0x7f) << 8) | MIDI_CMD_BENDER | ev->data.control.channel; - break; - case SND_SEQ_EVENT_PGMCHANGE: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_PGM_CHANGE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CHANPRESS: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_CHANNEL_PRESSURE | ev->data.control.channel; - break; - case SND_SEQ_EVENT_CLOCK: - toSend = 0xF8; - break; - case SND_SEQ_EVENT_START: - toSend = 0xFA; - break; - case SND_SEQ_EVENT_CONTINUE: - toSend = 0xFB; - break; - case SND_SEQ_EVENT_STOP: - toSend = 0xFC; - break; - case SND_SEQ_EVENT_SONGPOS: - toSend = (((ev->data.control.value >> 7) & 0x7f) << 16) | ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_POS; - break; - case SND_SEQ_EVENT_SONGSEL: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_SONG_SELECT; - break; - case SND_SEQ_EVENT_RESET: - toSend = 0xFF; - break; - case SND_SEQ_EVENT_QFRAME: - toSend = ((ev->data.control.value & 0x7f) << 8) | MIDI_CMD_COMMON_MTC_QUARTER; - break; - case SND_SEQ_EVENT_SYSEX: - { - int pos = 0; - int len = ev->data.ext.len; - LPBYTE ptr = ev->data.ext.ptr; - LPMIDIHDR lpMidiHdr; - - in_buffer_lock(); - while (len) { - if ((lpMidiHdr = MidiInDev[wDevID].lpQueueHdr) != NULL) { - int copylen = min(len, lpMidiHdr->dwBufferLength - lpMidiHdr->dwBytesRecorded); - memcpy(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded, ptr + pos, copylen); - lpMidiHdr->dwBytesRecorded += copylen; - len -= copylen; - pos += copylen; - /* We check if we reach the end of buffer or the end of sysex before notifying - * to handle the case where ALSA split the sysex into several events */ - if ((lpMidiHdr->dwBytesRecorded == lpMidiHdr->dwBufferLength) || - (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime); - } - } else { - FIXME("Sysex data received but no buffer to store it!\n"); - break; - } - } - in_buffer_unlock(); - } - break; - case SND_SEQ_EVENT_SENSING: - /* Noting to do */ - break; - default: - FIXME("Unhandled event received, type = %x\n", ev->type); - break; - } - if (toSend != 0) { - TRACE("Received event %08x from %d:%d\n", toSend, ev->source.client, ev->source.port); - MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime); - } - } + if ((src == MidiInDev + MIDM_NumDevs) || (src->state != 1)) + return; + + if (ev->type == SND_SEQ_EVENT_SYSEX) + handle_sysex_event(src, ev->data.ext.ptr, ev->data.ext.len); + else + handle_regular_event(src, ev); } static DWORD WINAPI midRecThread(void *arg) -- 2.25.1

2 1

[PATCH 4/6] winealsa: Introduce a notification thread.
by Huw Davies 24 Mar '22

24 Mar '22

Currently the thread just blocks until told to quit by midi_release. Eventually this thread will dispatch the MIM_DATA and MIM_LONGDATA notifications. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 2 ++ dlls/winealsa.drv/alsamidi.c | 39 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 24 +++++++++++++++++++--- dlls/winealsa.drv/unixlib.h | 10 +++++++++ 4 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index eb16203dbf9..5b592986c06 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2445,8 +2445,10 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_started, get_prop_value, midi_init, + midi_release, midi_out_message, midi_in_message, + midi_notify_wait, midi_seq_lock, /* temporary */ midi_in_lock, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index ccdb35731d1..e10779f63a1 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -69,6 +69,10 @@ static snd_seq_t *midi_seq; static unsigned int seq_refs; static int port_in = -1; +static pthread_mutex_t notify_mutex = PTHREAD_MUTEX_INITIALIZER; +static pthread_cond_t notify_cond = PTHREAD_COND_INITIALIZER; +static BOOL notify_quit; + static void seq_lock(void) { pthread_mutex_lock(&seq_mutex); @@ -119,6 +123,17 @@ static void set_in_notify(struct notify_context *notify, struct midi_src *src, W notify->instance = src->midiDesc.dwInstance; } +static void notify_post(struct notify_context *notify) +{ + pthread_mutex_lock(&notify_mutex); + + if (notify) FIXME("Not yet handled\n"); + else notify_quit = TRUE; + pthread_cond_signal(&notify_cond); + + pthread_mutex_unlock(&notify_mutex); +} + static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; @@ -405,6 +420,14 @@ NTSTATUS midi_init(void *args) return STATUS_SUCCESS; } +NTSTATUS midi_release(void *args) +{ + /* stop the notify_wait thread */ + notify_post(NULL); + + return STATUS_SUCCESS; +} + static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, UINT_PTR param_1, UINT_PTR param_2) { @@ -1101,3 +1124,19 @@ NTSTATUS midi_in_message(void *args) return STATUS_SUCCESS; } + +NTSTATUS midi_notify_wait(void *args) +{ + struct midi_notify_wait_params *params = args; + + pthread_mutex_lock(&notify_mutex); + + while (!notify_quit) + pthread_cond_wait(&notify_cond, &notify_mutex); + + *params->quit = notify_quit; + + pthread_mutex_unlock(&notify_mutex); + + return STATUS_SUCCESS; +} diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 35678588549..ca31def8d16 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -557,18 +557,36 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return err; } +static DWORD WINAPI notify_thread(void *p) +{ + struct midi_notify_wait_params params; + struct notify_context notify; + BOOL quit; + + params.notify = &notify; + params.quit = &quit; + + while (1) + { + ALSA_CALL(midi_notify_wait, &params); + if (quit) break; + } + return 0; +} + /************************************************************************** * DriverProc (WINEALSA.@) */ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { -/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */ -/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ - switch(wMsg) { case DRV_LOAD: + CloseHandle(CreateThread(NULL, 0, notify_thread, NULL, 0, NULL)); + return 1; case DRV_FREE: + ALSA_CALL(midi_release, NULL); + return 1; case DRV_OPEN: case DRV_CLOSE: case DRV_ENABLE: diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 6d5bcb64cf0..68ab650d2f6 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -265,6 +265,12 @@ struct midi_in_message_params struct notify_context *notify; }; +struct midi_notify_wait_params +{ + BOOL *quit; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -298,8 +304,10 @@ enum alsa_funcs alsa_is_started, alsa_get_prop_value, alsa_midi_init, + alsa_midi_release, alsa_midi_out_message, alsa_midi_in_message, + alsa_midi_notify_wait, alsa_midi_seq_lock, /* temporary */ alsa_midi_in_lock, @@ -307,8 +315,10 @@ enum alsa_funcs }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_release(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_message(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_notify_wait(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_in_lock(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH 3/6] winealsa: Move MIDM_STOP to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 17 +++++++++++++++++ dlls/winealsa.drv/midi.c | 16 ---------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index d647ba79a9e..ccdb35731d1 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -957,6 +957,20 @@ static UINT midi_in_start(WORD dev_id) return MMSYSERR_NOERROR; } +static UINT midi_in_stop(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 0; + return MMSYSERR_NOERROR; +} + static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1074,6 +1088,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_START: *params->err = midi_in_start(params->dev_id); break; + case MIDM_STOP: + *params->err = midi_in_stop(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 88b23f52ec1..35678588549 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,20 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStop [internal] - */ -static DWORD midStop(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 0; - return MMSYSERR_NOERROR; -} - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -518,8 +504,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_STOP: - return midStop(wDevID); } params.dev_id = wDevID; -- 2.25.1

2 1

[PATCH 2/6] winealsa: Move MIDM_START to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 18 ++++++++++++++++++ dlls/winealsa.drv/midi.c | 17 ----------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 535699a4059..d647ba79a9e 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -942,6 +942,21 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static UINT midi_in_start(WORD dev_id) +{ + struct midi_src *src; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + src->state = 1; + src->startTime = NtGetTickCount(); + return MMSYSERR_NOERROR; +} + static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) { UINT cur_time = NtGetTickCount(); @@ -1056,6 +1071,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_START: + *params->err = midi_in_start(params->dev_id); + break; case MIDM_RESET: *params->err = midi_in_reset(params->dev_id, params->notify); break; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 5639bf67369..88b23f52ec1 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,21 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midStart [internal] - */ -static DWORD midStart(WORD wDevID) -{ - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - MidiInDev[wDevID].state = 1; - MidiInDev[wDevID].startTime = GetTickCount(); - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStop [internal] */ @@ -533,8 +518,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_START: - return midStart(wDevID); case MIDM_STOP: return midStop(wDevID); } -- 2.25.1

2 1

[PATCH 1/6] winealsa: Move MIDM_RESET to the unixlib.
by Huw Davies 24 Mar '22

24 Mar '22

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 49 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 35 ++++++-------------------- dlls/winealsa.drv/unixlib.h | 1 + 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 80e677b3064..535699a4059 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -105,6 +105,20 @@ NTSTATUS midi_in_lock(void *args) return STATUS_SUCCESS; } +static void set_in_notify(struct notify_context *notify, struct midi_src *src, WORD dev_id, WORD msg, + UINT_PTR param_1, UINT_PTR param_2) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = src->midiDesc.dwCallback; + notify->flags = src->wFlags; + notify->device = src->midiDesc.hMidi; + notify->instance = src->midiDesc.dwInstance; +} + static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; @@ -928,6 +942,36 @@ static UINT midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, UINT size) return MMSYSERR_NOERROR; } +static DWORD midi_in_reset(WORD dev_id, struct notify_context *notify) +{ + UINT cur_time = NtGetTickCount(); + UINT err = MMSYSERR_NOERROR; + struct midi_src *src; + MIDIHDR *hdr; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID; + src = srcs + dev_id; + if (src->state == -1) return MIDIERR_NODEVICE; + + in_buffer_lock(); + + if (src->lpQueueHdr) + { + hdr = src->lpQueueHdr; + src->lpQueueHdr = hdr->lpNext; + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + set_in_notify(notify, src, dev_id, MIM_LONGDATA, (DWORD_PTR)hdr, cur_time - src->startTime); + if (src->lpQueueHdr) err = ERROR_RETRY; /* ask the client to call again */ + } + + in_buffer_unlock(); + + return err; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -987,6 +1031,8 @@ NTSTATUS midi_in_message(void *args) { struct midi_in_message_params *params = args; + params->notify->send_notify = FALSE; + switch (params->msg) { case DRVM_EXIT: @@ -1010,6 +1056,9 @@ NTSTATUS midi_in_message(void *args) case MIDM_GETNUMDEVS: *params->err = num_srcs; break; + case MIDM_RESET: + *params->err = midi_in_reset(params->dev_id, 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 72649eca89c..5639bf67369 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -459,31 +459,6 @@ static DWORD midClose(WORD wDevID) return ret; } -/************************************************************************** - * midReset [internal] - */ -static DWORD midReset(WORD wDevID) -{ - DWORD dwTime = GetTickCount(); - - TRACE("(%04X);\n", wDevID); - - if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID; - if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE; - - in_buffer_lock(); - while (MidiInDev[wDevID].lpQueueHdr) { - LPMIDIHDR lpMidiHdr = MidiInDev[wDevID].lpQueueHdr; - MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime - MidiInDev[wDevID].startTime); - } - in_buffer_unlock(); - - return MMSYSERR_NOERROR; -} - /************************************************************************** * midStart [internal] */ @@ -545,6 +520,7 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { struct midi_in_message_params params; + struct notify_context notify; UINT err; TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", @@ -557,8 +533,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MIDM_CLOSE: return midClose(wDevID); - case MIDM_RESET: - return midReset(wDevID); case MIDM_START: return midStart(wDevID); case MIDM_STOP: @@ -571,8 +545,13 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, params.param_1 = dwParam1; params.param_2 = dwParam2; params.err = &err; + params.notify = &notify; - ALSA_CALL(midi_in_message, &params); + do + { + ALSA_CALL(midi_in_message, &params); + if ((!err || err == ERROR_RETRY) && notify.send_notify) notify_client(&notify); + } while (err == ERROR_RETRY); return err; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 263e83eda57..6d5bcb64cf0 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -262,6 +262,7 @@ struct midi_in_message_params UINT_PTR param_1; UINT_PTR param_2; UINT *err; + struct notify_context *notify; }; struct midi_seq_open_params -- 2.25.1

2 1

[PATCH 6/6] win32u: Move NtUserGetMessage implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 856 +---------------------------------- dlls/win32u/gdiobj.c | 1 + dlls/win32u/message.c | 103 ++++- dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 7 files changed, 112 insertions(+), 858 deletions(-)

3 2

[PATCH 5/6] win32u: Move NtUserPeekMessage implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

3 2

[PATCH 4/6] win32u: Move process_sent_messages implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

3 2

[PATCH 2/6] win32u: Move reply_message_result implementation from user32.
by Jacek Caban 24 Mar '22

24 Mar '22

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 29 +-- dlls/win32u/message.c | 416 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 9 + dlls/win32u/sysparams.c | 2 + dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 1 + 6 files changed, 431 insertions(+), 27 deletions(-)

3 2

← Newer
1
...
20
21
22
23
24
25
26
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2022