[PATCH 05/10] winecoreaudio: Move midi_in_get_num_devs to the unixlib.

[Huw Davies]

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 983d0676b16..eae68ec153e 100644
--- a/dlls/winecoreaudio.drv/coremidi.c
+++ b/dlls/winecoreaudio.drv/coremidi.c
@@ -845,6 +845,12 @@ static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size)
     return MMSYSERR_NOERROR;
 }
 
+static DWORD midi_in_get_num_devs(void)
+{
+    TRACE("\n");
+    return num_srcs;
+}
+
 NTSTATUS midi_out_message(void *args)
 {
     struct midi_out_message_params *params = args;
@@ -929,6 +935,9 @@ NTSTATUS midi_in_message(void *args)
     case MIDM_GETDEVCAPS:
         *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2);
         break;
+    case MIDM_GETNUMDEVS:
+        *params->err = midi_in_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 35da144c927..6456568be85 100644
--- a/dlls/winecoreaudio.drv/midi.c
+++ b/dlls/winecoreaudio.drv/midi.c
@@ -194,12 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
     return MMSYSERR_NOERROR;
 }
 
-static DWORD MIDIIn_GetNumDevs(void)
-{
-    TRACE("\n");
-    return MIDIIn_NumDevs;
-}
-
 static DWORD MIDIIn_Start(WORD wDevID)
 {
     TRACE("%d\n", wDevID);
@@ -420,8 +414,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR
     switch (wMsg) {
         case MIDM_ADDBUFFER:
             return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
-        case MIDM_GETNUMDEVS:
-            return MIDIIn_GetNumDevs();
         case MIDM_START:
             return MIDIIn_Start(wDevID);
         case MIDM_STOP:
-- 
2.23.0

[Andrew Eikum]

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com>

On Mon, Nov 29, 2021 at 11:26:43AM +0000, Huw Davies wrote:
> 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 983d0676b16..eae68ec153e 100644
> --- a/dlls/winecoreaudio.drv/coremidi.c
> +++ b/dlls/winecoreaudio.drv/coremidi.c
> @@ -845,6 +845,12 @@ static DWORD midi_in_get_devcaps(WORD dev_id, MIDIINCAPSW *caps, DWORD size)
>      return MMSYSERR_NOERROR;
>  }
>
> +static DWORD midi_in_get_num_devs(void)
> +{
> +    TRACE("\n");
> +    return num_srcs;
> +}
> +
>  NTSTATUS midi_out_message(void *args)
>  {
>      struct midi_out_message_params *params = args;
> @@ -929,6 +935,9 @@ NTSTATUS midi_in_message(void *args)
>      case MIDM_GETDEVCAPS:
>          *params->err = midi_in_get_devcaps(params->dev_id, (MIDIINCAPSW *)params->param_1, params->param_2);
>          break;
> +    case MIDM_GETNUMDEVS:
> +        *params->err = midi_in_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 35da144c927..6456568be85 100644
> --- a/dlls/winecoreaudio.drv/midi.c
> +++ b/dlls/winecoreaudio.drv/midi.c
> @@ -194,12 +194,6 @@ static DWORD MIDIIn_AddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
>      return MMSYSERR_NOERROR;
>  }
>
> -static DWORD MIDIIn_GetNumDevs(void)
> -{
> -    TRACE("\n");
> -    return MIDIIn_NumDevs;
> -}
> -
>  static DWORD MIDIIn_Start(WORD wDevID)
>  {
>      TRACE("%d\n", wDevID);
> @@ -420,8 +414,6 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWOR
>      switch (wMsg) {
>          case MIDM_ADDBUFFER:
>              return MIDIIn_AddBuffer(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
> -        case MIDM_GETNUMDEVS:
> -            return MIDIIn_GetNumDevs();
>          case MIDM_START:
>              return MIDIIn_Start(wDevID);
>          case MIDM_STOP:
> -- 
> 2.23.0