[PATCH] winealsa.drv: Cleanup modLongData and Fix F0 and F7 byte insertion + memory leak.

[Christian Costa]

---
 dlls/winealsa.drv/midi.c |   98 +++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 50 deletions(-)

diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
index 7c496c5..affcc30 100644
--- a/dlls/winealsa.drv/midi.c
+++ b/dlls/winealsa.drv/midi.c
@@ -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;
 
@@ -967,51 +967,49 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
      * If the latest is true, then the following WARNing will fire up
      */
     if (lpData[0] != 0xF0 || lpData[lpMidiHdr->dwBufferLength - 1] != 0xF7) {
-	WARN("Alleged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
-	lpNewData = HeapAlloc(GetProcessHeap(), 0, lpMidiHdr->dwBufferLength + 2);
+        WARN("Alleged system exclusive buffer is not correct. Please report with MIDI file\n");
+        lpNewData = HeapAlloc(GetProcessHeap(), 0, lpMidiHdr->dwBufferLength + 2);
     }
 
-    TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength);
+    TRACE("dwBufferLength = %u\n", lpMidiHdr->dwBufferLength);
     TRACE("                 %02X %02X %02X ... %02X %02X %02X\n",
-	  lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3],
-	  lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]);
+          lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3],
+          lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]);
 
     switch (MidiOutDev[wDevID].caps.wTechnology) {
     case MOD_FMSYNTH:
-	/* FIXME: I don't think there is much to do here */
-	break;
+        /* FIXME: I don't think there is much to do here */
+        HeapFree(GetProcessHeap(), 0, lpNewData);
+        break;
     case MOD_MIDIPORT:
-	if (lpData[0] != 0xF0) {
-	    /* Send start of System Exclusive */
-	    len_add = 1;
-	    lpData[0] = 0xF0;
-	    memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength);
-	    WARN("Adding missing 0xF0 marker at the beginning of "
-		 "system exclusive byte stream\n");
-	}
-	if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) {
-	    /* Send end of System Exclusive */
-	    memcpy(lpData + len_add, lpData, lpMidiHdr->dwBufferLength);
-            lpNewData[lpMidiHdr->dwBufferLength + len_add - 1] = 0xF0;
-	    len_add++;
-	    WARN("Adding missing 0xF7 marker at the end of "
-		 "system exclusive byte stream\n");
-	}
-	snd_seq_ev_clear(&event);
-	snd_seq_ev_set_direct(&event);
-	snd_seq_ev_set_source(&event, port_out);
-	snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port);
-	TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port);
-	snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData);
-	snd_seq_event_output_direct(midiSeq, &event);
-	if (lpNewData)
-		HeapFree(GetProcessHeap(), 0, lpData);
-	break;
+       if (lpData[0] != 0xF0) {
+            /* Send start of System Exclusive */
+            len_add = 1;
+            lpNewData[0] = 0xF0;
+            memcpy(lpNewData + 1, lpData, lpMidiHdr->dwBufferLength);
+            WARN("Adding missing 0xF0 marker at the beginning of system exclusive byte stream\n");
+        }
+        if (lpData[lpMidiHdr->dwBufferLength-1] != 0xF7) {
+            /* Send end of System Exclusive */
+            if (!len_add)
+                memcpy(lpNewData, lpData, lpMidiHdr->dwBufferLength);
+            lpNewData[lpMidiHdr->dwBufferLength + len_add] = 0xF7;
+            len_add++;
+            WARN("Adding missing 0xF7 marker at the end of system exclusive byte stream\n");
+        }
+        snd_seq_ev_clear(&event);
+        snd_seq_ev_set_direct(&event);
+        snd_seq_ev_set_source(&event, port_out);
+        snd_seq_ev_set_dest(&event, MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port);
+        TRACE("client = %d port = %d\n", MidiOutDev[wDevID].addr.client, MidiOutDev[wDevID].addr.port);
+        snd_seq_ev_set_sysex(&event, lpMidiHdr->dwBufferLength + len_add, lpNewData ? lpNewData : lpData);
+        snd_seq_event_output_direct(midiSeq, &event);
+        HeapFree(GetProcessHeap(), 0, lpNewData);
+        break;
     default:
-	WARN("Technology not supported (yet) %d !\n",
-	     MidiOutDev[wDevID].caps.wTechnology);
-	HeapFree(GetProcessHeap(), 0, lpNewData);
-	return MMSYSERR_NOTENABLED;
+        WARN("Technology %d not supported yet\n", MidiOutDev[wDevID].caps.wTechnology);
+        HeapFree(GetProcessHeap(), 0, lpNewData);
+        return MMSYSERR_NOTENABLED;
     }
 
     lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;