Re: [PATCH 3/7] winealsa: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib.

[Andrew Eikum]

Signed-off-by: Andrew Eikum

On Thu, Mar 17, 2022 at 08:14:04AM +0000, Huw Davies wrote:
> Signed-off-by: Huw Davies
>
> dlls/winealsa.drv/alsamidi.c | 36 +++++++++++++++++++++++++++++++++
>  dlls/winealsa.drv/midi.c     | 39 ------------------------------------
>  2 files changed, 36 insertions(+), 39 deletions(-)
>
> diff --git a/dlls/winealsa.drv/alsamidi.c b/dlls/winealsa.drv/alsamidi.c
> index 0a3e1a80be3..bc68442a0d7 100644
> --- a/dlls/winealsa.drv/alsamidi.c
> +++ b/dlls/winealsa.drv/alsamidi.c
> @@ -749,6 +749,36 @@ static UINT midi_out_long_data(WORD dev_id, MIDIHDR *hdr, UINT hdr_size, struct
>      return MMSYSERR_NOERROR;
>  }
>
> +static UINT midi_out_prepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
> +{
> - TRACE("(%04X, %p, %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 UINT midi_out_unprepare(WORD dev_id, MIDIHDR *hdr, UINT hdr_size)
> +{
> - TRACE("(%04X, %p, %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;
> @@ -775,6 +805,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/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
> index 5638dace27c..7329b2cd2e7 100644
> --- a/dlls/winealsa.drv/midi.c
> +++ b/dlls/winealsa.drv/midi.c
> @@ -620,41 +620,6 @@ static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
>      return MMSYSERR_NOERROR;
>  }
>
> -/**************************************************************************
> -
> -
> 	modPrepare				[internal]
> - */
>
> -static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
> -{
> - TRACE("(%04X, %p, %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;
>
> -}
> -
>
> -/**************************************************************************
> -
> -
> 		modUnprepare			[internal]
> - */
>
> -static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
> -{
> - TRACE("(%04X, %p, %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;
>
> -}
> -
>
> /**************************************************************************
> -
> 	modGetVolume				[internal]
>
> */
> @@ -782,10 +747,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
>      case DRVM_INIT:
>          ALSA_MidiInit();
>          return 0;
> - case MODM_PREPARE:
> - return modPrepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
> - case MODM_UNPREPARE:
> - return modUnprepare(wDevID, (LPMIDIHDR)dwParam1, dwParam2);
> case MODM_GETDEVCAPS:
> return modGetDevCaps(wDevID, (LPMIDIOUTCAPSW)dwParam1, dwParam2);
> case MODM_GETNUMDEVS:
>
> -- 
> 2.25.1