From 37afecb88371617ea3de2d42e8b3785c9c6d6c1d Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Sat, 23 Jan 2010 18:56:36 +0100 Subject: [PATCH] winmm: A couple of simple fixes for winmm compilation on 64bit platforms. --- dlls/winejack.drv/audio.c | 2 +- dlls/winmm/winmm.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winejack.drv/audio.c b/dlls/winejack.drv/audio.c index d93502d89fd..512bc01c2a4 100644 --- a/dlls/winejack.drv/audio.c +++ b/dlls/winejack.drv/audio.c @@ -397,7 +397,7 @@ static int JACK_callback_wwo (nframes_t nframes, void *arg) if(wwo->buffer_size < (nframes * sizeof(short) * 2)) { ERR("for some reason JACK_BufSize() didn't allocate enough memory\n"); - ERR("allocated %ld bytes, need %d bytes\n", wwo->buffer_size, (nframes * sizeof(short) * 2)); + ERR("allocated %ld bytes, need %d bytes\n", wwo->buffer_size, (nframes * (unsigned)sizeof(short) * 2)); return 0; } diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index f5e2af13cb6..b2caa4889bd 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -732,7 +732,7 @@ UINT WINAPI auxGetVolume(UINT uDeviceID, DWORD* lpdwVolume) TRACE("(%04X, %p) !\n", uDeviceID, lpdwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_GETVOLUME, (DWORD_PTR)lpdwVolume, 0L); } @@ -746,7 +746,7 @@ UINT WINAPI auxSetVolume(UINT uDeviceID, DWORD dwVolume) TRACE("(%04X, %u) !\n", uDeviceID, dwVolume); - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, AUXDM_SETVOLUME, dwVolume, 0L); } @@ -758,7 +758,7 @@ UINT WINAPI auxOutMessage(UINT uDeviceID, UINT uMessage, DWORD_PTR dw1, DWORD_PT { LPWINE_MLD wmld; - if ((wmld = MMDRV_Get((HANDLE)uDeviceID, MMDRV_AUX, TRUE)) == NULL) + if ((wmld = MMDRV_Get((HANDLE)(DWORD_PTR)uDeviceID, MMDRV_AUX, TRUE)) == NULL) return MMSYSERR_INVALHANDLE; return MMDRV_Message(wmld, uMessage, dw1, dw2);