- Wine-Devel - list.winehq.org

[PATCH v2 9/9] winex11: Use UpdateDisplayDevices driver entry point for registering devices.
by Jacek Caban Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 2 +- dlls/winex11.drv/display.c | 537 ++------------------------------- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 +- 5 files changed, 32 insertions(+), 512 deletions(-)

2 2

[PATCH 12/12] winecoreaudio: Move midi_out_reset to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 46 +++++++++++++++++++++++++++++-- dlls/winecoreaudio.drv/coremidi.h | 13 --------- dlls/winecoreaudio.drv/midi.c | 37 ------------------------- dlls/winecoreaudio.drv/unixlib.h | 6 ++-- 4 files changed, 46 insertions(+), 56 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 1ced023d4a6..1ca9ad6eb8e 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -92,6 +92,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); +struct midi_dest +{ + /* graph and synth are only used for MIDI Synth */ + AUGraph graph; + AudioUnit synth; + + MIDIEndpointRef dest; + + MIDIOUTCAPSW caps; + MIDIOPENDESC midiDesc; + WORD wFlags; +}; + static MIDIClientRef midi_client; static MIDIPortRef midi_out_port, midi_in_port; static UINT num_dests, num_srcs; @@ -234,11 +247,8 @@ NTSTATUS midi_init(void *args) dests[i].caps.wNotes = 0; } - params->num_dests = num_dests; params->num_srcs = num_srcs; - params->dests = dests; params->srcs = srcs; - params->midi_out_port = (void *)midi_out_port; params->midi_in_port = (void *)midi_in_port; *params->err = DRV_SUCCESS; @@ -674,6 +684,33 @@ static DWORD midi_out_set_volume(WORD dev_id, DWORD volume) return MMSYSERR_NOTSUPPORTED; } +static DWORD midi_out_reset(WORD dev_id) +{ + unsigned chn; + + TRACE("%d\n", dev_id); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (dests[dev_id].caps.wTechnology == MOD_SYNTH) + { + for (chn = 0; chn < 16; chn++) + { + /* turn off every note */ + MusicDeviceMIDIEvent(dests[dev_id].synth, 0xB0 | chn, 0x7B, 0, 0); + /* remove sustain on channel */ + MusicDeviceMIDIEvent(dests[dev_id].synth, 0xB0 | chn, 0x40, 0, 0); + } + } + else FIXME("MOD_MIDIPORT\n"); + + /* FIXME: the LongData buffers must also be returned to the app */ + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -718,6 +755,9 @@ NTSTATUS midi_out_message(void *args) case MODM_SETVOLUME: *params->err = midi_out_set_volume(params->dev_id, params->param_1); break; + case MODM_RESET: + *params->err = midi_out_reset(params->dev_id); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index bf6a478c859..e6d5c8c18c8 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -64,19 +64,6 @@ extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLen #endif /* midi.c */ -typedef struct midi_dest -{ - /* graph and synth are only used for MIDI Synth */ - AUGraph graph; - AudioUnit synth; - - MIDIEndpointRef dest; - - MIDIOUTCAPSW caps; - MIDIOPENDESC midiDesc; - WORD wFlags; -} MIDIDestination; - typedef struct midi_src { MIDIEndpointRef source; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 3033503f8f2..f58dcc2e7a0 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -50,7 +50,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi); #define WINE_DEFINITIONS #include "coremidi.h" -static DWORD MIDIOut_NumDevs = 0; static DWORD MIDIIn_NumDevs = 0; static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ @@ -59,9 +58,7 @@ static CFStringRef MIDIInThreadPortName; static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); static MIDIPortRef MIDIInPort = NULL; -static MIDIPortRef MIDIOutPort = NULL; -MIDIDestination *destinations; MIDISource *sources; static void notify_client(struct notify_context *notify) @@ -86,11 +83,8 @@ static LONG CoreAudio_MIDIInit(void) return err; } - MIDIOut_NumDevs = params.num_dests; MIDIIn_NumDevs = params.num_srcs; - destinations = params.dests; sources = params.srcs; - MIDIOutPort = params.midi_out_port; MIDIInPort = params.midi_in_port; if (MIDIIn_NumDevs > 0) @@ -110,7 +104,6 @@ static LONG CoreAudio_MIDIRelease(void) UNIX_CALL(midi_release, NULL); sources = NULL; - destinations = NULL; if (MIDIIn_NumDevs > 0) { @@ -155,31 +148,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_Reset(WORD wDevID) -{ - unsigned chn; - - TRACE("%d\n", wDevID); - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) - { - for (chn = 0; chn < 16; chn++) { - /* turn off every note */ - MusicDeviceMIDIEvent(destinations[wDevID].synth, 0xB0 | chn, 0x7B, 0, 0); - /* remove sustain on channel */ - MusicDeviceMIDIEvent(destinations[wDevID].synth, 0xB0 | chn, 0x40, 0, 0); - } - } - else FIXME("MOD_MIDIPORT\n"); - - /* FIXME: the LongData buffers must also be returned to the app */ - return MMSYSERR_NOERROR; -} - static DWORD MIDIIn_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { TRACE("wDevID=%d lpDesc=%p dwFlags=%08x\n", wDevID, lpDesc, dwFlags); @@ -532,11 +500,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - switch (wMsg) { - case MODM_RESET: - return MIDIOut_Reset(wDevID); - } - params.dev_id = wDevID; params.msg = wMsg; params.user = dwUser; diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 6afb9eb287d..bdf38b24c88 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -186,9 +186,9 @@ struct set_volumes_params struct midi_init_params { DWORD *err; - UINT num_dests, num_srcs; - void *dests, *srcs; - void *midi_out_port, *midi_in_port; + UINT num_srcs; + void *srcs; + void *midi_in_port; }; struct notify_context -- 2.23.0

2 1

[PATCH 11/12] winecoreaudio: Move midi_out_[gs]et_volume to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/Makefile.in | 1 - dlls/winecoreaudio.drv/audiounit.c | 85 ------------------------------ dlls/winecoreaudio.drv/coremidi.c | 60 +++++++++++++++++++++ dlls/winecoreaudio.drv/coremidi.h | 4 -- dlls/winecoreaudio.drv/midi.c | 54 ------------------- 5 files changed, 60 insertions(+), 144 deletions(-) delete mode 100644 dlls/winecoreaudio.drv/audiounit.c diff --git a/dlls/winecoreaudio.drv/Makefile.in b/dlls/winecoreaudio.drv/Makefile.in index b6bf5bd4587..8162eae67d7 100644 --- a/dlls/winecoreaudio.drv/Makefile.in +++ b/dlls/winecoreaudio.drv/Makefile.in @@ -7,7 +7,6 @@ EXTRALIBS = $(COREAUDIO_LIBS) EXTRADLLFLAGS = -mcygwin C_SRCS = \ - audiounit.c \ coreaudio.c \ coremidi.c \ midi.c \ diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c deleted file mode 100644 index 137b1e93bcf..00000000000 --- a/dlls/winecoreaudio.drv/audiounit.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Wine Driver for CoreAudio / AudioUnit - * - * Copyright 2005, 2006 Emmanuel Maillard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" - -#define ULONG CoreFoundation_ULONG -#define HRESULT CoreFoundation_HRESULT -#include <mach/mach_time.h> -#include <AudioUnit/AudioUnit.h> -#include <AudioToolbox/AudioToolbox.h> -#undef ULONG -#undef HRESULT -#undef STDMETHODCALLTYPE -#undef SUCCEEDED -#undef FAILED -#undef IS_ERROR -#undef HRESULT_FACILITY -#undef MAKE_HRESULT -#undef S_OK -#undef S_FALSE -#undef E_UNEXPECTED -#undef E_NOTIMPL -#undef E_OUTOFMEMORY -#undef E_INVALIDARG -#undef E_NOINTERFACE -#undef E_POINTER -#undef E_HANDLE -#undef E_ABORT -#undef E_FAIL -#undef E_ACCESSDENIED -#include "coreaudio.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(wave); - -int AudioUnit_SetVolume(AudioUnit au, float left, float right) -{ - OSStatus err = noErr; - static int once; - - if (!once++) FIXME("independent left/right volume not implemented (%f, %f)\n", left, right); - - err = AudioUnitSetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left, 0); - - if (err != noErr) - { - ERR("AudioUnitSetParameter return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - return 1; -} - -int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) -{ - OSStatus err = noErr; - static int once; - - if (!once++) FIXME("independent left/right volume not implemented\n"); - - err = AudioUnitGetParameter(au, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left); - if (err != noErr) - { - ERR("AudioUnitGetParameter return an error %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - *right = *left; - return 1; -} diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 769491f2414..1ced023d4a6 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -620,6 +620,60 @@ static DWORD midi_out_get_num_devs(void) return num_dests; } +static DWORD midi_out_get_volume(WORD dev_id, DWORD *volume) +{ + TRACE("%d\n", dev_id); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (!volume) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (dests[dev_id].caps.wTechnology == MOD_SYNTH) + { + static int once; + float left; + + if (!once++) FIXME("independent left/right volume not implemented\n"); + AudioUnitGetParameter(dests[dev_id].synth, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, &left); + *volume = (WORD)(left * 0xffff) + ((WORD)(left * 0xffff) << 16); + return MMSYSERR_NOERROR; + } + + return MMSYSERR_NOTSUPPORTED; +} + +static DWORD midi_out_set_volume(WORD dev_id, DWORD volume) +{ + TRACE("dev_id = %d vol = %08x\n", dev_id, volume); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (dests[dev_id].caps.wTechnology == MOD_SYNTH) + { + float left, right; + static int once; + + if (!once++) FIXME("independent left/right volume not implemented\n"); + left = LOWORD(volume) / 65535.0f; + right = HIWORD(volume) / 65535.0f; + + AudioUnitSetParameter(dests[dev_id].synth, kHALOutputParam_Volume, kAudioUnitParameterFlag_Output, 0, left, 0); + return MMSYSERR_NOERROR; + } + + return MMSYSERR_NOTSUPPORTED; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -658,6 +712,12 @@ NTSTATUS midi_out_message(void *args) case MODM_GETNUMDEVS: *params->err = midi_out_get_num_devs(); break; + case MODM_GETVOLUME: + *params->err = midi_out_get_volume(params->dev_id, (DWORD *)params->param_1); + break; + case MODM_SETVOLUME: + *params->err = midi_out_set_volume(params->dev_id, params->param_1); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index f764bad45aa..bf6a478c859 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -61,10 +61,6 @@ typedef void *AUGraph; extern OSStatus MusicDeviceMIDIEvent(AudioUnit au, UInt32 inStatus, UInt32 inData1, UInt32 inData2, UInt32 inOffsetSampleFrame); extern OSStatus MusicDeviceSysEx(AudioUnit au, const UInt8 *inData, UInt32 inLength); - -/* audiounit.c */ -extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); -extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif /* midi.c */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 7f5496fe715..3033503f8f2 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -155,56 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume) -{ - TRACE("%d\n", wDevID); - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (lpdwVolume == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) - { - float left; - float right; - AudioUnit_GetVolume(destinations[wDevID].synth, &left, &right); - - *lpdwVolume = (WORD) (left * 0xFFFF) + ((WORD) (right * 0xFFFF) << 16); - - return MMSYSERR_NOERROR; - } - - return MMSYSERR_NOTSUPPORTED; -} - -static DWORD MIDIOut_SetVolume(WORD wDevID, DWORD dwVolume) -{ - TRACE("%d\n", wDevID); - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) - { - float left; - float right; - - left = LOWORD(dwVolume) / 65535.0f; - right = HIWORD(dwVolume) / 65535.0f; - AudioUnit_SetVolume(destinations[wDevID].synth, left, right); - - return MMSYSERR_NOERROR; - } - - return MMSYSERR_NOTSUPPORTED; -} - static DWORD MIDIOut_Reset(WORD wDevID) { unsigned chn; @@ -583,10 +533,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_GETVOLUME: - return MIDIOut_GetVolume(wDevID, (DWORD*)dwParam1); - case MODM_SETVOLUME: - return MIDIOut_SetVolume(wDevID, dwParam1); case MODM_RESET: return MIDIOut_Reset(wDevID); } -- 2.23.0

