- Wine-Devel - list.winehq.org

[PATCH v2 5/5] winealsa: Move MODM_CLOSE to the unixlib.
by Huw Davies March 16, 2022

March 16, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsamidi.c | 57 ++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 47 ----------------------------- 2 files changed, 57 insertions(+), 47 deletions(-) diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index a7a5a211484..a92c08793af 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -471,6 +471,60 @@ static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, stru return MMSYSERR_NOERROR; } +static UINT midi_out_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_dest *dest; + + TRACE("(%04X);\n", dev_id); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + + dest = dests + dev_id; + + if (dest->midiDesc.hMidi == 0) + { + WARN("device not opened !\n"); + return MMSYSERR_ERROR; + } + + /* FIXME: should test that no pending buffer is still in the queue for + * playing */ + + if (dest->seq == NULL) + { + WARN("can't close !\n"); + return MMSYSERR_ERROR; + } + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + case MOD_MIDIPORT: + case MOD_SYNTH: + seq_lock(); + TRACE("Deleting port :%d, connected to %d:%d\n", dest->port_out, dest->addr.client, dest->addr.port); + snd_seq_delete_simple_port(dest->seq, dest->port_out); + dest->port_out = -1; + seq_unlock(); + seq_close(); + dest->seq = NULL; + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + set_out_notify(notify, dest, dev_id, MOM_CLOSE, 0, 0); + + dest->midiDesc.hMidi = 0; + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -488,6 +542,9 @@ NTSTATUS midi_out_message(void *args) case MODM_OPEN: *params->err = midi_out_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); break; + case MODM_CLOSE: + *params->err = midi_out_close(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 c77d479162b..5f8d855c9fb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -122,7 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: if (wDevID > MODM_NumDevs) return; @@ -631,50 +630,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modClose [internal] - */ -static DWORD modClose(WORD wDevID) -{ - int ret = MMSYSERR_NOERROR; - - TRACE("(%04X);\n", wDevID); - - if (MidiOutDev[wDevID].midiDesc.hMidi == 0) { - WARN("device not opened !\n"); - return MMSYSERR_ERROR; - } - /* FIXME: should test that no pending buffer is still in the queue for - * playing */ - - if (MidiOutDev[wDevID].seq == NULL) { - WARN("can't close !\n"); - return MMSYSERR_ERROR; - } - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - case MOD_MIDIPORT: - case MOD_SYNTH: - seq_lock(); - TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - snd_seq_delete_simple_port(MidiOutDev[wDevID].seq, MidiOutDev[wDevID].port_out); - MidiOutDev[wDevID].port_out = -1; - seq_unlock(); - midiCloseSeq(); - MidiOutDev[wDevID].seq = NULL; - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); - MidiOutDev[wDevID].midiDesc.hMidi = 0; - return ret; -} - /************************************************************************** * modData [internal] */ @@ -1051,8 +1006,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case MODM_CLOSE: - return modClose(wDevID); case MODM_DATA: return modData(wDevID, dwParam1); case MODM_LONGDATA: -- 2.25.1

2 1

[PATCH v2 4/5] winealsa: Move MODM_OPEN to the unixlib.
by Huw Davies March 16, 2022

