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

Fix modLongData. 

Enable opening of MOD_SYNTH type devices.
Add some comments.
This commit is contained in:
Christian Costa 2003-09-04 00:04:37 +00:00 committed by Alexandre Julliard
parent c7a539d8e1
commit 4b40180e38
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/winmm/wineoss/midi.c
View File

@ -115,6 +115,8 @@ static int MIDI_UnixToWindowsDeviceType(int type)
* MOD_SQSYNTH square wave internal synth * MOD_SQSYNTH square wave internal synth
* MOD_FMSYNTH FM internal synth * MOD_FMSYNTH FM internal synth
* MOD_MAPPER MIDI mapper * MOD_MAPPER MIDI mapper
* MOD_WAVETABLE hardware watetable internal synth
* MOD_SWSYNTH software internal synth
*/ */
/* FIXME Is this really the correct equivalence from UNIX to /* FIXME Is this really the correct equivalence from UNIX to
@ -1048,6 +1050,7 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
} }
break; break;
case MOD_MIDIPORT: case MOD_MIDIPORT:
case MOD_SYNTH:
if (midiOpenSeq() < 0) { if (midiOpenSeq() < 0) {
return MMSYSERR_ALLOCATED; return MMSYSERR_ALLOCATED;
} }
@ -1421,6 +1424,11 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize); TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
/* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure
* but it seems to be used only for midi input.
* Taking a look at the WAVEHDR structure (which is quite similar) confirms this assumption.
*/
if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE; if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
@ -1465,7 +1473,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
WARN("Adding missing 0xF0 marker at the beginning of " WARN("Adding missing 0xF0 marker at the beginning of "
"system exclusive byte stream\n"); "system exclusive byte stream\n");
} }
for (count = 0; count < lpMidiHdr->dwBytesRecorded; count++) { for (count = 0; count < lpMidiHdr->dwBufferLength; count++) {
SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, lpData[count]); SEQ_MIDIOUT(wDevID - MODM_NumFMSynthDevs, lpData[count]);
} }
if (lpData[count - 1] != 0xF7) { if (lpData[count - 1] != 0xF7) {