winmm/wineoss: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Fri Oct 6 15:59:51 CDT 2006
---
dlls/winmm/wineoss/Makefile.in | 1
dlls/winmm/wineoss/audio.c | 106 ++++++++++++++++++++--------------------
dlls/winmm/wineoss/dscapture.c | 54 ++++++++++----------
dlls/winmm/wineoss/dsrender.c | 44 ++++++++---------
dlls/winmm/wineoss/midi.c | 44 ++++++++---------
dlls/winmm/wineoss/mixer.c | 96 ++++++++++++++++++------------------
dlls/winmm/wineoss/mmaux.c | 6 +-
7 files changed, 175 insertions(+), 176 deletions(-)
diff --git a/dlls/winmm/wineoss/Makefile.in b/dlls/winmm/wineoss/Makefile.in
index e61a231..8c65b36 100644
--- a/dlls/winmm/wineoss/Makefile.in
+++ b/dlls/winmm/wineoss/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
MODULE = wineoss.drv
IMPORTS = winmm user32 kernel32
EXTRALIBS = -ldxguid -luuid
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
audio.c \
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index ec90234..eb43648 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -226,19 +226,19 @@ static DWORD widDevInterface(UINT wDevID
static DWORD bytes_to_mmtime(LPMMTIME lpTime, DWORD position,
WAVEFORMATPCMEX* format)
{
- TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%lu nChannels=%u nAvgBytesPerSec=%lu\n",
+ TRACE("wType=%04X wBitsPerSample=%u nSamplesPerSec=%u nChannels=%u nAvgBytesPerSec=%u\n",
lpTime->wType, format->Format.wBitsPerSample, format->Format.nSamplesPerSec,
format->Format.nChannels, format->Format.nAvgBytesPerSec);
- TRACE("Position in bytes=%lu\n", position);
+ TRACE("Position in bytes=%u\n", position);
switch (lpTime->wType) {
case TIME_SAMPLES:
lpTime->u.sample = position / (format->Format.wBitsPerSample / 8 * format->Format.nChannels);
- TRACE("TIME_SAMPLES=%lu\n", lpTime->u.sample);
+ TRACE("TIME_SAMPLES=%u\n", lpTime->u.sample);
break;
case TIME_MS:
lpTime->u.ms = 1000.0 * position / (format->Format.wBitsPerSample / 8 * format->Format.nChannels * format->Format.nSamplesPerSec);
- TRACE("TIME_MS=%lu\n", lpTime->u.ms);
+ TRACE("TIME_MS=%u\n", lpTime->u.ms);
break;
case TIME_SMPTE:
lpTime->u.smpte.fps = 30;
@@ -262,7 +262,7 @@ static DWORD bytes_to_mmtime(LPMMTIME lp
/* fall through */
case TIME_BYTES:
lpTime->u.cb = position;
- TRACE("TIME_BYTES=%lu\n", lpTime->u.cb);
+ TRACE("TIME_BYTES=%u\n", lpTime->u.cb);
break;
}
return MMSYSERR_NOERROR;
@@ -852,7 +852,7 @@ #ifdef DSP_CAP_MULTI /* not every oss
#endif
}
OSS_CloseDevice(ossdev);
- TRACE("out wChannels = %d, dwFormats = %08lX, dwSupport = %08lX\n",
+ TRACE("out wChannels = %d, dwFormats = %08X, dwSupport = %08X\n",
ossdev->out_caps.wChannels, ossdev->out_caps.dwFormats,
ossdev->out_caps.dwSupport);
return TRUE;
@@ -962,7 +962,7 @@ #endif
ossdev->in_caps_support |= WAVECAPS_SAMPLEACCURATE;
}
OSS_CloseDevice(ossdev);
- TRACE("in wChannels = %d, dwFormats = %08lX, in_caps_support = %08lX\n",
+ TRACE("in wChannels = %d, dwFormats = %08X, in_caps_support = %08X\n",
ossdev->in_caps.wChannels, ossdev->in_caps.dwFormats, ossdev->in_caps_support);
return TRUE;
}
@@ -1080,7 +1080,7 @@ #endif /* SOUND_MIXER_INFO */
}
}
OSS_CloseDevice(ossdev);
- TRACE("duplex wChannels = %d, dwFormats = %08lX, dwSupport = %08lX\n",
+ TRACE("duplex wChannels = %d, dwFormats = %08X, dwSupport = %08X\n",
ossdev->duplex_out_caps.wChannels,
ossdev->duplex_out_caps.dwFormats,
ossdev->duplex_out_caps.dwSupport);
@@ -1379,7 +1379,7 @@ static int OSS_PeekRingMessage(OSS_MSG_R
*/
static DWORD wodNotifyClient(WINE_WAVEOUT* wwo, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
{
- TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lX dwParam2 = %04lX\n", wMsg,
+ TRACE("wMsg = 0x%04x (%s) dwParm1 = %04X dwParam2 = %04X\n", wMsg,
wMsg == WOM_OPEN ? "WOM_OPEN" : wMsg == WOM_CLOSE ? "WOM_CLOSE" :
wMsg == WOM_DONE ? "WOM_DONE" : "Unknown", dwParam1, dwParam2);
@@ -1455,7 +1455,7 @@ static void wodPlayer_BeginWaveHdr(WINE_
if (wwo->lpLoopPtr) {
WARN("Already in a loop. Discarding loop on this header (%p)\n", lpWaveHdr);
} else {
- TRACE("Starting loop (%ldx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr);
+ TRACE("Starting loop (%dx) with %p\n", lpWaveHdr->dwLoops, lpWaveHdr);
wwo->lpLoopPtr = lpWaveHdr;
/* Windows does not touch WAVEHDR.dwLoops,
* so we need to make an internal copy */
@@ -1556,14 +1556,14 @@ static BOOL wodPlayer_WriteMaxFrags(WINE
int written;
BOOL ret = FALSE;
- TRACE("Writing wavehdr %p.%lu[%lu]/%lu\n",
+ TRACE("Writing wavehdr %p.%u[%u]/%u\n",
wwo->lpPlayPtr, wwo->dwPartialOffset, wwo->lpPlayPtr->dwBufferLength, toWrite);
if (toWrite > 0)
{
written = write(wwo->ossdev->fd, wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, toWrite);
if (written <= 0) {
- TRACE("write(%s, %p, %ld) failed (%s) returned %d\n", wwo->ossdev->dev_name,
+ TRACE("write(%s, %p, %d) failed (%s) returned %d\n", wwo->ossdev->dev_name,
wwo->lpPlayPtr->lpData + wwo->dwPartialOffset, toWrite, strerror(errno), written);
return FALSE;
}
@@ -1581,7 +1581,7 @@ static BOOL wodPlayer_WriteMaxFrags(WINE
}
*bytes -= written;
wwo->dwWrittenTotal += written;
- TRACE("dwWrittenTotal=%lu\n", wwo->dwWrittenTotal);
+ TRACE("dwWrittenTotal=%u\n", wwo->dwWrittenTotal);
return ret;
}
@@ -1626,7 +1626,7 @@ #else
{
if (lpWaveHdr == wwo->lpPlayPtr) {TRACE("play %p\n", lpWaveHdr); break;}
if (lpWaveHdr == wwo->lpLoopPtr) {TRACE("loop %p\n", lpWaveHdr); break;}
- if (lpWaveHdr->reserved > wwo->dwPlayedTotal){TRACE("still playing %p (%lu/%lu)\n", lpWaveHdr, lpWaveHdr->reserved, wwo->dwPlayedTotal);break;}
+ if (lpWaveHdr->reserved > wwo->dwPlayedTotal) {TRACE("still playing %p (%u/%u)\n", lpWaveHdr, lpWaveHdr->reserved, wwo->dwPlayedTotal);break;}
}
wwo->lpQueuePtr = lpWaveHdr->lpNext;
@@ -1728,7 +1728,7 @@ static void wodPlayer_ProcessMessages(WI
HANDLE ev;
while (OSS_RetrieveRingMessage(&wwo->msgRing, &msg, ¶m, &ev)) {
- TRACE("Received %s %lx\n", getCmdString(msg), param);
+ TRACE("Received %s %x\n", getCmdString(msg), param);
switch (msg) {
case WINE_WM_PAUSING:
wodPlayer_Reset(wwo, FALSE);
@@ -1810,7 +1810,7 @@ static DWORD wodPlayer_FeedDSP(WINE_WAVE
/* Feed wavehdrs until we run out of wavehdrs or DSP space */
if (wwo->dwPartialOffset == 0 && wwo->lpPlayPtr) {
do {
- TRACE("Setting time to elapse for %p to %lu\n",
+ TRACE("Setting time to elapse for %p to %u\n",
wwo->lpPlayPtr, wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength);
/* note the value that dwPlayedTotal will return when this wave finishes playing */
wwo->lpPlayPtr->reserved = wwo->dwWrittenTotal + wwo->lpPlayPtr->dwBufferLength;
@@ -1849,7 +1849,7 @@ static DWORD CALLBACK wodPlayer(LPVOID p
* are no pending actions, wait forever for a command.
*/
dwSleepTime = min(dwNextFeedTime, dwNextNotifyTime);
- TRACE("waiting %lums (%lu,%lu)\n", dwSleepTime, dwNextFeedTime, dwNextNotifyTime);
+ TRACE("waiting %ums (%u,%u)\n", dwSleepTime, dwNextFeedTime, dwNextNotifyTime);
WAIT_OMR(&wwo->msgRing, dwSleepTime);
wodPlayer_ProcessMessages(wwo);
if (wwo->state == WINE_WS_PLAYING) {
@@ -1885,7 +1885,7 @@ static DWORD CALLBACK wodPlayer(LPVOID p
*/
static DWORD wodGetDevCaps(WORD wDevID, LPWAVEOUTCAPSW lpCaps, DWORD dwSize)
{
- TRACE("(%u, %p, %lu);\n", wDevID, lpCaps, dwSize);
+ TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize);
if (lpCaps == NULL) {
WARN("not enabled\n");
@@ -1915,7 +1915,7 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDES
audio_buf_info info;
DWORD ret;
- TRACE("(%u, %p[cb=%08lx], %08lX);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags);
+ TRACE("(%u, %p[cb=%08x], %08X);\n", wDevID, lpDesc, lpDesc->dwCallback, dwFlags);
if (lpDesc == NULL) {
WARN("Invalid Parameter !\n");
return MMSYSERR_INVALPARAM;
@@ -1927,20 +1927,20 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDES
/* only PCM format is supported so far... */
if (!supportedFormat(lpDesc->lpFormat)) {
- WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
+ WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec);
return WAVERR_BADFORMAT;
}
if (dwFlags & WAVE_FORMAT_QUERY) {
- TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
+ TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec);
return MMSYSERR_NOERROR;
}
- TRACE("OSS_OpenDevice requested this format: %ldx%dx%d %s\n",
+ TRACE("OSS_OpenDevice requested this format: %dx%dx%d %s\n",
lpDesc->lpFormat->nSamplesPerSec,
lpDesc->lpFormat->wBitsPerSample,
lpDesc->lpFormat->nChannels,
@@ -1976,7 +1976,7 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDES
audio_fragment = 0x00100000 + shift; /* 16 fragments of 2^shift */
}
- TRACE("requesting %d %d byte fragments (%ld ms/fragment)\n",
+ TRACE("requesting %d %d byte fragments (%d ms/fragment)\n",
audio_fragment >> 16, 1 << (audio_fragment & 0xffff),
((1 << (audio_fragment & 0xffff)) * 1000) / lpDesc->lpFormat->nAvgBytesPerSec);
@@ -2001,7 +2001,7 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDES
lpDesc->lpFormat->wBitsPerSample=(wwo->ossdev->format == AFMT_U8 ? 8 : 16);
lpDesc->lpFormat->nBlockAlign=lpDesc->lpFormat->nChannels*lpDesc->lpFormat->wBitsPerSample/8;
lpDesc->lpFormat->nAvgBytesPerSec=lpDesc->lpFormat->nSamplesPerSec*lpDesc->lpFormat->nBlockAlign;
- TRACE("OSS_OpenDevice returned this format: %ldx%dx%d\n",
+ TRACE("OSS_OpenDevice returned this format: %dx%dx%d\n",
lpDesc->lpFormat->nSamplesPerSec,
lpDesc->lpFormat->wBitsPerSample,
lpDesc->lpFormat->nChannels);
@@ -2048,10 +2048,10 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDES
wwo->dwWrittenTotal = 0;
wwo->bNeedPost = TRUE;
- TRACE("fd=%d fragstotal=%d fragsize=%d BufferSize=%ld\n",
+ TRACE("fd=%d fragstotal=%d fragsize=%d BufferSize=%d\n",
wwo->ossdev->fd, info.fragstotal, info.fragsize, wwo->dwBufferSize);
if (wwo->dwFragmentSize % wwo->waveFormat.Format.nBlockAlign) {
- ERR("Fragment doesn't contain an integral number of data blocks fragsize=%ld BlockAlign=%d\n",wwo->dwFragmentSize,wwo->waveFormat.Format.nBlockAlign);
+ ERR("Fragment doesn't contain an integral number of data blocks fragsize=%d BlockAlign=%d\n",wwo->dwFragmentSize,wwo->waveFormat.Format.nBlockAlign);
/* Some SoundBlaster 16 cards return an incorrect (odd) fragment
* size for 16 bit sound. This will cause a system crash when we try
* to write just the specified odd number of bytes. So if we
@@ -2070,7 +2070,7 @@ DWORD wodOpen(WORD wDevID, LPWAVEOPENDES
CloseHandle(wwo->hStartUpEvent);
wwo->hStartUpEvent = INVALID_HANDLE_VALUE;
- TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%lu, nSamplesPerSec=%lu, nChannels=%u nBlockAlign=%u!\n",
+ TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n",
wwo->waveFormat.Format.wBitsPerSample, wwo->waveFormat.Format.nAvgBytesPerSec,
wwo->waveFormat.Format.nSamplesPerSec, wwo->waveFormat.Format.nChannels,
wwo->waveFormat.Format.nBlockAlign);
@@ -2118,7 +2118,7 @@ static DWORD wodClose(WORD wDevID)
*/
static DWORD wodWrite(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
{
- TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize);
+ TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize);
/* first, do the sanity checks... */
if (wDevID >= numOutDev || WOutDev[wDevID].state == WINE_WS_CLOSED) {
@@ -2138,7 +2138,7 @@ static DWORD wodWrite(WORD wDevID, LPWAV
if ((lpWaveHdr->dwBufferLength & (WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1)) != 0)
{
- WARN("WaveHdr length isn't a multiple of the PCM block size: %ld %% %d\n",lpWaveHdr->dwBufferLength,WOutDev[wDevID].waveFormat.Format.nBlockAlign);
+ WARN("WaveHdr length isn't a multiple of the PCM block size: %d %% %d\n",lpWaveHdr->dwBufferLength,WOutDev[wDevID].waveFormat.Format.nBlockAlign);
lpWaveHdr->dwBufferLength &= ~(WOutDev[wDevID].waveFormat.Format.nBlockAlign - 1);
}
@@ -2210,7 +2210,7 @@ static DWORD wodGetPosition(WORD wDevID,
{
WINE_WAVEOUT* wwo;
- TRACE("(%u, %p, %lu);\n", wDevID, lpTime, uSize);
+ TRACE("(%u, %p, %u);\n", wDevID, lpTime, uSize);
if (wDevID >= numOutDev || WOutDev[wDevID].state == WINE_WS_CLOSED) {
WARN("bad device ID !\n");
@@ -2297,10 +2297,10 @@ static DWORD wodGetVolume(WORD wDevID, L
left = LOBYTE(volume);
right = HIBYTE(volume);
- TRACE("left=%ld right=%ld !\n", left, right);
+ TRACE("left=%d right=%d !\n", left, right);
last_left = (LOWORD(WOutDev[wDevID].volume) * 100) / 0xFFFFl;
last_right = (HIWORD(WOutDev[wDevID].volume) * 100) / 0xFFFFl;
- TRACE("last_left=%ld last_right=%ld !\n", last_left, last_right);
+ TRACE("last_left=%d last_right=%d !\n", last_left, last_right);
if (last_left == left && last_right == right)
*lpdwVol = WOutDev[wDevID].volume;
else
@@ -2317,7 +2317,7 @@ DWORD wodSetVolume(WORD wDevID, DWORD dw
int volume;
DWORD left, right;
- TRACE("(%u, %08lX);\n", wDevID, dwParam);
+ TRACE("(%u, %08X);\n", wDevID, dwParam);
left = (LOWORD(dwParam) * 100) / 0xFFFFl;
right = (HIWORD(dwParam) * 100) / 0xFFFFl;
@@ -2363,7 +2363,7 @@ DWORD wodSetVolume(WORD wDevID, DWORD dw
DWORD WINAPI OSS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
- TRACE("(%u, %s, %08lX, %08lX, %08lX);\n",
+ TRACE("(%u, %s, %08X, %08X, %08X);\n",
wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2);
switch (wMsg) {
@@ -2411,7 +2411,7 @@ DWORD WINAPI OSS_wodMessage(UINT wDevID,
*/
static DWORD widNotifyClient(WINE_WAVEIN* wwi, WORD wMsg, DWORD dwParam1, DWORD dwParam2)
{
- TRACE("wMsg = 0x%04x (%s) dwParm1 = %04lX dwParam2 = %04lX\n", wMsg,
+ TRACE("wMsg = 0x%04x (%s) dwParm1 = %04X dwParam2 = %04X\n", wMsg,
wMsg == WIM_OPEN ? "WIM_OPEN" : wMsg == WIM_CLOSE ? "WIM_CLOSE" :
wMsg == WIM_DATA ? "WIM_DATA" : "Unknown", dwParam1, dwParam2);
@@ -2439,7 +2439,7 @@ static DWORD widNotifyClient(WINE_WAVEIN
*/
static DWORD widGetDevCaps(WORD wDevID, LPWAVEINCAPSW lpCaps, DWORD dwSize)
{
- TRACE("(%u, %p, %lu);\n", wDevID, lpCaps, dwSize);
+ TRACE("(%u, %p, %u);\n", wDevID, lpCaps, dwSize);
if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
@@ -2519,7 +2519,7 @@ static DWORD CALLBACK widRecorder(LPVOID
/* make sleep time to be # of ms to output a fragment */
dwSleepTime = (wwi->dwFragmentSize * 1000) / wwi->waveFormat.Format.nAvgBytesPerSec;
- TRACE("sleeptime=%ld ms\n", dwSleepTime);
+ TRACE("sleeptime=%d ms\n", dwSleepTime);
for (;;) {
/* wait for dwSleepTime or an event in thread's queue */
@@ -2546,7 +2546,7 @@ static DWORD CALLBACK widRecorder(LPVOID
lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded,
wwi->dwFragmentSize);
- TRACE("bytesRead=%ld (direct)\n", bytesRead);
+ TRACE("bytesRead=%d (direct)\n", bytesRead);
if (bytesRead != (DWORD) -1)
{
/* update number of bytes recorded in current buffer and by this device */
@@ -2570,7 +2570,7 @@ static DWORD CALLBACK widRecorder(LPVOID
lpWaveHdr = lpNext;
}
} else {
- TRACE("read(%s, %p, %ld) failed (%s)\n", wwi->ossdev->dev_name,
+ TRACE("read(%s, %p, %d) failed (%s)\n", wwi->ossdev->dev_name,
lpWaveHdr->lpData + lpWaveHdr->dwBytesRecorded,
wwi->dwFragmentSize, strerror(errno));
}
@@ -2581,10 +2581,10 @@ static DWORD CALLBACK widRecorder(LPVOID
bytesRead = read(wwi->ossdev->fd, buffer, wwi->dwFragmentSize);
pOffset = buffer;
- TRACE("bytesRead=%ld (local)\n", bytesRead);
+ TRACE("bytesRead=%d (local)\n", bytesRead);
if (bytesRead == (DWORD) -1) {
- TRACE("read(%s, %p, %ld) failed (%s)\n", wwi->ossdev->dev_name,
+ TRACE("read(%s, %p, %d) failed (%s)\n", wwi->ossdev->dev_name,
buffer, wwi->dwFragmentSize, strerror(errno));
continue;
}
@@ -2648,7 +2648,7 @@ static DWORD CALLBACK widRecorder(LPVOID
/* no more buffer to copy data to, but we did read more.
* what hasn't been copied will be dropped
*/
- WARN("buffer under run! %lu bytes dropped.\n", bytesRead);
+ WARN("buffer under run! %u bytes dropped.\n", bytesRead);
wwi->lpQueuePtr = NULL;
break;
}
@@ -2663,7 +2663,7 @@ static DWORD CALLBACK widRecorder(LPVOID
while (OSS_RetrieveRingMessage(&wwi->msgRing, &msg, ¶m, &ev))
{
- TRACE("msg=%s param=0x%lx\n", getCmdString(msg), param);
+ TRACE("msg=%s param=0x%x\n", getCmdString(msg), param);
switch (msg) {
case WINE_WM_PAUSING:
wwi->state = WINE_WS_PAUSED;
@@ -2807,7 +2807,7 @@ DWORD widOpen(WORD wDevID, LPWAVEOPENDES
int audio_fragment;
DWORD ret;
- TRACE("(%u, %p, %08lX);\n", wDevID, lpDesc, dwFlags);
+ TRACE("(%u, %p, %08X);\n", wDevID, lpDesc, dwFlags);
if (lpDesc == NULL) {
WARN("Invalid Parameter !\n");
return MMSYSERR_INVALPARAM;
@@ -2819,20 +2819,20 @@ DWORD widOpen(WORD wDevID, LPWAVEOPENDES
/* only PCM format is supported so far... */
if (!supportedFormat(lpDesc->lpFormat)) {
- WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
+ WARN("Bad format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec);
return WAVERR_BADFORMAT;
}
if (dwFlags & WAVE_FORMAT_QUERY) {
- TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%ld !\n",
+ TRACE("Query format: tag=%04X nChannels=%d nSamplesPerSec=%d !\n",
lpDesc->lpFormat->wFormatTag, lpDesc->lpFormat->nChannels,
lpDesc->lpFormat->nSamplesPerSec);
return MMSYSERR_NOERROR;
}
- TRACE("OSS_OpenDevice requested this format: %ldx%dx%d %s\n",
+ TRACE("OSS_OpenDevice requested this format: %dx%dx%d %s\n",
lpDesc->lpFormat->nSamplesPerSec,
lpDesc->lpFormat->wBitsPerSample,
lpDesc->lpFormat->nChannels,
@@ -2879,7 +2879,7 @@ DWORD widOpen(WORD wDevID, LPWAVEOPENDES
}
}
- TRACE("requesting %d %d byte fragments (%ld ms)\n", audio_fragment >> 16,
+ TRACE("requesting %d %d byte fragments (%d ms)\n", audio_fragment >> 16,
1 << (audio_fragment & 0xffff),
((1 << (audio_fragment & 0xffff)) * 1000) / lpDesc->lpFormat->nAvgBytesPerSec);
@@ -2925,8 +2925,8 @@ DWORD widOpen(WORD wDevID, LPWAVEOPENDES
wwi->dwFragmentSize = info.fragsize;
- TRACE("dwFragmentSize=%lu\n", wwi->dwFragmentSize);
- TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%lu, nSamplesPerSec=%lu, nChannels=%u nBlockAlign=%u!\n",
+ TRACE("dwFragmentSize=%u\n", wwi->dwFragmentSize);
+ TRACE("wBitsPerSample=%u, nAvgBytesPerSec=%u, nSamplesPerSec=%u, nChannels=%u nBlockAlign=%u!\n",
wwi->waveFormat.Format.wBitsPerSample, wwi->waveFormat.Format.nAvgBytesPerSec,
wwi->waveFormat.Format.nSamplesPerSec, wwi->waveFormat.Format.nChannels,
wwi->waveFormat.Format.nBlockAlign);
@@ -2977,7 +2977,7 @@ static DWORD widClose(WORD wDevID)
*/
static DWORD widAddBuffer(WORD wDevID, LPWAVEHDR lpWaveHdr, DWORD dwSize)
{
- TRACE("(%u, %p, %08lX);\n", wDevID, lpWaveHdr, dwSize);
+ TRACE("(%u, %p, %08X);\n", wDevID, lpWaveHdr, dwSize);
if (wDevID >= numInDev || WInDev[wDevID].state == WINE_WS_CLOSED) {
WARN("can't do it !\n");
@@ -3053,7 +3053,7 @@ static DWORD widGetPosition(WORD wDevID,
{
WINE_WAVEIN* wwi;
- TRACE("(%u, %p, %lu);\n", wDevID, lpTime, uSize);
+ TRACE("(%u, %p, %u);\n", wDevID, lpTime, uSize);
if (wDevID >= numInDev || WInDev[wDevID].state == WINE_WS_CLOSED) {
WARN("can't get pos !\n");
@@ -3080,7 +3080,7 @@ #endif
DWORD WINAPI OSS_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
- TRACE("(%u, %s, %08lX, %08lX, %08lX);\n",
+ TRACE("(%u, %s, %08X, %08X, %08X);\n",
wDevID, getMessage(wMsg), dwUser, dwParam1, dwParam2);
switch (wMsg) {
diff --git a/dlls/winmm/wineoss/dscapture.c b/dlls/winmm/wineoss/dscapture.c
index b4f5529..5a1a80c 100644
--- a/dlls/winmm/wineoss/dscapture.c
+++ b/dlls/winmm/wineoss/dscapture.c
@@ -177,7 +177,7 @@ static ULONG WINAPI IDsCaptureDriverProp
IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -188,7 +188,7 @@ static ULONG WINAPI IDsCaptureDriverProp
IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) {
IDsCaptureDriverBuffer_Release((PIDSCDRIVERBUFFER)This->capture_buffer);
@@ -209,7 +209,7 @@ static HRESULT WINAPI IDsCaptureDriverPr
PULONG pcbReturnedData )
{
IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface;
- FIXME("(%p,%p,%p,%lx,%p,%lx,%p)\n",This,pDsProperty,pPropertyParams,
+ FIXME("(%p,%p,%p,%x,%p,%x,%p)\n",This,pDsProperty,pPropertyParams,
cbPropertyParams,pPropertyData,cbPropertyData,pcbReturnedData);
return DSERR_UNSUPPORTED;
}
@@ -223,7 +223,7 @@ static HRESULT WINAPI IDsCaptureDriverPr
ULONG cbPropertyData )
{
IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface;
- FIXME("(%p,%p,%p,%lx,%p,%lx)\n",This,pDsProperty,pPropertyParams,
+ FIXME("(%p,%p,%p,%x,%p,%x)\n",This,pDsProperty,pPropertyParams,
cbPropertyParams,pPropertyData,cbPropertyData);
return DSERR_UNSUPPORTED;
}
@@ -235,7 +235,7 @@ static HRESULT WINAPI IDsCaptureDriverPr
PULONG pSupport )
{
IDsCaptureDriverPropertySetImpl *This = (IDsCaptureDriverPropertySetImpl *)iface;
- FIXME("(%p,%s,%lx,%p)\n",This,debugstr_guid(PropertySetId),PropertyId,
+ FIXME("(%p,%s,%x,%p)\n",This,debugstr_guid(PropertySetId),PropertyId,
pSupport);
return DSERR_UNSUPPORTED;
}
@@ -281,7 +281,7 @@ static ULONG WINAPI IDsCaptureDriverNoti
IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -292,7 +292,7 @@ static ULONG WINAPI IDsCaptureDriverNoti
IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) {
IDsCaptureDriverBuffer_Release((PIDSCDRIVERBUFFER)This->capture_buffer);
@@ -309,7 +309,7 @@ static HRESULT WINAPI IDsCaptureDriverNo
LPCDSBPOSITIONNOTIFY notify)
{
IDsCaptureDriverNotifyImpl *This = (IDsCaptureDriverNotifyImpl *)iface;
- TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify);
+ TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify);
if (!notify) {
WARN("invalid parameter\n");
@@ -319,7 +319,7 @@ static HRESULT WINAPI IDsCaptureDriverNo
if (TRACE_ON(dscapture)) {
int i;
for (i=0;i<howmuch;i++)
- TRACE("notify at %ld to 0x%08lx\n",
+ TRACE("notify at %d to 0x%08x\n",
notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
}
@@ -363,7 +363,7 @@ static HRESULT DSCDB_MapBuffer(IDsCaptur
return DSERR_GENERIC;
}
TRACE("(%p): sound device has been mapped for direct access at %p, "
- "size=%ld\n", dscdb, dscdb->mapping, dscdb->maplen);
+ "size=%d\n", dscdb, dscdb->mapping, dscdb->maplen);
}
return DS_OK;
}
@@ -430,7 +430,7 @@ static ULONG WINAPI IDsCaptureDriverBuff
IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -439,7 +439,7 @@ static ULONG WINAPI IDsCaptureDriverBuff
{
IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) {
WINE_WAVEIN* wwi;
@@ -485,7 +485,7 @@ static HRESULT WINAPI IDsCaptureDriverBu
DWORD dwFlags)
{
IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface;
- TRACE("(%p,%p,%p,%p,%p,%ld,%ld,0x%08lx)\n",This,ppvAudio1,pdwLen1,
+ TRACE("(%p,%p,%p,%p,%p,%d,%d,0x%08x)\n",This,ppvAudio1,pdwLen1,
ppvAudio2,pdwLen2,dwWritePosition,dwWriteLen,dwFlags);
if (This->is_direct_map) {
@@ -539,7 +539,7 @@ static HRESULT WINAPI IDsCaptureDriverBu
DWORD dwLen2)
{
IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface;
- TRACE("(%p,%p,%ld,%p,%ld)\n",This,pvAudio1,dwLen1,pvAudio2,dwLen2);
+ TRACE("(%p,%p,%d,%p,%d)\n",This,pvAudio1,dwLen1,pvAudio2,dwLen2);
if (This->is_direct_map)
This->map_readpos = (This->map_readpos + dwLen1 + dwLen2) % This->maplen;
@@ -582,7 +582,7 @@ static HRESULT WINAPI IDsCaptureDriverBu
*lpdwRead = This->readptr;
}
- TRACE("capturepos=%ld, readpos=%ld\n", lpdwCapture?*lpdwCapture:0,
+ TRACE("capturepos=%d, readpos=%d\n", lpdwCapture?*lpdwCapture:0,
lpdwRead?*lpdwRead:0);
return DS_OK;
}
@@ -611,7 +611,7 @@ static HRESULT WINAPI IDsCaptureDriverBu
{
IDsCaptureDriverBufferImpl *This = (IDsCaptureDriverBufferImpl *)iface;
int enable;
- TRACE("(%p,%lx)\n",This,dwFlags);
+ TRACE("(%p,%x)\n",This,dwFlags);
if (This->is_capturing)
return DS_OK;
@@ -737,7 +737,7 @@ static ULONG WINAPI IDsCaptureDriverImpl
IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -747,7 +747,7 @@ static ULONG WINAPI IDsCaptureDriverImpl
IDsCaptureDriverImpl *This = (IDsCaptureDriverImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) {
HeapFree(GetProcessHeap(),0,This);
@@ -821,15 +821,15 @@ static void DSCDB_CheckEvent(
{
LPDSBPOSITIONNOTIFY event = dscb->notifies + dscb->notify_index;
DWORD offset = event->dwOffset;
- TRACE("(%p,%ld,%ld,%ld)\n", dscb, writepos, len, buflen);
+ TRACE("(%p,%d,%d,%d)\n", dscb, writepos, len, buflen);
- TRACE("(%p) buflen = %ld, writeptr = %ld\n",
+ TRACE("(%p) buflen = %d, writeptr = %d\n",
dscb, dscb->buflen, dscb->writeptr);
- TRACE("checking %d, position %ld, event = %p\n",
+ TRACE("checking %d, position %d, event = %p\n",
dscb->notify_index, offset, event->hEventNotify);
if ((writepos + len) > offset) {
- TRACE("signalled event %p (%d) %ld\n",
+ TRACE("signalled event %p (%d) %d\n",
event->hEventNotify, dscb->notify_index, offset);
SetEvent(event->hEventNotify);
dscb->notify_index = (dscb->notify_index + 1) % dscb->nrofnotifies;
@@ -837,7 +837,7 @@ static void DSCDB_CheckEvent(
} else if ((writepos + len) > buflen) {
writepos = writepos + len - buflen;
if ((writepos + len) > offset) {
- TRACE("signalled event %p (%d) %ld\n",
+ TRACE("signalled event %p (%d) %d\n",
event->hEventNotify, dscb->notify_index, offset);
SetEvent(event->hEventNotify);
dscb->notify_index = (dscb->notify_index + 1) % dscb->nrofnotifies;
@@ -988,7 +988,7 @@ static HRESULT WINAPI IDsCaptureDriverIm
int audio_fragment, fsize, shift, ret;
BOOL bNewBuffer = FALSE;
WINE_WAVEIN* wwi;
- TRACE("(%p,%p,%lx,%lx,%p,%p,%p)\n",This,pwfx,dwFlags,dwCardAddress,
+ TRACE("(%p,%p,%x,%x,%p,%p,%p)\n",This,pwfx,dwFlags,dwCardAddress,
pdwcbBufferSize,ppbBuffer,ppvObj);
if (This->capture_buffer) {
@@ -1059,7 +1059,7 @@ static HRESULT WINAPI IDsCaptureDriverIm
shift--;
fsize = 1 << shift;
TRACE("shift = %d, fragment size = %d\n", shift, fsize);
- TRACE("BufferSize=%ld(%08lx)\n", *pdwcbBufferSize, *pdwcbBufferSize);
+ TRACE("BufferSize=%d(%08x)\n", *pdwcbBufferSize, *pdwcbBufferSize);
/* See if we can directly map the buffer first.
* (buffer length is multiple of a power of 2)
@@ -1103,7 +1103,7 @@ static HRESULT WINAPI IDsCaptureDriverIm
}
frag_size = 1 << (audio_fragment & 0xffff);
TRACE("is_direct_map = %s\n", (*ippdscdb)->is_direct_map ? "TRUE" : "FALSE");
- TRACE("requesting %d %d byte fragments (%d bytes) (%ld ms/fragment)\n",
+ TRACE("requesting %d %d byte fragments (%d bytes) (%d ms/fragment)\n",
audio_fragment >> 16, frag_size, frag_size * (audio_fragment >> 16),
(frag_size * 1000) / pwfx->nAvgBytesPerSec);
@@ -1133,7 +1133,7 @@ static HRESULT WINAPI IDsCaptureDriverIm
return DSERR_GENERIC;
}
- TRACE("got %d %d byte fragments (%d bytes) (%ld ms/fragment)\n",
+ TRACE("got %d %d byte fragments (%d bytes) (%d ms/fragment)\n",
info.fragstotal, info.fragsize, info.fragstotal * info.fragsize,
info.fragsize * 1000 / pwfx->nAvgBytesPerSec);
diff --git a/dlls/winmm/wineoss/dsrender.c b/dlls/winmm/wineoss/dsrender.c
index 6cd6762..f73624e 100644
--- a/dlls/winmm/wineoss/dsrender.c
+++ b/dlls/winmm/wineoss/dsrender.c
@@ -170,7 +170,7 @@ static ULONG WINAPI IDsDriverPropertySet
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -180,7 +180,7 @@ static ULONG WINAPI IDsDriverPropertySet
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) {
IDsDriverBuffer_Release((PIDSDRIVERBUFFER)This->buffer);
@@ -200,7 +200,7 @@ static HRESULT WINAPI IDsDriverPropertyS
PULONG pcbReturnedData )
{
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
- FIXME("(%p,%p,%p,%lx,%p,%lx,%p)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData,pcbReturnedData);
+ FIXME("(%p,%p,%p,%x,%p,%x,%p)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData,pcbReturnedData);
return DSERR_UNSUPPORTED;
}
@@ -213,7 +213,7 @@ static HRESULT WINAPI IDsDriverPropertyS
ULONG cbPropertyData )
{
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
- FIXME("(%p,%p,%p,%lx,%p,%lx)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData);
+ FIXME("(%p,%p,%p,%x,%p,%x)\n",This,pDsProperty,pPropertyParams,cbPropertyParams,pPropertyData,cbPropertyData);
return DSERR_UNSUPPORTED;
}
@@ -224,7 +224,7 @@ static HRESULT WINAPI IDsDriverPropertyS
PULONG pSupport )
{
IDsDriverPropertySetImpl *This = (IDsDriverPropertySetImpl *)iface;
- FIXME("(%p,%s,%lx,%p)\n",This,debugstr_guid(PropertySetId),PropertyId,pSupport);
+ FIXME("(%p,%s,%x,%p)\n",This,debugstr_guid(PropertySetId),PropertyId,pSupport);
return DSERR_UNSUPPORTED;
}
@@ -268,7 +268,7 @@ static ULONG WINAPI IDsDriverNotifyImpl_
IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -278,7 +278,7 @@ static ULONG WINAPI IDsDriverNotifyImpl_
IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) {
IDsDriverBuffer_Release((PIDSDRIVERBUFFER)This->buffer);
@@ -295,7 +295,7 @@ static HRESULT WINAPI IDsDriverNotifyImp
LPCDSBPOSITIONNOTIFY notify)
{
IDsDriverNotifyImpl *This = (IDsDriverNotifyImpl *)iface;
- TRACE("(%p,0x%08lx,%p)\n",This,howmuch,notify);
+ TRACE("(%p,0x%08x,%p)\n",This,howmuch,notify);
if (!notify) {
WARN("invalid parameter\n");
@@ -305,7 +305,7 @@ static HRESULT WINAPI IDsDriverNotifyImp
if (TRACE_ON(wave)) {
int i;
for (i=0;i<howmuch;i++)
- TRACE("notify at %ld to 0x%08lx\n",
+ TRACE("notify at %d to 0x%08x\n",
notify[i].dwOffset,(DWORD)notify[i].hEventNotify);
}
@@ -338,7 +338,7 @@ static const IDsDriverNotifyVtbl dsdnvt
static HRESULT DSDB_MapBuffer(IDsDriverBufferImpl *dsdb)
{
- TRACE("(%p), format=%ldx%dx%d\n", dsdb, dsdb->wfex.Format.nSamplesPerSec,
+ TRACE("(%p), format=%dx%dx%d\n", dsdb, dsdb->wfex.Format.nSamplesPerSec,
dsdb->wfex.Format.wBitsPerSample, dsdb->wfex.Format.nChannels);
if (!dsdb->mapping) {
dsdb->mapping = mmap(NULL, dsdb->maplen, PROT_WRITE, MAP_SHARED,
@@ -349,7 +349,7 @@ static HRESULT DSDB_MapBuffer(IDsDriverB
"\"Hardware Acceleration\" to \"Emulation\".\n");
return DSERR_GENERIC;
}
- TRACE("The sound device has been mapped for direct access at %p, size=%ld\n", dsdb->mapping, dsdb->maplen);
+ TRACE("The sound device has been mapped for direct access at %p, size=%d\n", dsdb->mapping, dsdb->maplen);
/* for some reason, es1371 and sblive! sometimes have junk in here.
* clear it, or we get junk noise */
@@ -445,7 +445,7 @@ static ULONG WINAPI IDsDriverBufferImpl_
IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -455,7 +455,7 @@ static ULONG WINAPI IDsDriverBufferImpl_
IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (refCount)
return refCount;
@@ -527,7 +527,7 @@ static HRESULT WINAPI IDsDriverBufferImp
static HRESULT WINAPI IDsDriverBufferImpl_SetFrequency(PIDSDRIVERBUFFER iface, DWORD dwFreq)
{
/* IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface; */
- TRACE("(%p,%ld): stub\n",iface,dwFreq);
+ TRACE("(%p,%d): stub\n",iface,dwFreq);
return DSERR_UNSUPPORTED;
}
@@ -550,7 +550,7 @@ static HRESULT WINAPI IDsDriverBufferImp
static HRESULT WINAPI IDsDriverBufferImpl_SetPosition(PIDSDRIVERBUFFER iface, DWORD dwNewPos)
{
/* IDsDriverImpl *This = (IDsDriverImpl *)iface; */
- TRACE("(%p,%ld): stub\n",iface,dwNewPos);
+ TRACE("(%p,%d): stub\n",iface,dwNewPos);
return DSERR_UNSUPPORTED;
}
@@ -582,7 +582,7 @@ static HRESULT WINAPI IDsDriverBufferImp
while (*lpdwWrite > This->buflen)
*lpdwWrite -= This->buflen;
}
- TRACE("playpos=%ld, writepos=%ld\n", lpdwPlay?*lpdwPlay:0, lpdwWrite?*lpdwWrite:0);
+ TRACE("playpos=%d, writepos=%d\n", lpdwPlay?*lpdwPlay:0, lpdwWrite?*lpdwWrite:0);
return DS_OK;
}
@@ -590,7 +590,7 @@ static HRESULT WINAPI IDsDriverBufferImp
{
IDsDriverBufferImpl *This = (IDsDriverBufferImpl *)iface;
int enable;
- TRACE("(%p,%lx,%lx,%lx)\n",iface,dwRes1,dwRes2,dwFlags);
+ TRACE("(%p,%x,%x,%x)\n",iface,dwRes1,dwRes2,dwFlags);
WOutDev[This->drv->wDevID].ossdev->bOutputEnabled = TRUE;
enable = getEnables(WOutDev[This->drv->wDevID].ossdev);
if (ioctl(This->fd, SNDCTL_DSP_SETTRIGGER, &enable) < 0) {
@@ -686,7 +686,7 @@ static ULONG WINAPI IDsDriverImpl_AddRef
IDsDriverImpl *This = (IDsDriverImpl *)iface;
ULONG refCount = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount - 1);
+ TRACE("(%p) ref was %d\n", This, refCount - 1);
return refCount;
}
@@ -696,7 +696,7 @@ static ULONG WINAPI IDsDriverImpl_Releas
IDsDriverImpl *This = (IDsDriverImpl *)iface;
ULONG refCount = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref was %ld\n", This, refCount + 1);
+ TRACE("(%p) ref was %d\n", This, refCount + 1);
if (!refCount) {
HeapFree(GetProcessHeap(),0,This);
@@ -780,7 +780,7 @@ static HRESULT WINAPI DSD_CreatePrimaryB
HRESULT err;
audio_buf_info info;
int enable = 0;
- TRACE("(%p,%p,%lx,%lx,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
+ TRACE("(%p,%p,%x,%x,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
if (This->primary)
return DSERR_ALLOCATED;
@@ -844,7 +844,7 @@ static HRESULT WINAPI DSD_CreateSecondar
{
IDsDriverImpl *This = (IDsDriverImpl *)iface;
IDsDriverBufferImpl** ippdsdb = (IDsDriverBufferImpl**)ppvObj;
- FIXME("(%p,%p,%lx,%lx,%p,%p,%p): stub\n",This,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
+ FIXME("(%p,%p,%x,%x,%p,%p,%p): stub\n",This,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
*ippdsdb = 0;
return DSERR_UNSUPPORTED;
@@ -858,7 +858,7 @@ static HRESULT WINAPI IDsDriverImpl_Crea
LPBYTE *ppbBuffer,
LPVOID *ppvObj)
{
- TRACE("(%p,%p,%lx,%lx,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
+ TRACE("(%p,%p,%x,%x,%p,%p,%p)\n",iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
if (dwFlags & DSBCAPS_PRIMARYBUFFER)
return DSD_CreatePrimaryBuffer(iface,pwfx,dwFlags,dwCardAddress,pdwcbBufferSize,ppbBuffer,ppvObj);
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index 9ea61c6..66601e0 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -263,8 +263,8 @@ LRESULT OSS_MidiInit(void)
FIXME("Synthesizer supports MIDI in. Not yet supported.\n");
}
- TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%ld\n"
- "\tOSS info: synth subtype=%d capa=%lx\n",
+ TRACE("SynthOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
+ "\tOSS info: synth subtype=%d capa=%lx\n",
i, wine_dbgstr_w(MidiOutDev[i].caps.szPname),
MidiOutDev[i].caps.wTechnology,
MidiOutDev[i].caps.wVoices, MidiOutDev[i].caps.wNotes,
@@ -353,9 +353,9 @@ LRESULT OSS_MidiInit(void)
/* FIXME : could we get better information than that ? */
MidiInDev[i].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME;
- TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%ld\n"
- "MidiIn [%d]\tname='%s' support=%ld\n"
- "\tOSS info: midi dev-type=%d, capa=%lx\n",
+ TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n"
+ "MidiIn [%d]\tname='%s' support=%d\n"
+ "\tOSS info: midi dev-type=%d, capa=%lx\n",
i, wine_dbgstr_w(MidiOutDev[numsynthdevs + i].caps.szPname),
MidiOutDev[numsynthdevs + i].caps.wTechnology,
MidiOutDev[numsynthdevs + i].caps.wVoices, MidiOutDev[numsynthdevs + i].caps.wNotes,
@@ -407,7 +407,7 @@ static DWORD MIDI_NotifyClient(UINT wDev
HANDLE hDev;
DWORD dwInstance;
- TRACE("wDevID = %04X wMsg = %d dwParm1 = %04lX dwParam2 = %04lX\n",
+ TRACE("wDevID = %04X wMsg = %d dwParm1 = %04X dwParam2 = %04X\n",
wDevID, wMsg, dwParam1, dwParam2);
switch (wMsg) {
@@ -632,7 +632,7 @@ #undef IS_SYS_CMD
WARN("This shouldn't happen (%02X)\n", MidiInDev[wDevID].incoming[0]);
}
if (toSend != 0) {
- TRACE("Sending event %08lx\n", toSend);
+ TRACE("Sending event %08x\n", toSend);
MidiInDev[wDevID].incLen = 0;
dwTime -= MidiInDev[wDevID].startTime;
if (MIDI_NotifyClient(wDevID, MIM_DATA, toSend, dwTime) != MMSYSERR_NOERROR) {
@@ -704,7 +704,7 @@ static DWORD WINAPI midRecThread(LPVOID
*/
static DWORD midGetDevCaps(WORD wDevID, LPMIDIINCAPSW lpCaps, DWORD dwSize)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpCaps, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize);
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
@@ -719,7 +719,7 @@ static DWORD midGetDevCaps(WORD wDevID,
*/
static DWORD midOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpDesc, dwFlags);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags);
if (lpDesc == NULL) {
WARN("Invalid Parameter !\n");
@@ -834,7 +834,7 @@ static DWORD midClose(WORD wDevID)
*/
static DWORD midAddBuffer(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE;
@@ -866,7 +866,7 @@ static DWORD midAddBuffer(WORD wDevID, L
*/
static DWORD midPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 ||
lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 ||
@@ -885,7 +885,7 @@ static DWORD midPrepare(WORD wDevID, LPM
*/
static DWORD midUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (wDevID >= MIDM_NumDevs) return MMSYSERR_BADDEVICEID;
if (MidiInDev[wDevID].state == -1) return MIDIERR_NODEVICE;
@@ -1079,7 +1079,7 @@ #define IS_DRUM_CHANNEL(_xtra, _chn) ((
*/
static DWORD modGetDevCaps(WORD wDevID, LPMIDIOUTCAPSW lpCaps, DWORD dwSize)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpCaps, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpCaps, dwSize);
if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
if (lpCaps == NULL) return MMSYSERR_INVALPARAM;
@@ -1094,7 +1094,7 @@ static DWORD modGetDevCaps(WORD wDevID,
*/
static DWORD modOpen(WORD wDevID, LPMIDIOPENDESC lpDesc, DWORD dwFlags)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpDesc, dwFlags);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpDesc, dwFlags);
if (lpDesc == NULL) {
WARN("Invalid Parameter !\n");
return MMSYSERR_INVALPARAM;
@@ -1231,7 +1231,7 @@ static DWORD modData(WORD wDevID, DWORD
WORD d1 = HIBYTE(LOWORD(dwParam));
WORD d2 = LOBYTE(HIWORD(dwParam));
- TRACE("(%04X, %08lX);\n", wDevID, dwParam);
+ TRACE("(%04X, %08X);\n", wDevID, dwParam);
if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID;
if (!MidiOutDev[wDevID].bEnabled) return MIDIERR_NODEVICE;
@@ -1521,7 +1521,7 @@ static DWORD modLongData(WORD wDevID, LP
int count;
LPBYTE lpData;
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
/* Note: MS doc does not say much about the dwBytesRecorded member of the MIDIHDR structure
* but it seems to be used only for midi input.
@@ -1556,7 +1556,7 @@ static DWORD modLongData(WORD wDevID, LP
WARN("Alledged system exclusive buffer is not correct\n\tPlease report with MIDI file\n");
}
- TRACE("dwBufferLength=%lu !\n", lpMidiHdr->dwBufferLength);
+ TRACE("dwBufferLength=%u !\n", lpMidiHdr->dwBufferLength);
TRACE(" %02X %02X %02X ... %02X %02X %02X\n",
lpData[0], lpData[1], lpData[2], lpData[lpMidiHdr->dwBufferLength-3],
lpData[lpMidiHdr->dwBufferLength-2], lpData[lpMidiHdr->dwBufferLength-1]);
@@ -1603,7 +1603,7 @@ static DWORD modLongData(WORD wDevID, LP
*/
static DWORD modPrepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (midiSeqFD == -1) {
WARN("can't prepare !\n");
@@ -1617,7 +1617,7 @@ static DWORD modPrepare(WORD wDevID, LPM
if (dwSize < sizeof(MIDIHDR) || lpMidiHdr == 0 ||
lpMidiHdr->lpData == 0 || (lpMidiHdr->dwFlags & MHDR_INQUEUE) != 0 ||
lpMidiHdr->dwBufferLength >= 0x10000ul) {
- WARN("%p %p %08lx %d/%ld\n", lpMidiHdr, lpMidiHdr->lpData,
+ WARN("%p %p %08x %d/%d\n", lpMidiHdr, lpMidiHdr->lpData,
lpMidiHdr->dwFlags, sizeof(MIDIHDR), dwSize);
return MMSYSERR_INVALPARAM;
}
@@ -1633,7 +1633,7 @@ static DWORD modPrepare(WORD wDevID, LPM
*/
static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize)
{
- TRACE("(%04X, %p, %08lX);\n", wDevID, lpMidiHdr, dwSize);
+ TRACE("(%04X, %p, %08X);\n", wDevID, lpMidiHdr, dwSize);
if (midiSeqFD == -1) {
WARN("can't unprepare !\n");
@@ -1693,7 +1693,7 @@ #endif /* HAVE_OSS_MIDI */
DWORD WINAPI OSS_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
- TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
+ TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) {
#ifdef HAVE_OSS_MIDI
@@ -1736,7 +1736,7 @@ #endif
DWORD WINAPI OSS_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
- TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
+ TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) {
diff --git a/dlls/winmm/wineoss/mixer.c b/dlls/winmm/wineoss/mixer.c
index 9794afb..d15eda7 100644
--- a/dlls/winmm/wineoss/mixer.c
+++ b/dlls/winmm/wineoss/mixer.c
@@ -208,7 +208,7 @@ #define TYPE_TO_STR(x) case x: return #x
TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME);
}
#undef TYPE_TO_STR
- sprintf(str, "UNKNOWN(%08lx)", dwControlType);
+ sprintf(str, "UNKNOWN(%08x)", dwControlType);
return str;
}
@@ -239,7 +239,7 @@ #define TYPE_TO_STR(x) case x: return #x
TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG);
}
#undef TYPE_TO_STR
- sprintf(str, "UNKNOWN(%08lx)", dwComponentType);
+ sprintf(str, "UNKNOWN(%08x)", dwComponentType);
return str;
}
@@ -256,7 +256,7 @@ #define TYPE_TO_STR(x) case x: return #x
TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX);
}
#undef TYPE_TO_STR
- sprintf(str, "UNKNOWN(%08lx)", dwType);
+ sprintf(str, "UNKNOWN(%08x)", dwType);
return str;
}
@@ -274,7 +274,7 @@ static void MIX_FillLineControls(struct
struct mixerCtrl* mc = &mix->ctrl[c];
int j;
- TRACE("(%p, %d, %08lx, %s)\n", mix, c, lineID,
+ TRACE("(%p, %d, %08x, %s)\n", mix, c, lineID,
getControlType(dwControlType));
mc->dwLineID = lineID;
@@ -327,9 +327,9 @@ static void MIX_FillLineControls(struct
break;
default:
- FIXME("Internal error: unknown type: %08lx\n", dwControlType);
+ FIXME("Internal error: unknown type: %08x\n", dwControlType);
}
- TRACE("ctrl[%2d]: typ=%08lx lin=%08lx\n", c + 1, dwControlType, lineID);
+ TRACE("ctrl[%2d]: typ=%08x lin=%08x\n", c + 1, dwControlType, lineID);
}
/******************************************************************
@@ -357,7 +357,7 @@ static DWORD MIX_Open(WORD wDevID, LPMIX
struct mixer* mix;
DWORD ret = MMSYSERR_NOERROR;
- TRACE("(%04X, %p, %lu);\n", wDevID, lpMod, flags);
+ TRACE("(%04X, %p, %u);\n", wDevID, lpMod, flags);
/* as we partly init the mixer with MIX_Open, we can allow null open decs
* EPP if (lpMod == NULL) return MMSYSERR_INVALPARAM;
@@ -603,7 +603,7 @@ static DWORD MIX_GetDevCaps(WORD wDevID,
MIXERCAPSW capsW;
const char* name;
- TRACE("(%04X, %p, %lu);\n", wDevID, lpCaps, dwSize);
+ TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize);
if (lpCaps == NULL) {
WARN("invalid parameter: lpCaps == NULL\n");
@@ -637,7 +637,7 @@ static DWORD MIX_GetLineInfoDst(struct m
unsigned mask;
int j;
- TRACE("(%p, %p, %08lx)\n", mix, lpMl, dst);
+ TRACE("(%p, %p, %08x)\n", mix, lpMl, dst);
lpMl->dwDestination = dst;
switch (dst)
@@ -688,7 +688,7 @@ static DWORD MIX_GetLineInfoSrc(struct m
int i, j;
unsigned mask = (dst) ? mix->recMask : mix->devMask;
- TRACE("(%p, %p, %ld, %08lx)\n", mix, lpMl, idx, dst);
+ TRACE("(%p, %p, %d, %08x)\n", mix, lpMl, idx, dst);
MultiByteToWideChar(CP_ACP, 0, MIX_Labels[idx], -1, lpMl->szShortName, sizeof(lpMl->szShortName) / sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, MIX_Names[idx], -1, lpMl->szName, sizeof(lpMl->szName) / sizeof(WCHAR));
@@ -733,7 +733,7 @@ static DWORD MIX_GetLineInfoSrc(struct m
lpMl->Target.dwType = MIXERLINE_TARGETTYPE_UNDEFINED;
break;
default:
- WARN("Index %ld not handled.\n", idx);
+ WARN("Index %d not handled.\n", idx);
return MIXERR_INVALLINE;
}
lpMl->cChannels = 1;
@@ -756,7 +756,7 @@ static DWORD MIX_GetLineInfoSrc(struct m
*/
static BOOL MIX_CheckLine(DWORD lineID)
{
- TRACE("(%08lx)\n",lineID);
+ TRACE("(%08x)\n",lineID);
return ((HIWORD(lineID) < SOUND_MIXER_NRDEVICES && LOWORD(lineID) < 2) ||
(HIWORD(lineID) == LINEID_DST &&
@@ -773,7 +773,7 @@ static DWORD MIX_GetLineInfo(WORD wDevID
unsigned mask;
struct mixer* mix;
- TRACE("(%04X, %p, %lu);\n", wDevID, lpMl, fdwInfo);
+ TRACE("(%04X, %p, %u);\n", wDevID, lpMl, fdwInfo);
if (lpMl == NULL) {
WARN("invalid parameter: lpMl = NULL\n");
@@ -781,7 +781,7 @@ static DWORD MIX_GetLineInfo(WORD wDevID
}
if (lpMl->cbStruct != sizeof(*lpMl)) {
- WARN("invalid parameter: lpMl->cbStruct = %ld != %d\n",
+ WARN("invalid parameter: lpMl->cbStruct = %d != %d\n",
lpMl->cbStruct, sizeof(*lpMl));
return MMSYSERR_INVALPARAM;
}
@@ -800,9 +800,9 @@ static DWORD MIX_GetLineInfo(WORD wDevID
switch (fdwInfo & MIXER_GETLINEINFOF_QUERYMASK)
{
case MIXER_GETLINEINFOF_DESTINATION:
- TRACE("MIXER_GETLINEINFOF_DESTINATION (%08lx)\n", lpMl->dwDestination);
+ TRACE("MIXER_GETLINEINFOF_DESTINATION (%08x)\n", lpMl->dwDestination);
if (lpMl->dwDestination >= 2) {
- WARN("invalid parameter: lpMl->dwDestination = %ld >= 2\n",
+ WARN("invalid parameter: lpMl->dwDestination = %d >= 2\n",
lpMl->dwDestination);
return MMSYSERR_INVALPARAM;
}
@@ -813,7 +813,7 @@ static DWORD MIX_GetLineInfo(WORD wDevID
}
break;
case MIXER_GETLINEINFOF_SOURCE:
- TRACE("MIXER_GETLINEINFOF_SOURCE (%08lx), dst=%08lx\n", lpMl->dwSource,
+ TRACE("MIXER_GETLINEINFOF_SOURCE (%08x), dst=%08x\n", lpMl->dwSource,
lpMl->dwDestination);
switch (lpMl->dwDestination)
{
@@ -840,7 +840,7 @@ static DWORD MIX_GetLineInfo(WORD wDevID
}
break;
case MIXER_GETLINEINFOF_LINEID:
- TRACE("MIXER_GETLINEINFOF_LINEID (%08lx)\n", lpMl->dwLineID);
+ TRACE("MIXER_GETLINEINFOF_LINEID (%08x)\n", lpMl->dwLineID);
if (!MIX_CheckLine(lpMl->dwLineID)) {
WARN("invalid line\n");
@@ -935,7 +935,7 @@ static DWORD MIX_GetLineInfo(WORD wDevID
*/
static BOOL MIX_CheckControl(struct mixer* mix, DWORD ctrlID)
{
- TRACE("(%p, %08lx)\n", mix, ctrlID);
+ TRACE("(%p, %08x)\n", mix, ctrlID);
return (ctrlID >= 1 && ctrlID <= mix->numCtrl);
}
@@ -949,7 +949,7 @@ static DWORD MIX_GetLineControls(WORD wD
DWORD dwRet = MMSYSERR_NOERROR;
struct mixer* mix;
- TRACE("(%04X, %p, %lu);\n", wDevID, lpMlc, flags);
+ TRACE("(%04X, %p, %u);\n", wDevID, lpMlc, flags);
if (lpMlc == NULL) {
WARN("invalid parameter: lpMlc == NULL\n");
@@ -957,13 +957,13 @@ static DWORD MIX_GetLineControls(WORD wD
}
if (lpMlc->cbStruct < sizeof(*lpMlc)) {
- WARN("invalid parameter: lpMlc->cbStruct = %ld < %d\n",
+ WARN("invalid parameter: lpMlc->cbStruct = %d < %d\n",
lpMlc->cbStruct, sizeof(*lpMlc));
return MMSYSERR_INVALPARAM;
}
if (lpMlc->cbmxctrl < sizeof(MIXERCONTROLW)) {
- WARN("invalid parameter: lpMlc->cbmxctrl = %ld < %d\n",
+ WARN("invalid parameter: lpMlc->cbmxctrl = %d < %d\n",
lpMlc->cbmxctrl, sizeof(MIXERCONTROLW));
return MMSYSERR_INVALPARAM;
}
@@ -979,7 +979,7 @@ static DWORD MIX_GetLineControls(WORD wD
{
int i, j;
- TRACE("line=%08lx MIXER_GETLINECONTROLSF_ALL (%ld)\n",
+ TRACE("line=%08x MIXER_GETLINECONTROLSF_ALL (%d)\n",
lpMlc->dwLineID, lpMlc->cControls);
for (i = j = 0; i < mix->numCtrl; i++)
@@ -999,7 +999,7 @@ static DWORD MIX_GetLineControls(WORD wD
{
if (mix->ctrl[i].dwLineID == lpMlc->dwLineID)
{
- TRACE("[%d] => [%2d]: typ=%08lx\n", j, i + 1,
+ TRACE("[%d] => [%2d]: typ=%08x\n", j, i + 1,
mix->ctrl[i].ctrl.dwControlType);
lpMlc->pamxctrl[j++] = mix->ctrl[i].ctrl;
}
@@ -1008,7 +1008,7 @@ static DWORD MIX_GetLineControls(WORD wD
}
break;
case MIXER_GETLINECONTROLSF_ONEBYID:
- TRACE("line=%08lx MIXER_GETLINECONTROLSF_ONEBYID (%lx)\n",
+ TRACE("line=%08x MIXER_GETLINECONTROLSF_ONEBYID (%x)\n",
lpMlc->dwLineID, lpMlc->u.dwControlID);
if (!MIX_CheckControl(mix, lpMlc->u.dwControlID) ||
@@ -1019,7 +1019,7 @@ static DWORD MIX_GetLineControls(WORD wD
lpMlc->pamxctrl[0] = mix->ctrl[lpMlc->u.dwControlID - 1].ctrl;
break;
case MIXER_GETLINECONTROLSF_ONEBYTYPE:
- TRACE("line=%08lx MIXER_GETLINECONTROLSF_ONEBYTYPE (%s)\n",
+ TRACE("line=%08x MIXER_GETLINECONTROLSF_ONEBYTYPE (%s)\n",
lpMlc->dwLineID, getControlType(lpMlc->u.dwControlType));
if (!MIX_CheckLine(lpMlc->dwLineID)) {
WARN("invalid line\n");
@@ -1060,7 +1060,7 @@ static DWORD MIX_GetControlDetails(WORD
DWORD c, chnl;
struct mixer* mix;
- TRACE("(%04X, %p, %lu);\n", wDevID, lpmcd, fdwDetails);
+ TRACE("(%04X, %p, %u);\n", wDevID, lpmcd, fdwDetails);
if (lpmcd == NULL) {
WARN("invalid parameter: lpmcd == NULL\n");
@@ -1075,7 +1075,7 @@ static DWORD MIX_GetControlDetails(WORD
switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK)
{
case MIXER_GETCONTROLDETAILSF_VALUE:
- TRACE("MIXER_GETCONTROLDETAILSF_VALUE (%08lx)\n", lpmcd->dwControlID);
+ TRACE("MIXER_GETCONTROLDETAILSF_VALUE (%08x)\n", lpmcd->dwControlID);
if (MIX_CheckControl(mix, lpmcd->dwControlID))
{
c = lpmcd->dwControlID - 1;
@@ -1097,7 +1097,7 @@ static DWORD MIX_GetControlDetails(WORD
return MMSYSERR_INVALPARAM;
}
- TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%lu]\n",
+ TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n",
getControlType(mix->ctrl[c].ctrl.dwControlType),
lpmcd->cChannels);
@@ -1115,21 +1115,21 @@ static DWORD MIX_GetControlDetails(WORD
case 1:
/* mono... so R = L */
mcdu->dwValue = ((LOBYTE(LOWORD(val)) * 65536.0) / 100.0) + 0.5;
- TRACE("Reading RL = %ld\n", mcdu->dwValue);
+ TRACE("Reading RL = %d\n", mcdu->dwValue);
break;
case 2:
/* stereo, left is paDetails[0] */
mcdu->dwValue = ((LOBYTE(LOWORD(val)) * 65536.0) / 100.0) + 0.5;
- TRACE("Reading L = %ld\n", mcdu->dwValue);
+ TRACE("Reading L = %d\n", mcdu->dwValue);
mcdu++;
mcdu->dwValue = ((HIBYTE(LOWORD(val)) * 65536.0) / 100.0) + 0.5;
- TRACE("Reading R = %ld\n", mcdu->dwValue);
+ TRACE("Reading R = %d\n", mcdu->dwValue);
break;
default:
- WARN("Unsupported cChannels (%ld)\n", lpmcd->cChannels);
+ WARN("Unsupported cChannels (%d)\n", lpmcd->cChannels);
return MMSYSERR_INVALPARAM;
}
- TRACE("=> %08lx\n", mcdu->dwValue);
+ TRACE("=> %08x\n", mcdu->dwValue);
}
break;
case MIXERCONTROL_CONTROLTYPE_MUTE:
@@ -1144,7 +1144,7 @@ static DWORD MIX_GetControlDetails(WORD
return MMSYSERR_INVALPARAM;
}
- TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%lu]\n",
+ TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n",
getControlType(mix->ctrl[c].ctrl.dwControlType),
lpmcd->cChannels);
@@ -1166,7 +1166,7 @@ static DWORD MIX_GetControlDetails(WORD
return MMSYSERR_INVALPARAM;
}
- TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%lu]\n",
+ TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n",
getControlType(mix->ctrl[c].ctrl.dwControlType),
lpmcd->cChannels);
@@ -1209,7 +1209,7 @@ static DWORD MIX_GetControlDetails(WORD
}
break;
case MIXER_GETCONTROLDETAILSF_LISTTEXT:
- TRACE("MIXER_GETCONTROLDETAILSF_LISTTEXT (%08lx)\n",
+ TRACE("MIXER_GETCONTROLDETAILSF_LISTTEXT (%08x)\n",
lpmcd->dwControlID);
ret = MMSYSERR_INVALPARAM;
@@ -1258,7 +1258,7 @@ static DWORD MIX_SetControlDetails(WORD
int val;
struct mixer* mix;
- TRACE("(%04X, %p, %lu);\n", wDevID, lpmcd, fdwDetails);
+ TRACE("(%04X, %p, %u);\n", wDevID, lpmcd, fdwDetails);
if (lpmcd == NULL) {
TRACE("invalid parameter: lpmcd == NULL\n");
@@ -1273,12 +1273,12 @@ static DWORD MIX_SetControlDetails(WORD
switch (fdwDetails & MIXER_GETCONTROLDETAILSF_QUERYMASK)
{
case MIXER_GETCONTROLDETAILSF_VALUE:
- TRACE("MIXER_GETCONTROLDETAILSF_VALUE (%08lx)\n", lpmcd->dwControlID);
+ TRACE("MIXER_GETCONTROLDETAILSF_VALUE (%08x)\n", lpmcd->dwControlID);
if (MIX_CheckControl(mix, lpmcd->dwControlID))
{
c = lpmcd->dwControlID - 1;
- TRACE("dwLineID=%08lx\n",mix->ctrl[c].dwLineID);
+ TRACE("dwLineID=%08x\n",mix->ctrl[c].dwLineID);
chnl = HIWORD(mix->ctrl[c].dwLineID);
if (chnl == LINEID_DST)
@@ -1298,7 +1298,7 @@ static DWORD MIX_SetControlDetails(WORD
return MMSYSERR_INVALPARAM;
}
- TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%lu]\n",
+ TRACE("%s MIXERCONTROLDETAILS_UNSIGNED[%u]\n",
getControlType(mix->ctrl[c].ctrl.dwControlType),
lpmcd->cChannels);
@@ -1308,19 +1308,19 @@ static DWORD MIX_SetControlDetails(WORD
{
case 1:
/* mono... so R = L */
- TRACE("Setting RL to %ld\n", mcdu->dwValue);
+ TRACE("Setting RL to %d\n", mcdu->dwValue);
val = 0x101 * ((mcdu->dwValue * 100) >> 16);
break;
case 2:
/* stereo, left is paDetails[0] */
- TRACE("Setting L to %ld\n", mcdu->dwValue);
+ TRACE("Setting L to %d\n", mcdu->dwValue);
val = ((mcdu->dwValue * 100.0) / 65536.0) + 0.5;
mcdu++;
- TRACE("Setting R to %ld\n", mcdu->dwValue);
+ TRACE("Setting R to %d\n", mcdu->dwValue);
val += (int)(((mcdu->dwValue * 100) / 65536.0) + 0.5) << 8;
break;
default:
- WARN("Unsupported cChannels (%ld)\n", lpmcd->cChannels);
+ WARN("Unsupported cChannels (%d)\n", lpmcd->cChannels);
return MMSYSERR_INVALPARAM;
}
@@ -1350,7 +1350,7 @@ static DWORD MIX_SetControlDetails(WORD
return MMSYSERR_INVALPARAM;
}
- TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%lu]\n",
+ TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n",
getControlType(mix->ctrl[c].ctrl.dwControlType),
lpmcd->cChannels);
@@ -1394,7 +1394,7 @@ static DWORD MIX_SetControlDetails(WORD
return MMSYSERR_INVALPARAM;
}
- TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%lu]\n",
+ TRACE("%s MIXERCONTROLDETAILS_BOOLEAN[%u]\n",
getControlType(mix->ctrl[c].ctrl.dwControlType),
lpmcd->cChannels);
@@ -1522,7 +1522,7 @@ DWORD WINAPI OSS_mxdMessage(UINT wDevID,
DWORD dwParam1, DWORD dwParam2)
{
#ifdef HAVE_OSS
- TRACE("(%04X, %s, %08lX, %08lX, %08lX);\n", wDevID, getMessage(wMsg),
+ TRACE("(%04X, %s, %08X, %08X, %08X);\n", wDevID, getMessage(wMsg),
dwUser, dwParam1, dwParam2);
switch (wMsg)
diff --git a/dlls/winmm/wineoss/mmaux.c b/dlls/winmm/wineoss/mmaux.c
index 7731476..b48ea6b 100644
--- a/dlls/winmm/wineoss/mmaux.c
+++ b/dlls/winmm/wineoss/mmaux.c
@@ -80,7 +80,7 @@ static DWORD AUX_GetDevCaps(WORD wDevID,
int mixer, volume;
static const WCHAR ini[] = {'O','S','S',' ','A','u','x',0};
- TRACE("(%04X, %p, %lu);\n", wDevID, lpCaps, dwSize);
+ TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize);
if (lpCaps == NULL) return MMSYSERR_NOTENABLED;
if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) {
WARN("mixer device not available !\n");
@@ -166,7 +166,7 @@ static DWORD AUX_SetVolume(WORD wDevID,
int volume, left, right;
int cmd;
- TRACE("(%04X, %08lX);\n", wDevID, dwParam);
+ TRACE("(%04X, %08X);\n", wDevID, dwParam);
left = (LOWORD(dwParam) * 100) >> 16;
right = (HIWORD(dwParam) * 100) >> 16;
@@ -222,7 +222,7 @@ #endif
DWORD WINAPI OSS_auxMessage(UINT wDevID, UINT wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
- TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
+ TRACE("(%04X, %04X, %08X, %08X, %08X);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2);
#ifdef HAVE_OSS
--
1.4.2.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20061006/9f435d98/attachment-0001.pgp
More information about the wine-patches
mailing list