ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winecoreaudio: Fix 64-bits incompatibilities.

This commit is contained in:
Jörg Höhle 2011-03-09 02:12:49 +01:00 committed by Alexandre Julliard
parent 5021f6102b
commit a74c29e081
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/winecoreaudio.drv/audio.c
View File

@ -787,9 +787,9 @@ void CoreAudio_WaveRelease(void)
/************************************************************************** /**************************************************************************
* wodNotifyClient [internal] * 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) { switch (wMsg) {
case WOM_OPEN: case WOM_OPEN:
@ -1178,7 +1178,7 @@ static void wodHelper_NotifyDoneForList(WINE_WAVEOUT_INSTANCE* wwo, LPWAVEHDR lp
lpWaveHdr->lpNext = NULL; lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE; lpWaveHdr->dwFlags |= WHDR_DONE;
wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0); wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext; lpWaveHdr = lpNext;
} }
@ -1746,9 +1746,9 @@ OSStatus CoreAudio_woAudioUnitIOProc(void *inRefCon,
/************************************************************************** /**************************************************************************
* widNotifyClient [internal] * 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) switch (wMsg)
{ {
@ -1816,7 +1816,7 @@ static void widHelper_NotifyCompletions(WINE_WAVEIN* wwi)
lpWaveHdr->lpNext = NULL; lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE; lpWaveHdr->dwFlags |= WHDR_DONE;
widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext; lpWaveHdr = lpNext;
} }
@ -2265,7 +2265,7 @@ static DWORD widStop(WORD wDevID)
lpWaveHdr->lpNext = NULL; lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE; lpWaveHdr->dwFlags |= WHDR_DONE;
widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
} }
return ret; return ret;
@ -2345,7 +2345,7 @@ static DWORD widReset(WORD wDevID)
lpWaveHdr->lpNext = NULL; lpWaveHdr->lpNext = NULL;
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE; lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE; lpWaveHdr->dwFlags |= WHDR_DONE;
widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0); widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext; lpWaveHdr = lpNext;
} }

8
dlls/winecoreaudio.drv/midi.c
View File

@ -222,14 +222,14 @@ LONG CoreAudio_MIDIRelease(void)
/************************************************************************** /**************************************************************************
* MIDI_NotifyClient [internal] * 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; DWORD dwCallBack;
UINT uFlags; UINT uFlags;
HANDLE hDev; HANDLE hDev;
DWORD dwInstance; 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) { switch (wMsg) {
case MOM_OPEN: case MOM_OPEN:
@ -443,7 +443,7 @@ static DWORD MIDIOut_LongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
lpMidiHdr->dwFlags |= MHDR_DONE; lpMidiHdr->dwFlags |= MHDR_DONE;
MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L); MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L);
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
@ -811,7 +811,7 @@ static DWORD MIDIIn_Reset(WORD wDevID)
lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
lpMidiHdr->dwFlags |= MHDR_DONE; lpMidiHdr->dwFlags |= MHDR_DONE;
/* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */ /* 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); LeaveCriticalSection(&midiInLock);