[PATCH 2/4] winealsa: Remove several unused members.

Andrew Eikum aeikum at codeweavers.com
Mon Mar 14 08:45:10 CDT 2022


Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>

On Mon, Mar 14, 2022 at 10:21:47AM +0000, Huw Davies wrote:
> Signed-off-by: Huw Davies <huw at codeweavers.com>
> ---
>  dlls/winealsa.drv/midi.c | 23 -----------------------
>  1 file changed, 23 deletions(-)
> 
> diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c
> index e61dae12860..699790d380d 100644
> --- a/dlls/winealsa.drv/midi.c
> +++ b/dlls/winealsa.drv/midi.c
> @@ -60,14 +60,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(midi);
>  
>  typedef struct {
>      int			state;                  /* -1 disabled, 0 is no recording started, 1 in recording, bit 2 set if in sys exclusive recording */
> -    DWORD		bufsize;
>      MIDIOPENDESC	midiDesc;
>      WORD		wFlags;
>      LPMIDIHDR	 	lpQueueHdr;
> -    DWORD		dwTotalPlayed;
> -    unsigned char	incoming[3];
> -    unsigned char	incPrev;
> -    char		incLen;
>      DWORD		startTime;
>      MIDIINCAPSW         caps;
>      snd_seq_addr_t      addr;
> @@ -75,12 +70,8 @@ typedef struct {
>  
>  typedef struct {
>      BOOL                bEnabled;
> -    DWORD		bufsize;
>      MIDIOPENDESC	midiDesc;
>      WORD		wFlags;
> -    LPMIDIHDR	 	lpQueueHdr;
> -    DWORD		dwTotalPlayed;
> -    void*		lpExtra;	 	/* according to port type (MIDI, FM...), extra data when needed */
>      MIDIOUTCAPSW        caps;
>      snd_seq_addr_t      addr;
>      int                 port_out;
> @@ -497,11 +488,8 @@ static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
>      MidiInDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
>  
>      MidiInDev[wDevID].lpQueueHdr = NULL;
> -    MidiInDev[wDevID].dwTotalPlayed = 0;
> -    MidiInDev[wDevID].bufsize = 0x3FFF;
>      MidiInDev[wDevID].midiDesc = *lpDesc;
>      MidiInDev[wDevID].state = 0;
> -    MidiInDev[wDevID].incLen = 0;
>      MidiInDev[wDevID].startTime = 0;
>  
>      /* Connect our app port to the device port */
> @@ -571,7 +559,6 @@ static DWORD midClose(WORD wDevID)
>      LeaveCriticalSection(&midiSeqLock);
>      midiCloseSeq();
>  
> -    MidiInDev[wDevID].bufsize = 0;
>      MIDI_NotifyClient(wDevID, MIM_CLOSE, 0L, 0L);
>      MidiInDev[wDevID].midiDesc.hMidi = 0;
>  
> @@ -752,8 +739,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
>  	return MMSYSERR_INVALFLAG;
>      }
>  
> -    MidiOutDev[wDevID].lpExtra = 0;
> -
>      switch (MidiOutDev[wDevID].caps.wTechnology) {
>      case MOD_FMSYNTH:
>      case MOD_MIDIPORT:
> @@ -769,10 +754,6 @@ static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
>      }
>  
>      MidiOutDev[wDevID].wFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK);
> -
> -    MidiOutDev[wDevID].lpQueueHdr = NULL;
> -    MidiOutDev[wDevID].dwTotalPlayed = 0;
> -    MidiOutDev[wDevID].bufsize = 0x3FFF;
>      MidiOutDev[wDevID].midiDesc = *lpDesc;
>  
>      EnterCriticalSection(&midiSeqLock);
> @@ -853,10 +834,6 @@ static DWORD modClose(WORD wDevID)
>  	return MMSYSERR_NOTENABLED;
>      }
>  
> -    HeapFree(GetProcessHeap(), 0, MidiOutDev[wDevID].lpExtra);
> -    MidiOutDev[wDevID].lpExtra = 0;
> - 
> -    MidiOutDev[wDevID].bufsize = 0;
>      MIDI_NotifyClient(wDevID, MOM_CLOSE, 0L, 0L);
>      MidiOutDev[wDevID].midiDesc.hMidi = 0;
>      return ret;
> -- 
> 2.25.1
> 
> 



More information about the wine-devel mailing list