Huw Davies : wineoss: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
Alexandre Julliard
julliard at winehq.org
Mon Apr 25 16:30:34 CDT 2022
Module: wine
Branch: master
Commit: 03d2bddc95051b930c597d931ad8173890f18655
URL: https://source.winehq.org/git/wine.git/?a=commit;h=03d2bddc95051b930c597d931ad8173890f18655
Author: Huw Davies <huw at codeweavers.com>
Date: Fri Apr 22 07:08:40 2022 +0100
wineoss: Move MODM_GETVOLUME and MODM_SETVOLUME to the unixlib.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wineoss.drv/midi.c | 15 ---------------
dlls/wineoss.drv/ossmidi.c | 14 ++++++++++++++
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c
index cc8fc54568c..8c3a2405b0f 100644
--- a/dlls/wineoss.drv/midi.c
+++ b/dlls/wineoss.drv/midi.c
@@ -648,17 +648,6 @@ static DWORD midStop(WORD wDevID)
/*-----------------------------------------------------------------------*/
-/**************************************************************************
- * modGetVolume [internal]
- */
-static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume)
-{
- if (!lpdwVolume) return MMSYSERR_INVALPARAM;
- if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
- *lpdwVolume = 0xFFFFFFFF;
- return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED;
-}
-
DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
DWORD_PTR dwParam1, DWORD_PTR dwParam2);
@@ -753,10 +742,6 @@ DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return OSS_MidiInit();
case DRVM_EXIT:
return OSS_MidiExit();
- case MODM_GETVOLUME:
- return modGetVolume(wDevID, (DWORD*)dwParam1);
- case MODM_SETVOLUME:
- return 0;
case MODM_RESET:
return modReset(wDevID);
}
diff --git a/dlls/wineoss.drv/ossmidi.c b/dlls/wineoss.drv/ossmidi.c
index f307a54b81f..4b419c2716c 100644
--- a/dlls/wineoss.drv/ossmidi.c
+++ b/dlls/wineoss.drv/ossmidi.c
@@ -1056,6 +1056,14 @@ static UINT midi_out_get_devcaps(WORD dev_id, MIDIOUTCAPSW *caps, UINT size)
return MMSYSERR_NOERROR;
}
+static UINT midi_out_get_volume(WORD dev_id, UINT *volume)
+{
+ if (!volume) return MMSYSERR_INVALPARAM;
+ if (dev_id >= num_dests) return MMSYSERR_BADDEVICEID;
+
+ *volume = 0xFFFFFFFF;
+ return (dests[dev_id].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED;
+}
NTSTATUS midi_out_message(void *args)
{
@@ -1094,6 +1102,12 @@ NTSTATUS midi_out_message(void *args)
case MODM_GETNUMDEVS:
*params->err = num_dests;
break;
+ case MODM_GETVOLUME:
+ *params->err = midi_out_get_volume(params->dev_id, (UINT *)params->param_1);
+ break;
+ case MODM_SETVOLUME:
+ *params->err = 0;
+ break;
default:
TRACE("Unsupported message\n");
*params->err = MMSYSERR_NOTSUPPORTED;
More information about the wine-cvs
mailing list