msacm32/tests: Win64 printf format warning fixes.
This commit is contained in:
parent
a3a12dff89
commit
723b884b26
|
@ -4,7 +4,6 @@ SRCDIR = @srcdir@
|
||||||
VPATH = @srcdir@
|
VPATH = @srcdir@
|
||||||
TESTDLL = msacm32.dll
|
TESTDLL = msacm32.dll
|
||||||
IMPORTS = msacm32 kernel32
|
IMPORTS = msacm32 kernel32
|
||||||
EXTRADEFS = -DWINE_NO_LONG_AS_INT
|
|
||||||
|
|
||||||
CTESTS = \
|
CTESTS = \
|
||||||
msacm.c
|
msacm.c
|
||||||
|
|
|
@ -38,7 +38,7 @@ static BOOL CALLBACK FormatTagEnumProc(HACMDRIVERID hadid,
|
||||||
DWORD fdwSupport)
|
DWORD fdwSupport)
|
||||||
{
|
{
|
||||||
if (winetest_interactive)
|
if (winetest_interactive)
|
||||||
trace(" Format 0x%04lx: %s\n", paftd->dwFormatTag, paftd->szFormatTag);
|
trace(" Format 0x%04x: %s\n", paftd->dwFormatTag, paftd->szFormatTag);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@ -49,7 +49,7 @@ static BOOL CALLBACK FormatEnumProc(HACMDRIVERID hadid,
|
||||||
DWORD fd)
|
DWORD fd)
|
||||||
{
|
{
|
||||||
if (winetest_interactive)
|
if (winetest_interactive)
|
||||||
trace(" 0x%04lx, %s\n", pafd->dwFormatTag, pafd->szFormat);
|
trace(" 0x%04x, %s\n", pafd->dwFormatTag, pafd->szFormat);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
@ -128,7 +128,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
|
||||||
*/
|
*/
|
||||||
if (rc == MMSYSERR_NOERROR) {
|
if (rc == MMSYSERR_NOERROR) {
|
||||||
ok(dd.cbStruct == sizeof(dd),
|
ok(dd.cbStruct == sizeof(dd),
|
||||||
"acmDriverDetails(): cbStruct = %08lx, should be %08lx\n",
|
"acmDriverDetails(): cbStruct = %08x, should be %08lx\n",
|
||||||
dd.cbStruct, (unsigned long)sizeof(dd));
|
dd.cbStruct, (unsigned long)sizeof(dd));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -138,8 +138,8 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
|
||||||
trace(" Copyright: %s\n", dd.szCopyright);
|
trace(" Copyright: %s\n", dd.szCopyright);
|
||||||
trace(" Licensing: %s\n", dd.szLicensing);
|
trace(" Licensing: %s\n", dd.szLicensing);
|
||||||
trace(" Features: %s\n", dd.szFeatures);
|
trace(" Features: %s\n", dd.szFeatures);
|
||||||
trace(" Supports %lu formats\n", dd.cFormatTags);
|
trace(" Supports %u formats\n", dd.cFormatTags);
|
||||||
trace(" Supports %lu filter formats\n", dd.cFilterTags);
|
trace(" Supports %u filter formats\n", dd.cFilterTags);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* try bad pointer */
|
/* try bad pointer */
|
||||||
|
@ -453,7 +453,7 @@ static DWORD check_count(UINT uMetric)
|
||||||
ok(rc == MMSYSERR_NOERROR, "acmMetrics() failed: rc = 0x%08x\n", rc);
|
ok(rc == MMSYSERR_NOERROR, "acmMetrics() failed: rc = 0x%08x\n", rc);
|
||||||
|
|
||||||
if (rc == MMSYSERR_NOERROR && winetest_interactive)
|
if (rc == MMSYSERR_NOERROR && winetest_interactive)
|
||||||
trace("%s: %lu\n", get_metric(uMetric), dwMetric);
|
trace("%s: %u\n", get_metric(uMetric), dwMetric);
|
||||||
|
|
||||||
return dwMetric;
|
return dwMetric;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue