reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-26 05:00:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

winmm: Remove casts to the type of the casted expression.

Browse Source
This commit is contained in:
Michael Stefaniuc 2011-09-22 16:24:21 +02:00 committed by Alexandre Julliard
parent 5526779567
commit f83c470805
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/winmm/waveform.c
View File

@ -625,7 +625,7 @@ static MMRESULT WINMM_TryDeviceMapping(WINMM_OpenInfo *info, WORD channels,
if(mr != MMSYSERR_NOERROR) if(mr != MMSYSERR_NOERROR)
return WAVERR_BADFORMAT; return WAVERR_BADFORMAT;
device = WINMM_GetDeviceFromHWAVE((HWAVE)info->handle); device = WINMM_GetDeviceFromHWAVE(info->handle);
if(!device) if(!device)
return MMSYSERR_INVALHANDLE; return MMSYSERR_INVALHANDLE;
@ -917,7 +917,7 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_MMDevice *mmdevice,
device->cb_info.flags = HIWORD(info->flags & CALLBACK_TYPEMASK); device->cb_info.flags = HIWORD(info->flags & CALLBACK_TYPEMASK);
device->cb_info.callback = info->callback; device->cb_info.callback = info->callback;
device->cb_info.user = info->cb_user; device->cb_info.user = info->cb_user;
device->cb_info.hwave = (HWAVE)device->handle; device->cb_info.hwave = device->handle;
info->handle = device->handle; info->handle = device->handle;
@ -1645,7 +1645,7 @@ static HRESULT WINMM_BeginPlaying(WINMM_Device *device)
static LRESULT WINMM_Pause(HWAVE hwave) static LRESULT WINMM_Pause(HWAVE hwave)
{ {
WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave);
HRESULT hr; HRESULT hr;
TRACE("(%p)\n", hwave); TRACE("(%p)\n", hwave);
@ -1670,7 +1670,7 @@ static LRESULT WINMM_Pause(HWAVE hwave)
static LRESULT WINMM_Reset(HWAVE hwave) static LRESULT WINMM_Reset(HWAVE hwave)
{ {
WINMM_CBInfo cb_info; WINMM_CBInfo cb_info;
WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave);
WAVEHDR *first; WAVEHDR *first;
MMRESULT mr; MMRESULT mr;
@ -1752,7 +1752,7 @@ static MMRESULT WINMM_FramesToMMTime(MMTIME *time, UINT32 played_frames,
static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time) static LRESULT WINMM_GetPosition(HWAVE hwave, MMTIME *time)
{ {
WINMM_Device *device = WINMM_GetDeviceFromHWAVE((HWAVE)hwave); WINMM_Device *device = WINMM_GetDeviceFromHWAVE(hwave);
UINT32 played_frames, sample_rate, bytes_per_frame; UINT32 played_frames, sample_rate, bytes_per_frame;
TRACE("(%p, %p)\n", hwave, time); TRACE("(%p, %p)\n", hwave, time);
@ -2823,8 +2823,7 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage,
return WINMM_QueryInstanceIDSize(HandleToULong(hWaveOut), return WINMM_QueryInstanceIDSize(HandleToULong(hWaveOut),
(DWORD_PTR*)dwParam1, TRUE); (DWORD_PTR*)dwParam1, TRUE);
case DRV_QUERYFUNCTIONINSTANCEID: case DRV_QUERYFUNCTIONINSTANCEID:
return WINMM_QueryInstanceID(HandleToULong(hWaveOut), return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE);
(WCHAR*)dwParam1, (DWORD_PTR)dwParam2, TRUE);
/* TODO: Remove after dsound has been rewritten for mmdevapi */ /* TODO: Remove after dsound has been rewritten for mmdevapi */
case DRV_QUERYDSOUNDDESC: case DRV_QUERYDSOUNDDESC:
case DRV_QUERYDSOUNDIFACE: case DRV_QUERYDSOUNDIFACE:
@ -3203,8 +3202,7 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage,
return WINMM_QueryInstanceIDSize(HandleToULong(hWaveIn), return WINMM_QueryInstanceIDSize(HandleToULong(hWaveIn),
(DWORD_PTR*)dwParam1, FALSE); (DWORD_PTR*)dwParam1, FALSE);
case DRV_QUERYFUNCTIONINSTANCEID: case DRV_QUERYFUNCTIONINSTANCEID:
return WINMM_QueryInstanceID(HandleToULong(hWaveIn), return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE);
(WCHAR*)dwParam1, (DWORD_PTR)dwParam2, FALSE);
/* TODO: Remove after dsound has been rewritten for mmdevapi */ /* TODO: Remove after dsound has been rewritten for mmdevapi */
case DRV_QUERYDSOUNDDESC: case DRV_QUERYDSOUNDDESC:
case DRV_QUERYDSOUNDIFACE: case DRV_QUERYDSOUNDIFACE: