November 2021 - Wine-Commits

Huw Davies : winecoreaudio: Move midi_out_close to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: bf502e36851674c98698f381d82db7ab8f703dcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf502e36851674c98698f381… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:40 2021 +0000 winecoreaudio: Move midi_out_close to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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:

1 0

Eric Pouech : winedbg: Protect fetch_float() in CPU backends against buffer overflow.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 6cee83a665189fc99e91f18ffb80c23918b0aa6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6cee83a665189fc99e91f18f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:58 2021 +0100 winedbg: Protect fetch_float() in CPU backends against buffer overflow. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/be_arm.c | 1 + programs/winedbg/be_arm64.c | 1 + programs/winedbg/be_i386.c | 1 + programs/winedbg/be_x86_64.c | 1 + 4 files changed, 4 insertions(+) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 3bf5771439c..451eb50e772 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1859,6 +1859,7 @@ static BOOL be_arm_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, d /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp; diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index d7611ba75de..aaf6ecf0bb6 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -256,6 +256,7 @@ static BOOL be_arm64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp; diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index e7a1dd9d460..3bb7b9b4240 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -805,6 +805,7 @@ static BOOL be_i386_fetch_float(const struct dbg_lvalue* lvalue, unsigned size, /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp; diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 4920bf2d0ca..45c01a70594 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -727,6 +727,7 @@ static BOOL be_x86_64_fetch_float(const struct dbg_lvalue* lvalue, unsigned size /* FIXME: this assumes that debuggee and debugger use the same * representation for reals */ + if (size > sizeof(tmp)) return FALSE; if (!memory_read_value(lvalue, size, tmp)) return FALSE; if (size == sizeof(float)) *ret = *(float*)tmp;

1 0

Huw Davies : winecoreaudio: Temporarily move MIDIOut_Send() to audiounit.c.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 1f0591dd4558c606d844fc30c21f5c2b1e11c34b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0591dd4558c606d844fc30… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:36 2021 +0000 winecoreaudio: Temporarily move MIDIOut_Send() to audiounit.c. This is to enable coremidi.c to become the unixlib, while still enabling code on the user-side to be able to call MIDIOut_Send() for the time being. Eventually, its equivalent will move to the unixlib and audiounit.c will disappear. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/audiounit.c | 13 +++++++++++++ dlls/winecoreaudio.drv/coremidi.c | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index 030ff4d090a..c91fec216bd 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,6 +22,7 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT +#include <mach/mach_time.h> #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -195,3 +196,15 @@ int SynthUnit_Close(AUGraph graph) 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 94761b05c4f..6d54d89cfac 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -67,15 +67,3 @@ void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefC packet = MIDIPacketNext(packet); } } - -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); -}

1 0

Eric Pouech : winedbg: Use I width modifier for DWORD_PTR printf's args.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: d65edd04ccce575dd8308d2fe85295ac8fdd916a URL: https://source.winehq.org/git/wine.git/?a=commit;h=d65edd04ccce575dd8308d2f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:16 2021 +0100 winedbg: Use I width modifier for DWORD_PTR printf's args. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/break.c | 2 +- programs/winedbg/expr.c | 4 ++-- programs/winedbg/gdbproxy.c | 8 ++++---- programs/winedbg/info.c | 14 +++++++------- programs/winedbg/memory.c | 4 ++-- programs/winedbg/stack.c | 2 +- programs/winedbg/symbol.c | 8 ++++---- programs/winedbg/tgt_active.c | 4 ++-- programs/winedbg/types.c | 2 +- programs/winedbg/winedbg.c | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d65edd04ccce575dd830…

1 0

Eric Pouech : winedbg: Use wide-char string literals.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 14781c718372816730bb439f3a40a3527038b6a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14781c718372816730bb439f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Nov 26 17:30:09 2021 +0100 winedbg: Use wide-char string literals. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/crashdlg.c | 21 +++++++-------------- programs/winedbg/tgt_active.c | 10 +++------- programs/winedbg/tgt_minidump.c | 4 ++-- programs/winedbg/types.c | 30 ++++++++++-------------------- programs/winedbg/winedbg.c | 3 +-- 5 files changed, 23 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=14781c718372816730bb…

1 0

Huw Davies : winecoreaudio: Move midi_out_reset to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: b74a8ab202db70bdea2d7c0a14262169e290621a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b74a8ab202db70bdea2d7c0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:47 2021 +0000 winecoreaudio: Move midi_out_reset to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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

1 0

Huw Davies : winecoreaudio: Move midi_out_[gs]et_volume to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: 5df38b4708fa60f52c0a672844c11a5be791bd83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df38b4708fa60f52c0a6728… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:46 2021 +0000 winecoreaudio: Move midi_out_[gs]et_volume to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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(-) 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); }

