[PATCH] wineoss.drv: Eliminate all 64 bits warnings
mlankhorst
mlankhorst at dhcp-172-29-61-127.smo.corp.google.com
Sat Aug 9 16:59:06 CDT 2008
---
dlls/wineoss.drv/audio.c | 67 ++++++++++++++++++++---------------------
dlls/wineoss.drv/audio.h | 2 +-
dlls/wineoss.drv/dscapture.c | 4 +-
dlls/wineoss.drv/dsrender.c | 4 +-
dlls/wineoss.drv/midi.c | 23 +++++++-------
dlls/wineoss.drv/mixer.c | 44 ++++++++++++++--------------
dlls/wineoss.drv/mmaux.c | 7 ++--
7 files changed, 76 insertions(+), 75 deletions(-)
diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c
index 460c1f5..1828320 100644
--- a/dlls/wineoss.drv/audio.c
+++ b/dlls/wineoss.drv/audio.c
@@ -1370,7 +1370,7 @@ static int OSS_AddRingMessage(OSS_MSG_RING* omr, enum win_wm_message msg, DWORD
* Get a message from the ring. Should be called by the playback/record thread.
*/
static int OSS_RetrieveRingMessage(OSS_MSG_RING* omr,
- enum win_wm_message *msg, DWORD *param, HANDLE *hEvent)
+ enum win_wm_message *msg, DWORD_PTR *param, HANDLE *hEvent)
{
EnterCriticalSection(&omr->msg_crst);
@@ -1398,7 +1398,7 @@ static int OSS_RetrieveRingMessage(OSS_MSG_RING* omr,
*/
static int OSS_PeekRingMessage(OSS_MSG_RING* omr,
enum win_wm_message *msg,
- DWORD *param, HANDLE *hEvent)
+ DWORD_PTR *param, HANDLE *hEvent)
{
EnterCriticalSection(&omr->msg_crst);
@@ -1422,9 +1422,9 @@ static int OSS_PeekRingMessage(OSS_MSG_RING* omr,
/**************************************************************************
* wodNotifyClient [internal]
*/
-static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
+static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("wMsg = 0x%04x (%s) dwParm1 = %04X dwParam2 = %04X\n", wMsg,
+ TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lx dwParam2 = %04lx\n", wMsg,
wMsg == WOM_OPEN ? "WOM_OPEN" : wMsg == WOM_CLOSE ? "WOM_CLOSE" :
wMsg == WOM_DONE ? "WOM_DONE" : "Unknown", dwParam1, dwParam2);
@@ -1678,7 +1678,7 @@ static DWORD wodPlayer_NotifyCompletions(WINE_WAVEOUT* wwo, BOOL force)
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
- wodNotifyClient(wwo, WOM_DONE, (DWORD)lpWaveHdr, 0);
+ wodNotifyClient(wwo, WOM_DONE, (DWORD_PTR)lpWaveHdr, 0);
}
#endif
return (lpWaveHdr && lpWaveHdr != wwo->lpPlayPtr && lpWaveHdr != wwo->lpLoopPtr) ?
@@ -1706,7 +1706,7 @@ static void wodPlayer_Reset(WINE_WAVEOUT* wwo, BOOL reset)
if (reset) {
enum win_wm_message msg;
- DWORD param;
+ DWORD_PTR param;
HANDLE ev;
/* remove any buffer */
@@ -1769,11 +1769,11 @@ static void wodPlayer_ProcessMessages(WINE_WAVEOUT* wwo)
{
LPWAVEHDR lpWaveHdr;
enum win_wm_message msg;
- DWORD param;
+ DWORD_PTR param;
HANDLE ev;
while (OSS_RetrieveRingMessage(&wwo->msgRing, &msg, ¶m, &ev)) {
- TRACE("Received %s %x\n", getCmdString(msg), param);
+ TRACE("Received %s %lx\n", getCmdString(msg), param);
switch (msg) {
case WINE_WM_PAUSING:
wodPlayer_Reset(wwo, FALSE);
@@ -1880,7 +1880,7 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVEOUT* wwo)
*/
static DWORD CALLBACK wodPlayer(LPVOID pmt)
{
- WORD uDevID = (DWORD)pmt;
+ WORD uDevID = (DWORD_PTR)pmt;
WINE_WAVEOUT* wwo = &WOutDev[uDevID];
DWORD dwNextFeedTime = INFINITE; /* Time before DSP needs feeding */
DWORD dwNextNotifyTime = INFINITE; /* Time before next wave completion */
@@ -1923,7 +1923,6 @@ static DWORD CALLBACK wodPlayer(LPVOID pmt)
dwNextFeedTime = dwNextNotifyTime = INFINITE;
}
}
-
return 0;
}
@@ -2108,7 +2107,7 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
OSS_InitRingMessage(&wwo->msgRing);
wwo->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
- wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD)wDevID, 0, &(wwo->dwThreadID));
+ wwo->hThread = CreateThread(NULL, 0, wodPlayer, (LPVOID)(DWORD_PTR)wDevID, 0, &(wwo->dwThreadID));
if (wwo->hThread)
SetThreadPriority(wwo->hThread, THREAD_PRIORITY_TIME_CRITICAL);
WaitForSingleObject(wwo->hStartUpEvent, INFINITE);
@@ -2187,7 +2186,7 @@ static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
lpWaveHdr->dwBufferLength &= ~(WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1);
}
- OSS_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD)lpWaveHdr, FALSE);
+ OSS_AddRingMessage(&WOutDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD_PTR)lpWaveHdr, FALSE);
return MMSYSERR_NOERROR;
}
@@ -2405,10 +2404,10 @@ DWORD wodSetVolume(WORD wDevID, DWORD dwParam)
/**************************************************************************
* wodMessage (WINEOSS.7)
*/
-DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("(%u, %s, %08X, %08X, %08X);\n",
+ TRACE("(%u, %s, %08lX, %08lX, %08lX);\n",
wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2);
switch (wMsg) {
@@ -2454,9 +2453,9 @@ DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
/**************************************************************************
* widNotifyClient [internal]
*/
-static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
+static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("wMsg = 0x%04x (%s) dwParm1 = %04X dwParam2 = %04X\n", wMsg,
+ TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lx dwParam2 = %04lx\n", wMsg,
wMsg == WIM_OPEN ? "WIM_OPEN" : wMsg == WIM_CLOSE ? "WIM_CLOSE" :
wMsg == WIM_DATA ? "WIM_DATA" : "Unknown", dwParam1, dwParam2);
@@ -2503,7 +2502,7 @@ static DWORD widGetDevCaps(WORD wDevID, LPWAVEINCAPSW lpCaps, DWORD dwSize)
static void widRecorder_ReadHeaders(WINE_WAVEIN * wwi)
{
enum win_wm_message tmp_msg;
- DWORD tmp_param;
+ DWORD_PTR tmp_param;
HANDLE tmp_ev;
WAVEHDR* lpWaveHdr;
@@ -2530,7 +2529,7 @@ static void widRecorder_ReadHeaders(WINE_WAVEIN * wwi)
*/
static DWORD CALLBACK widRecorder(LPVOID pmt)
{
- WORD uDevID = (DWORD)pmt;
+ WORD uDevID = (DWORD_PTR)pmt;
WINE_WAVEIN* wwi = &WInDev[uDevID];
WAVEHDR* lpWaveHdr;
DWORD dwSleepTime;
@@ -2540,7 +2539,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt)
audio_buf_info info;
int xs;
enum win_wm_message msg;
- DWORD param;
+ DWORD_PTR param;
HANDLE ev;
int enable;
@@ -2611,7 +2610,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt)
lpWaveHdr->dwFlags |= WHDR_DONE;
wwi->lpQueuePtr = lpNext;
- widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
+ widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext;
}
} else {
@@ -2663,7 +2662,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt)
lpWaveHdr->dwFlags |= WHDR_DONE;
wwi->lpQueuePtr = lpNext;
- widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
+ widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
lpWaveHdr = lpNext;
if (!lpNext && bytesRead) {
@@ -2708,7 +2707,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt)
while (OSS_RetrieveRingMessage(&wwi->msgRing, &msg, ¶m, &ev))
{
- TRACE("msg=%s param=0x%x\n", getCmdString(msg), param);
+ TRACE("msg=%s param=0x%lx\n", getCmdString(msg), param);
switch (msg) {
case WINE_WM_PAUSING:
wwi->state = WINE_WS_PAUSED;
@@ -2774,7 +2773,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt)
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
wwi->lpQueuePtr = lpNext;
- widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
+ widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
}
}
wwi->state = WINE_WS_STOPPED;
@@ -2807,7 +2806,7 @@ static DWORD CALLBACK widRecorder(LPVOID pmt)
lpWaveHdr->dwFlags &= ~WHDR_INQUEUE;
lpWaveHdr->dwFlags |= WHDR_DONE;
wwi->lpQueuePtr = lpWaveHdr->lpNext;
- widNotifyClient(wwi, WIM_DATA, (DWORD)lpWaveHdr, 0);
+ widNotifyClient(wwi, WIM_DATA, (DWORD_PTR)lpWaveHdr, 0);
}
wwi->lpQueuePtr = NULL;
@@ -2979,7 +2978,7 @@ DWORD widOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags)
OSS_InitRingMessage(&wwi->msgRing);
wwi->hStartUpEvent = CreateEventW(NULL, FALSE, FALSE, NULL);
- wwi->hThread = CreateThread(NULL, 0, widRecorder, (LPVOID)(DWORD)wDevID, 0, &(wwi->dwThreadID));
+ wwi->hThread = CreateThread(NULL, 0, widRecorder, (LPVOID)(DWORD_PTR)wDevID, 0, &(wwi->dwThreadID));
if (wwi->hThread)
SetThreadPriority(wwi->hThread, THREAD_PRIORITY_TIME_CRITICAL);
WaitForSingleObject(wwi->hStartUpEvent, INFINITE);
@@ -3042,7 +3041,7 @@ static DWORD widAddBuffer(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
lpWaveHdr->dwBytesRecorded = 0;
lpWaveHdr->lpNext = NULL;
- OSS_AddRingMessage(&WInDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD)lpWaveHdr, FALSE);
+ OSS_AddRingMessage(&WInDev[wDevID].msgRing, WINE_WM_HEADER, (DWORD_PTR)lpWaveHdr, FALSE);
return MMSYSERR_NOERROR;
}
@@ -3122,10 +3121,10 @@ static DWORD widGetPosition(WORD wDevID, LPMMTIME lpTime, DWORD uSize)
/**************************************************************************
* widMessage (WINEOSS.6)
*/
-DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("(%u, %s, %08X, %08X, %08X);\n",
+ TRACE("(%u, %s, %08lX, %08lX, %08lX);\n",
wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2);
switch (wMsg) {
@@ -3161,8 +3160,8 @@ DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
/**************************************************************************
* wodMessage (WINEOSS.7)
*/
-DWORD WINAPI OSS_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_wodMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
return MMSYSERR_NOTENABLED;
@@ -3171,8 +3170,8 @@ DWORD WINAPI OSS_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
/**************************************************************************
* widMessage (WINEOSS.6)
*/
-DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
return MMSYSERR_NOTENABLED;
diff --git a/dlls/wineoss.drv/audio.h b/dlls/wineoss.drv/audio.h
index d90719b..f039084 100644
--- a/dlls/wineoss.drv/audio.h
+++ b/dlls/wineoss.drv/audio.h
@@ -62,7 +62,7 @@ enum win_wm_message {
typedef struct {
enum win_wm_message msg; /* message identifier */
- DWORD param; /* parameter for this message */
+ DWORD_PTR param; /* parameter for this message */
HANDLE hEvent; /* if message is synchronous, handle of event for synchro */
} OSS_MSG;
diff --git a/dlls/wineoss.drv/dscapture.c b/dlls/wineoss.drv/dscapture.c
index e058c26..6df133a 100644
--- a/dlls/wineoss.drv/dscapture.c
+++ b/dlls/wineoss.drv/dscapture.c
@@ -319,8 +319,8 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions(
if (TRACE_ON(dscapture)) {
int i;
for (i=0;i<howmuch;i++)
- TRACE("notify at %d to 0x%08x\n",
- notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
+ TRACE("notify at %d to 0x%08lx\n",
+ notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify);
}
/* Make an internal copy of the caller-supplied array.
diff --git a/dlls/wineoss.drv/dsrender.c b/dlls/wineoss.drv/dsrender.c
index 57e3dd1..79aa2ea 100644
--- a/dlls/wineoss.drv/dsrender.c
+++ b/dlls/wineoss.drv/dsrender.c
@@ -305,8 +305,8 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions(
if (TRACE_ON(wave)) {
int i;
for (i=0;i<howmuch;i++)
- TRACE("notify at %d to 0x%08x\n",
- notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
+ TRACE("notify at %d to 0x%08lx\n",
+ notify[i].dwOffset,(DWORD_PTR)notify[i].hEventNotify);
}
/* Make an internal copy of the caller-supplied array.
diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c
index ade1928..e21e559 100644
--- a/dlls/wineoss.drv/midi.c
+++ b/dlls/wineoss.drv/midi.c
@@ -569,7 +569,7 @@ static void midReceiveChar(WORD wDevID, unsigned char value, DWORD dwTime)
lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
lpMidiHdr->dwFlags |= MHDR_DONE;
MidiInDev[wDevID].lpQueueHdr = lpMidiHdr->lpNext;
- if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) {
+ if (MIDI_NotifyClient(wDevID, MIM_LONGDATA, (DWORD_PTR)lpMidiHdr, dwTime) != MMSYSERR_NOERROR) {
WARN("Couldn't notify client\n");
}
}
@@ -923,7 +923,7 @@ static DWORD midReset(WORD wDevID)
MidiInDev[wDevID].lpQueueHdr->dwFlags |= MHDR_DONE;
/* FIXME: when called from 16 bit, lpQueueHdr needs to be a segmented ptr */
if (MIDI_NotifyClient(wDevID, MIM_LONGDATA,
- (DWORD)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) {
+ (DWORD_PTR)MidiInDev[wDevID].lpQueueHdr, dwTime) != MMSYSERR_NOERROR) {
WARN("Couldn't notify client\n");
}
MidiInDev[wDevID].lpQueueHdr = MidiInDev[wDevID].lpQueueHdr->lpNext;
@@ -1594,7 +1594,7 @@ static DWORD modLongData(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
lpMidiHdr->dwFlags &= ~MHDR_INQUEUE;
lpMidiHdr->dwFlags |= MHDR_DONE;
- if (MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD)lpMidiHdr, 0L) != MMSYSERR_NOERROR) {
+ if (MIDI_NotifyClient(wDevID, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L) != MMSYSERR_NOERROR) {
WARN("can't notify client !\n");
return MMSYSERR_INVALPARAM;
}
@@ -1620,8 +1620,9 @@ static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 ||
lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 ||
lpMidiHdr->dwBufferLength >= 0x10000ul) {
- WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL,
- lpMidiHdr ? lpMidiHdr->dwFlags : 0, sizeof(MIDIHDR), dwSize);
+ WARN("%p %p %08x %ld/%d\n",
+ lpMidiHdr, lpMidiHdr ? lpMidiHdr->lpData : NULL,
+ lpMidiHdr ? lpMidiHdr->dwFlags : 0, (long)sizeof(MIDIHDR), dwSize);
return MMSYSERR_INVALPARAM;
}
@@ -1701,10 +1702,10 @@ LRESULT OSS_MidiExit(void)
/**************************************************************************
* midMessage (WINEOSS.4)
*/
-DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
+ TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) {
#ifdef HAVE_OSS_MIDI
@@ -1744,10 +1745,10 @@ DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
/**************************************************************************
* modMessage (WINEOSS.5)
*/
-DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
+ TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) {
diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c
index 34588f9..951f7ba 100644
--- a/dlls/wineoss.drv/mixer.c
+++ b/dlls/wineoss.drv/mixer.c
@@ -787,8 +787,8 @@ static DWORD MIX_GetLineInfo(WORD wDevID, LPMIXERLINEW lpMl, DWORD fdwInfo)
}
if (lpMl->cbStruct != sizeof(*lpMl)) {
- WARN("invalid parameter: lpMl->cbStruct = %d != %d\n",
- lpMl->cbStruct, sizeof(*lpMl));
+ WARN("invalid parameter: lpMl->cbStruct = %d != %ld\n",
+ lpMl->cbStruct, (long)sizeof(*lpMl));
return MMSYSERR_INVALPARAM;
}
@@ -963,14 +963,14 @@ static DWORD MIX_GetLineControls(WORD wDevID, LPMIXERLINECONTROLSW lpMlc,
}
if (lpMlc->cbStruct < sizeof(*lpMlc)) {
- WARN("invalid parameter: lpMlc->cbStruct = %d < %d\n",
- lpMlc->cbStruct, sizeof(*lpMlc));
+ WARN("invalid parameter: lpMlc->cbStruct = %d < %ld\n",
+ lpMlc->cbStruct, (long)sizeof(*lpMlc));
return MMSYSERR_INVALPARAM;
}
if (lpMlc->cbmxctrl < sizeof(MIXERCONTROLW)) {
- WARN("invalid parameter: lpMlc->cbmxctrl = %d < %d\n",
- lpMlc->cbmxctrl, sizeof(MIXERCONTROLW));
+ WARN("invalid parameter: lpMlc->cbmxctrl = %d < %ld\n",
+ lpMlc->cbmxctrl, (long)sizeof(MIXERCONTROLW));
return MMSYSERR_INVALPARAM;
}
@@ -1098,8 +1098,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails !=
sizeof(MIXERCONTROLDETAILS_UNSIGNED)) {
- WARN("invalid parameter: cbDetails != %d\n",
- sizeof(MIXERCONTROLDETAILS_UNSIGNED));
+ WARN("invalid parameter: cbDetails != %ld\n",
+ (long)sizeof(MIXERCONTROLDETAILS_UNSIGNED));
return MMSYSERR_INVALPARAM;
}
@@ -1145,8 +1145,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails !=
sizeof(MIXERCONTROLDETAILS_BOOLEAN)) {
- WARN("invalid parameter: cbDetails != %d\n",
- sizeof(MIXERCONTROLDETAILS_BOOLEAN));
+ WARN("invalid parameter: cbDetails != %ld\n",
+ (long)sizeof(MIXERCONTROLDETAILS_BOOLEAN));
return MMSYSERR_INVALPARAM;
}
@@ -1167,8 +1167,8 @@ static DWORD MIX_GetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails !=
sizeof(MIXERCONTROLDETAILS_BOOLEAN)) {
- WARN("invalid parameter: cbDetails != %d\n",
- sizeof(MIXERCONTROLDETAILS_BOOLEAN));
+ WARN("invalid parameter: cbDetails != %ld\n",
+ (long)sizeof(MIXERCONTROLDETAILS_BOOLEAN));
return MMSYSERR_INVALPARAM;
}
@@ -1299,8 +1299,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails !=
sizeof(MIXERCONTROLDETAILS_UNSIGNED)) {
- WARN("invalid parameter: cbDetails != %d\n",
- sizeof(MIXERCONTROLDETAILS_UNSIGNED));
+ WARN("invalid parameter: cbDetails != %ld\n",
+ (long)sizeof(MIXERCONTROLDETAILS_UNSIGNED));
return MMSYSERR_INVALPARAM;
}
@@ -1351,8 +1351,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails !=
sizeof(MIXERCONTROLDETAILS_BOOLEAN)) {
- WARN("invalid parameter: cbDetails != %d\n",
- sizeof(MIXERCONTROLDETAILS_BOOLEAN));
+ WARN("invalid parameter: cbDetails != %ld\n",
+ (long)sizeof(MIXERCONTROLDETAILS_BOOLEAN));
return MMSYSERR_INVALPARAM;
}
@@ -1395,8 +1395,8 @@ static DWORD MIX_SetControlDetails(WORD wDevID, LPMIXERCONTROLDETAILS lpmcd,
if (lpmcd->cbDetails !=
sizeof(MIXERCONTROLDETAILS_BOOLEAN)) {
- WARN("invalid parameter: cbDetails != %d\n",
- sizeof(MIXERCONTROLDETAILS_BOOLEAN));
+ WARN("invalid parameter: cbDetails != %ld\n",
+ (long)sizeof(MIXERCONTROLDETAILS_BOOLEAN));
return MMSYSERR_INVALPARAM;
}
@@ -1524,11 +1524,11 @@ static DWORD MIX_GetNumDevs(void)
/**************************************************************************
* mxdMessage (WINEOSS.3)
*/
-DWORD WINAPI OSS_mxdMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
#ifdef HAVE_OSS
- TRACE("(%04X, %s, %08X, %08X, %08X);\n", wDevID, getMessage(wMsg),
+ TRACE("(%04X, %s, %08lX, %08lX, %08lX);\n", wDevID, getMessage(wMsg),
dwUser, dwParam1, dwParam2);
switch (wMsg)
@@ -1540,7 +1540,7 @@ DWORD WINAPI OSS_mxdMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
/* FIXME: Pretend this is supported */
return 0;
case MXDM_GETDEVCAPS:
- return MIX_GetDevCaps(wDevID, (LPMIXERCAPSW)dwParam1, dwParam2);
+ return MIX_GetDevCaps(wDevID, (LPMIXERCAPSW)dwParam1, dwParam2);
case MXDM_GETLINEINFO:
return MIX_GetLineInfo(wDevID, (LPMIXERLINEW)dwParam1, dwParam2);
case MXDM_GETNUMDEVS:
diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c
index b48ea6b..44e22b7 100644
--- a/dlls/wineoss.drv/mmaux.c
+++ b/dlls/wineoss.drv/mmaux.c
@@ -219,10 +219,10 @@ static DWORD AUX_SetVolume(WORD wDevID, DWORD dwParam)
/**************************************************************************
* auxMessage (WINEOSS.2)
*/
-DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
- DWORD dwParam1, DWORD dwParam2)
+DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
+ DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
- TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
+ TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
#ifdef HAVE_OSS
@@ -250,3 +250,4 @@ DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
return MMSYSERR_NOTENABLED;
#endif
}
+
--
1.5.6.5
--------------070905060501070406000104--
More information about the wine-patches
mailing list