dsound/tests: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Mon Oct 9 18:07:36 CDT 2006
---
dlls/dsound/tests/Makefile.in | 1 -
dlls/dsound/tests/capture.c | 18 ++++++------
dlls/dsound/tests/ds3d.c | 56 +++++++++++++++++++------------------
dlls/dsound/tests/ds3d8.c | 52 +++++++++++++++++-----------------
dlls/dsound/tests/dsound.c | 26 +++++++++--------
dlls/dsound/tests/dsound8.c | 20 +++++++------
dlls/dsound/tests/duplex.c | 8 +++--
dlls/dsound/tests/propset.c | 62 +++++++++++++++++++++--------------------
8 files changed, 121 insertions(+), 122 deletions(-)
diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in
index 9610892..2eed681 100644
--- a/dlls/dsound/tests/Makefile.in
+++ b/dlls/dsound/tests/Makefile.in
@@ -5,7 +5,6 @@ VPATH = @srcdir@
TESTDLL = dsound.dll
IMPORTS = dsound ole32 version user32 kernel32
EXTRALIBS = -ldxguid -luuid -ldxerr8
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \
capture.c \
diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c
index 8ed8aa2..27ebff5 100644
--- a/dlls/dsound/tests/capture.c
+++ b/dlls/dsound/tests/capture.c
@@ -95,7 +95,7 @@ const char * format_string(const WAVEFOR
{
static char str[64];
- sprintf(str, "%5ldx%2dx%d %s",
+ sprintf(str, "%5dx%2dx%d %s",
wfx->nSamplesPerSec, wfx->wBitsPerSample, wfx->nChannels,
get_format_str(wfx->wFormatTag));
@@ -354,7 +354,7 @@ static void test_capture_buffer(LPDIRECT
ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetCaps() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Caps: size = %ld flags=0x%08lx buffer size=%ld\n",
+ trace(" Caps: size = %d flags=0x%08x buffer size=%d\n",
dscbcaps.dwSize,dscbcaps.dwFlags,dscbcaps.dwBufferBytes);
}
@@ -369,14 +369,14 @@ static void test_capture_buffer(LPDIRECT
size=0;
rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,NULL,0,&size);
ok(rc==DS_OK && size!=0,"IDirectSoundCaptureBuffer_GetFormat() should "
- "have returned the needed size: rc=%s, size=%ld\n",
+ "have returned the needed size: rc=%s, size=%d\n",
DXGetErrorString8(rc),size);
rc=IDirectSoundCaptureBuffer_GetFormat(dscbo,&wfx,sizeof(wfx),NULL);
ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetFormat() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Format: tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace(" Format: tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample,
wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign);
}
@@ -391,7 +391,7 @@ static void test_capture_buffer(LPDIRECT
ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Status=0x%04lx\n",status);
+ trace(" Status=0x%04x\n",status);
}
ZeroMemory(&state, sizeof(state));
@@ -439,7 +439,7 @@ static void test_capture_buffer(LPDIRECT
ok(rc==DS_OK,"IDirectSoundCaptureBuffer_GetStatus() failed: %s\n",
DXGetErrorString8(rc));
ok(status==(DSCBSTATUS_CAPTURING|DSCBSTATUS_LOOPING),
- "GetStatus: bad status: %lx\n",status);
+ "GetStatus: bad status: %x\n",status);
if (rc!=DS_OK)
return;
@@ -447,10 +447,10 @@ static void test_capture_buffer(LPDIRECT
for (i = 0; i < (NOTIFICATIONS * 2); i++) {
rc=WaitForMultipleObjects(NOTIFICATIONS,state.event,FALSE,3000);
ok(rc==(WAIT_OBJECT_0+(i%NOTIFICATIONS)),
- "WaitForMultipleObjects failed: 0x%lx\n",rc);
+ "WaitForMultipleObjects failed: 0x%x\n",rc);
if (rc!=(WAIT_OBJECT_0+(i%NOTIFICATIONS))) {
ok((rc==WAIT_TIMEOUT)||(rc==WAIT_FAILED),
- "Wrong notification: should be %d, got %ld\n",
+ "Wrong notification: should be %d, got %d\n",
i%NOTIFICATIONS,rc-WAIT_OBJECT_0);
}
if (!capture_buffer_service(&state))
@@ -512,7 +512,7 @@ static BOOL WINAPI dscenum_callback(LPGU
ok(rc==DS_OK,"IDirectSoundCapture_GetCaps() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Caps: size=%ld flags=0x%08lx formats=%05lx channels=%ld\n",
+ trace(" Caps: size=%d flags=0x%08x formats=%05x channels=%d\n",
dsccaps.dwSize,dsccaps.dwFlags,dsccaps.dwFormats,
dsccaps.dwChannels);
}
diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c
index db0ddfe..76022c3 100644
--- a/dlls/dsound/tests/ds3d.c
+++ b/dlls/dsound/tests/ds3d.c
@@ -225,7 +225,7 @@ static int buffer_service(play_state_t*
state->played+=play_pos-last_play_pos;
if (winetest_debug > 1)
- trace("buf size=%ld last_play_pos=%ld play_pos=%ld played=%ld / %ld\n",
+ trace("buf size=%d last_play_pos=%d play_pos=%d played=%d / %d\n",
state->buffer_size,last_play_pos,play_pos,state->played,
state->wave_len);
@@ -242,7 +242,7 @@ static int buffer_service(play_state_t*
buf_free=state->buffer_size-state->offset+play_pos;
if (winetest_debug > 1)
- trace("offset=%ld free=%ld written=%ld / %ld\n",
+ trace("offset=%d free=%d written=%d / %d\n",
state->offset,buf_free,state->written,state->wave_len);
if (buf_free==0)
return 1;
@@ -254,14 +254,14 @@ static int buffer_service(play_state_t*
goto STOP;
buf_free-=w;
if (state->written==state->wave_len && winetest_debug > 1)
- trace("last sound byte at %ld\n",
+ trace("last sound byte at %d\n",
(state->written % state->buffer_size));
}
if (buf_free>0) {
/* Fill with silence */
if (winetest_debug > 1)
- trace("writing %ld bytes of silence\n",buf_free);
+ trace("writing %d bytes of silence\n",buf_free);
if (buffer_silence(state,buf_free)==-1)
goto STOP;
}
@@ -315,7 +315,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Caps: flags=0x%08lx size=%ld\n",dsbcaps.dwFlags,
+ trace(" Caps: flags=0x%08x size=%d\n",dsbcaps.dwFlags,
dsbcaps.dwBufferBytes);
}
@@ -323,13 +323,13 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
size=0;
rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size);
ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have "
- "returned the needed size: rc=%s size=%ld\n",DXGetErrorString8(rc),size);
+ "returned the needed size: rc=%s size=%d\n",DXGetErrorString8(rc),size);
rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL);
ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Format: %s tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
is_primary ? "Primary" : "Secondary",
wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample,
wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign);
@@ -348,7 +348,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
if (rc==DS_OK) {
DWORD f = set_frequency?frequency:wfx.nSamplesPerSec;
ok(freq==f,"The frequency returned by GetFrequency "
- "%ld does not match the format %ld\n",freq,f);
+ "%d does not match the format %d\n",freq,f);
}
/* DSOUND: Error: Invalid status pointer */
@@ -359,7 +359,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
rc=IDirectSoundBuffer_GetStatus(*dsbo,&status);
ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %s\n",
DXGetErrorString8(rc));
- ok(status==0,"status=0x%lx instead of 0\n",status);
+ ok(status==0,"status=0x%x instead of 0\n",status);
if (is_primary) {
DSBCAPS new_dsbcaps;
@@ -393,10 +393,10 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
wfx.nSamplesPerSec!=wfx2.nSamplesPerSec ||
wfx.wBitsPerSample!=wfx2.wBitsPerSample ||
wfx.nChannels!=wfx2.nChannels)) {
- trace("Requested format tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace("Requested format tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample,
wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign);
- trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample,
wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign);
}
@@ -407,20 +407,20 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags,
+ trace(" new Caps: flags=0x%08x size=%d\n",new_dsbcaps.dwFlags,
new_dsbcaps.dwBufferBytes);
}
/* Check for primary buffer size change */
ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes,
" buffer size changed after SetFormat() - "
- "previous size was %lu, current size is %lu\n",
+ "previous size was %u, current size is %u\n",
dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes);
/* Check for primary buffer flags change */
ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags,
" flags changed after SetFormat() - "
- "previous flags were %08lx, current flags are %08lx\n",
+ "previous flags were %08x, current flags are %08x\n",
dsbcaps.dwFlags, new_dsbcaps.dwFlags);
/* Set the CooperativeLevel back to normal */
@@ -441,12 +441,12 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
if (winetest_interactive) {
if (set_frequency)
- trace(" Playing %g second 440Hz tone at %ldx%dx%d with a "
- "frequency of %ld (%ldHz)\n", duration,
+ trace(" Playing %g second 440Hz tone at %dx%dx%d with a "
+ "frequency of %d (%dHz)\n", duration,
wfx.nSamplesPerSec, wfx.wBitsPerSample, wfx.nChannels,
frequency, (440 * frequency) / wfx.nSamplesPerSec);
else
- trace(" Playing %g second 440Hz tone at %ldx%dx%d\n", duration,
+ trace(" Playing %g second 440Hz tone at %dx%dx%d\n", duration,
wfx.nSamplesPerSec, wfx.wBitsPerSample, wfx.nChannels);
}
@@ -594,7 +594,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %s\n",
DXGetErrorString8(rc));
ok(status==(DSBSTATUS_PLAYING|DSBSTATUS_LOOPING),
- "GetStatus: bad status: %lx\n",status);
+ "GetStatus: bad status: %x\n",status);
if (listener) {
ZeroMemory(&listener_param,sizeof(listener_param));
@@ -655,7 +655,7 @@ void test_buffer(LPDIRECTSOUND dso, LPDI
/* Check the sound duration was within 10% of the expected value */
now=GetTickCount();
ok(fabs(1000*duration-now+start_time)<=100*duration,
- "The sound played for %ld ms instead of %g ms\n",
+ "The sound played for %d ms instead of %g ms\n",
now-start_time,1000*duration);
free(state.wave);
@@ -783,8 +783,8 @@ static HRESULT test_secondary(LPGUID lpG
wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx;
if (winetest_interactive) {
- trace(" Testing a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d "
- "with a primary buffer at %ldx%dx%d\n",
+ trace(" Testing a %s%ssecondary buffer %s%s%s%sat %dx%dx%d "
+ "with a primary buffer at %dx%dx%d\n",
has_3dbuffer?"3D ":"",
has_duplicate?"duplicated ":"",
listener!=NULL||move_sound?"with ":"",
@@ -797,7 +797,7 @@ static HRESULT test_secondary(LPGUID lpG
}
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK && secondary!=NULL,"IDirectSound_CreateSoundBuffer() "
- "failed to create a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d (%s): %s\n",
+ "failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %s\n",
has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"",
listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"",
listener!=NULL?"listener ":"",
@@ -813,11 +813,11 @@ static HRESULT test_secondary(LPGUID lpG
rc=IDirectSoundBuffer_GetVolume(secondary,&vol);
ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(vol==0,"wrong volume for a new secondary buffer: %ld\n",vol);
+ ok(vol==0,"wrong volume for a new secondary buffer: %d\n",vol);
rc=IDirectSoundBuffer_GetPan(secondary,&pan);
ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(pan==0,"wrong pan for a new secondary buffer: %ld\n",pan);
+ ok(pan==0,"wrong pan for a new secondary buffer: %d\n",pan);
/* Check that changing the secondary buffer's volume and pan
* does not impact the primary buffer's volume and pan
@@ -835,7 +835,7 @@ static HRESULT test_secondary(LPGUID lpG
rc=IDirectSoundBuffer_GetVolume(secondary,&vol);
ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(vol==-1000,"secondary: wrong volume %ld instead of -1000\n",
+ ok(vol==-1000,"secondary: wrong volume %d instead of -1000\n",
vol);
rc=IDirectSoundBuffer_SetPan(secondary,-1000);
ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: "
@@ -843,18 +843,18 @@ static HRESULT test_secondary(LPGUID lpG
rc=IDirectSoundBuffer_GetPan(secondary,&pan);
ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(pan==-1000,"secondary: wrong pan %ld instead of -1000\n",
+ ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n",
pan);
rc=IDirectSoundBuffer_GetVolume(primary,&vol);
ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(primary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(vol==refvol,"The primary volume changed from %ld to %ld\n",
+ ok(vol==refvol,"The primary volume changed from %d to %d\n",
refvol,vol);
rc=IDirectSoundBuffer_GetPan(primary,&pan);
ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: %s\n",
DXGetErrorString8(rc));
- ok(pan==refpan,"The primary pan changed from %ld to %ld\n",
+ ok(pan==refpan,"The primary pan changed from %d to %d\n",
refpan,pan);
rc=IDirectSoundBuffer_SetVolume(secondary,0);
diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c
index ef02a45..07083e5 100644
--- a/dlls/dsound/tests/ds3d8.c
+++ b/dlls/dsound/tests/ds3d8.c
@@ -128,7 +128,7 @@ static int buffer_service8(play_state_t*
state->played+=play_pos-last_play_pos;
if (winetest_debug > 1)
- trace("buf size=%ld last_play_pos=%ld play_pos=%ld played=%ld / %ld\n",
+ trace("buf size=%d last_play_pos=%d play_pos=%d played=%d / %d\n",
state->buffer_size,last_play_pos,play_pos,state->played,
state->wave_len);
@@ -145,7 +145,7 @@ static int buffer_service8(play_state_t*
buf_free=state->buffer_size-state->offset+play_pos;
if (winetest_debug > 1)
- trace("offset=%ld free=%ld written=%ld / %ld\n",
+ trace("offset=%d free=%d written=%d / %d\n",
state->offset,buf_free,state->written,state->wave_len);
if (buf_free==0)
return 1;
@@ -157,14 +157,14 @@ static int buffer_service8(play_state_t*
goto STOP;
buf_free-=w;
if (state->written==state->wave_len && winetest_debug > 1)
- trace("last sound byte at %ld\n",
+ trace("last sound byte at %d\n",
(state->written % state->buffer_size));
}
if (buf_free>0) {
/* Fill with silence */
if (winetest_debug > 1)
- trace("writing %ld bytes of silence\n",buf_free);
+ trace("writing %d bytes of silence\n",buf_free);
if (buffer_silence8(state,buf_free)==-1)
goto STOP;
}
@@ -208,7 +208,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Caps: flags=0x%08lx size=%ld\n",dsbcaps.dwFlags,
+ trace(" Caps: flags=0x%08x size=%d\n",dsbcaps.dwFlags,
dsbcaps.dwBufferBytes);
}
@@ -216,13 +216,13 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
size=0;
rc=IDirectSoundBuffer_GetFormat(*dsbo,NULL,0,&size);
ok(rc==DS_OK && size!=0,"IDirectSoundBuffer_GetFormat() should have "
- "returned the needed size: rc=%s size=%ld\n",DXGetErrorString8(rc),size);
+ "returned the needed size: rc=%s size=%d\n",DXGetErrorString8(rc),size);
rc=IDirectSoundBuffer_GetFormat(*dsbo,&wfx,sizeof(wfx),NULL);
ok(rc==DS_OK,"IDirectSoundBuffer_GetFormat() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" Format: %s tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace(" Format: %s tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
is_primary ? "Primary" : "Secondary",
wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample,
wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign);
@@ -240,7 +240,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
"IDirectSoundBuffer_GetFrequency() failed: %s\n",DXGetErrorString8(rc));
if (rc==DS_OK) {
ok(freq==wfx.nSamplesPerSec,"The frequency returned by GetFrequency "
- "%ld does not match the format %ld\n",freq,wfx.nSamplesPerSec);
+ "%d does not match the format %d\n",freq,wfx.nSamplesPerSec);
}
/* DSOUND: Error: Invalid status pointer */
@@ -251,7 +251,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
rc=IDirectSoundBuffer_GetStatus(*dsbo,&status);
ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %s\n",
DXGetErrorString8(rc));
- ok(status==0,"status=0x%lx instead of 0\n",status);
+ ok(status==0,"status=0x%x instead of 0\n",status);
if (is_primary) {
DSBCAPS new_dsbcaps;
@@ -285,10 +285,10 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
wfx.nSamplesPerSec!=wfx2.nSamplesPerSec ||
wfx.wBitsPerSample!=wfx2.wBitsPerSample ||
wfx.nChannels!=wfx2.nChannels)) {
- trace("Requested format tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace("Requested format tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample,
wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign);
- trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample,
wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign);
}
@@ -299,20 +299,20 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
ok(rc==DS_OK,"IDirectSoundBuffer_GetCaps() failed: %s\n",
DXGetErrorString8(rc));
if (rc==DS_OK && winetest_debug > 1) {
- trace(" new Caps: flags=0x%08lx size=%ld\n",new_dsbcaps.dwFlags,
+ trace(" new Caps: flags=0x%08x size=%d\n",new_dsbcaps.dwFlags,
new_dsbcaps.dwBufferBytes);
}
/* Check for primary buffer size change */
ok(new_dsbcaps.dwBufferBytes == dsbcaps.dwBufferBytes,
" buffer size changed after SetFormat() - "
- "previous size was %lu, current size is %lu\n",
+ "previous size was %u, current size is %u\n",
dsbcaps.dwBufferBytes, new_dsbcaps.dwBufferBytes);
/* Check for primary buffer flags change */
ok(new_dsbcaps.dwFlags == dsbcaps.dwFlags,
" flags changed after SetFormat() - "
- "previous flags were %08lx, current flags are %08lx\n",
+ "previous flags were %08x, current flags are %08x\n",
dsbcaps.dwFlags, new_dsbcaps.dwFlags);
/* Set the CooperativeLevel back to normal */
@@ -332,7 +332,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
DWORD length1;
if (winetest_interactive) {
- trace(" Playing %g second 440Hz tone at %ldx%dx%d\n", duration,
+ trace(" Playing %g second 440Hz tone at %dx%dx%d\n", duration,
wfx.nSamplesPerSec, wfx.wBitsPerSample,wfx.nChannels);
}
@@ -477,7 +477,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
ok(rc==DS_OK,"IDirectSoundBuffer_GetStatus() failed: %s\n",
DXGetErrorString8(rc));
ok(status==(DSBSTATUS_PLAYING|DSBSTATUS_LOOPING),
- "GetStatus: bad status: %lx\n",status);
+ "GetStatus: bad status: %x\n",status);
if (listener) {
ZeroMemory(&listener_param,sizeof(listener_param));
@@ -537,7 +537,7 @@ void test_buffer8(LPDIRECTSOUND8 dso, LP
/* Check the sound duration was within 10% of the expected value */
now=GetTickCount();
ok(fabs(1000*duration-now+start_time)<=100*duration,
- "The sound played for %ld ms instead of %g ms\n",
+ "The sound played for %d ms instead of %g ms\n",
now-start_time,1000*duration);
free(state.wave);
@@ -668,8 +668,8 @@ static HRESULT test_secondary8(LPGUID lp
}
if (winetest_interactive) {
- trace(" Testing a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d "
- "with a primary buffer at %ldx%dx%d\n",
+ trace(" Testing a %s%ssecondary buffer %s%s%s%sat %dx%dx%d "
+ "with a primary buffer at %dx%dx%d\n",
has_3dbuffer?"3D ":"",
has_duplicate?"duplicated ":"",
listener!=NULL||move_sound?"with ":"",
@@ -682,7 +682,7 @@ static HRESULT test_secondary8(LPGUID lp
}
rc=IDirectSound8_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK && secondary!=NULL,"IDirectSound8_CreateSoundBuffer() "
- "failed to create a %s%ssecondary buffer %s%s%s%sat %ldx%dx%d (%s): %s\n",
+ "failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %s\n",
has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"",
listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"",
listener!=NULL?"listener ":"",
@@ -698,11 +698,11 @@ static HRESULT test_secondary8(LPGUID lp
rc=IDirectSoundBuffer_GetVolume(secondary,&vol);
ok(rc==DS_OK,"IDirectSoundBuffer_GetVolume(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(vol==0,"wrong volume for a new secondary buffer: %ld\n",vol);
+ ok(vol==0,"wrong volume for a new secondary buffer: %d\n",vol);
rc=IDirectSoundBuffer_GetPan(secondary,&pan);
ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(pan==0,"wrong pan for a new secondary buffer: %ld\n",pan);
+ ok(pan==0,"wrong pan for a new secondary buffer: %d\n",pan);
/* Check that changing the secondary buffer's volume and pan
* does not impact the primary buffer's volume and pan
@@ -720,7 +720,7 @@ static HRESULT test_secondary8(LPGUID lp
rc=IDirectSoundBuffer_GetVolume(secondary,&vol);
ok(rc==DS_OK,"IDirectSoundBuffer_SetVolume(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(vol==-1000,"secondary: wrong volume %ld instead of -1000\n",
+ ok(vol==-1000,"secondary: wrong volume %d instead of -1000\n",
vol);
rc=IDirectSoundBuffer_SetPan(secondary,-1000);
ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: "
@@ -728,18 +728,18 @@ static HRESULT test_secondary8(LPGUID lp
rc=IDirectSoundBuffer_GetPan(secondary,&pan);
ok(rc==DS_OK,"IDirectSoundBuffer_SetPan(secondary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(pan==-1000,"secondary: wrong pan %ld instead of -1000\n",
+ ok(pan==-1000,"secondary: wrong pan %d instead of -1000\n",
pan);
rc=IDirectSoundBuffer_GetVolume(primary,&vol);
ok(rc==DS_OK,"IDirectSoundBuffer_`GetVolume(primary) failed: i"
"%s\n",DXGetErrorString8(rc));
- ok(vol==refvol,"The primary volume changed from %ld to %ld\n",
+ ok(vol==refvol,"The primary volume changed from %d to %d\n",
refvol,vol);
rc=IDirectSoundBuffer_GetPan(primary,&pan);
ok(rc==DS_OK,"IDirectSoundBuffer_GetPan(primary) failed: "
"%s\n",DXGetErrorString8(rc));
- ok(pan==refpan,"The primary pan changed from %ld to %ld\n",
+ ok(pan==refpan,"The primary pan changed from %d to %d\n",
refpan,pan);
rc=IDirectSoundBuffer_SetVolume(secondary,0);
diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c
index 6163484..176c7f6 100644
--- a/dlls/dsound/tests/dsound.c
+++ b/dlls/dsound/tests/dsound.c
@@ -159,7 +159,7 @@ static void IDirectSound_test(LPDIRECTSO
DXGetErrorString8(rc));
if (rc==DS_OK && speaker_config!=new_speaker_config)
trace("IDirectSound_GetSpeakerConfig() failed to set speaker "
- "config: expected 0x%08lx, got 0x%08lx\n",
+ "config: expected 0x%08x, got 0x%08x\n",
speaker_config,new_speaker_config);
}
@@ -472,7 +472,7 @@ static HRESULT test_primary(LPGUID lpGui
trace("Playing a 5 seconds reference tone at the current "
"volume.\n");
if (rc==DS_OK)
- trace("(the current volume is %ld according to DirectSound)\n",
+ trace("(the current volume is %d according to DirectSound)\n",
vol);
trace("All subsequent tones should be identical to this one.\n");
trace("Listen for stutter, changes in pitch, volume, etc.\n");
@@ -576,11 +576,11 @@ static HRESULT test_primary_secondary(LP
wfx.nSamplesPerSec!=wfx2.nSamplesPerSec ||
wfx.wBitsPerSample!=wfx2.wBitsPerSample ||
wfx.nChannels!=wfx2.nChannels)) {
- trace("Requested primary format tag=0x%04x %ldx%dx%d "
- "avg.B/s=%ld align=%d\n",
+ trace("Requested primary format tag=0x%04x %dx%dx%d "
+ "avg.B/s=%d align=%d\n",
wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample,
wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign);
- trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample,
wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign);
}
@@ -601,8 +601,8 @@ static HRESULT test_primary_secondary(LP
wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx2;
if (winetest_interactive) {
- trace(" Testing a primary buffer at %ldx%dx%d with a "
- "secondary buffer at %ldx%dx%d\n",
+ trace(" Testing a primary buffer at %dx%dx%d with a "
+ "secondary buffer at %dx%dx%d\n",
wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,
wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels);
}
@@ -714,8 +714,8 @@ static HRESULT test_secondary(LPGUID lpG
wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx;
if (winetest_interactive) {
- trace(" Testing a secondary buffer at %ldx%dx%d "
- "with a primary buffer at %ldx%dx%d\n",
+ trace(" Testing a secondary buffer at %dx%dx%d "
+ "with a primary buffer at %dx%dx%d\n",
wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,
wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels);
}
@@ -790,8 +790,8 @@ static HRESULT test_block_align(LPGUID l
"returned: %s\n", DXGetErrorString8(rc));
if (rc==DS_OK)
ok(dsbcaps.dwBufferBytes==(wfx.nAvgBytesPerSec + wfx.nBlockAlign),
- "Buffer size not a multiple of nBlockAlign: requested %ld, "
- "got %ld, should be %ld\n", bufdesc.dwBufferBytes,
+ "Buffer size not a multiple of nBlockAlign: requested %d, "
+ "got %d, should be %d\n", bufdesc.dwBufferBytes,
dsbcaps.dwBufferBytes, wfx.nAvgBytesPerSec + wfx.nBlockAlign);
ref=IDirectSoundBuffer_Release(secondary);
ok(ref==0,"IDirectSoundBuffer_Release() secondary has %d references, "
@@ -874,8 +874,8 @@ static HRESULT test_frequency(LPGUID lpG
BUFFER_LEN/1000,wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx;
if (winetest_interactive) {
- trace(" Testing a secondary buffer at %ldx%dx%d "
- "with a primary buffer at %ldx%dx%d\n",
+ trace(" Testing a secondary buffer at %dx%dx%d "
+ "with a primary buffer at %dx%dx%d\n",
wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,
wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels);
}
diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c
index af90ac6..e142886 100644
--- a/dlls/dsound/tests/dsound8.c
+++ b/dlls/dsound/tests/dsound8.c
@@ -174,7 +174,7 @@ static void IDirectSound8_test(LPDIRECTS
DXGetErrorString8(rc));
if (rc==DS_OK && speaker_config!=new_speaker_config)
trace("IDirectSound8_GetSpeakerConfig() failed to set speaker "
- "config: expected 0x%08lx, got 0x%08lx\n",
+ "config: expected 0x%08x, got 0x%08x\n",
speaker_config,new_speaker_config);
}
@@ -503,7 +503,7 @@ static HRESULT test_primary8(LPGUID lpGu
if (winetest_interactive) {
trace("Playing a 5 seconds reference tone at the current volume.\n");
if (rc==DS_OK)
- trace("(the current volume is %ld according to DirectSound)\n",
+ trace("(the current volume is %d according to DirectSound)\n",
vol);
trace("All subsequent tones should be identical to this one.\n");
trace("Listen for stutter, changes in pitch, volume, etc.\n");
@@ -608,11 +608,11 @@ static HRESULT test_primary_secondary8(L
wfx.nSamplesPerSec!=wfx2.nSamplesPerSec ||
wfx.wBitsPerSample!=wfx2.wBitsPerSample ||
wfx.nChannels!=wfx2.nChannels)) {
- trace("Requested primary format tag=0x%04x %ldx%dx%d "
- "avg.B/s=%ld align=%d\n",
+ trace("Requested primary format tag=0x%04x %dx%dx%d "
+ "avg.B/s=%d align=%d\n",
wfx2.wFormatTag,wfx2.nSamplesPerSec,wfx2.wBitsPerSample,
wfx2.nChannels,wfx2.nAvgBytesPerSec,wfx2.nBlockAlign);
- trace("Got tag=0x%04x %ldx%dx%d avg.B/s=%ld align=%d\n",
+ trace("Got tag=0x%04x %dx%dx%d avg.B/s=%d align=%d\n",
wfx.wFormatTag,wfx.nSamplesPerSec,wfx.wBitsPerSample,
wfx.nChannels,wfx.nAvgBytesPerSec,wfx.nBlockAlign);
}
@@ -633,8 +633,8 @@ static HRESULT test_primary_secondary8(L
wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx2;
if (winetest_interactive) {
- trace(" Testing a primary buffer at %ldx%dx%d with a "
- "secondary buffer at %ldx%dx%d\n",
+ trace(" Testing a primary buffer at %dx%dx%d with a "
+ "secondary buffer at %dx%dx%d\n",
wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,
wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels);
}
@@ -746,8 +746,8 @@ static HRESULT test_secondary8(LPGUID lp
wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx;
if (winetest_interactive) {
- trace(" Testing a secondary buffer at %ldx%dx%d "
- "with a primary buffer at %ldx%dx%d\n",
+ trace(" Testing a secondary buffer at %dx%dx%d "
+ "with a primary buffer at %dx%dx%d\n",
wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels,
wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels);
}
@@ -829,7 +829,7 @@ const char * get_file_version(const char
VS_FIXEDFILEINFO *pFixedVersionInfo;
UINT len;
if (VerQueryValueA(data, backslash, (LPVOID *)&pFixedVersionInfo, &len)) {
- sprintf(version, "%ld.%ld.%ld.%ld",
+ sprintf(version, "%d.%d.%d.%d",
pFixedVersionInfo->dwFileVersionMS >> 16,
pFixedVersionInfo->dwFileVersionMS & 0xffff,
pFixedVersionInfo->dwFileVersionLS >> 16,
diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c
index e4095c1..cfa8582 100644
--- a/dlls/dsound/tests/duplex.c
+++ b/dlls/dsound/tests/duplex.c
@@ -124,7 +124,7 @@ static void IDirectSoundFullDuplex_tests
CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex,
(void**)&dsfdo);
ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG||rc==CLASS_E_CLASSNOTAVAILABLE,
- "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n",
+ "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08x)\n",
DXGetErrorString8(rc), rc);
if (rc==REGDB_E_CLASSNOTREG) {
trace(" Class Not Registered\n");
@@ -141,7 +141,7 @@ static void IDirectSoundFullDuplex_tests
rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL,
CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex,
(void**)&dsfdo);
- ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n",
+ ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08x)\n",
DXGetErrorString8(rc), rc);
if (dsfdo)
IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultCapture,
@@ -152,7 +152,7 @@ static void IDirectSoundFullDuplex_tests
rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL,
CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex,
(void**)&dsfdo);
- ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n",
+ ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08x)\n",
DXGetErrorString8(rc), rc);
if (dsfdo)
IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultVoiceCapture,
@@ -165,7 +165,7 @@ static void IDirectSoundFullDuplex_tests
(void**)&dsfdo);
ok(rc==E_NOINTERFACE,
"CoCreateInstance(CLSID_DirectSoundFullDuplex,CLSID_DirectSoundPrivate) "
- "should have failed: %s (0x%08lx)\n",DXGetErrorString8(rc), rc);
+ "should have failed: %s (0x%08x)\n",DXGetErrorString8(rc), rc);
ZeroMemory(&wfex, sizeof(wfex));
wfex.wFormatTag = WAVE_FORMAT_PCM;
diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c
index 2c11afa..cf2ab31 100644
--- a/dlls/dsound/tests/propset.c
+++ b/dlls/dsound/tests/propset.c
@@ -83,7 +83,7 @@ BOOL CALLBACK callback(PDSPROPERTY_DIREC
trace(" Description: %s\n", data->Description);
trace(" Module: %s\n", data->Module);
trace(" Interface: %s\n", data->Interface);
- trace(" WaveDeviceId: %ld\n", data->WaveDeviceId);
+ trace(" WaveDeviceId: %d\n", data->WaveDeviceId);
return TRUE;
}
@@ -115,7 +115,7 @@ BOOL CALLBACK callback1(PDSPROPERTY_DIRE
trace(" ModuleA: %s\n", data->ModuleA);
WideCharToMultiByte(CP_ACP, 0, data->ModuleW, -1, moduleA, sizeof(moduleA), NULL, NULL);
trace(" ModuleW: %s\n", moduleA);
- trace(" WaveDeviceId: %ld\n", data->WaveDeviceId);
+ trace(" WaveDeviceId: %d\n", data->WaveDeviceId);
return TRUE;
}
@@ -141,7 +141,7 @@ BOOL CALLBACK callbackA(PDSPROPERTY_DIRE
trace(" Description: %s\n", data->Description);
trace(" Module: %s\n", data->Module);
trace(" Interface: %s\n", data->Interface);
- trace(" WaveDeviceId: %ld\n", data->WaveDeviceId);
+ trace(" WaveDeviceId: %d\n", data->WaveDeviceId);
return TRUE;
}
@@ -174,7 +174,7 @@ BOOL CALLBACK callbackW(PDSPROPERTY_DIRE
trace("\tDescription: %s\n", descriptionA);
trace("\tModule: %s\n", moduleA);
trace("\tInterface: %s\n", interfaceA);
- trace("\tWaveDeviceId: %ld\n", data->WaveDeviceId);
+ trace("\tWaveDeviceId: %d\n", data->WaveDeviceId);
return TRUE;
}
@@ -324,10 +324,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),
"Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1 */
rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice,
@@ -345,10 +345,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),
"Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A */
rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice,
@@ -366,10 +366,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),
"Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_A: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W */
rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice,
@@ -387,10 +387,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),
"Shouldn't be able to set DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
/* test generic DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING */
rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice,
@@ -403,10 +403,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set "
"DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING: support = "
- "0x%lx\n",support);
+ "0x%x\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A */
rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice,
@@ -419,10 +419,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set "
"DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_A: support = "
- "0x%lx\n",support);
+ "0x%x\n",support);
/* test DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W */
rc = IKsPropertySet_QuerySupport(pps, &DSPROPSETID_DirectSoundDevice,
@@ -435,10 +435,10 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET), "Shouldn't be able to set "
"DSPROPERTY_DIRECTSOUNDDEVICE_WAVEDEVICEMAPPING_W: support = "
- "0x%lx\n",support);
+ "0x%x\n",support);
/* test generic DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE */
trace("*** Testing DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE ***\n");
@@ -453,9 +453,9 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set "
- "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: support = 0x%lx\n",support);
+ "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE: support = 0x%x\n",support);
if (support & KSPROPERTY_SUPPORT_GET) {
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_DATA data;
@@ -467,7 +467,7 @@ static void propset_private_tests(void)
rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice,
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE,
NULL, 0, &data, sizeof(data), &bytes);
- ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc);
+ ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc);
}
/* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1 */
@@ -483,9 +483,9 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set "
- "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: support = 0x%lx\n",support);
+ "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1: support = 0x%x\n",support);
if (support & KSPROPERTY_SUPPORT_GET) {
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1_DATA data;
@@ -497,7 +497,7 @@ static void propset_private_tests(void)
rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice,
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_1,
NULL, 0, &data, sizeof(data), &bytes);
- ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc);
+ ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc);
}
/* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A */
@@ -513,9 +513,9 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set "
- "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: support = 0x%lx\n",support);
+ "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A: support = 0x%x\n",support);
if (support & KSPROPERTY_SUPPORT_GET) {
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A_DATA data;
@@ -527,7 +527,7 @@ static void propset_private_tests(void)
rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice,
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_A,
NULL, 0, &data, sizeof(data), &bytes);
- ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc);
+ ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc);
}
/* test DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W */
@@ -543,9 +543,9 @@ static void propset_private_tests(void)
ok(support & KSPROPERTY_SUPPORT_GET,
"Couldn't get DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: "
- "support = 0x%lx\n",support);
+ "support = 0x%x\n",support);
ok(!(support & KSPROPERTY_SUPPORT_SET),"Shouldn't be able to set "
- "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: support = 0x%lx\n",support);
+ "DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W: support = 0x%x\n",support);
if (support & KSPROPERTY_SUPPORT_GET) {
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W_DATA data;
@@ -557,7 +557,7 @@ static void propset_private_tests(void)
rc = IKsPropertySet_Get(pps, &DSPROPSETID_DirectSoundDevice,
DSPROPERTY_DIRECTSOUNDDEVICE_ENUMERATE_W,
NULL, 0, &data, sizeof(data), &bytes);
- ok(rc==DS_OK, "Couldn't enumerate: 0x%lx\n",rc);
+ ok(rc==DS_OK, "Couldn't enumerate: 0x%x\n",rc);
}
error:
@@ -618,7 +618,7 @@ static BOOL WINAPI dsenum_callback(LPGUI
bufdesc.dwFlags=DSBCAPS_CTRLDEFAULT|DSBCAPS_GETCURRENTPOSITION2;
bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec;
bufdesc.lpwfxFormat=&wfx;
- trace(" Testing a secondary buffer at %ldx%dx%d\n",
+ trace(" Testing a secondary buffer at %dx%dx%d\n",
wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels);
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK&&secondary!=NULL,"IDirectSound_CreateSoundBuffer() "
--
1.4.2.3
-------------- 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/20061010/eb1b967a/attachment-0001.pgp
More information about the wine-patches
mailing list