1 0

Huw Davies : winecoreaudio: Move midi_out_open to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: ec9d2a7773fa0ad74cad8d4ee3f673e219753f8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9d2a7773fa0ad74cad8d4e… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:39 2021 +0000 winecoreaudio: Move midi_out_open to the unixlib. Notifications are filled out by the unixlib and returned to the user-side for dispatch. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec9d2a7773fa0ad74cad…

1 0

Huw Davies : winecoreaudio: Move midi_init and midi_release to the unixlib.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: e506d99ceb72f60bd81ba54cde099712d9c54aca URL: https://source.winehq.org/git/wine.git/?a=commit;h=e506d99ceb72f60bd81ba54c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:38 2021 +0000 winecoreaudio: Move midi_init and midi_release to the unixlib. midi_init temporarily returns unix-side info, which will eventually be removed. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coreaudio.c | 2 + dlls/winecoreaudio.drv/coremidi.c | 233 ++++++++++++++++++++++++++++++++----- dlls/winecoreaudio.drv/coremidi.h | 28 ++++- dlls/winecoreaudio.drv/midi.c | 153 +++++------------------- dlls/winecoreaudio.drv/unixlib.h | 13 +++ 5 files changed, 276 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e506d99ceb72f60bd81b…

1 0

Huw Davies : winecoreaudio: Combine MIDIIn_SendMessage into MIDIIn_ReadProc.
by Alexandre Julliard Nov. 26, 2021

Nov. 26, 2021

