[PATCH 2/2] winmm/tests: Win64 printf format warning fixes.
Michael Stefaniuc
mstefani at redhat.de
Sun Nov 12 14:06:57 CST 2006
Pure fixformat.pl generated patch.
bye
michael
---
dlls/winmm/tests/Makefile.in | 1 -
dlls/winmm/tests/capture.c | 32 +++++++++----------
dlls/winmm/tests/mixer.c | 72 +++++++++++++++++++++---------------------
dlls/winmm/tests/mmio.c | 52 +++++++++++++++---------------
dlls/winmm/tests/timer.c | 8 ++---
dlls/winmm/tests/wave.c | 32 +++++++++----------
6 files changed, 98 insertions(+), 99 deletions(-)
diff --git a/dlls/winmm/tests/Makefile.in b/dlls/winmm/tests/Makefile.in
index 56ea858..bf63dc3 100644
--- a/dlls/winmm/tests/Makefile.in
+++ b/dlls/winmm/tests/Makefile.in
@@ -4,7 +4,6 @@ SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = winmm.dll
IMPORTS = winmm user32 kernel32
-EXTRADEFS = -DWINE_NO_LONG_AS_INT
CTESTS = \
capture.c \
diff --git a/dlls/winmm/tests/capture.c b/dlls/winmm/tests/capture.c
index c0e18d0..1dadd82 100644
--- a/dlls/winmm/tests/capture.c
+++ b/dlls/winmm/tests/capture.c
@@ -70,8 +70,8 @@ static void check_position(int device, H
trace("waveInGetPosition(%s): TIME_BYTES not supported, returned %s\n",
dev_name(device),wave_time_format(mmtime.wType));
returned = time_to_bytes(&mmtime, pwfx);
- ok(returned == bytes, "waveInGetPosition(%s): returned %ld bytes, "
- "should be %ld\n", dev_name(device), returned, bytes);
+ ok(returned == bytes, "waveInGetPosition(%s): returned %d bytes, "
+ "should be %d\n", dev_name(device), returned, bytes);
mmtime.wType = TIME_SAMPLES;
rc=waveInGetPosition(win, &mmtime, sizeof(mmtime));
@@ -81,8 +81,8 @@ static void check_position(int device, H
trace("waveInGetPosition(%s): TIME_SAMPLES not supported, "
"returned %s\n",dev_name(device),wave_time_format(mmtime.wType));
returned = time_to_bytes(&mmtime, pwfx);
- ok(returned == bytes, "waveInGetPosition(%s): returned %ld samples, "
- "should be %ld\n", dev_name(device), bytes_to_samples(returned, pwfx),
+ ok(returned == bytes, "waveInGetPosition(%s): returned %d samples, "
+ "should be %d\n", dev_name(device), bytes_to_samples(returned, pwfx),
bytes_to_samples(bytes, pwfx));
mmtime.wType = TIME_MS;
@@ -93,8 +93,8 @@ static void check_position(int device, H
trace("waveInGetPosition(%s): TIME_MS not supported, returned %s\n",
dev_name(device), wave_time_format(mmtime.wType));
returned = time_to_bytes(&mmtime, pwfx);
- ok(returned == bytes, "waveInGetPosition(%s): returned %ld ms, "
- "should be %ld\n", dev_name(device), bytes_to_ms(returned, pwfx),
+ ok(returned == bytes, "waveInGetPosition(%s): returned %d ms, "
+ "should be %d\n", dev_name(device), bytes_to_ms(returned, pwfx),
bytes_to_ms(bytes, pwfx));
mmtime.wType = TIME_SMPTE;
@@ -143,7 +143,7 @@ static void wave_in_test_deviceIn(int de
DWORD nSamplesPerSec = pwfx->nSamplesPerSec;
hevent=CreateEvent(NULL,FALSE,FALSE,NULL);
- ok(hevent!=NULL,"CreateEvent(): error=%ld\n",GetLastError());
+ ok(hevent!=NULL,"CreateEvent(): error=%d\n",GetLastError());
if (hevent==NULL)
return;
@@ -159,7 +159,7 @@ static void wave_in_test_deviceIn(int de
(!(flags & WAVE_FORMAT_DIRECT) || (flags & WAVE_MAPPED)) &&
!(pcaps->dwFormats & format)) ||
(rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)),
- "waveInOpen(%s): format=%ldx%2dx%d flags=%lx(%s) rc=%s\n",
+ "waveInOpen(%s): format=%dx%2dx%d flags=%lx(%s) rc=%s\n",
dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample,
pwfx->nChannels,CALLBACK_EVENT|flags,
wave_open_flags(CALLBACK_EVENT|flags),wave_in_error(rc));
@@ -169,7 +169,7 @@ static void wave_in_test_deviceIn(int de
"capabilities but opening it failed.\n");
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
!(pcaps->dwFormats & format))
- trace("waveInOpen(%s): format=%ldx%2dx%d %s rc=%s failed but format "
+ trace("waveInOpen(%s): format=%dx%2dx%d %s rc=%s failed but format "
"not supported so OK.\n",dev_name(device),pwfx->nSamplesPerSec,
pwfx->wBitsPerSample,pwfx->nChannels,
flags & WAVE_FORMAT_DIRECT ? "flags=WAVE_FORMAT_DIRECT" :
@@ -184,7 +184,7 @@ static void wave_in_test_deviceIn(int de
ok(pwfx->nChannels==nChannels &&
pwfx->wBitsPerSample==wBitsPerSample &&
pwfx->nSamplesPerSec==nSamplesPerSec,
- "got the wrong format: %ldx%2dx%d instead of %ldx%2dx%d\n",
+ "got the wrong format: %dx%2dx%d instead of %dx%2dx%d\n",
pwfx->nSamplesPerSec, pwfx->wBitsPerSample,
pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels);
@@ -206,7 +206,7 @@ static void wave_in_test_deviceIn(int de
"not set\n",dev_name(device));
if (winetest_interactive && rc==MMSYSERR_NOERROR) {
- trace("Recording for 1 second at %5ldx%2dx%d %s %s\n",
+ trace("Recording for 1 second at %5dx%2dx%d %s %s\n",
pwfx->nSamplesPerSec, pwfx->wBitsPerSample,pwfx->nChannels,
get_format_str(pwfx->wFormatTag),
flags & WAVE_FORMAT_DIRECT ? "WAVE_FORMAT_DIRECT" :
@@ -226,7 +226,7 @@ static void wave_in_test_deviceIn(int de
ok(res==WAIT_OBJECT_0,"WaitForSingleObject failed for header\n");
ok(frag.dwFlags&WHDR_DONE,"WHDR_DONE not set in frag.dwFlags\n");
ok(frag.dwBytesRecorded==pwfx->nAvgBytesPerSec,
- "frag.dwBytesRecorded=%ld, should=%ld\n",
+ "frag.dwBytesRecorded=%d, should=%d\n",
frag.dwBytesRecorded,pwfx->nAvgBytesPerSec);
/* stop playing on error */
@@ -261,7 +261,7 @@ static void wave_in_test_deviceIn(int de
rc==MMSYSERR_ALLOCATED ||
((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
!(pcaps->dwFormats & format)),
- "waveOutOpen(%s) format=%ldx%2dx%d flags=%lx(%s) rc=%s\n",
+ "waveOutOpen(%s) format=%dx%2dx%d flags=%lx(%s) rc=%s\n",
dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample,
pwfx->nChannels,CALLBACK_EVENT|flags,
wave_open_flags(CALLBACK_EVENT),wave_out_error(rc));
@@ -375,7 +375,7 @@ #endif
ok(rc==MMSYSERR_NOERROR,"waveInMessage(%s): failed to get interface "
"name: rc=%s\n",dev_name(device),wave_in_error(rc));
ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),
- "got an incorrect size %ld\n", size);
+ "got an incorrect size %d\n", size);
if (rc==MMSYSERR_NOERROR) {
nameA = malloc(size/sizeof(WCHAR));
WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR),
@@ -389,7 +389,7 @@ #endif
trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname,
(nameA?nameA:"failed"),capsA.vDriverVersion >> 8,
capsA.vDriverVersion & 0xff,capsA.wMid,capsA.wPid);
- trace(" channels=%d formats=%05lx\n",
+ trace(" channels=%d formats=%05x\n",
capsA.wChannels,capsA.dwFormats);
free(nameA);
@@ -455,7 +455,7 @@ #endif
"waveInOpen(%s): opening the device with 2 MHz sample rate should fail: "
" rc=%s\n",dev_name(device),wave_in_error(rc));
if (rc==MMSYSERR_NOERROR) {
- trace(" got %ldx%2dx%d for %ldx%2dx%d\n",
+ trace(" got %dx%2dx%d for %dx%2dx%d\n",
format.nSamplesPerSec, format.wBitsPerSample,
format.nChannels,
oformat.nSamplesPerSec, oformat.wBitsPerSample,
diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c
index b376fa1..bf27c77 100644
--- a/dlls/winmm/tests/mixer.c
+++ b/dlls/winmm/tests/mixer.c
@@ -200,7 +200,7 @@ static void mixer_test_controlA(HMIXER m
MIXERCONTROLDETAILS_UNSIGNED new_value;
if (winetest_interactive)
- trace(" Value=%ld\n",value.dwValue);
+ trace(" Value=%d\n",value.dwValue);
if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum)
new_value.dwValue = value.dwValue + control->Metrics.cSteps;
@@ -238,7 +238,7 @@ static void mixer_test_controlA(HMIXER m
if (rc==MMSYSERR_NOERROR) {
/* result may not match exactly because of rounding */
ok(abs(ret_value.dwValue-new_value.dwValue)<=1,
- "Couldn't change value from %ld to %ld, returned %ld\n",
+ "Couldn't change value from %d to %d, returned %d\n",
value.dwValue,new_value.dwValue,ret_value.dwValue);
if (abs(ret_value.dwValue-new_value.dwValue)<=1) {
@@ -280,7 +280,7 @@ static void mixer_test_controlA(HMIXER m
MIXERCONTROLDETAILS_BOOLEAN new_value;
if (winetest_interactive)
- trace(" Value=%ld\n",value.fValue);
+ trace(" Value=%d\n",value.fValue);
if (value.fValue == FALSE)
new_value.fValue = TRUE;
@@ -318,7 +318,7 @@ static void mixer_test_controlA(HMIXER m
if (rc==MMSYSERR_NOERROR) {
/* result may not match exactly because of rounding */
ok(ret_value.fValue==new_value.fValue,
- "Couldn't change value from %ld to %ld, returned %ld\n",
+ "Couldn't change value from %d to %d, returned %d\n",
value.fValue,new_value.fValue,ret_value.fValue);
if (ret_value.fValue==new_value.fValue) {
@@ -366,7 +366,7 @@ static void mixer_test_deviceA(int devic
mmsys_error(rc));
if (winetest_interactive) {
- trace(" %d: \"%s\" %d.%d (%d:%d) destinations=%ld\n", device,
+ trace(" %d: \"%s\" %d.%d (%d:%d) destinations=%d\n", device,
capsA.szPname, capsA.vDriverVersion >> 8,
capsA.vDriverVersion & 0xff,capsA.wMid,capsA.wPid,
capsA.cDestinations);
@@ -427,20 +427,20 @@ static void mixer_test_deviceA(int devic
if (rc==MMSYSERR_NODRIVER)
trace(" No Driver\n");
else if (rc==MMSYSERR_NOERROR && winetest_interactive) {
- trace(" %ld: \"%s\" (%s) Destination=%ld Source=%ld\n",
+ trace(" %d: \"%s\" (%s) Destination=%d Source=%d\n",
d,mixerlineA.szShortName, mixerlineA.szName,
mixerlineA.dwDestination,mixerlineA.dwSource);
- trace(" LineID=%08lx Channels=%ld "
- "Connections=%ld Controls=%ld\n",
+ trace(" LineID=%08x Channels=%d "
+ "Connections=%d Controls=%d\n",
mixerlineA.dwLineID,mixerlineA.cChannels,
mixerlineA.cConnections,mixerlineA.cControls);
- trace(" State=0x%08lx(%s)\n",
+ trace(" State=0x%08x(%s)\n",
mixerlineA.fdwLine,line_flags(mixerlineA.fdwLine));
trace(" ComponentType=%s\n",
component_type(mixerlineA.dwComponentType));
trace(" Type=%s\n",
target_type(mixerlineA.Target.dwType));
- trace(" Device=%ld (%s) %d.%d (%d:%d)\n",
+ trace(" Device=%d (%s) %d.%d (%d:%d)\n",
mixerlineA.Target.dwDeviceID,
mixerlineA.Target.szPname,
mixerlineA.Target.vDriverVersion >> 8,
@@ -464,20 +464,20 @@ static void mixer_test_deviceA(int devic
LPMIXERCONTROLA array;
MIXERLINECONTROLSA controls;
if (winetest_interactive) {
- trace(" %ld: \"%s\" (%s) Destination=%ld Source=%ld\n",
+ trace(" %d: \"%s\" (%s) Destination=%d Source=%d\n",
s,mixerlineA.szShortName, mixerlineA.szName,
mixerlineA.dwDestination,mixerlineA.dwSource);
- trace(" LineID=%08lx Channels=%ld "
- "Connections=%ld Controls=%ld\n",
+ trace(" LineID=%08x Channels=%d "
+ "Connections=%d Controls=%d\n",
mixerlineA.dwLineID,mixerlineA.cChannels,
mixerlineA.cConnections,mixerlineA.cControls);
- trace(" State=0x%08lx(%s)\n",
+ trace(" State=0x%08x(%s)\n",
mixerlineA.fdwLine,line_flags(mixerlineA.fdwLine));
trace(" ComponentType=%s\n",
component_type(mixerlineA.dwComponentType));
trace(" Type=%s\n",
target_type(mixerlineA.Target.dwType));
- trace(" Device=%ld (%s) %d.%d (%d:%d)\n",
+ trace(" Device=%d (%s) %d.%d (%d:%d)\n",
mixerlineA.Target.dwDeviceID,
mixerlineA.Target.szPname,
mixerlineA.Target.vDriverVersion >> 8,
@@ -519,15 +519,15 @@ static void mixer_test_deviceA(int devic
if (rc==MMSYSERR_NOERROR) {
for(nc=0;nc<mixerlineA.cControls;nc++) {
if (winetest_interactive) {
- trace(" %ld: \"%s\" (%s) ControlID=%ld\n", nc,
+ trace(" %d: \"%s\" (%s) ControlID=%d\n", nc,
array[nc].szShortName,
array[nc].szName, array[nc].dwControlID);
trace(" ControlType=%s\n",
control_type(array[nc].dwControlType));
- trace(" Control=0x%08lx(%s)\n",
+ trace(" Control=0x%08x(%s)\n",
array[nc].fdwControl,
control_flags(array[nc].fdwControl));
- trace(" Items=%ld Min=%ld Max=%ld Step=%ld\n",
+ trace(" Items=%d Min=%d Max=%d Step=%d\n",
array[nc].cMultipleItems,
S1(array[nc].Bounds).dwMinimum,
S1(array[nc].Bounds).dwMaximum,
@@ -577,7 +577,7 @@ static void mixer_test_controlW(HMIXER m
MIXERCONTROLDETAILS_UNSIGNED new_value;
if (winetest_interactive)
- trace(" Value=%ld\n",value.dwValue);
+ trace(" Value=%d\n",value.dwValue);
if (value.dwValue + control->Metrics.cSteps < S1(control->Bounds).dwMaximum)
new_value.dwValue = value.dwValue + control->Metrics.cSteps;
@@ -615,7 +615,7 @@ static void mixer_test_controlW(HMIXER m
if (rc==MMSYSERR_NOERROR) {
/* result may not match exactly because of rounding */
ok(abs(ret_value.dwValue-new_value.dwValue)<=1,
- "Couldn't change value from %ld to %ld, returned %ld\n",
+ "Couldn't change value from %d to %d, returned %d\n",
value.dwValue,new_value.dwValue,ret_value.dwValue);
if (abs(ret_value.dwValue-new_value.dwValue)<=1) {
@@ -657,7 +657,7 @@ static void mixer_test_controlW(HMIXER m
MIXERCONTROLDETAILS_BOOLEAN new_value;
if (winetest_interactive)
- trace(" Value=%ld\n",value.fValue);
+ trace(" Value=%d\n",value.fValue);
if (value.fValue == FALSE)
new_value.fValue = TRUE;
@@ -695,7 +695,7 @@ static void mixer_test_controlW(HMIXER m
if (rc==MMSYSERR_NOERROR) {
/* result may not match exactly because of rounding */
ok(ret_value.fValue==new_value.fValue,
- "Couldn't change value from %ld to %ld, returned %ld\n",
+ "Couldn't change value from %d to %d, returned %d\n",
value.fValue,new_value.fValue,ret_value.fValue);
if (ret_value.fValue==new_value.fValue) {
@@ -748,7 +748,7 @@ static void mixer_test_deviceW(int devic
WideCharToMultiByte(CP_ACP,0,capsW.szPname, MAXPNAMELEN,szPname,
MAXPNAMELEN,NULL,NULL);
if (winetest_interactive) {
- trace(" %d: \"%s\" %d.%d (%d:%d) destinations=%ld\n", device,
+ trace(" %d: \"%s\" %d.%d (%d:%d) destinations=%d\n", device,
szPname, capsW.vDriverVersion >> 8,
capsW.vDriverVersion & 0xff,capsW.wMid,capsW.wPid,
capsW.cDestinations);
@@ -817,20 +817,20 @@ static void mixer_test_deviceW(int devic
WideCharToMultiByte(CP_ACP,0,mixerlineW.Target.szPname,
MAXPNAMELEN,szPname,
MAXPNAMELEN,NULL, NULL);
- trace(" %ld: \"%s\" (%s) Destination=%ld Source=%ld\n",
+ trace(" %d: \"%s\" (%s) Destination=%d Source=%d\n",
d,szShortName,szName,
mixerlineW.dwDestination,mixerlineW.dwSource);
- trace(" LineID=%08lx Channels=%ld "
- "Connections=%ld Controls=%ld\n",
+ trace(" LineID=%08x Channels=%d "
+ "Connections=%d Controls=%d\n",
mixerlineW.dwLineID,mixerlineW.cChannels,
mixerlineW.cConnections,mixerlineW.cControls);
- trace(" State=0x%08lx(%s)\n",
+ trace(" State=0x%08x(%s)\n",
mixerlineW.fdwLine,line_flags(mixerlineW.fdwLine));
trace(" ComponentType=%s\n",
component_type(mixerlineW.dwComponentType));
trace(" Type=%s\n",
target_type(mixerlineW.Target.dwType));
- trace(" Device=%ld (%s) %d.%d (%d:%d)\n",
+ trace(" Device=%d (%s) %d.%d (%d:%d)\n",
mixerlineW.Target.dwDeviceID,szPname,
mixerlineW.Target.vDriverVersion >> 8,
mixerlineW.Target.vDriverVersion & 0xff,
@@ -862,20 +862,20 @@ static void mixer_test_deviceW(int devic
WideCharToMultiByte(CP_ACP,0,mixerlineW.Target.szPname,
MAXPNAMELEN,szPname,
MAXPNAMELEN,NULL, NULL);
- trace(" %ld: \"%s\" (%s) Destination=%ld Source=%ld\n",
+ trace(" %d: \"%s\" (%s) Destination=%d Source=%d\n",
s,szShortName,szName,
mixerlineW.dwDestination,mixerlineW.dwSource);
- trace(" LineID=%08lx Channels=%ld "
- "Connections=%ld Controls=%ld\n",
+ trace(" LineID=%08x Channels=%d "
+ "Connections=%d Controls=%d\n",
mixerlineW.dwLineID,mixerlineW.cChannels,
mixerlineW.cConnections,mixerlineW.cControls);
- trace(" State=0x%08lx(%s)\n",
+ trace(" State=0x%08x(%s)\n",
mixerlineW.fdwLine,line_flags(mixerlineW.fdwLine));
trace(" ComponentType=%s\n",
component_type(mixerlineW.dwComponentType));
trace(" Type=%s\n",
target_type(mixerlineW.Target.dwType));
- trace(" Device=%ld (%s) %d.%d (%d:%d)\n",
+ trace(" Device=%d (%s) %d.%d (%d:%d)\n",
mixerlineW.Target.dwDeviceID,szPname,
mixerlineW.Target.vDriverVersion >> 8,
mixerlineW.Target.vDriverVersion & 0xff,
@@ -922,14 +922,14 @@ static void mixer_test_deviceW(int devic
WideCharToMultiByte(CP_ACP,0,array[nc].szName,
MIXER_LONG_NAME_CHARS,szName,
MIXER_LONG_NAME_CHARS,NULL,NULL);
- trace(" %ld: \"%s\" (%s) ControlID=%ld\n", nc,
+ trace(" %d: \"%s\" (%s) ControlID=%d\n", nc,
szShortName, szName, array[nc].dwControlID);
trace(" ControlType=%s\n",
control_type(array[nc].dwControlType));
- trace(" Control=0x%08lx(%s)\n",
+ trace(" Control=0x%08x(%s)\n",
array[nc].fdwControl,
control_flags(array[nc].fdwControl));
- trace(" Items=%ld Min=%ld Max=%ld Step=%ld\n",
+ trace(" Items=%d Min=%d Max=%d Step=%d\n",
array[nc].cMultipleItems,
S1(array[nc].Bounds).dwMinimum,
S1(array[nc].Bounds).dwMaximum,
diff --git a/dlls/winmm/tests/mmio.c b/dlls/winmm/tests/mmio.c
index 309105d..dbb049b 100644
--- a/dlls/winmm/tests/mmio.c
+++ b/dlls/winmm/tests/mmio.c
@@ -59,25 +59,25 @@ static void test_mmioDescend(void)
/* first normal RIFF AVI parsing */
ret = mmioDescend(hmmio, &ckRiff, NULL, 0);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ckRiff.ckid == FOURCC_RIFF, "wrong ckid: %04lx\n", ckRiff.ckid);
- ok(ckRiff.fccType == formtypeAVI, "wrong fccType: %04lx\n", ckRiff.fccType);
- trace("ckid %4.4s cksize %04lx fccType %4.4s off %04lx flags %04lx\n",
+ ok(ckRiff.ckid == FOURCC_RIFF, "wrong ckid: %04x\n", ckRiff.ckid);
+ ok(ckRiff.fccType == formtypeAVI, "wrong fccType: %04x\n", ckRiff.fccType);
+ trace("ckid %4.4s cksize %04x fccType %4.4s off %04x flags %04x\n",
(LPCSTR)&ckRiff.ckid, ckRiff.cksize, (LPCSTR)&ckRiff.fccType,
ckRiff.dwDataOffset, ckRiff.dwFlags);
ret = mmioDescend(hmmio, &ckList, &ckRiff, 0);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ckList.ckid == FOURCC_LIST, "wrong ckid: %04lx\n", ckList.ckid);
- ok(ckList.fccType == listtypeAVIHEADER, "wrong fccType: %04lx\n", ckList.fccType);
- trace("ckid %4.4s cksize %04lx fccType %4.4s off %04lx flags %04lx\n",
+ ok(ckList.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ckList.ckid);
+ ok(ckList.fccType == listtypeAVIHEADER, "wrong fccType: %04x\n", ckList.fccType);
+ trace("ckid %4.4s cksize %04x fccType %4.4s off %04x flags %04x\n",
(LPCSTR)&ckList.ckid, ckList.cksize, (LPCSTR)&ckList.fccType,
ckList.dwDataOffset, ckList.dwFlags);
ret = mmioDescend(hmmio, &ck, &ckList, 0);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ck.ckid == ckidAVIMAINHDR, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType == 0, "wrong fccType: %04lx\n", ck.fccType);
- trace("ckid %4.4s cksize %04lx fccType %4.4s off %04lx flags %04lx\n",
+ ok(ck.ckid == ckidAVIMAINHDR, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType == 0, "wrong fccType: %04x\n", ck.fccType);
+ trace("ckid %4.4s cksize %04x fccType %4.4s off %04x flags %04x\n",
(LPCSTR)&ck.ckid, ck.cksize, (LPCSTR)&ck.fccType,
ck.dwDataOffset, ck.dwFlags);
@@ -101,23 +101,23 @@ static void test_mmioDescend(void)
ck.fccType = 0;
ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDRIFF);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType == formtypeAVI, "wrong fccType: %04lx\n", ck.fccType);
+ ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType);
mmioSeek(hmmio, 0, SEEK_SET);
memset(&ck, 0x55, sizeof(ck));
ret = mmioDescend(hmmio, &ck, NULL, 0);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType == formtypeAVI, "wrong fccType: %04lx\n", ck.fccType);
+ ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType);
/* do NOT seek, use current file position */
memset(&ck, 0x55, sizeof(ck));
ck.fccType = 0;
ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDLIST);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ck.ckid == FOURCC_LIST, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType == listtypeAVIHEADER, "wrong fccType: %04lx\n", ck.fccType);
+ ok(ck.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType == listtypeAVIHEADER, "wrong fccType: %04x\n", ck.fccType);
mmioSeek(hmmio, 0, SEEK_SET);
memset(&ck, 0x55, sizeof(ck));
@@ -125,41 +125,41 @@ static void test_mmioDescend(void)
ck.fccType = listtypeAVIHEADER;
ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType == formtypeAVI, "wrong fccType: %04lx\n", ck.fccType);
+ ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType);
/* do NOT seek, use current file position */
memset(&ck, 0x55, sizeof(ck));
ck.ckid = FOURCC_LIST;
ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ck.ckid == FOURCC_LIST, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType == listtypeAVIHEADER, "wrong fccType: %04lx\n", ck.fccType);
+ ok(ck.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType == listtypeAVIHEADER, "wrong fccType: %04x\n", ck.fccType);
mmioSeek(hmmio, 0, SEEK_SET);
memset(&ck, 0x55, sizeof(ck));
ck.ckid = FOURCC_RIFF;
ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType == formtypeAVI, "wrong fccType: %04lx\n", ck.fccType);
+ ok(ck.ckid == FOURCC_RIFF, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType == formtypeAVI, "wrong fccType: %04x\n", ck.fccType);
/* do NOT seek, use current file position */
memset(&ckList, 0x55, sizeof(ckList));
ckList.ckid = 0;
ret = mmioDescend(hmmio, &ckList, &ck, MMIO_FINDCHUNK);
ok(ret == MMSYSERR_NOERROR, "mmioDescend error %u\n", ret);
- ok(ckList.ckid == FOURCC_LIST, "wrong ckid: %04lx\n", ckList.ckid);
- ok(ckList.fccType == listtypeAVIHEADER, "wrong fccType: %04lx\n", ckList.fccType);
+ ok(ckList.ckid == FOURCC_LIST, "wrong ckid: %04x\n", ckList.ckid);
+ ok(ckList.fccType == listtypeAVIHEADER, "wrong fccType: %04x\n", ckList.fccType);
mmioSeek(hmmio, 0, SEEK_SET);
memset(&ck, 0x55, sizeof(ck));
ret = mmioDescend(hmmio, &ck, NULL, MMIO_FINDCHUNK);
ok(ret == MMIOERR_CHUNKNOTFOUND ||
ret == MMIOERR_INVALIDFILE, "mmioDescend returned %u\n", ret);
- ok(ck.ckid != 0x55555555, "wrong ckid: %04lx\n", ck.ckid);
- ok(ck.fccType != 0x55555555, "wrong fccType: %04lx\n", ck.fccType);
- ok(ck.dwDataOffset != 0x55555555, "wrong dwDataOffset: %04lx\n", ck.dwDataOffset);
+ ok(ck.ckid != 0x55555555, "wrong ckid: %04x\n", ck.ckid);
+ ok(ck.fccType != 0x55555555, "wrong fccType: %04x\n", ck.fccType);
+ ok(ck.dwDataOffset != 0x55555555, "wrong dwDataOffset: %04x\n", ck.dwDataOffset);
mmioSeek(hmmio, 0, SEEK_SET);
memset(&ck, 0x55, sizeof(ck));
diff --git a/dlls/winmm/tests/timer.c b/dlls/winmm/tests/timer.c
index 309c3ce..22ce81d 100644
--- a/dlls/winmm/tests/timer.c
+++ b/dlls/winmm/tests/timer.c
@@ -119,14 +119,14 @@ static void test_timer(UINT period, UINT
if (i == 0)
{
if (winetest_debug > 1)
- trace("time[%d] = %lu\n", i, times[i]);
+ trace("time[%d] = %u\n", i, times[i]);
}
else
{
delta = times[i] - times[i - 1];
if (winetest_debug > 1)
- trace("time[%d] = %lu delta = %d\n", i, times[i], delta);
+ trace("time[%d] = %u delta = %d\n", i, times[i], delta);
sum += delta;
deviation += ((delta - period) * (delta - period));
@@ -139,7 +139,7 @@ static void test_timer(UINT period, UINT
}
}
- trace("min = %lu, max = %lu, average = %f, standard deviation = %f\n",
+ trace("min = %u, max = %u, average = %f, standard deviation = %f\n",
dwMin, dwMax, sum / (count - 1), sqrt(deviation / (count - 2)));
}
@@ -167,7 +167,7 @@ static void CALLBACK priorityTimeProc(UI
DWORD_PTR dw1, DWORD_PTR dw2)
{
priority = GetThreadPriority(GetCurrentThread());
- ok(priority!=THREAD_PRIORITY_ERROR_RETURN, "GetThreadPriority() failed, GetLastError() = %08lx\n", GetLastError());
+ ok(priority!=THREAD_PRIORITY_ERROR_RETURN, "GetThreadPriority() failed, GetLastError() = %08x\n", GetLastError());
fired = TRUE;
}
diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c
index 3c447d2..240f0f1 100644
--- a/dlls/winmm/tests/wave.c
+++ b/dlls/winmm/tests/wave.c
@@ -319,7 +319,7 @@ #define WHDR_MASK (WHDR_BEGINLOOP|WHDR_D
}
if (flags & ~WHDR_MASK) {
char temp[32];
- sprintf(temp, "UNKNOWN(0x%08lx)", flags & ~WHDR_MASK);
+ sprintf(temp, "UNKNOWN(0x%08x)", flags & ~WHDR_MASK);
if (!first) strcat(msg, " ");
strcat(msg, temp);
}
@@ -461,8 +461,8 @@ static void check_position(int device, H
trace("waveOutGetPosition(%s): TIME_BYTES not supported, returned %s\n",
dev_name(device),wave_time_format(mmtime.wType));
returned = time_to_bytes(&mmtime, pwfx);
- ok(returned == bytes, "waveOutGetPosition(%s): returned %ld bytes, "
- "should be %ld\n", dev_name(device), returned, bytes);
+ ok(returned == bytes, "waveOutGetPosition(%s): returned %d bytes, "
+ "should be %d\n", dev_name(device), returned, bytes);
mmtime.wType = TIME_SAMPLES;
rc=waveOutGetPosition(wout, &mmtime, sizeof(mmtime));
@@ -472,8 +472,8 @@ static void check_position(int device, H
trace("waveOutGetPosition(%s): TIME_SAMPLES not supported, "
"returned %s\n",dev_name(device),wave_time_format(mmtime.wType));
returned = time_to_bytes(&mmtime, pwfx);
- ok(returned == bytes, "waveOutGetPosition(%s): returned %ld samples "
- "(%ld bytes), should be %ld (%ld bytes)\n", dev_name(device),
+ ok(returned == bytes, "waveOutGetPosition(%s): returned %d samples "
+ "(%d bytes), should be %d (%d bytes)\n", dev_name(device),
bytes_to_samples(returned, pwfx), returned,
bytes_to_samples(bytes, pwfx), bytes);
@@ -485,8 +485,8 @@ static void check_position(int device, H
trace("waveOutGetPosition(%s): TIME_MS not supported, returned %s\n",
dev_name(device), wave_time_format(mmtime.wType));
returned = time_to_bytes(&mmtime, pwfx);
- ok(returned == bytes, "waveOutGetPosition(%s): returned %ld ms, "
- "(%ld bytes), should be %ld (%ld bytes)\n", dev_name(device),
+ ok(returned == bytes, "waveOutGetPosition(%s): returned %d ms, "
+ "(%d bytes), should be %d (%d bytes)\n", dev_name(device),
bytes_to_ms(returned, pwfx), returned,
bytes_to_ms(bytes, pwfx), bytes);
@@ -581,7 +581,7 @@ static void wave_out_test_deviceOut(int
int i, j;
hevent=CreateEvent(NULL,FALSE,FALSE,NULL);
- ok(hevent!=NULL,"CreateEvent(): error=%ld\n",GetLastError());
+ ok(hevent!=NULL,"CreateEvent(): error=%d\n",GetLastError());
if (hevent==NULL)
return;
@@ -629,7 +629,7 @@ static void wave_out_test_deviceOut(int
(!(flags & WAVE_FORMAT_DIRECT) || (flags & WAVE_MAPPED)) &&
!(pcaps->dwFormats & format)) ||
(rc==MMSYSERR_INVALFLAG && (flags & WAVE_FORMAT_DIRECT)),
- "waveOutOpen(%s): format=%ldx%2dx%d flags=%lx(%s) rc=%s\n",
+ "waveOutOpen(%s): format=%dx%2dx%d flags=%lx(%s) rc=%s\n",
dev_name(device),pwfx->nSamplesPerSec,pwfx->wBitsPerSample,
pwfx->nChannels,CALLBACK_EVENT|flags,
wave_open_flags(CALLBACK_EVENT|flags),wave_out_error(rc));
@@ -639,7 +639,7 @@ static void wave_out_test_deviceOut(int
"capabilities but opening it failed.\n");
if ((rc==WAVERR_BADFORMAT || rc==MMSYSERR_NOTSUPPORTED) &&
!(pcaps->dwFormats & format))
- trace("waveOutOpen(%s): format=%ldx%2dx%d %s rc=%s failed but format "
+ trace("waveOutOpen(%s): format=%dx%2dx%d %s rc=%s failed but format "
"not supported so OK.\n", dev_name(device), pwfx->nSamplesPerSec,
pwfx->wBitsPerSample,pwfx->nChannels,
flags & WAVE_FORMAT_DIRECT ? "flags=WAVE_FORMAT_DIRECT" :
@@ -652,7 +652,7 @@ static void wave_out_test_deviceOut(int
ok(pwfx->nChannels==nChannels &&
pwfx->wBitsPerSample==wBitsPerSample &&
pwfx->nSamplesPerSec==nSamplesPerSec,
- "got the wrong format: %ldx%2dx%d instead of %ldx%2dx%d\n",
+ "got the wrong format: %dx%2dx%d instead of %dx%2dx%d\n",
pwfx->nSamplesPerSec, pwfx->wBitsPerSample,
pwfx->nChannels, nSamplesPerSec, wBitsPerSample, nChannels);
@@ -690,7 +690,7 @@ static void wave_out_test_deviceOut(int
if (interactive && rc==MMSYSERR_NOERROR) {
DWORD start,end;
- trace("Playing %g second %s at %5ldx%2dx%d %2d header%s %d loop%s %ld bytes %s %s\n",duration,
+ trace("Playing %g second %s at %5dx%2dx%d %2d header%s %d loop%s %d bytes %s %s\n",duration,
sine ? "440Hz tone" : "silence",pwfx->nSamplesPerSec,
pwfx->wBitsPerSample,pwfx->nChannels, headers, headers > 1 ? "s": " ",
loops, loops == 1 ? " " : "s", length * (loops + 1),
@@ -873,7 +873,7 @@ #endif
(DWORD_PTR)nameW, size);
ok(rc==MMSYSERR_NOERROR,"waveOutMessage(%s): failed to get interface "
"name, rc=%s\n",dev_name(device),wave_out_error(rc));
- ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),"got an incorrect size %ld\n",size);
+ ok(lstrlenW(nameW)+1==size/sizeof(WCHAR),"got an incorrect size %d\n",size);
if (rc==MMSYSERR_NOERROR) {
nameA = malloc(size/sizeof(WCHAR));
WideCharToMultiByte(CP_ACP, 0, nameW, size/sizeof(WCHAR), nameA,
@@ -888,7 +888,7 @@ #endif
trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname,
(nameA?nameA:"failed"),capsA.vDriverVersion >> 8,
capsA.vDriverVersion & 0xff, capsA.wMid,capsA.wPid);
- trace(" channels=%d formats=%05lx support=%04lx\n",
+ trace(" channels=%d formats=%05x support=%04x\n",
capsA.wChannels,capsA.dwFormats,capsA.dwSupport);
trace(" %s\n",wave_out_caps(capsA.dwSupport));
free(nameA);
@@ -1084,7 +1084,7 @@ #endif
"waveOutOpen(%s): opening the device in 11 bits mode should fail: "
"rc=%s\n",dev_name(device),wave_out_error(rc));
if (rc==MMSYSERR_NOERROR) {
- trace(" got %ldx%2dx%d for %ldx%2dx%d\n",
+ trace(" got %dx%2dx%d for %dx%2dx%d\n",
format.nSamplesPerSec, format.wBitsPerSample,
format.nChannels,
oformat.nSamplesPerSec, oformat.wBitsPerSample,
@@ -1107,7 +1107,7 @@ #endif
"waveOutOpen(%s): opening the device at 2 MHz sample rate should fail: "
"rc=%s\n",dev_name(device),wave_out_error(rc));
if (rc==MMSYSERR_NOERROR) {
- trace(" got %ldx%2dx%d for %ldx%2dx%d\n",
+ trace(" got %dx%2dx%d for %dx%2dx%d\n",
format.nSamplesPerSec, format.wBitsPerSample,
format.nChannels,
oformat.nSamplesPerSec, oformat.wBitsPerSample,
--
1.4.2.4
-------------- 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/20061112/874ccde5/attachment-0001.pgp
More information about the wine-patches
mailing list