[PATCH 10/12] winecoreaudio: Move midi_out_get_num_devs to the unixlib.
Andrew Eikum
aeikum at codeweavers.com
Fri Nov 26 09:03:10 CST 2021
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
On Thu, Nov 25, 2021 at 11:03:45AM +0000, Huw Davies wrote:
> Signed-off-by: Huw Davies <huw at 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
>
>
More information about the wine-devel
mailing list