2 1

[PATCH 10/12] winecoreaudio: Move midi_out_get_num_devs to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 9 +++++++++ dlls/winecoreaudio.drv/midi.c | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index dd217ea95f3..769491f2414 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -614,6 +614,12 @@ static DWORD midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, DWORD size) return MMSYSERR_NOERROR; } +static DWORD midi_out_get_num_devs(void) +{ + TRACE("\n"); + return num_dests; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -649,6 +655,9 @@ NTSTATUS midi_out_message(void *args) case MODM_GETDEVCAPS: *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); break; + case MODM_GETNUMDEVS: + *params->err = midi_out_get_num_devs(); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 675950f45d1..7f5496fe715 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -155,12 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_GetNumDevs(void) -{ - TRACE("\n"); - return MIDIOut_NumDevs; -} - static DWORD MIDIOut_GetVolume(WORD wDevID, DWORD *lpdwVolume) { TRACE("%d\n", wDevID); @@ -589,8 +583,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_GETNUMDEVS: - return MIDIOut_GetNumDevs(); case MODM_GETVOLUME: return MIDIOut_GetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: -- 2.23.0

2 1

[PATCH 09/12] winecoreaudio: Move midi_out_get_devcaps to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 22 ++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 19 ------------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 3a560c21d74..dd217ea95f3 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -595,6 +595,25 @@ static DWORD midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) return MMSYSERR_NOERROR; } +static DWORD midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, DWORD size) +{ + TRACE("dev_id = %d caps = %p size = %d\n", dev_id, caps, size); + + if (!caps) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + memcpy(caps, &dests[dev_id].caps, min(size, sizeof(*caps))); + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -627,6 +646,9 @@ NTSTATUS midi_out_message(void *args) case MODM_UNPREPARE: *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); break; + case MODM_GETDEVCAPS: + *params->err = midi_out_get_devcaps(params->dev_id, (MIDIOUTCAPSW *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 71bd7afebdf..675950f45d1 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -155,23 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_GetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) -{ - TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); - - if (lpCaps == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - memcpy(lpCaps, &destinations[wDevID].caps, min(dwSize, sizeof(*lpCaps))); - return MMSYSERR_NOERROR; -} - static DWORD MIDIOut_GetNumDevs(void) { TRACE("\n"); @@ -606,8 +589,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_GETDEVCAPS: - return MIDIOut_GetDevCaps(wDevID, (LPMIDIOUTCAPSW) dwParam1, dwParam2); case MODM_GETNUMDEVS: return MIDIOut_GetNumDevs(); case MODM_GETVOLUME: -- 2.23.0

2 1

[PATCH 08/12] winecoreaudio: Move midi_out_prepare and midi_out_unprepare to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

While these could be left on the user-side, it seems simplest to move everything across. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 36 ++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 40 ------------------------------- 2 files changed, 36 insertions(+), 40 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index d80b8c1711b..3a560c21d74 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -565,6 +565,36 @@ static DWORD midi_out_long_data(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size, struc return MMSYSERR_NOERROR; } +static DWORD midi_out_prepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +{ + TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (hdr->dwFlags & MHDR_PREPARED) + return MMSYSERR_NOERROR; + + hdr->lpNext = 0; + hdr->dwFlags |= MHDR_PREPARED; + hdr->dwFlags &= ~(MHDR_DONE | MHDR_INQUEUE); + return MMSYSERR_NOERROR; +} + +static DWORD midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size) +{ + TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (hdr_size < offsetof(MIDIHDR, dwOffset) || !hdr || !hdr->lpData) + return MMSYSERR_INVALPARAM; + if (!(hdr->dwFlags & MHDR_PREPARED)) + return MMSYSERR_NOERROR; + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_PREPARED; + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -591,6 +621,12 @@ NTSTATUS midi_out_message(void *args) case MODM_LONGDATA: *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); break; + case MODM_PREPARE: + *params->err = midi_out_prepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; + case MODM_UNPREPARE: + *params->err = midi_out_unprepare(params->dev_id, (MIDIHDR *)params->param_1, params->param_2); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 589a08e0907..71bd7afebdf 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -155,42 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -/************************************************************************** - * MIDIOut_Prepare [internal] - */ -static DWORD MIDIOut_Prepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (lpMidiHdr->dwFlags & MHDR_PREPARED) - return MMSYSERR_NOERROR; - - lpMidiHdr->lpNext = 0; - lpMidiHdr->dwFlags |= MHDR_PREPARED; - lpMidiHdr->dwFlags &= ~(MHDR_DONE|MHDR_INQUEUE); /* flags cleared since w2k */ - return MMSYSERR_NOERROR; -} - -/************************************************************************** - * MIDIOut_Unprepare [internal] - */ -static DWORD MIDIOut_Unprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - if (dwSize < offsetof(MIDIHDR,dwOffset) || lpMidiHdr == 0 || lpMidiHdr->lpData == 0) - return MMSYSERR_INVALPARAM; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MMSYSERR_NOERROR; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - - lpMidiHdr->dwFlags &= ~MHDR_PREPARED; - return MMSYSERR_NOERROR; -} - static DWORD MIDIOut_GetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize) { TRACE("wDevID=%d lpCaps=%p dwSize=%d\n", wDevID, lpCaps, dwSize); @@ -642,10 +606,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_PREPARE: - return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); - case MODM_UNPREPARE: - return MIDIOut_Unprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_GETDEVCAPS: return MIDIOut_GetDevCaps(wDevID, (LPMIDIOUTCAPSW) dwParam1, dwParam2); case MODM_GETNUMDEVS: -- 2.23.0