Module: wine Branch: master Commit: dcbbe185197b6c81b5a9cd9fdcdb9cfd64c4aab7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcbbe185197b6c81b5a9cd9f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Nov 25 11:03:37 2021 +0000 winecoreaudio: Combine MIDIIn_SendMessage into MIDIIn_ReadProc. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/coremidi.c | 31 ++++++++++++++++++------- dlls/winecoreaudio.drv/coremidi.h | 8 ++++++- dlls/winecoreaudio.drv/midi.c | 48 +++++---------------------------------- 3 files changed, 36 insertions(+), 51 deletions(-) diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index 6d54d89cfac..92f52c972d3 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -1,7 +1,11 @@ /* - * Wine Midi driver for Mac OS X + * MIDI driver for macOS (unixlib) * - * Copyright 2006 Emmanuel Maillard + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella + * Copyright 1998, 1999 Eric POUECH + * Copyright 2005, 2006 Emmanuel Maillard + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -56,14 +60,25 @@ void CoreMIDI_GetObjectName(MIDIObjectRef obj, char *name, int size) */ void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *connRefCon) { - unsigned int i; - + CFMessagePortRef msg_port = CFMessagePortCreateRemote(kCFAllocatorDefault, MIDIInThreadPortName); MIDIPacket *packet = (MIDIPacket *)pktlist->packet; - for (i = 0; i < pktlist->numPackets; ++i) { - UInt16 devID = *((UInt16 *)connRefCon); - - MIDIIn_SendMessage(devID, packet->data, packet->length); + CFMutableDataRef data; + MIDIMessage msg; + unsigned int i; + for (i = 0; i < pktlist->numPackets; ++i) + { + msg.devID = *(UInt16 *)connRefCon; + msg.length = packet->length; + data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + packet->length); + if (data) + { + CFDataAppendBytes(data, (UInt8 *)&msg, sizeof(msg)); + CFDataAppendBytes(data, packet->data, packet->length); + CFMessagePortSendRequest(msg_port, 0, data, 0.0, 0.0, NULL, NULL); + CFRelease(data); + } packet = MIDIPacketNext(packet); } + CFRelease(msg_port); } diff --git a/dlls/winecoreaudio.drv/coremidi.h b/dlls/winecoreaudio.drv/coremidi.h index 3433a1d4342..47566345b54 100644 --- a/dlls/winecoreaudio.drv/coremidi.h +++ b/dlls/winecoreaudio.drv/coremidi.h @@ -73,6 +73,12 @@ extern void MIDIIn_ReadProc(const MIDIPacketList *pktlist, void *refCon, void *c extern void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigned length); /* midi.c */ -void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length); +extern CFStringRef MIDIInThreadPortName; + +typedef struct { + UInt16 devID; + UInt16 length; + Byte data[]; +} MIDIMessage; #endif diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 32826cb658c..2c89f32b430 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -1,14 +1,11 @@ /* - * Sample MIDI Wine Driver for Mac OS X (based on OSS midi driver) + * MIDI driver for macOS (PE-side) * - * Copyright 1994 Martin Ayotte - * Copyright 1998 Luiz Otavio L. Zorzella (init procedures) - * Copyright 1998/1999 Eric POUECH : - * 98/7 changes for making this MIDI driver work on OSS - * current support is limited to MIDI ports of OSS systems - * 98/9 rewriting MCI code for MIDI - * 98/11 split in midi.c and mcimidi.c + * Copyright 1994 Martin Ayotte + * Copyright 1998 Luiz Otavio L. Zorzella + * Copyright 1998, 1999 Eric POUECH * Copyright 2005, 2006 Emmanuel Maillard + * Copyright 2021 Huw Davies * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -78,14 +75,8 @@ typedef struct tagMIDISource { DWORD startTime; } MIDISource; -typedef struct { - UInt16 devID; - UInt16 length; - Byte data[]; -} MIDIMessage; - static CRITICAL_SECTION midiInLock; /* Critical section for MIDI In */ -static CFStringRef MIDIInThreadPortName = NULL; +CFStringRef MIDIInThreadPortName = NULL; static DWORD WINAPI MIDIIn_MessageThread(LPVOID p); @@ -798,33 +789,6 @@ static DWORD MIDIIn_Reset(WORD wDevID) /* * MIDI In Mach message handling */ - -/* - * Call from CoreMIDI IO threaded callback, - * we can't call Wine debug channels, critical section or anything using NtCurrentTeb here. - */ -void MIDIIn_SendMessage(UInt16 devID, const void *buffer, UInt16 length) -{ - MIDIMessage msg; - CFMutableDataRef data; - - CFMessagePortRef messagePort; - messagePort = CFMessagePortCreateRemote(kCFAllocatorDefault, MIDIInThreadPortName); - - msg.devID = devID; - msg.length = length; - - data = CFDataCreateMutable(kCFAllocatorDefault, sizeof(msg) + length); - if (data) - { - CFDataAppendBytes(data, (UInt8 *) &msg, sizeof(msg)); - CFDataAppendBytes(data, buffer, length); - CFMessagePortSendRequest(messagePort, 0, data, 0.0, 0.0, NULL, NULL); - CFRelease(data); - } - CFRelease(messagePort); -} - static CFDataRef MIDIIn_MessageHandler(CFMessagePortRef local, SInt32 msgid, CFDataRef data, void *info) { MIDIMessage *msg = NULL;

1 0