[PATCH] winealsa.drv: Cleanup modLongData and Fix F0 and F7 byte insertion + memory leak.
Alexandre Julliard
julliard at winehq.org
Thu Jan 17 09:40:14 CST 2013
Christian Costa <titan.costa at gmail.com> writes:
> @@ -927,12 +927,12 @@ static DWORD modData(WORD wDevID, DWORD dwParam)
> }
>
> /**************************************************************************
> - * modLongData [internal]
> + * modLongData internal]
> */
> static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
> {
> - int len_add = 0;
> - LPBYTE lpData, lpNewData = NULL;
> + int len_add = 0;
> + BYTE *lpData, *lpNewData = NULL;
> snd_seq_event_t event;
>
> TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
> @@ -941,23 +941,23 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
> * 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 (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
>
> - if (midiSeq == NULL) {
> - WARN("can't play !\n");
> - return MIDIERR_NODEVICE;
> + if (!midiSeq) {
> + WARN("Can't play !\n");
> + return MIDIERR_NODEVICE;
> }
>
> - lpData = (LPBYTE) lpMidiHdr->lpData;
> -
> - if (lpData == NULL)
> - return MIDIERR_UNPREPARED;
> + lpData = (BYTE*)lpMidiHdr->lpData;
> +
> + if (!lpData)
> + return MIDIERR_UNPREPARED;
> if (!(lpMidiHdr->dwFlags & MHDR_PREPARED))
> - return MIDIERR_UNPREPARED;
> + return MIDIERR_UNPREPARED;
> if (lpMidiHdr->dwFlags & MHDR_INQUEUE)
> - return MIDIERR_STILLPLAYING;
> + return MIDIERR_STILLPLAYING;
> lpMidiHdr->dwFlags &= ~MHDR_DONE;
> lpMidiHdr->dwFlags |= MHDR_INQUEUE;
Please avoid gratuitous formatting changes.
--
Alexandre Julliard
julliard at winehq.org
More information about the wine-devel
mailing list