2 1

[PATCH 07/12] winecoreaudio: Move midi_out_long_data to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/audiounit.c | 12 ----- dlls/winecoreaudio.drv/coremidi.c | 59 +++++++++++++++++++++ dlls/winecoreaudio.drv/coremidi.h | 7 --- dlls/winecoreaudio.drv/midi.c | 85 ------------------------------ 4 files changed, 59 insertions(+), 104 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index d3c53926c59..137b1e93bcf 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -83,15 +83,3 @@ int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) *right = *left; return 1; } - -void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length) -{ - Byte packetBuff[512]; - MIDIPacketList *packetList = (MIDIPacketList *)packetBuff; - - MIDIPacket *packet = MIDIPacketListInit(packetList); - - packet = MIDIPacketListAdd(packetList, sizeof(packetBuff), packet, mach_absolute_time(), length, buffer); - if (packet) - MIDISend(port, dest, packetList); -} diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 4dc4166dda1..d80b8c1711b 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -509,6 +509,62 @@ static DWORD midi_out_data(WORD dev_id, DWORD data) return MMSYSERR_NOERROR; } +static DWORD midi_out_long_data(WORD dev_id, MIDIHDR *hdr, DWORD hdr_size, struct notify_context *notify) +{ + struct midi_dest *dest; + OSStatus sc; + + TRACE("dev_id = %d midi_hdr = %p hdr_size = %d\n", dev_id, hdr, hdr_size); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (!hdr) + { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + if (!hdr->lpData || !(hdr->dwFlags & MHDR_PREPARED)) + return MIDIERR_UNPREPARED; + + if (hdr->dwFlags & MHDR_INQUEUE) + return MIDIERR_STILLPLAYING; + + hdr->dwFlags &= ~MHDR_DONE; + hdr->dwFlags |= MHDR_INQUEUE; + + if ((UInt8)hdr->lpData[0] != 0xf0) + /* System Exclusive */ + ERR("Add missing 0xf0 marker at the beginning of system exclusive byte stream\n"); + + if ((UInt8)hdr->lpData[hdr->dwBufferLength - 1] != 0xF7) + /* Send end of System Exclusive */ + ERR("Add missing 0xf7 marker at the end of system exclusive byte stream\n"); + + dest = dests + dev_id; + + if (dest->caps.wTechnology == MOD_SYNTH) /* FIXME */ + { + sc = MusicDeviceSysEx(dest->synth, (const UInt8 *)hdr->lpData, hdr->dwBufferLength); + if (sc != noErr) + { + ERR("MusicDeviceSysEx returns %s\n", wine_dbgstr_fourcc(sc)); + return MMSYSERR_ERROR; + } + } + else if (dest->caps.wTechnology == MOD_MIDIPORT) + midi_send(midi_out_port, dest->dest, (UInt8 *)hdr->lpData, hdr->dwBufferLength); + + hdr->dwFlags &= ~MHDR_INQUEUE; + hdr->dwFlags |= MHDR_DONE; + + set_out_notify(notify, dest, dev_id, MOM_DONE, (DWORD_PTR)hdr, 0); + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -532,6 +588,9 @@ NTSTATUS midi_out_message(void *args) case MODM_DATA: *params->err = midi_out_data(params->dev_id, params->param_1); break; + case MODM_LONGDATA: + *params->err = midi_out_long_data(params->dev_id, (MIDIHDR *)params->param_1, params->param_2, params->notify); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index ca669db7db1..f764bad45aa 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -67,13 +67,6 @@ extern int AudioUnit_SetVolume(AudioUnit au, float left, float right); extern int AudioUnit_GetVolume(AudioUnit au, float *left, float *right); #endif -/* coremidi.c */ -extern MIDIClientRef CoreMIDI_CreateClient(CFStringRef name); -extern void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size); -extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon); - -extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); - /* midi.c */ typedef struct midi_dest { diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 98b0a17a147..589a08e0907 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -135,14 +135,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_DONE: - case MOM_POSITIONCB: - dwCallBack = destinations[wDevID].midiDesc.dwCallback; - uFlags = destinations[wDevID].wFlags; - hDev = destinations[wDevID].midiDesc.hMidi; - dwInstance = destinations[wDevID].midiDesc.dwInstance; - break; - case MIM_OPEN: case MIM_CLOSE: case MIM_DATA: @@ -163,81 +155,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) -{ - LPBYTE lpData; - OSStatus err = noErr; - - TRACE("wDevID=%d lpMidiHdr=%p dwSize=%d\n", wDevID, lpMidiHdr, dwSize); - - /* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure - * but it seems to be used only for midi input. - * Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption. - */ - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - if (lpMidiHdr == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - lpData = (LPBYTE) lpMidiHdr->lpData; - - if (lpData == NULL) - return MIDIERR_UNPREPARED; - if (!(lpMidiHdr->dwFlags & MHDR_PREPARED)) - return MIDIERR_UNPREPARED; - if (lpMidiHdr->dwFlags & MHDR_INQUEUE) - return MIDIERR_STILLPLAYING; - lpMidiHdr->dwFlags &= ~MHDR_DONE; - lpMidiHdr->dwFlags |= MHDR_INQUEUE; - - /* FIXME: MS doc is not 100% clear. Will lpData only contain system exclusive - * data, or can it also contain raw MIDI data, to be split up and sent to - * modShortData() ? - * If the latter is true, then the following WARNing will fire up - */ - if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - WARN("The allegedly system exclusive buffer is not correct\n\tPlease report with MIDI file\n"); - } - - TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength); - TRACE(" %02X %02X %02X ... %02X %02X %02X\n", - lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3], - lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]); - - - if (lpData[0] != 0xF0) { - /* System Exclusive */ - ERR("Add missing 0xF0 marker at the beginning of system exclusive byte stream\n"); - } - if (lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) { - /* Send end of System Exclusive */ - ERR("Add missing 0xF7 marker at the end of system exclusive byte stream\n"); - } - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) /* FIXME */ - { - err = MusicDeviceSysEx(destinations[wDevID].synth, (const UInt8 *) lpData, lpMidiHdr->dwBufferLength); - if (err != noErr) - { - ERR("MusicDeviceSysEx(%p, %p, %d) return %s\n", destinations[wDevID].synth, lpData, lpMidiHdr->dwBufferLength, wine_dbgstr_fourcc(err)); - return MMSYSERR_ERROR; - } - } - else if (destinations[wDevID].caps.wTechnology == MOD_MIDIPORT) { - MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, lpData, lpMidiHdr->dwBufferLength); - } - - lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; - lpMidiHdr->dwFlags |= MHDR_DONE; - MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); - return MMSYSERR_NOERROR; -} - /************************************************************************** * MIDIOut_Prepare [internal] */ @@ -725,8 +642,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_LONGDATA: - return MIDIOut_LongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: return MIDIOut_Prepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_UNPREPARE: -- 2.23.0

2 1

[PATCH 06/12] winecoreaudio: Move midi_out_data to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coremidi.c | 49 +++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 40 ------------------------- 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 6fddbd7d88a..4dc4166dda1 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -463,6 +463,52 @@ static DWORD midi_out_close(WORD dev_id, struct notify_context *notify) return MMSYSERR_NOERROR; } +static void midi_send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned len) +{ + Byte packet_buf[512]; + MIDIPacketList *packet_list = (MIDIPacketList *)packet_buf; + MIDIPacket *packet = MIDIPacketListInit(packet_list); + + packet = MIDIPacketListAdd(packet_list, sizeof(packet_buf), packet, mach_absolute_time(), len, buffer); + if (packet) MIDISend(port, dest, packet_list); +} + +static DWORD midi_out_data(WORD dev_id, DWORD data) +{ + struct midi_dest *dest; + UInt8 bytes[3]; + OSStatus sc; + + TRACE("dev_id = %d data = %08x\n", dev_id, data); + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + + bytes[0] = data & 0xff; + bytes[1] = (data >> 8) & 0xff; + bytes[2] = (data >> 16) & 0xff; + + dest = dests + dev_id; + if (dest->caps.wTechnology == MOD_SYNTH) + { + sc = MusicDeviceMIDIEvent(dest->synth, bytes[0], bytes[1], bytes[2], 0); + if (sc != noErr) + { + ERR("MusicDeviceMIDIEvent returns %s\n", wine_dbgstr_fourcc(sc)); + return MMSYSERR_ERROR; + } + } + else + { + midi_send(midi_out_port, dest->dest, bytes, sizeof(bytes)); + } + + return MMSYSERR_NOERROR; +} + NTSTATUS midi_out_message(void *args) { struct midi_out_message_params *params = args; @@ -483,6 +529,9 @@ NTSTATUS midi_out_message(void *args) case MODM_CLOSE: *params->err = midi_out_close(params->dev_id, params->notify); break; + case MODM_DATA: + *params->err = midi_out_data(params->dev_id, params->param_1); + break; default: TRACE("Unsupported message\n"); *params->err = MMSYSERR_NOTSUPPORTED; diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index e2418645968..98b0a17a147 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -163,44 +163,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) -{ - WORD evt = LOBYTE(LOWORD(dwParam)); - UInt8 chn = (evt & 0x0F); - - TRACE("wDevID=%d dwParam=%08X\n", wDevID, dwParam); - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) - { - WORD d1 = HIBYTE(LOWORD(dwParam)); - WORD d2 = LOBYTE(HIWORD(dwParam)); - OSStatus err = noErr; - - err = MusicDeviceMIDIEvent(destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0); - if (err != noErr) - { - ERR("MusicDeviceMIDIEvent(%p, %04x, %04x, %04x, %d) return %s\n", destinations[wDevID].synth, (evt & 0xF0) | chn, d1, d2, 0, wine_dbgstr_fourcc(err)); - return MMSYSERR_ERROR; - } - } - else - { - UInt8 buffer[3]; - buffer[0] = (evt & 0xF0) | chn; - buffer[1] = HIBYTE(LOWORD(dwParam)); - buffer[2] = LOBYTE(HIWORD(dwParam)); - - MIDIOut_Send(MIDIOutPort, destinations[wDevID].dest, buffer, 3); - } - - return MMSYSERR_NOERROR; -} - static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) { LPBYTE lpData; @@ -763,8 +725,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_DATA: - return MIDIOut_Data(wDevID, dwParam1); case MODM_LONGDATA: return MIDIOut_LongData(wDevID, (LPMIDIHDR)dwParam1, dwParam2); case MODM_PREPARE: -- 2.23.0

2 1

[PATCH 05/12] winecoreaudio: Move midi_out_close to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/audiounit.c | 23 -------------- dlls/winecoreaudio.drv/coremidi.c | 50 ++++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 28 ----------------- 3 files changed, 50 insertions(+), 51 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index d155bda7be3..d3c53926c59 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -49,7 +49,6 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wave); -WINE_DECLARE_DEBUG_CHANNEL(midi); int AudioUnit_SetVolume(AudioUnit au, float left, float right) { @@ -85,28 +84,6 @@ int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) return 1; } - -int SynthUnit_Close(AUGraph graph) -{ - OSStatus err = noErr; - - err = AUGraphStop(graph); - if (err != noErr) - { - ERR_(midi)("AUGraphStop(%p) return %s\n", graph, wine_dbgstr_fourcc(err)); - return 0; - } - - err = DisposeAUGraph(graph); - if (err != noErr) - { - ERR_(midi)("DisposeAUGraph(%p) return %s\n", graph, wine_dbgstr_fourcc(err)); - return 0; - } - - return 1; -} - void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length) { Byte packetBuff[512]; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index a7b84f0a41e..6fddbd7d88a 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -356,6 +356,27 @@ static BOOL synth_unit_init(AudioUnit synth, AUGraph graph) return TRUE; } +static BOOL synth_unit_close(AUGraph graph) +{ + OSStatus sc; + + sc = AUGraphStop(graph); + if (sc != noErr) + { + ERR("AUGraphStop(%p) returns %s\n", graph, wine_dbgstr_fourcc(sc)); + return FALSE; + } + + sc = DisposeAUGraph(graph); + if (sc != noErr) + { + ERR("DisposeAUGraph(%p) returns %s\n", graph, wine_dbgstr_fourcc(sc)); + return FALSE; + } + + return TRUE; +} + static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, DWORD_PTR param_1, DWORD_PTR param_2) { @@ -416,6 +437,32 @@ static DWORD midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, st return MMSYSERR_NOERROR; } +static DWORD midi_out_close(WORD dev_id, struct notify_context *notify) +{ + struct midi_dest *dest; + + TRACE("dev_id = %d\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->caps.wTechnology == MOD_SYNTH) + synth_unit_close(dest->graph); + dest->graph = 0; + dest->synth = 0; + + 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; @@ -433,6 +480,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/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 575a8bf6813..e2418645968 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -64,8 +64,6 @@ static MIDIPortRef MIDIOutPort = NULL; MIDIDestination *destinations; MIDISource *sources; -extern int SynthUnit_Close(AUGraph graph); - 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); @@ -137,7 +135,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: dwCallBack = destinations[wDevID].midiDesc.dwCallback; @@ -166,29 +163,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_Close(WORD wDevID) -{ - DWORD ret = MMSYSERR_NOERROR; - - TRACE("wDevID=%d\n", wDevID); - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - if (destinations[wDevID].caps.wTechnology == MOD_SYNTH) - SynthUnit_Close(destinations[wDevID].graph); - - destinations[wDevID].graph = 0; - destinations[wDevID].synth = 0; - - MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L); - destinations[wDevID].midiDesc.hMidi = 0; - - return ret; -} - static DWORD MIDIOut_Data(WORD wDevID, DWORD dwParam) { WORD evt = LOBYTE(LOWORD(dwParam)); @@ -789,8 +763,6 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case MODM_CLOSE: - return MIDIOut_Close(wDevID); case MODM_DATA: return MIDIOut_Data(wDevID, dwParam1); case MODM_LONGDATA: -- 2.23.0

2 1

[PATCH 04/12] winecoreaudio: Move midi_out_open to the unixlib.
by Huw Davies Nov. 26, 2021

Nov. 26, 2021

Notifications are filled out by the unixlib and returned to the user-side for dispatch. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/audiounit.c | 90 --------------- dlls/winecoreaudio.drv/coreaudio.c | 1 + dlls/winecoreaudio.drv/coremidi.c | 177 +++++++++++++++++++++++++++++ dlls/winecoreaudio.drv/midi.c | 87 +++++--------- dlls/winecoreaudio.drv/unixlib.h | 27 +++++ 5 files changed, 231 insertions(+), 151 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index c91fec216bd..d155bda7be3 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -86,96 +86,6 @@ int AudioUnit_GetVolume(AudioUnit au, float *left, float *right) } -/* - * MIDI Synth Unit - */ -int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth) -{ - OSStatus err; - AudioComponentDescription desc; - AUNode synthNode; - AUNode outNode; - - err = NewAUGraph(graph); - if (err != noErr) - { - ERR_(midi)("NewAUGraph return %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - desc.componentManufacturer = kAudioUnitManufacturer_Apple; - desc.componentFlags = 0; - desc.componentFlagsMask = 0; - - /* create synth node */ - desc.componentType = kAudioUnitType_MusicDevice; - desc.componentSubType = kAudioUnitSubType_DLSSynth; - - err = AUGraphAddNode(*graph, &desc, &synthNode); - if (err != noErr) - { - ERR_(midi)("AUGraphAddNode cannot create synthNode : %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - /* create out node */ - desc.componentType = kAudioUnitType_Output; - desc.componentSubType = kAudioUnitSubType_DefaultOutput; - - err = AUGraphAddNode(*graph, &desc, &outNode); - if (err != noErr) - { - ERR_(midi)("AUGraphAddNode cannot create outNode %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - err = AUGraphOpen(*graph); - if (err != noErr) - { - ERR_(midi)("AUGraphOpen return %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - /* connecting the nodes */ - err = AUGraphConnectNodeInput(*graph, synthNode, 0, outNode, 0); - if (err != noErr) - { - ERR_(midi)("AUGraphConnectNodeInput cannot connect synthNode to outNode : %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - /* Get the synth unit */ - err = AUGraphNodeInfo(*graph, synthNode, 0, synth); - if (err != noErr) - { - ERR_(midi)("AUGraphNodeInfo return %s\n", wine_dbgstr_fourcc(err)); - return 0; - } - - return 1; -} - -int SynthUnit_Initialize(AudioUnit synth, AUGraph graph) -{ - OSStatus err = noErr; - - err = AUGraphInitialize(graph); - if (err != noErr) - { - ERR_(midi)("AUGraphInitialize(%p) return %s\n", graph, wine_dbgstr_fourcc(err)); - return 0; - } - - err = AUGraphStart(graph); - if (err != noErr) - { - ERR_(midi)("AUGraphStart(%p) return %s\n", graph, wine_dbgstr_fourcc(err)); - return 0; - } - - return 1; -} - int SynthUnit_Close(AUGraph graph) { OSStatus err = noErr; diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 9476b6baf6f..e90c400102f 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1631,4 +1631,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = set_volumes, midi_init, midi_release, + midi_out_message, }; diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index dedfa0aa9ee..a7b84f0a41e 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -86,6 +86,7 @@ #include "wine/unicode.h" #include "wine/unixlib.h" +#include "coreaudio.h" #include "coremidi.h" #include "unixlib.h" @@ -263,3 +264,179 @@ NTSTATUS midi_release(void *args) return STATUS_SUCCESS; } + +/* + * MIDI Synth Unit + */ +static BOOL synth_unit_create_default(AUGraph *graph, AudioUnit *synth) +{ + AudioComponentDescription desc; + AUNode synth_node; + AUNode out_node; + OSStatus sc; + + sc = NewAUGraph(graph); + if (sc != noErr) + { + ERR("NewAUGraph return %s\n", wine_dbgstr_fourcc(sc)); + return FALSE; + } + + desc.componentManufacturer = kAudioUnitManufacturer_Apple; + desc.componentFlags = 0; + desc.componentFlagsMask = 0; + + /* create synth node */ + desc.componentType = kAudioUnitType_MusicDevice; + desc.componentSubType = kAudioUnitSubType_DLSSynth; + + sc = AUGraphAddNode(*graph, &desc, &synth_node); + if (sc != noErr) + { + ERR("AUGraphAddNode cannot create synthNode : %s\n", wine_dbgstr_fourcc(sc)); + return FALSE; + } + + /* create out node */ + desc.componentType = kAudioUnitType_Output; + desc.componentSubType = kAudioUnitSubType_DefaultOutput; + + sc = AUGraphAddNode(*graph, &desc, &out_node); + if (sc != noErr) + { + ERR("AUGraphAddNode cannot create outNode %s\n", wine_dbgstr_fourcc(sc)); + return FALSE; + } + + sc = AUGraphOpen(*graph); + if (sc != noErr) + { + ERR("AUGraphOpen returns %s\n", wine_dbgstr_fourcc(sc)); + return FALSE; + } + + /* connecting the nodes */ + sc = AUGraphConnectNodeInput(*graph, synth_node, 0, out_node, 0); + if (sc != noErr) + { + ERR("AUGraphConnectNodeInput cannot connect synthNode to outNode : %s\n", + wine_dbgstr_fourcc(sc)); + return FALSE; + } + + /* Get the synth unit */ + sc = AUGraphNodeInfo(*graph, synth_node, 0, synth); + if (sc != noErr) + { + ERR("AUGraphNodeInfo return %s\n", wine_dbgstr_fourcc(sc)); + return FALSE; + } + + return TRUE; +} + +static BOOL synth_unit_init(AudioUnit synth, AUGraph graph) +{ + OSStatus sc; + + sc = AUGraphInitialize(graph); + if (sc != noErr) + { + ERR("AUGraphInitialize(%p) returns %s\n", graph, wine_dbgstr_fourcc(sc)); + return FALSE; + } + + sc = AUGraphStart(graph); + if (sc != noErr) + { + ERR("AUGraphStart(%p) returns %s\n", graph, wine_dbgstr_fourcc(sc)); + return FALSE; + } + + return TRUE; +} + +static void set_out_notify(struct notify_context *notify, struct midi_dest *dest, WORD dev_id, WORD msg, + DWORD_PTR param_1, DWORD_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 DWORD midi_out_open(WORD dev_id, MIDIOPENDESC *midi_desc, DWORD flags, struct notify_context *notify) +{ + struct midi_dest *dest; + + TRACE("dev_id = %d desc = %p flags = %08x\n", dev_id, midi_desc, flags); + + if (!midi_desc) return MMSYSERR_INVALPARAM; + + if (dev_id >= num_dests) + { + WARN("bad device ID : %d\n", dev_id); + return MMSYSERR_BADDEVICEID; + } + if (dests[dev_id].midiDesc.hMidi != 0) + { + WARN("device already open!\n"); + return MMSYSERR_ALLOCATED; + } + if ((flags & ~CALLBACK_TYPEMASK) != 0) + { + WARN("bad flags\n"); + return MMSYSERR_INVALFLAG; + } + + dest = dests + dev_id; + if (dest->caps.wTechnology == MOD_SYNTH) + { + if (!synth_unit_create_default(&dest->graph, &dest->synth)) + { + ERR("SynthUnit_CreateDefaultSynthUnit dest=%p failed\n", dest); + return MMSYSERR_ERROR; + } + if (!synth_unit_init(dest->synth, dest->graph)) + { + ERR("SynthUnit_Initialise dest=%p failed\n", dest); + return MMSYSERR_ERROR; + } + } + dest->wFlags = HIWORD(flags & CALLBACK_TYPEMASK); + dest->midiDesc = *midi_desc; + + 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_INIT: + case DRVM_EXIT: + case DRVM_ENABLE: + case DRVM_DISABLE: + *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/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 000c57ad98d..575a8bf6813 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -64,10 +64,16 @@ static MIDIPortRef MIDIOutPort = NULL; MIDIDestination *destinations; MIDISource *sources; -extern int SynthUnit_CreateDefaultSynthUnit(AUGraph *graph, AudioUnit *synth); -extern int SynthUnit_Initialize(AudioUnit synth, AUGraph graph); extern int SynthUnit_Close(AUGraph graph); +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); +} + static LONG CoreAudio_MIDIInit(void) { struct midi_init_params params; @@ -131,7 +137,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2); switch (wMsg) { - case MOM_OPEN: case MOM_CLOSE: case MOM_DONE: case MOM_POSITIONCB: @@ -161,54 +166,6 @@ static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_ DriverCallback(dwCallBack, uFlags, hDev, wMsg, dwInstance, dwParam1, dwParam2); } -static DWORD MIDIOut_Open(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags) -{ - MIDIDestination *dest; - - TRACE("wDevID=%d lpDesc=%p dwFlags=%08x\n", wDevID, lpDesc, dwFlags); - - if (lpDesc == NULL) { - WARN("Invalid Parameter\n"); - return MMSYSERR_INVALPARAM; - } - - if (wDevID >= MIDIOut_NumDevs) { - WARN("bad device ID : %d\n", wDevID); - return MMSYSERR_BADDEVICEID; - } - - if (destinations[wDevID].midiDesc.hMidi != 0) { - WARN("device already open !\n"); - return MMSYSERR_ALLOCATED; - } - - if ((dwFlags & ~CALLBACK_TYPEMASK) != 0) { - WARN("bad dwFlags\n"); - return MMSYSERR_INVALFLAG; - } - dest = &destinations[wDevID]; - - if (dest->caps.wTechnology == MOD_SYNTH) - { - if (!SynthUnit_CreateDefaultSynthUnit(&dest->graph, &dest->synth)) - { - ERR("SynthUnit_CreateDefaultSynthUnit dest=%p failed\n", dest); - return MMSYSERR_ERROR; - } - - if (!SynthUnit_Initialize(dest->synth, dest->graph)) - { - ERR("SynthUnit_Initialise dest=%p failed\n", dest); - return MMSYSERR_ERROR; - } - } - dest->wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); - dest->midiDesc = *lpDesc; - - MIDI_NotifyClient(wDevID, MOM_OPEN, 0L, 0L); - return MMSYSERR_NOERROR; -} - static DWORD MIDIOut_Close(WORD wDevID) { DWORD ret = MMSYSERR_NOERROR; @@ -825,16 +782,13 @@ static DWORD WINAPI MIDIIn_MessageThread(LPVOID p) */ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { + struct midi_out_message_params params; + struct notify_context notify; + DWORD err; + TRACE("%d %08x %08lx %08lx %08lx\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { - case DRVM_INIT: - case DRVM_EXIT: - case DRVM_ENABLE: - case DRVM_DISABLE: - return 0; - case MODM_OPEN: - return MIDIOut_Open(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2); case MODM_CLOSE: return MIDIOut_Close(wDevID); case MODM_DATA: @@ -855,10 +809,21 @@ DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR return MIDIOut_SetVolume(wDevID, dwParam1); case MODM_RESET: return MIDIOut_Reset(wDevID); - default: - TRACE("Unsupported message (08%x)\n", wMsg); } - 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; + + UNIX_CALL(midi_out_message, &params); + + if (!err && notify.send_notify) notify_client(&notify); + + return err; } /************************************************************************** diff --git a/dlls/winecoreaudio.drv/unixlib.h b/dlls/winecoreaudio.drv/unixlib.h index 6dfb68d202f..6afb9eb287d 100644 --- a/dlls/winecoreaudio.drv/unixlib.h +++ b/dlls/winecoreaudio.drv/unixlib.h @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "mmddk.h" struct coreaudio_stream; @@ -190,6 +191,30 @@ struct midi_init_params void *midi_out_port, *midi_in_port; }; +struct notify_context +{ + BOOL send_notify; + WORD dev_id; + WORD msg; + DWORD_PTR param_1; + DWORD_PTR param_2; + DWORD_PTR callback; + DWORD flags; + HANDLE device; + DWORD_PTR instance; +}; + +struct midi_out_message_params +{ + UINT dev_id; + UINT msg; + DWORD_PTR user; + DWORD_PTR param_1; + DWORD_PTR param_2; + DWORD *err; + struct notify_context *notify; +}; + enum unix_funcs { unix_get_endpoint_ids, @@ -214,10 +239,12 @@ enum unix_funcs unix_set_volumes, unix_midi_init, unix_midi_release, + unix_midi_out_message, }; NTSTATUS midi_init( void * ) DECLSPEC_HIDDEN; NTSTATUS midi_release( void * ) DECLSPEC_HIDDEN; +NTSTATUS midi_out_message( void * ) DECLSPEC_HIDDEN; extern unixlib_handle_t coreaudio_handle; -- 2.23.0

2 1