Jörg Höhle : winecoreaudio: Fix 64-bits incompatibilities.
Alexandre Julliard
julliard at winehq.org
Mon Mar 14 14:29:37 CDT 2011
Module: wine
Branch: master
Commit: a74c29e08181ee8f803f706240d2d4a2b7453b40
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a74c29e08181ee8f803f706240d2d4a2b7453b40
Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date: Wed Mar 9 02:12:49 2011 +0100
winecoreaudio: Fix 64-bits incompatibilities.
---
dlls/winecoreaudio.drv/audio.c | 16 ++++++++--------
dlls/winecoreaudio.drv/midi.c | 8 ++++----
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c
index a2158ef..9fb11b1 100644
--- a/dlls/winecoreaudio.drv/audio.c
+++ b/dlls/winecoreaudio.drv/audio.c
@@ -787,9 +787,9 @@ void CoreAudio_WaveRelease(void)
/**************************************************************************
* wodNotifyClient [internal]
*/
-static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
+static void wodNotifyClient(WINE_WAVEOUT_INSTANCE* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("wMsg = 0x%04x dwParm1 = %04x dwParam2 = %04x\n", wMsg, dwParam1, dwParam2);
+ TRACE("wMsg = 0x%04x dwParm1 = %04lx dwParam2 = %04lx\n", wMsg, dwParam1, dwParam2);
switch (wMsg) {
case WOM_OPEN:
@@ -1178,7 +1178,7 @@ static void wodHelper_NotifyDoneForList(WINE_WAVEOUT_INSTANCE* wwo, LPWAVEHDR lp
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
- wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0);
+ wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext;
}
@@ -1746,9 +1746,9 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon,
/**************************************************************************
* widNotifyClient [internal]
*/
-static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
+static void widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("wMsg = 0x%04x dwParm1 = %04X dwParam2 = %04X\n", wMsg, dwParam1, dwParam2);
+ TRACE("wMsg = 0x%04x dwParm1 = %04lX dwParam2 = %04lX\n", wMsg, dwParam1, dwParam2);
switch (wMsg)
{
@@ -1816,7 +1816,7 @@ static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi)
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
- widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
+ widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext;
}
@@ -2265,7 +2265,7 @@ static DWORD widStop(WORD wDevID)
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
- widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
+ widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
}
return ret;
@@ -2345,7 +2345,7 @@ static DWORD widReset(WORD wDevID)
lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
- widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
+ widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext;
}
diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c
index d2b08e2..071e937 100644
--- a/dlls/winecoreaudio.drv/midi.c
+++ b/dlls/winecoreaudio.drv/midi.c
@@ -222,14 +222,14 @@ LONG CoreAudio_MIDIRelease(void)
/**************************************************************************
* MIDI_NotifyClient [internal]
*/
-static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
+static void MIDI_NotifyClient(UINT wDevID, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
DWORD dwCallBack;
UINT uFlags;
HANDLE hDev;
DWORD dwInstance;
- TRACE("wDevID=%d wMsg=%d dwParm1=%04X dwParam2=%04X\n", wDevID, wMsg, dwParam1, dwParam2);
+ TRACE("wDevID=%d wMsg=%d dwParm1=%04lX dwParam2=%04lX\n", wDevID, wMsg, dwParam1, dwParam2);
switch (wMsg) {
case MOM_OPEN:
@@ -443,7 +443,7 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
lpMidiHdr->dwFlags |= MHDR_DONE;
- MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L);
+ MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L);
return MMSYSERR_NOERROR;
}
@@ -811,7 +811,7 @@ static DWORD MIDIIn_Reset(WORD wDevID)
lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
lpMidiHdr->dwFlags |= MHDR_DONE;
/* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */
- MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime);
+ MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime);
}
LeaveCriticalSection(&midiInLock);
More information about the wine-cvs
mailing list