March 16, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 133 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 127 +++++++-------------------------- dlls/winealsa.drv/unixlib.h | 26 +++++++ 4 files changed, 186 insertions(+), 101 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 16c0c7c387d..6d307eb84bf 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2445,6 +2445,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_started, get_prop_value, midi_init, + midi_out_message, midi_seq_lock, /* temporary */ midi_seq_open, diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index e1fca85b3b4..a7a5a211484 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -362,3 +362,136 @@ NTSTATUS midi_init(void *args) 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) +{ + notify->send_notify = TRUE; + notify->dev_id = dev_id; + notify->msg = msg; + notify->param_1 = param_1; + notify->param_2 = param_2; + notify->callback = dest->midiDesc.dwCallback; + notify->flags = dest->wFlags; + notify->device = dest->midiDesc.hMidi; + notify->instance = dest->midiDesc.dwInstance; +} + +static UINT midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, UINT flags, struct notify_context *notify) +{ + int ret; + int port_out; + char port_out_name[32]; + snd_seq_t *midi_seq; + struct midi_dest *dest; + + TRACE("(%04X, %p, %08X);\n", dev_id, midi_desc, flags); + + if (midi_desc == NULL) + { + WARN("Invalid Parameter !\n"); + return MMSYSERR_INVALPARAM; + } + if (dev_id >= num_dests) + { + TRACE("MAX_MIDIOUTDRV reached !\n"); + return MMSYSERR_BADDEVICEID; + } + dest = dests + dev_id; + if (dest->midiDesc.hMidi != 0) + { + WARN("device already open !\n"); + return MMSYSERR_ALLOCATED; + } + if (!dest->bEnabled) + { + WARN("device disabled !\n"); + return MIDIERR_NODEVICE; + } + if ((flags & ~CALLBACK_TYPEMASK) != 0) + { + WARN("bad dwFlags\n"); + return MMSYSERR_INVALFLAG; + } + + switch (dest->caps.wTechnology) + { + case MOD_FMSYNTH: + case MOD_MIDIPORT: + case MOD_SYNTH: + if (!(midi_seq = seq_open(NULL))) + return MMSYSERR_ALLOCATED; + break; + default: + WARN("Technology not supported (yet) %d !\n", dest->caps.wTechnology); + return MMSYSERR_NOTENABLED; + } + + dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + dest->midiDesc = *midi_desc; + dest->seq = midi_seq; + + seq_lock(); + /* Create a port dedicated to a specific device */ + /* Keep the old name without a number for the first port */ + if (dev_id) + sprintf(port_out_name, "WINE ALSA Output #%d", dev_id); + + port_out = snd_seq_create_simple_port(midi_seq, dev_id ? port_out_name : "WINE ALSA Output", + SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION); + + if (port_out < 0) + { + TRACE("Unable to create output port\n"); + dest->port_out = -1; + } + else + { + TRACE("Output port %d created successfully\n", port_out); + dest->port_out = port_out; + + /* Connect our app port to the device port */ + ret = snd_seq_connect_to(midi_seq, port_out, dest->addr.client, dest->addr.port); + + /* usually will happen when the port is already connected */ + /* other errors should not be fatal either */ + if (ret < 0) + WARN("Could not connect port %d to %d:%d: %s\n", dev_id, dest->addr.client, + dest->addr.port, snd_strerror(ret)); + } + seq_unlock(); + + if (port_out < 0) + return MMSYSERR_NOTENABLED; + + TRACE("Output port :%d connected %d:%d\n", port_out, dest->addr.client, dest->addr.port); + + set_out_notify(notify, dest, dev_id, MOM_OPEN, 0, 0); + return MMSYSERR_NOERROR; +} + +NTSTATUS midi_out_message(void *args) +{ + struct midi_out_message_params *params = args; + + params->notify->send_notify = FALSE; + + switch (params->msg) + { + case DRVM_EXIT: + case DRVM_ENABLE: + case DRVM_DISABLE: + /* FIXME: Pretend this is supported */ + *params->err = MMSYSERR_NOERROR; + break; + case MODM_OPEN: + *params->err = midi_out_open(params->dev_id, (MIDIOPENDESC *)params->param_1, params->param_2, params->notify); + break; + default: + TRACE("Unsupported message\n"); + *params->err = MMSYSERR_NOTSUPPORTED; + } + + return STATUS_SUCCESS; +} diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 535f3dbd348..c77d479162b 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -79,6 +79,14 @@ static void seq_unlock(void) ALSA_CALL(midi_seq_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); + + DriverCallback(notify->callback, notify->flags, notify->device, notify->msg, + notify->instance, notify->param_1, notify->param_2); +} + /*======================================================================* * Low level MIDI implementation * *======================================================================*/ @@ -114,7 +122,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_OPEN: case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: @@ -624,96 +631,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) return MMSYSERR_NOERROR; } -/************************************************************************** - * modOpen [internal] - */ -static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - int ret; - int port_out; - char port_out_name[32]; - snd_seq_t *midi_seq; - - TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); - if (lpDesc == NULL) { - WARN("Invalid Parameter !\n"); - return MMSYSERR_INVALPARAM; - } - if (wDevID >= MODM_NumDevs) { - TRACE("MAX_MIDIOUTDRV reached !\n"); - return MMSYSERR_BADDEVICEID; - } - if (MidiOutDev[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - if (!MidiOutDev[wDevID].bEnabled) { - WARN("device disabled !\n"); - return MIDIERR_NODEVICE; - } - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - WARN("bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - - switch (MidiOutDev[wDevID].caps.wTechnology) { - case MOD_FMSYNTH: - case MOD_MIDIPORT: - case MOD_SYNTH: - if (!(midi_seq = midiOpenSeq(NULL))) { - return MMSYSERR_ALLOCATED; - } - break; - default: - WARN("Technology not supported (yet) %d !\n", - MidiOutDev[wDevID].caps.wTechnology); - return MMSYSERR_NOTENABLED; - } - - MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - MidiOutDev[wDevID].midiDesc = *lpDesc; - MidiOutDev[wDevID].seq = midi_seq; - - seq_lock(); - /* Create a port dedicated to a specific device */ - /* Keep the old name without a number for the first port */ - if (wDevID) - sprintf(port_out_name, "WINE ALSA Output #%d", wDevID); - - port_out = snd_seq_create_simple_port(midi_seq, wDevID?port_out_name:"WINE ALSA Output", - SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, - SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); - - if (port_out < 0) { - TRACE("Unable to create output port\n"); - MidiOutDev[wDevID].port_out = -1; - } else { - TRACE("Output port %d created successfully\n", port_out); - MidiOutDev[wDevID].port_out = port_out; - - /* Connect our app port to the device port */ - ret = snd_seq_connect_to(midi_seq, port_out, MidiOutDev[wDevID].addr.client, - MidiOutDev[wDevID].addr.port); - - /* usually will happen when the port is already connected */ - /* other errors should not be fatal either */ - if (ret < 0) - WARN("Could not connect port %d to %d:%d: %s\n", - wDevID, MidiOutDev[wDevID].addr.client, - MidiOutDev[wDevID].addr.port, snd_strerror(ret)); - } - seq_unlock(); - - if (port_out < 0) - return MMSYSERR_NOTENABLED; - - TRACE("Output port :%d connected %d:%d\n",port_out,MidiOutDev[wDevID].addr.client,MidiOutDev[wDevID].addr.port); - - MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - return MMSYSERR_NOERROR; -} - - /************************************************************************** * modClose [internal] */ @@ -1123,6 +1040,10 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct midi_out_message_params params; + struct notify_context notify; + UINT err; + TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); @@ -1130,13 +1051,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case DRVM_INIT: ALSA_MidiInit(); return 0; - case DRVM_EXIT: - case DRVM_ENABLE: - case DRVM_DISABLE: - /* FIXME: Pretend this is supported */ - return 0; - case MODM_OPEN: - return modOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MODM_CLOSE: return modClose(wDevID); case MODM_DATA: @@ -1157,10 +1071,21 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return 0; case MODM_RESET: return modReset(wDevID); - default: - TRACE("Unsupported message\n"); } - return MMSYSERR_NOTSUPPORTED; + + params.dev_id = wDevID; + params.msg = wMsg; + params.user = dwUser; + params.param_1 = dwParam1; + params.param_2 = dwParam2; + params.err = &err; + params.notify = &notify; + + ALSA_CALL(midi_out_message, &params); + + if (!err && notify.send_notify) notify_client(&notify); + + return err; } /************************************************************************** diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index d69ab980f42..e3cd7123101 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -241,6 +241,30 @@ struct midi_init_params void *dests, *srcs; }; +struct notify_context +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + UINT_PTR param_1; + UINT_PTR param_2; + UINT_PTR callback; + UINT flags; + HANDLE device; + UINT_PTR instance; +}; + +struct midi_out_message_params +{ + UINT dev_id; + UINT msg; + UINT_PTR user; + UINT_PTR param_1; + UINT_PTR param_2; + UINT *err; + struct notify_context *notify; +}; + struct midi_seq_open_params { int close; @@ -274,12 +298,14 @@ enum alsa_funcs alsa_is_started, alsa_get_prop_value, alsa_midi_init, + alsa_midi_out_message, alsa_midi_seq_lock, /* temporary */ alsa_midi_seq_open, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_out_message(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; -- 2.25.1

2 1

[PATCH v2 3/5] winealsa: Add a temporary syscall to return the snd_seq handle.
by Huw Davies March 16, 2022

March 16, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 51 ++++++++++++++++++++++++++++++------ dlls/winealsa.drv/midi.c | 49 ++++++++-------------------------- dlls/winealsa.drv/unixlib.h | 9 +++++++ 4 files changed, 64 insertions(+), 46 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 76e4b98caaf..16c0c7c387d 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2447,4 +2447,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = midi_init, midi_seq_lock, /* temporary */ + midi_seq_open, }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index 86e092bd977..e1fca85b3b4 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -55,6 +55,7 @@ static struct midi_dest dests[MAX_MIDIOUTDRV]; static struct midi_src srcs[MAX_MIDIINDRV]; static snd_seq_t *midi_seq; static unsigned int seq_refs; +static int port_in = -1; static void seq_lock(void) { @@ -74,7 +75,7 @@ NTSTATUS midi_seq_lock(void *args) return STATUS_SUCCESS; } -static int seq_open(void) +static snd_seq_t *seq_open(int *port_in_ret) { static int midi_warn; @@ -87,12 +88,28 @@ static int seq_open(void) WARN("Error opening ALSA sequencer.\n"); midi_warn = 1; seq_unlock(); - return -1; + return NULL; } + snd_seq_set_client_name(midi_seq, "WINE midi driver"); } seq_refs++; + + if (port_in_ret) + { + if (port_in < 0) + { + port_in = snd_seq_create_simple_port(midi_seq, "WINE ALSA Input", + SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_READ | SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC | SND_SEQ_PORT_TYPE_APPLICATION); + if (port_in < 0) + TRACE("Unable to create input port\n"); + else + TRACE("Input port %d created successfully\n", port_in); + } + *port_in_ret = port_in; + } seq_unlock(); - return 0; + return midi_seq; } static void seq_close(void) @@ -100,12 +117,29 @@ static void seq_close(void) seq_lock(); if (--seq_refs == 0) { + if (port_in >= 0) + { + snd_seq_delete_simple_port(midi_seq, port_in); + port_in = -1; + } snd_seq_close(midi_seq); midi_seq = NULL; } seq_unlock(); } +NTSTATUS midi_seq_open(void *args) +{ + struct midi_seq_open_params *params = args; + + if (!params->close) + params->seq = seq_open(params->port_in); + else + seq_close(); + + return STATUS_SUCCESS; +} + static int alsa_to_win_device_type(unsigned int type) { /* MOD_MIDIPORT output port @@ -270,6 +304,7 @@ NTSTATUS midi_init(void *args) static BOOL init_done; snd_seq_client_info_t *cinfo; snd_seq_port_info_t *pinfo; + snd_seq_t *seq; if (init_done) { *params->err = ERROR_ALREADY_INITIALIZED; @@ -280,7 +315,7 @@ NTSTATUS midi_init(void *args) init_done = TRUE; /* try to open device */ - if (seq_open() == -1) { + if (!(seq = seq_open(NULL))) { *params->err = ERROR_OPEN_FAILED; return STATUS_SUCCESS; } @@ -290,10 +325,10 @@ NTSTATUS midi_init(void *args) /* First, search for all internal midi devices */ snd_seq_client_info_set_client(cinfo, -1); - while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) { + while (snd_seq_query_next_client(seq, cinfo) >= 0) { snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); snd_seq_port_info_set_port(pinfo, -1); - while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) { + while (snd_seq_query_next_port(seq, pinfo) >= 0) { unsigned int cap = snd_seq_port_info_get_capability(pinfo); unsigned int type = snd_seq_port_info_get_type(pinfo); if (!(type & SND_SEQ_PORT_TYPE_PORT)) @@ -303,10 +338,10 @@ NTSTATUS midi_init(void *args) /* Second, search for all external ports */ snd_seq_client_info_set_client(cinfo, -1); - while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) { + while (snd_seq_query_next_client(seq, cinfo) >= 0) { snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); snd_seq_port_info_set_port(pinfo, -1); - while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) { + while (snd_seq_query_next_port(seq, pinfo) >= 0) { unsigned int cap = snd_seq_port_info_get_capability(pinfo); unsigned int type = snd_seq_port_info_get_type(pinfo); if (type & SND_SEQ_PORT_TYPE_PORT) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index fae6ddf8615..535f3dbd348 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -55,12 +55,8 @@ static int MODM_NumDevs = 0; /* this is the total number of MIDI out devices found */ static int MIDM_NumDevs = 0; -static snd_seq_t* midiSeq = NULL; -static int numOpenMidiSeq = 0; static int numStartedMidiIn = 0; -static int port_in; - static CRITICAL_SECTION crit_sect; /* protects all MidiIn buffer queues */ static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -152,40 +148,18 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static BOOL midi_warn = TRUE; /************************************************************************** * midiOpenSeq [internal] */ static snd_seq_t *midiOpenSeq(int *port_in_ret) { - seq_lock(); - if (numOpenMidiSeq == 0) { - if (snd_seq_open(&midiSeq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0) - { - if (midi_warn) - { - WARN("Error opening ALSA sequencer.\n"); - } - midi_warn = FALSE; - seq_unlock(); - return NULL; - } + struct midi_seq_open_params params; - /* Setting the client name is the only init to do */ - snd_seq_set_client_name(midiSeq, "WINE midi driver"); + params.port_in = port_in_ret; + params.close = 0; + ALSA_CALL(midi_seq_open, &params); - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", - SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, - SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); - if (port_in < 0) - TRACE("Unable to create input port\n"); - else - TRACE("Input port %d created successfully\n", port_in); - } - numOpenMidiSeq++; - seq_unlock(); - if (port_in_ret) *port_in_ret = port_in; - return midiSeq; + return params.seq; } /************************************************************************** @@ -193,13 +167,12 @@ static snd_seq_t *midiOpenSeq(int *port_in_ret) */ static int midiCloseSeq(void) { - seq_lock(); - if (--numOpenMidiSeq == 0) { - snd_seq_delete_simple_port(midiSeq, port_in); - snd_seq_close(midiSeq); - midiSeq = NULL; - } - seq_unlock(); + struct midi_seq_open_params params; + + params.port_in = NULL; + params.close = 1; + ALSA_CALL(midi_seq_open, &params); + return 0; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index e0ae16b97d9..d69ab980f42 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -241,6 +241,13 @@ struct midi_init_params void *dests, *srcs; }; +struct midi_seq_open_params +{ + int close; + snd_seq_t *seq; + int *port_in; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -269,11 +276,13 @@ enum alsa_funcs alsa_midi_init, alsa_midi_seq_lock, /* temporary */ + alsa_midi_seq_open, }; NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; +NTSTATUS midi_seq_open(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH v2 2/5] winealsa: Store the snd_seq handle and the input port in the device data.
by Huw Davies March 16, 2022

March 16, 2022

This is to avoid accessing more global variables and generally makes things a bit cleaner. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/midi.c | 85 ++++++++++++++++++++----------------- dlls/winealsa.drv/unixlib.h | 3 ++ 2 files changed, 49 insertions(+), 39 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 988429ab934..fae6ddf8615 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -156,7 +156,7 @@ static BOOL midi_warn = TRUE; /************************************************************************** * midiOpenSeq [internal] */ -static int midiOpenSeq(BOOL create_client) +static snd_seq_t *midiOpenSeq(int *port_in_ret) { seq_lock(); if (numOpenMidiSeq == 0) { @@ -168,25 +168,24 @@ static int midiOpenSeq(BOOL create_client) } midi_warn = FALSE; seq_unlock(); - return -1; + return NULL; } - if (create_client) { - /* Setting the client name is the only init to do */ - snd_seq_set_client_name(midiSeq, "WINE midi driver"); - - port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", - SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, - SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); - if (port_in < 0) - TRACE("Unable to create input port\n"); - else - TRACE("Input port %d created successfully\n", port_in); - } + /* Setting the client name is the only init to do */ + snd_seq_set_client_name(midiSeq, "WINE midi driver"); + + port_in = snd_seq_create_simple_port(midiSeq, "WINE ALSA Input", + SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, + SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); + if (port_in < 0) + TRACE("Unable to create input port\n"); + else + TRACE("Input port %d created successfully\n", port_in); } numOpenMidiSeq++; seq_unlock(); - return 0; + if (port_in_ret) *port_in_ret = port_in; + return midiSeq; } /************************************************************************** @@ -314,8 +313,9 @@ static void handle_midi_event(snd_seq_event_t *ev) } } -static DWORD WINAPI midRecThread(LPVOID arg) +static DWORD WINAPI midRecThread(void *arg) { + snd_seq_t *midi_seq = arg; int npfd; struct pollfd *pfd; int ret; @@ -325,9 +325,9 @@ static DWORD WINAPI midRecThread(LPVOID arg) while(!end_thread) { TRACE("Thread loop\n"); seq_lock(); - npfd = snd_seq_poll_descriptors_count(midiSeq, POLLIN); + npfd = snd_seq_poll_descriptors_count(midi_seq, POLLIN); pfd = HeapAlloc(GetProcessHeap(), 0, npfd * sizeof(struct pollfd)); - snd_seq_poll_descriptors(midiSeq, pfd, npfd, POLLIN); + snd_seq_poll_descriptors(midi_seq, pfd, npfd, POLLIN); seq_unlock(); /* Check if an event is present */ @@ -337,9 +337,9 @@ static DWORD WINAPI midRecThread(LPVOID arg) } /* Note: This definitely does not work. - * while(snd_seq_event_input_pending(midiSeq, 0) > 0) { + * while(snd_seq_event_input_pending(midi_seq, 0) > 0) { snd_seq_event_t* ev; - snd_seq_event_input(midiSeq, &ev); + snd_seq_event_input(midi_seq, &ev); .................... snd_seq_free_event(ev); }*/ @@ -348,7 +348,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) snd_seq_event_t *ev; seq_lock(); - snd_seq_event_input(midiSeq, &ev); + snd_seq_event_input(midi_seq, &ev); seq_unlock(); if (ev) { @@ -357,10 +357,10 @@ static DWORD WINAPI midRecThread(LPVOID arg) } seq_lock(); - ret = snd_seq_event_input_pending(midiSeq, 0); + ret = snd_seq_event_input_pending(midi_seq, 0); seq_unlock(); } while(ret > 0); - + HeapFree(GetProcessHeap(), 0, pfd); } return 0; @@ -387,7 +387,8 @@ static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize) */ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { - int ret = 0; + int ret = 0, port_in; + snd_seq_t *midi_seq; TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); @@ -420,7 +421,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) return MMSYSERR_INVALFLAG; } - if (midiOpenSeq(TRUE) < 0) { + if (!(midi_seq = midiOpenSeq(&port_in))) { return MMSYSERR_ERROR; } @@ -430,10 +431,12 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiInDev[wDevID].midiDesc = *lpDesc; MidiInDev[wDevID].state = 0; MidiInDev[wDevID].startTime = 0; + MidiInDev[wDevID].seq = midi_seq; + MidiInDev[wDevID].port_in = port_in; /* Connect our app port to the device port */ seq_lock(); - ret = snd_seq_connect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, + ret = snd_seq_connect_from(midi_seq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); seq_unlock(); if (ret < 0) @@ -443,7 +446,7 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (numStartedMidiIn++ == 0) { end_thread = 0; - hThread = CreateThread(NULL, 0, midRecThread, NULL, 0, NULL); + hThread = CreateThread(NULL, 0, midRecThread, midi_seq, 0, NULL); if (!hThread) { numStartedMidiIn = 0; WARN("Couldn't create thread for midi-in\n"); @@ -479,7 +482,7 @@ static DWORD midClose(WORD wDevID) return MIDIERR_STILLPLAYING; } - if (midiSeq == NULL) { + if (MidiInDev[wDevID].seq == NULL) { WARN("ooops !\n"); return MMSYSERR_ERROR; } @@ -494,12 +497,13 @@ static DWORD midClose(WORD wDevID) } seq_lock(); - snd_seq_disconnect_from(midiSeq, port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); + snd_seq_disconnect_from(MidiInDev[wDevID].seq, MidiInDev[wDevID].port_in, MidiInDev[wDevID].addr.client, MidiInDev[wDevID].addr.port); seq_unlock(); midiCloseSeq(); MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L); MidiInDev[wDevID].midiDesc.hMidi = 0; + MidiInDev[wDevID].seq = NULL; return ret; } @@ -655,6 +659,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) int ret; int port_out; char port_out_name[32]; + snd_seq_t *midi_seq; TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags); if (lpDesc == NULL) { @@ -682,7 +687,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) case MOD_FMSYNTH: case MOD_MIDIPORT: case MOD_SYNTH: - if (midiOpenSeq(TRUE) < 0) { + if (!(midi_seq = midiOpenSeq(NULL))) { return MMSYSERR_ALLOCATED; } break; @@ -694,6 +699,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); MidiOutDev[wDevID].midiDesc = *lpDesc; + MidiOutDev[wDevID].seq = midi_seq; seq_lock(); /* Create a port dedicated to a specific device */ @@ -701,7 +707,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) if (wDevID) sprintf(port_out_name, "WINE ALSA Output #%d", wDevID); - port_out = snd_seq_create_simple_port(midiSeq, wDevID?port_out_name:"WINE ALSA Output", + port_out = snd_seq_create_simple_port(midi_seq, wDevID?port_out_name:"WINE ALSA Output", SND_SEQ_PORT_CAP_READ|SND_SEQ_PORT_CAP_SUBS_READ|SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION); @@ -713,7 +719,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) MidiOutDev[wDevID].port_out = port_out; /* Connect our app port to the device port */ - ret = snd_seq_connect_to(midiSeq, port_out, MidiOutDev[wDevID].addr.client, + ret = snd_seq_connect_to(midi_seq, port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); /* usually will happen when the port is already connected */ @@ -751,7 +757,7 @@ static DWORD modClose(WORD wDevID) /* FIXME: should test that no pending buffer is still in the queue for * playing */ - if (midiSeq == NULL) { + if (MidiOutDev[wDevID].seq == NULL) { WARN("can't close !\n"); return MMSYSERR_ERROR; } @@ -762,10 +768,11 @@ static DWORD modClose(WORD wDevID) case MOD_SYNTH: seq_lock(); TRACE("Deleting port :%d, connected to %d:%d\n", MidiOutDev[wDevID].port_out, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port); - snd_seq_delete_simple_port(midiSeq, MidiOutDev[wDevID].port_out); + snd_seq_delete_simple_port(MidiOutDev[wDevID].seq, MidiOutDev[wDevID].port_out); MidiOutDev[wDevID].port_out = -1; seq_unlock(); - midiCloseSeq(); + midiCloseSeq(); + MidiOutDev[wDevID].seq = NULL; break; default: WARN("Technology not supported (yet) %d !\n", @@ -792,7 +799,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - if (midiSeq == NULL) { + if (MidiOutDev[wDevID].seq == NULL) { WARN("can't play !\n"); return MIDIERR_NODEVICE; } @@ -886,7 +893,7 @@ static DWORD modData(WORD wDevID, DWORD dwParam) } if (handled) { seq_lock(); - snd_seq_event_output_direct(midiSeq, &event); + snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event); seq_unlock(); } } @@ -919,7 +926,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; - if (midiSeq == NULL) { + if (MidiOutDev[wDevID].seq == NULL) { WARN("can't play !\n"); return MIDIERR_NODEVICE; } @@ -977,7 +984,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) 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(midiSeq, &event); + snd_seq_event_output_direct(MidiOutDev[wDevID].seq, &event); seq_unlock(); HeapFree(GetProcessHeap(), 0, lpNewData); break; diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index adac72183ee..e0ae16b97d9 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -218,7 +218,9 @@ typedef struct midi_src MIDIHDR *lpQueueHdr; UINT startTime; MIDIINCAPSW caps; + snd_seq_t *seq; snd_seq_addr_t addr; + int port_in; } WINE_MIDIIN; typedef struct midi_dest @@ -227,6 +229,7 @@ typedef struct midi_dest MIDIOPENDESC midiDesc; WORD wFlags; MIDIOUTCAPSW caps; + snd_seq_t *seq; snd_seq_addr_t addr; int port_out; } WINE_MIDIOUT; -- 2.25.1

2 1

[PATCH v2 1/5] winealsa: Move midi_init to unixlib.
by Huw Davies March 16, 2022

March 16, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winealsa.drv/alsa.c | 1 + dlls/winealsa.drv/alsamidi.c | 265 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/midi.c | 250 ++------------------------------- dlls/winealsa.drv/unixlib.h | 34 +++++ 4 files changed, 314 insertions(+), 236 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index cdc3d81d8cc..76e4b98caaf 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2444,6 +2444,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_event_handle, is_started, get_prop_value, + midi_init, midi_seq_lock, /* temporary */ }; diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c index ab4de4f7f9e..86e092bd977 100644 --- a/dlls/winealsa.drv/alsamidi.c +++ b/dlls/winealsa.drv/alsamidi.c @@ -31,6 +31,7 @@ #include <stdarg.h> #include <stdio.h> #include <pthread.h> +#include <alsa/asoundlib.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -38,13 +39,23 @@ #include "winbase.h" #include "winternl.h" #include "mmdeviceapi.h" +#include "mmddk.h" +#include "wine/debug.h" #include "wine/unixlib.h" #include "unixlib.h" +WINE_DEFAULT_DEBUG_CHANNEL(midi); + static pthread_mutex_t seq_mutex = PTHREAD_MUTEX_INITIALIZER; +static unsigned int num_dests, num_srcs; +static struct midi_dest dests[MAX_MIDIOUTDRV]; +static struct midi_src srcs[MAX_MIDIINDRV]; +static snd_seq_t *midi_seq; +static unsigned int seq_refs; + static void seq_lock(void) { pthread_mutex_lock(&seq_mutex); @@ -62,3 +73,257 @@ NTSTATUS midi_seq_lock(void *args) return STATUS_SUCCESS; } + +static int seq_open(void) +{ + static int midi_warn; + + seq_lock(); + if (seq_refs == 0) + { + if (snd_seq_open(&midi_seq, "default", SND_SEQ_OPEN_DUPLEX, 0) < 0) + { + if (!midi_warn) + WARN("Error opening ALSA sequencer.\n"); + midi_warn = 1; + seq_unlock(); + return -1; + } + } + seq_refs++; + seq_unlock(); + return 0; +} + +static void seq_close(void) +{ + seq_lock(); + if (--seq_refs == 0) + { + snd_seq_close(midi_seq); + midi_seq = NULL; + } + seq_unlock(); +} + +static int alsa_to_win_device_type(unsigned int type) +{ + /* MOD_MIDIPORT output port + * MOD_SYNTH generic internal synth + * MOD_SQSYNTH square wave internal synth + * MOD_FMSYNTH FM internal synth + * MOD_MAPPER MIDI mapper + * MOD_WAVETABLE hardware wavetable internal synth + * MOD_SWSYNTH software internal synth + */ + + /* FIXME Is this really the correct equivalence from ALSA to + Windows Sound type? */ + + if (type & SND_SEQ_PORT_TYPE_SYNTH) + return MOD_FMSYNTH; + + if (type & (SND_SEQ_PORT_TYPE_DIRECT_SAMPLE|SND_SEQ_PORT_TYPE_SAMPLE)) + return MOD_SYNTH; + + if (type & (SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION)) + return MOD_MIDIPORT; + + ERR("Cannot determine the type (alsa type is %x) of this midi device. Assuming FM Synth\n", type); + return MOD_FMSYNTH; +} + +static void port_add(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, unsigned int cap, unsigned int type) +{ + char name[MAXPNAMELEN]; + unsigned int len; + struct midi_dest *dest; + struct midi_src *src; + + if (cap & SND_SEQ_PORT_CAP_WRITE) { + TRACE("OUT (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo), + snd_seq_client_info_get_name(cinfo), + snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel", + snd_seq_port_info_get_port(pinfo), + snd_seq_port_info_get_name(pinfo), + type); + + if (num_dests >= MAX_MIDIOUTDRV) + return; + if (!type) + return; + + dest = dests + num_dests; + dest->addr = *snd_seq_port_info_get_addr(pinfo); + + /* Manufac ID. We do not have access to this with soundcard.h + * Does not seem to be a problem, because in mmsystem.h only + * Microsoft's ID is listed. + */ + dest->caps.wMid = 0x00FF; + dest->caps.wPid = 0x0001; /* FIXME Product ID */ + /* Product Version. We simply say "1" */ + dest->caps.vDriverVersion = 0x001; + /* The following are mandatory for MOD_MIDIPORT */ + dest->caps.wChannelMask = 0xFFFF; + dest->caps.wVoices = 0; + dest->caps.wNotes = 0; + dest->caps.dwSupport = 0; + + /* Try to use both client and port names, if this is too long take the port name only. + In the second case the port name should be explicit enough due to its big size. + */ + len = strlen(snd_seq_port_info_get_name(pinfo)); + if ( (strlen(snd_seq_client_info_get_name(cinfo)) + len + 3) < sizeof(name) ) { + sprintf(name, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); + len = strlen(name); + } else { + len = min(len, sizeof(name) - 1); + memcpy(name, snd_seq_port_info_get_name(pinfo), len); + name[len] = '\0'; + } + ntdll_umbstowcs( name, len + 1, dest->caps.szPname, ARRAY_SIZE(dest->caps.szPname)); + + dest->caps.wTechnology = alsa_to_win_device_type(type); + + if (MOD_MIDIPORT != dest->caps.wTechnology) { + /* FIXME Do we have this information? + * Assuming the soundcards can handle + * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but + * not MIDICAPS_CACHE. + */ + dest->caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + dest->caps.wVoices = 16; + + /* FIXME Is it possible to know the maximum + * number of simultaneous notes of a soundcard ? + * I believe we don't have this information, but + * it's probably equal or more than wVoices + */ + dest->caps.wNotes = 16; + } + dest->bEnabled = TRUE; + dest->port_out = -1; + + TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" + "\tALSA info: midi dev-type=%x, capa=0\n", + num_dests, wine_dbgstr_w(dest->caps.szPname), + dest->caps.wTechnology, + dest->caps.wVoices, dest->caps.wNotes, + dest->caps.wChannelMask, dest->caps.dwSupport, + type); + + num_dests++; + } + if (cap & SND_SEQ_PORT_CAP_READ) { + TRACE("IN (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo), + snd_seq_client_info_get_name(cinfo), + snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel", + snd_seq_port_info_get_port(pinfo), + snd_seq_port_info_get_name(pinfo), + type); + + if (num_srcs >= MAX_MIDIINDRV) + return; + if (!type) + return; + + src = srcs + num_srcs; + src->addr = *snd_seq_port_info_get_addr(pinfo); + + /* Manufac ID. We do not have access to this with soundcard.h + * Does not seem to be a problem, because in mmsystem.h only + * Microsoft's ID is listed. + */ + src->caps.wMid = 0x00FF; + src->caps.wPid = 0x0001; /* FIXME Product ID */ + /* Product Version. We simply say "1" */ + src->caps.vDriverVersion = 0x001; + src->caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ + + /* Try to use both client and port names, if this is too long take the port name only. + In the second case the port name should be explicit enough due to its big size. + */ + len = strlen(snd_seq_port_info_get_name(pinfo)); + if ( (strlen(snd_seq_client_info_get_name(cinfo)) + len + 3) < sizeof(name) ) { + sprintf(name, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); + len = strlen(name); + } else { + len = min(len, sizeof(name) - 1); + memcpy(name, snd_seq_port_info_get_name(pinfo), len); + name[len] = '\0'; + } + ntdll_umbstowcs( name, len + 1, src->caps.szPname, ARRAY_SIZE(src->caps.szPname)); + src->state = 0; + + TRACE("MidiIn [%d]\tname='%s' support=%d\n" + "\tALSA info: midi dev-type=%x, capa=0\n", + num_srcs, wine_dbgstr_w(src->caps.szPname), src->caps.dwSupport, type); + + num_srcs++; + } +} + +NTSTATUS midi_init(void *args) +{ + struct midi_init_params *params = args; + static BOOL init_done; + snd_seq_client_info_t *cinfo; + snd_seq_port_info_t *pinfo; + + if (init_done) { + *params->err = ERROR_ALREADY_INITIALIZED; + return STATUS_SUCCESS; + } + + TRACE("Initializing the MIDI variables.\n"); + init_done = TRUE; + + /* try to open device */ + if (seq_open() == -1) { + *params->err = ERROR_OPEN_FAILED; + return STATUS_SUCCESS; + } + + cinfo = calloc( 1, snd_seq_client_info_sizeof() ); + pinfo = calloc( 1, snd_seq_port_info_sizeof() ); + + /* First, search for all internal midi devices */ + snd_seq_client_info_set_client(cinfo, -1); + while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) { + snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); + snd_seq_port_info_set_port(pinfo, -1); + while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) { + unsigned int cap = snd_seq_port_info_get_capability(pinfo); + unsigned int type = snd_seq_port_info_get_type(pinfo); + if (!(type & SND_SEQ_PORT_TYPE_PORT)) + port_add(cinfo, pinfo, cap, type); + } + } + + /* Second, search for all external ports */ + snd_seq_client_info_set_client(cinfo, -1); + while (snd_seq_query_next_client(midi_seq, cinfo) >= 0) { + snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); + snd_seq_port_info_set_port(pinfo, -1); + while (snd_seq_query_next_port(midi_seq, pinfo) >= 0) { + unsigned int cap = snd_seq_port_info_get_capability(pinfo); + unsigned int type = snd_seq_port_info_get_type(pinfo); + if (type & SND_SEQ_PORT_TYPE_PORT) + port_add(cinfo, pinfo, cap, type); + } + } + seq_close(); + free( cinfo ); + free( pinfo ); + + *params->err = NOERROR; + params->num_dests = num_dests; + params->num_srcs = num_srcs; + params->dests = dests; + params->srcs = srcs; + + TRACE("End\n"); + + return STATUS_SUCCESS; +} diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index dff77ce88d8..988429ab934 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -43,33 +43,12 @@ #include "wine/debug.h" #include "wine/unixlib.h" -#include <alsa/asoundlib.h> - #include "unixlib.h" WINE_DEFAULT_DEBUG_CHANNEL(midi); -typedef struct { - int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ - MIDIOPENDESC midiDesc; - WORD wFlags; - LPMIDIHDR lpQueueHdr; - DWORD startTime; - MIDIINCAPSW caps; - snd_seq_addr_t addr; -} WINE_MIDIIN; - -typedef struct { - BOOL bEnabled; - MIDIOPENDESC midiDesc; - WORD wFlags; - MIDIOUTCAPSW caps; - snd_seq_addr_t addr; - int port_out; -} WINE_MIDIOUT; - -static WINE_MIDIIN MidiInDev [MAX_MIDIINDRV ]; -static WINE_MIDIOUT MidiOutDev[MAX_MIDIOUTDRV]; +static WINE_MIDIIN *MidiInDev; +static WINE_MIDIOUT *MidiOutDev; /* this is the total number of MIDI out devices found (synth and port) */ static int MODM_NumDevs = 0; @@ -124,39 +103,6 @@ static void error_handler(const char* file, int line, const char* function, int } #endif -/************************************************************************** - * MIDI_unixToWindowsDeviceType [internal] - * - * return the Windows equivalent to a Unix Device Type - * - */ -static int MIDI_AlsaToWindowsDeviceType(unsigned int type) -{ - /* MOD_MIDIPORT output port - * MOD_SYNTH generic internal synth - * MOD_SQSYNTH square wave internal synth - * MOD_FMSYNTH FM internal synth - * MOD_MAPPER MIDI mapper - * MOD_WAVETABLE hardware wavetable internal synth - * MOD_SWSYNTH software internal synth - */ - - /* FIXME Is this really the correct equivalence from ALSA to - Windows Sound type? */ - - if (type & SND_SEQ_PORT_TYPE_SYNTH) - return MOD_FMSYNTH; - - if (type & (SND_SEQ_PORT_TYPE_DIRECT_SAMPLE|SND_SEQ_PORT_TYPE_SAMPLE)) - return MOD_SYNTH; - - if (type & (SND_SEQ_PORT_TYPE_MIDI_GENERIC|SND_SEQ_PORT_TYPE_APPLICATION)) - return MOD_MIDIPORT; - - ERR("Cannot determine the type (alsa type is %x) of this midi device. Assuming FM Synth\n", type); - return MOD_FMSYNTH; -} - /************************************************************************** * MIDI_NotifyClient [internal] */ @@ -1121,134 +1067,6 @@ static DWORD modReset(WORD wDevID) } -/************************************************************************** - * ALSA_AddMidiPort [internal] - * - * Helper for ALSA_MidiInit - */ -static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* pinfo, unsigned int cap, unsigned int type) -{ - char midiPortName[MAXPNAMELEN]; - - if (cap & SND_SEQ_PORT_CAP_WRITE) { - TRACE("OUT (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo), - snd_seq_client_info_get_name(cinfo), - snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel", - snd_seq_port_info_get_port(pinfo), - snd_seq_port_info_get_name(pinfo), - type); - - if (MODM_NumDevs >= MAX_MIDIOUTDRV) - return; - if (!type) - return; - - MidiOutDev[MODM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo); - - /* Manufac ID. We do not have access to this with soundcard.h - * Does not seem to be a problem, because in mmsystem.h only - * Microsoft's ID is listed. - */ - MidiOutDev[MODM_NumDevs].caps.wMid = 0x00FF; - MidiOutDev[MODM_NumDevs].caps.wPid = 0x0001; /* FIXME Product ID */ - /* Product Version. We simply say "1" */ - MidiOutDev[MODM_NumDevs].caps.vDriverVersion = 0x001; - /* The following are mandatory for MOD_MIDIPORT */ - MidiOutDev[MODM_NumDevs].caps.wChannelMask = 0xFFFF; - MidiOutDev[MODM_NumDevs].caps.wVoices = 0; - MidiOutDev[MODM_NumDevs].caps.wNotes = 0; - MidiOutDev[MODM_NumDevs].caps.dwSupport = 0; - - /* Try to use both client and port names, if this is too long take the port name only. - In the second case the port name should be explicit enough due to its big size. - */ - if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) { - sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); - } else { - lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); - } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname, - ARRAY_SIZE(MidiOutDev[MODM_NumDevs].caps.szPname)); - - MidiOutDev[MODM_NumDevs].caps.wTechnology = MIDI_AlsaToWindowsDeviceType(type); - - if (MOD_MIDIPORT != MidiOutDev[MODM_NumDevs].caps.wTechnology) { - /* FIXME Do we have this information? - * Assuming the soundcards can handle - * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but - * not MIDICAPS_CACHE. - */ - MidiOutDev[MODM_NumDevs].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; - MidiOutDev[MODM_NumDevs].caps.wVoices = 16; - - /* FIXME Is it possible to know the maximum - * number of simultaneous notes of a soundcard ? - * I believe we don't have this information, but - * it's probably equal or more than wVoices - */ - MidiOutDev[MODM_NumDevs].caps.wNotes = 16; - } - MidiOutDev[MODM_NumDevs].bEnabled = TRUE; - MidiOutDev[MODM_NumDevs].port_out = -1; - - TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" - "\tALSA info: midi dev-type=%x, capa=0\n", - MODM_NumDevs, wine_dbgstr_w(MidiOutDev[MODM_NumDevs].caps.szPname), - MidiOutDev[MODM_NumDevs].caps.wTechnology, - MidiOutDev[MODM_NumDevs].caps.wVoices, MidiOutDev[MODM_NumDevs].caps.wNotes, - MidiOutDev[MODM_NumDevs].caps.wChannelMask, MidiOutDev[MODM_NumDevs].caps.dwSupport, - type); - - MODM_NumDevs++; - } - if (cap & SND_SEQ_PORT_CAP_READ) { - TRACE("IN (%d:%s:%s:%d:%s:%x)\n",snd_seq_client_info_get_client(cinfo), - snd_seq_client_info_get_name(cinfo), - snd_seq_client_info_get_type(cinfo) == SND_SEQ_USER_CLIENT ? "user" : "kernel", - snd_seq_port_info_get_port(pinfo), - snd_seq_port_info_get_name(pinfo), - type); - - if (MIDM_NumDevs >= MAX_MIDIINDRV) - return; - if (!type) - return; - - MidiInDev[MIDM_NumDevs].addr = *snd_seq_port_info_get_addr(pinfo); - - /* Manufac ID. We do not have access to this with soundcard.h - * Does not seem to be a problem, because in mmsystem.h only - * Microsoft's ID is listed. - */ - MidiInDev[MIDM_NumDevs].caps.wMid = 0x00FF; - MidiInDev[MIDM_NumDevs].caps.wPid = 0x0001; /* FIXME Product ID */ - /* Product Version. We simply say "1" */ - MidiInDev[MIDM_NumDevs].caps.vDriverVersion = 0x001; - MidiInDev[MIDM_NumDevs].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ - - /* Try to use both client and port names, if this is too long take the port name only. - In the second case the port name should be explicit enough due to its big size. - */ - if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) { - sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); - } else { - lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); - } - MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname, - ARRAY_SIZE(MidiInDev[MIDM_NumDevs].caps.szPname)); - MidiInDev[MIDM_NumDevs].state = 0; - - TRACE("MidiIn [%d]\tname='%s' support=%d\n" - "\tALSA info: midi dev-type=%x, capa=0\n", - MIDM_NumDevs, wine_dbgstr_w(MidiInDev[MIDM_NumDevs].caps.szPname), - MidiInDev[MIDM_NumDevs].caps.dwSupport, - type); - - MIDM_NumDevs++; - } -} - - /*======================================================================* * MIDI entry points * *======================================================================*/ @@ -1260,59 +1078,19 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* */ static BOOL ALSA_MidiInit(void) { - static BOOL bInitDone = FALSE; - snd_seq_client_info_t *cinfo; - snd_seq_port_info_t *pinfo; - - if (bInitDone) - return TRUE; - - TRACE("Initializing the MIDI variables.\n"); - bInitDone = TRUE; - - /* try to open device */ - if (midiOpenSeq(FALSE) == -1) { - return TRUE; + struct midi_init_params params; + UINT err; + + params.err = &err; + ALSA_CALL(midi_init, &params); + + if (!err) + { + MODM_NumDevs = params.num_dests; + MIDM_NumDevs = params.num_srcs; + MidiOutDev = params.dests; + MidiInDev = params.srcs; } - -#if 0 /* Debug purpose */ - snd_lib_error_set_handler(error_handler); -#endif - cinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_seq_client_info_sizeof() ); - pinfo = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, snd_seq_port_info_sizeof() ); - - /* First, search for all internal midi devices */ - snd_seq_client_info_set_client(cinfo, -1); - while(snd_seq_query_next_client(midiSeq, cinfo) >= 0) { - snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); - snd_seq_port_info_set_port(pinfo, -1); - while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { - unsigned int cap = snd_seq_port_info_get_capability(pinfo); - unsigned int type = snd_seq_port_info_get_type(pinfo); - if (!(type & SND_SEQ_PORT_TYPE_PORT)) - ALSA_AddMidiPort(cinfo, pinfo, cap, type); - } - } - - /* Second, search for all external ports */ - snd_seq_client_info_set_client(cinfo, -1); - while(snd_seq_query_next_client(midiSeq, cinfo) >= 0) { - snd_seq_port_info_set_client(pinfo, snd_seq_client_info_get_client(cinfo)); - snd_seq_port_info_set_port(pinfo, -1); - while (snd_seq_query_next_port(midiSeq, pinfo) >= 0) { - unsigned int cap = snd_seq_port_info_get_capability(pinfo); - unsigned int type = snd_seq_port_info_get_type(pinfo); - if (type & SND_SEQ_PORT_TYPE_PORT) - ALSA_AddMidiPort(cinfo, pinfo, cap, type); - } - } - - /* close file and exit */ - midiCloseSeq(); - HeapFree( GetProcessHeap(), 0, cinfo ); - HeapFree( GetProcessHeap(), 0, pinfo ); - - TRACE("End\n"); return TRUE; } diff --git a/dlls/winealsa.drv/unixlib.h b/dlls/winealsa.drv/unixlib.h index 89afcb71bec..adac72183ee 100644 --- a/dlls/winealsa.drv/unixlib.h +++ b/dlls/winealsa.drv/unixlib.h @@ -207,6 +207,37 @@ struct get_prop_value_params unsigned int *buffer_size; }; +#include <alsa/asoundlib.h> +#include "mmddk.h" + +typedef struct midi_src +{ + int state; /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */ + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIHDR *lpQueueHdr; + UINT startTime; + MIDIINCAPSW caps; + snd_seq_addr_t addr; +} WINE_MIDIIN; + +typedef struct midi_dest +{ + BOOL bEnabled; + MIDIOPENDESC midiDesc; + WORD wFlags; + MIDIOUTCAPSW caps; + snd_seq_addr_t addr; + int port_out; +} WINE_MIDIOUT; + +struct midi_init_params +{ + UINT *err; + unsigned int num_dests, num_srcs; + void *dests, *srcs; +}; + enum alsa_funcs { alsa_get_endpoint_ids, @@ -232,10 +263,13 @@ enum alsa_funcs alsa_set_event_handle, alsa_is_started, alsa_get_prop_value, + alsa_midi_init, alsa_midi_seq_lock, /* temporary */ }; +NTSTATUS midi_init(void *args) DECLSPEC_HIDDEN; + NTSTATUS midi_seq_lock(void *args) DECLSPEC_HIDDEN; extern unixlib_handle_t alsa_handle; -- 2.25.1

2 1

[PATCH] msvcr110: Make sure we don't hang in _Condition_variable::notify* functions.
by Piotr Caban March 16, 2022

March 16, 2022

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)

1 0

[PATCH 1/5] winegstreamer: Implement H264 decoder GetInputStreamInfo.
by Rémi Bernon March 16, 2022

March 16, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45988 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47084 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49715 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52183 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 6 ------ dlls/winegstreamer/h264_decoder.c | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index e58d8278b82..6563ca81b29 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -6790,17 +6790,11 @@ static void test_h264_decoder(void) flags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; memset(&input_info, 0xcd, sizeof(input_info)); hr = IMFTransform_GetInputStreamInfo(transform, 0, &input_info); - todo_wine ok(hr == S_OK, "GetInputStreamInfo returned %#lx\n", hr); - todo_wine ok(input_info.hnsMaxLatency == 0, "got hnsMaxLatency %s\n", wine_dbgstr_longlong(input_info.hnsMaxLatency)); - todo_wine ok(input_info.dwFlags == flags, "got dwFlags %#lx\n", input_info.dwFlags); - todo_wine ok(input_info.cbSize == 0x1000, "got cbSize %lu\n", input_info.cbSize); - todo_wine ok(input_info.cbMaxLookahead == 0, "got cbMaxLookahead %#lx\n", input_info.cbMaxLookahead); - todo_wine ok(input_info.cbAlignment == 0, "got cbAlignment %#lx\n", input_info.cbAlignment); flags = MFT_OUTPUT_STREAM_WHOLE_SAMPLES | MFT_OUTPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 2f4b42ed101..f24b07ef496 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -217,8 +217,20 @@ static HRESULT WINAPI transform_GetStreamIDs(IMFTransform *iface, DWORD input_si static HRESULT WINAPI transform_GetInputStreamInfo(IMFTransform *iface, DWORD id, MFT_INPUT_STREAM_INFO *info) { - FIXME("iface %p, id %#lx, info %p stub!\n", iface, id, info); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + TRACE("iface %p, id %#lx, info %p.\n", iface, id, info); + + if (!decoder->input_type) + return MF_E_TRANSFORM_TYPE_NOT_SET; + + info->hnsMaxLatency = 0; + info->dwFlags = MFT_INPUT_STREAM_WHOLE_SAMPLES | MFT_INPUT_STREAM_SINGLE_SAMPLE_PER_BUFFER | MFT_INPUT_STREAM_FIXED_SAMPLE_SIZE; + info->cbSize = 0x1000; + info->cbMaxLookahead = 0; + info->cbAlignment = 0; + + return S_OK; } static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD id, MFT_OUTPUT_STREAM_INFO *info) -- 2.35.1

1 5

[PATCH v4 0/5] Series short description
by Eric Pouech March 16, 2022

March 16, 2022

As described in bugzilla ticket, when calling CreateProcess: - with "default" console inheritance (no CREATE_NEW_CONSOLE nor DETACHED_PROCESS flags), - when parent is not attached to a console - and when the child's subsystem is CUI , native behaves as if CREATE_NEW_CONSOLE was passed. builtin doesn't... this serie: - adds a test case for showing the CUI/GUI discrepancies - fixes kernelbase accordingly - but also requires to fix all usage of CreateProcess in Wine Code that would now generate the creation of a console + a couple of programs moved into the GUI subsystem (to avoid console creation on invocation) + when looking to the other usage of CreateProcess, I only convinced myself to adapt one of them V1 => V2: - don't mess up with the number of patches in the serie - no longer modify makedep for creating cui vs gui test executable, but copy current *_test.exe executable and adapt its subsystem to the need V2 => V3: - removed the hacks in wow64 redirect, and let programs/uninstaller and programs/wusa belong to the GUI subsystem instead - force console creation for wine initial process when a) none of the unix fd are attached to a TTY, b) the initial process is in CUI subsystem V3 => V4: - included Jacek's comments: + removed unneeded casts + move CreateProcess change in programs/services into a separate patch + I didn't change programs/start as you suggested. Testing on W10 shows that 'start /b cui.exe' from a cmd prompt just reuses the current console. And Marvin will generate errors for Chinese and Japanese VM in console testing that are independant of this serie. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- Eric Pouech (5): dlls/kernel32/tests: add some console tests about creating cui vs gui processes programs/wusa: set subsystem to GUI programs/uninstaller: set subsystem to GUI programs/services: start services detached from console dlls/kernelbase: handle corner case in CreateProcess dlls/kernel32/tests/console.c | 85 ++++++++++++++++++++++++++++++++ dlls/kernelbase/process.c | 6 ++- programs/services/services.c | 2 +- programs/uninstaller/Makefile.in | 2 +- programs/wusa/Makefile.in | 2 +- 5 files changed, 93 insertions(+), 4 deletions(-)

3 8

[PATCH v3] dlls: Flush CompositionString after X11DRV_XIMLookupChars.
by Alex Kwak March 16, 2022

March 16, 2022

There is no flushing after X11DRV_XIMLookupChars on wine11xdrv. for this reason, the characters of the GUI are not updated. In addition, in IME_SetResultString on wine11xdrv, the bInComposition flag is not deactivated after generating WM_IME_ENDCOMPOSITION, so that the WM_IME_STARTCOMPOSITION message is not generated in the next composition. Also, when WM_IME_COMPOSITION is processed in editor_handle_message on riched20, the existing selection is removed and the characters being entered disappear. WM_IME_STARTCOMPOSITION occurs when attempting to input after full selection, and ME_DeleteSelection is called, which causes the exact location of the cursor to be lost. Signed-off-by: Alex Kwak <take-me-home(a)kakao.com> --- v2: Fix test breakage. v3: Fix comment style --- dlls/riched20/editor.c | 3 +-- dlls/winex11.drv/ime.c | 5 ++--- dlls/winex11.drv/xim.c | 10 ++++++++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a8cf3175591..33437a6d6e3 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -4097,8 +4097,8 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, return 0; case WM_IME_STARTCOMPOSITION: { - editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_DeleteSelection(editor); + editor->imeStartIndex=ME_GetCursorOfs(&editor->pCursors[0]); ME_CommitUndo(editor); ME_UpdateRepaint(editor, FALSE); return 0; @@ -4109,7 +4109,6 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_Style *style = style_get_insert_style( editor, editor->pCursors ); hIMC = ITextHost_TxImmGetContext(editor->texthost); - ME_DeleteSelection(editor); ME_SaveTempStyle(editor, style); if (lParam & (GCS_RESULTSTR|GCS_COMPSTR)) { diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index c1584930861..db2ff5d85cc 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -1049,10 +1049,9 @@ void IME_SetResultString(LPWSTR lpResult, DWORD dwResultLen) GenerateIMEMessage(imc, WM_IME_COMPOSITION, 0, GCS_COMPSTR); GenerateIMEMessage(imc, WM_IME_COMPOSITION, lpResult[0], GCS_RESULTSTR|GCS_RESULTCLAUSE); GenerateIMEMessage(imc, WM_IME_ENDCOMPOSITION, 0, 0); + myPrivate->bInComposition = FALSE; - if (!inComp) - ImmSetOpenStatus(imc, FALSE); - + ImmSetOpenStatus(imc, FALSE); ImmUnlockIMC(imc); } diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c index 3994c2106cc..66c56c177ac 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -117,6 +117,16 @@ void X11DRV_XIMLookupChars( const char *str, DWORD count ) IME_SetResultString(wcOutput, dwOutput); HeapFree(GetProcessHeap(), 0, wcOutput); + + /* + * After then if `CompositionString` is remaining, flushing it. + * i.e., Korean + */ + if (CompositionString) + { + IME_SetCompositionString(SCS_SETSTR, CompositionString, + dwCompStringLength, NULL, 0); + } } static BOOL XIMPreEditStateNotifyCallback(XIC xic, XPointer p, XPointer data) -- 2.32.0

1 0

[PATCH v2] ws2_32/tests: Test getaddrinfo() for IPv6 DNS querying.
by Ziqing Hui March 16, 2022

March 16, 2022

The tests show that if we don't have a global IPv6 address, getaddrinfo() will not return IPv6 results. Specifing AF_UNSPEC makes it return IPv4 results. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- v2: Remove is_ipv6_local(). dlls/ws2_32/tests/protocol.c | 65 ++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 374fa01789d..8de22cdb586 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2035,6 +2035,17 @@ static void compare_addrinfo(ADDRINFO *a, ADDRINFO *b) ok(!a && !b, "Expected both addresses null (%p != %p)\n", a, b); } +static BOOL ipv6_found(ADDRINFOA *addr) +{ + ADDRINFOA *p; + for (p = addr; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6) + return TRUE; + } + return FALSE; +} + static void test_getaddrinfo(void) { int i, ret; @@ -2042,6 +2053,7 @@ static void test_getaddrinfo(void) SOCKADDR_IN *sockaddr; CHAR name[256], *ip; DWORD size = sizeof(name); + BOOL has_ipv6_addr; memset(&hint, 0, sizeof(ADDRINFOA)); GetComputerNameExA( ComputerNamePhysicalDnsHostname, name, &size ); @@ -2309,6 +2321,59 @@ static void test_getaddrinfo(void) ok(sockaddr->sin_family == AF_INET, "ai_addr->sin_family == %d\n", sockaddr->sin_family); ok(sockaddr->sin_port == 0, "ai_addr->sin_port == %d\n", sockaddr->sin_port); freeaddrinfo(result); + + /* Check whether we have global IPv6 address */ + result = NULL; + ret = getaddrinfo("", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + has_ipv6_addr = FALSE; + for (p = result; p; p = p->ai_next) + { + if (p->ai_family == AF_INET6) + { + IN6_ADDR *a = &((SOCKADDR_IN6 *)p->ai_addr)->sin6_addr; + if (!IN6_IS_ADDR_LINKLOCAL(a) && !IN6_IS_ADDR_LOOPBACK(a) && !IN6_IS_ADDR_UNSPECIFIED(a)) + { + has_ipv6_addr = TRUE; + break; + } + } + } + freeaddrinfo(result); + + result = NULL; + ret = getaddrinfo("dns.msftncsi.com", NULL, NULL, &result); + ok(!ret, "getaddrinfo failed with %d\n", WSAGetLastError()); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + for (i = 0; i < ARRAY_SIZE(hinttests); i++) + { + if (hinttests[i].family != AF_UNSPEC || hinttests[i].error) continue; + winetest_push_context("Test %u", i); + + hint.ai_flags = 0; + hint.ai_family = hinttests[i].family; + hint.ai_socktype = hinttests[i].socktype; + hint.ai_protocol = hinttests[i].protocol; + + result = NULL; + ret = getaddrinfo("dns.msftncsi.com", NULL, &hint, &result); + ok(!ret, "Got unexpected ret %d\n", ret); + if (!has_ipv6_addr) + todo_wine ok(!ipv6_found(result), "IPv6 address is returned.\n"); + freeaddrinfo(result); + + hint.ai_family = AF_INET6; + result = NULL; + ret = getaddrinfo("dns.msftncsi.com", NULL, &hint, &result); + if (!has_ipv6_addr) + todo_wine ok(ret == WSANO_DATA, "Got unexpected ret %d\n", ret); + freeaddrinfo(result); + + winetest_pop_context(); + } } static void test_dns(void) -- 2.25.1

2 1