Module: wine Branch: master Commit: aea94788e4187944f688061a9ea4ad7beab21a6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea94788e4187944f688061a9e...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Jan 23 10:36:15 2009 +0100
winealsa.drv: Remove superfluous pointer casts.
---
dlls/winealsa.drv/dscapture.c | 4 ++-- dlls/winealsa.drv/midi.c | 13 ++++++------- dlls/winealsa.drv/mixer.c | 14 +++++++------- dlls/winealsa.drv/wavein.c | 2 +- dlls/winealsa.drv/waveout.c | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/dlls/winealsa.drv/dscapture.c b/dlls/winealsa.drv/dscapture.c index 872a80c..304a5eb 100644 --- a/dlls/winealsa.drv/dscapture.c +++ b/dlls/winealsa.drv/dscapture.c @@ -477,7 +477,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFE if ( IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDsCaptureDriverBuffer) ) { IDsCaptureDriverBuffer_AddRef(iface); - *ppobj = (LPVOID)iface; + *ppobj = iface; return DS_OK; }
@@ -494,7 +494,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_QueryInterface(PIDSCDRIVERBUFFE IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); } IDsDriverNotify_AddRef((PIDSDRIVERNOTIFY)This->notify); - *ppobj = (LPVOID)This->notify; + *ppobj = This->notify; return DS_OK; }
diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 24a9b65..b62a885 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -376,7 +376,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) { int pos = 0; int len = ev->data.ext.len; - LPBYTE ptr = (BYTE*) ev->data.ext.ptr; + LPBYTE ptr = ev->data.ext.ptr; LPMIDIHDR lpMidiHdr;
EnterCriticalSection(&crit_sect); @@ -393,7 +393,7 @@ static DWORD WINAPI midRecThread(LPVOID arg) (*(BYTE*)(lpMidiHdr->lpData + lpMidiHdr->dwBytesRecorded - 1) == 0xF7)) { lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)lpMidiHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext; if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) WARN("Couldn't notify client\n"); } @@ -594,10 +594,9 @@ static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } else { LPMIDIHDR ptr;
- for (ptr = MidiInDev[wDevID].lpQueueHdr; - ptr->lpNext != 0; - ptr = (LPMIDIHDR)ptr->lpNext); - ptr->lpNext = (struct midihdr_tag*)lpMidiHdr; + for (ptr = MidiInDev[wDevID].lpQueueHdr; ptr->lpNext != 0; + ptr = ptr->lpNext); + ptr->lpNext = lpMidiHdr; } LeaveCriticalSection(&crit_sect);
@@ -666,7 +665,7 @@ static DWORD midReset(WORD wDevID) (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) { WARN("Couldn't notify client\n"); } - MidiInDev[wDevID].lpQueueHdr = (LPMIDIHDR)MidiInDev[wDevID].lpQueueHdr->lpNext; + MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext; } LeaveCriticalSection(&crit_sect);
diff --git a/dlls/winealsa.drv/mixer.c b/dlls/winealsa.drv/mixer.c index 426656d..e5cd347 100644 --- a/dlls/winealsa.drv/mixer.c +++ b/dlls/winealsa.drv/mixer.c @@ -915,7 +915,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW
TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels);
- mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)mctrld->paDetails; + mcdu = mctrld->paDetails;
if (mctrld->cChannels != 1 && mmixer->lines[line].chans != mctrld->cChannels) { @@ -966,7 +966,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW
TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels);
- mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails;
if (line == 1) for (chn = 0; chn <= SND_MIXER_SCHN_LAST; ++chn) @@ -1009,7 +1009,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW
TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels);
- mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails;
for (x = 0; x<mmixer->chans; ++x) if (line != x && mmixer->lines[x].dst == line) @@ -1045,7 +1045,7 @@ static DWORD MIX_GetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW
if (ct->c.dwControlType == MIXERCONTROL_CONTROLTYPE_MUX || ct->c.dwControlType == MIXERCONTROL_CONTROLTYPE_MIXER) { - LPMIXERCONTROLDETAILS_LISTTEXTW mcdlt = (LPMIXERCONTROLDETAILS_LISTTEXTW)mctrld->paDetails; + LPMIXERCONTROLDETAILS_LISTTEXTW mcdlt = mctrld->paDetails; int i, j;
for (i = j = 0; j < mmixer->chans; ++j) @@ -1143,7 +1143,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW }
TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdu = (LPMIXERCONTROLDETAILS_UNSIGNED)mctrld->paDetails; + mcdu = mctrld->paDetails;
for (chn=0; chn<mctrld->cChannels;++chn) { @@ -1191,7 +1191,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW
TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels);
- mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails; if (line == 1) /* Mute/unmute capturing */ for (i = 0; i <= SND_MIXER_SCHN_LAST; ++i) { @@ -1219,7 +1219,7 @@ static DWORD MIX_SetControlDetails(UINT wDevID, LPMIXERCONTROLDETAILS mctrld, DW }
TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n", getControlType(ct->c.dwControlType), mctrld->cChannels); - mcdb = (LPMIXERCONTROLDETAILS_BOOLEAN)mctrld->paDetails; + mcdb = mctrld->paDetails;
for (x=i=0; x < mmixer->chans; ++x) if (line != x && mmixer->lines[x].dst == line) diff --git a/dlls/winealsa.drv/wavein.c b/dlls/winealsa.drv/wavein.c index 89ad9df..d6337bc 100644 --- a/dlls/winealsa.drv/wavein.c +++ b/dlls/winealsa.drv/wavein.c @@ -142,7 +142,7 @@ static void widRecorder_ReadHeaders(WINE_WAVEDEV * wwi) static DWORD CALLBACK widRecorder(LPVOID pmt) { WORD uDevID = (DWORD_PTR)pmt; - WINE_WAVEDEV* wwi = (WINE_WAVEDEV*)&WInDev[uDevID]; + WINE_WAVEDEV* wwi = &WInDev[uDevID]; WAVEHDR* lpWaveHdr; DWORD dwSleepTime; DWORD bytesRead; diff --git a/dlls/winealsa.drv/waveout.c b/dlls/winealsa.drv/waveout.c index b99731b..b785dce 100644 --- a/dlls/winealsa.drv/waveout.c +++ b/dlls/winealsa.drv/waveout.c @@ -521,7 +521,7 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEDEV* wwo) static DWORD CALLBACK wodPlayer(LPVOID pmt) { WORD uDevID = (DWORD_PTR)pmt; - WINE_WAVEDEV* wwo = (WINE_WAVEDEV*)&WOutDev[uDevID]; + WINE_WAVEDEV* wwo = &WOutDev[uDevID]; DWORD dwNextFeedTime = INFINITE; /* Time before DSP needs feeding */ DWORD dwNextNotifyTime = INFINITE; /* Time before next wave completion */ DWORD dwSleepTime;