[PATCH 4/4] wineoss: Move MODM_PREPARE and MODM_UNPREPARE to the unixlib.

[Huw Davies]

Signed-off-by: Huw Davies <huw(a)codeweavers.com>
---
 dlls/wineoss.drv/midi.c    | 39 --------------------------------------
 dlls/wineoss.drv/ossmidi.c | 36 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c
index aa672e211b9..9615c9892b9 100644
--- a/dlls/wineoss.drv/midi.c
+++ b/dlls/wineoss.drv/midi.c
@@ -663,41 +663,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]
  */
@@ -803,10 +768,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
         return OSS_MidiInit();
     case DRVM_EXIT:
         return OSS_MidiExit();
-    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:
diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c
index 7ab78bcbfdd..b97c5159e89 100644
--- a/dlls/wineoss.drv/ossmidi.c
+++ b/dlls/wineoss.drv/ossmidi.c
@@ -1014,6 +1014,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;
@@ -1039,6 +1069,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;
-- 
2.25.1

[Andrew Eikum]

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

On Thu, Apr 21, 2022 at 07:52:18AM +0100, Huw Davies wrote:
> Signed-off-by: Huw Davies <huw(a)codeweavers.com>
> ---
>  dlls/wineoss.drv/midi.c    | 39 --------------------------------------
>  dlls/wineoss.drv/ossmidi.c | 36 +++++++++++++++++++++++++++++++++++
>  2 files changed, 36 insertions(+), 39 deletions(-)
>
> diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c
> index aa672e211b9..9615c9892b9 100644
> --- a/dlls/wineoss.drv/midi.c
> +++ b/dlls/wineoss.drv/midi.c
> @@ -663,41 +663,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]
>   */
> @@ -803,10 +768,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
>          return OSS_MidiInit();
>      case DRVM_EXIT:
>          return OSS_MidiExit();
> -    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:
> diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c
> index 7ab78bcbfdd..b97c5159e89 100644
> --- a/dlls/wineoss.drv/ossmidi.c
> +++ b/dlls/wineoss.drv/ossmidi.c
> @@ -1014,6 +1014,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;
> @@ -1039,6 +1069,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;
> -- 
> 2.25.1