ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineoss: Move MIDM_STOP to the unixlib. 

Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Huw Davies 2022-04-27 08:03:20 +01:00 committed by Alexandre Julliard
parent b50f9f0af5
commit 38e3f3f3eb
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/wineoss.drv/midi.c
View File

@ -490,20 +490,6 @@ static DWORD midClose(WORD wDevID)
return ret;
}
/**************************************************************************
* midStop [internal]
*/
static DWORD midStop(WORD wDevID)
{
TRACE("(%04X);\n", wDevID);
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE;
MidiInDev[wDevID].state = 0;
return MMSYSERR_NOERROR;
}
/*======================================================================*
* MIDI entry points *
*======================================================================*/
@ -529,8 +515,6 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return midOpen(wDevID, (LPMIDIOPENDESC)dwParam1, dwParam2);
case MIDM_CLOSE:
return midClose(wDevID);
case MIDM_STOP:
return midStop(wDevID);
}
params.dev_id = wDevID;

17
dlls/wineoss.drv/ossmidi.c
View File

@ -1225,6 +1225,20 @@ static UINT midi_in_start(WORD dev_id)
return MMSYSERR_NOERROR;
}
static UINT midi_in_stop(WORD dev_id)
{
struct midi_src *src;
TRACE("(%04X);\n", dev_id);
if (dev_id >= num_srcs) return MMSYSERR_BADDEVICEID;
src = srcs + dev_id;
if (src->state == -1) return MIDIERR_NODEVICE;
src->state = 0;
return MMSYSERR_NOERROR;
}
static UINT midi_in_reset(WORD dev_id, struct notify_context *notify)
{
UINT cur_time = NtGetTickCount();
@ -1340,6 +1354,9 @@ NTSTATUS midi_in_message(void *args)
case MIDM_START:
*params->err = midi_in_start(params->dev_id);
break;
case MIDM_STOP:
*params->err = midi_in_stop(params->dev_id);
break;
case MIDM_RESET:
*params->err = midi_in_reset(params->dev_id, params->notify);
break;