sync msacm32_winetest with wine 1.1.35

svn path=/trunk/; revision=44708
This commit is contained in:
Christoph von Wittich 2009-12-22 11:48:05 +00:00
parent 5f66dfaf10
commit 6387acbd9a

View file

@ -94,7 +94,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
/* MSDN says this should fail but it doesn't in practice */ /* MSDN says this should fail but it doesn't in practice */
dd.cbStruct = 4; dd.cbStruct = 4;
rc = acmDriverDetails(hadid, &dd, 0); rc = acmDriverDetails(hadid, &dd, 0);
ok(rc == MMSYSERR_NOERROR, ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED,
"acmDriverDetails(): rc = %08x, should be %08x\n", "acmDriverDetails(): rc = %08x, should be %08x\n",
rc, MMSYSERR_NOERROR); rc, MMSYSERR_NOERROR);
@ -119,17 +119,16 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
/* try valid parameters */ /* try valid parameters */
rc = acmDriverDetails(hadid, &dd, 0); rc = acmDriverDetails(hadid, &dd, 0);
ok(rc == MMSYSERR_NOERROR, ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED,
"acmDriverDetails(): rc = %08x, should be %08x\n", "acmDriverDetails(): rc = %08x, should be %08x\n",
rc, MMSYSERR_NOERROR); rc, MMSYSERR_NOERROR);
/* cbStruct should contain size of returned data (at most sizeof(dd)) /* cbStruct should contain size of returned data (at most sizeof(dd))
TODO: should it be *exactly* sizeof(dd), as tested here? TODO: should it be *exactly* sizeof(dd), as tested here?
*/ */
if (rc == MMSYSERR_NOERROR) { if (rc == MMSYSERR_NOERROR) {
ok(dd.cbStruct == sizeof(dd), ok(dd.cbStruct == sizeof(dd),
"acmDriverDetails(): cbStruct = %08x, should be %08lx\n", "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct);
dd.cbStruct, (unsigned long)sizeof(dd));
} }
if (rc == MMSYSERR_NOERROR && winetest_interactive) { if (rc == MMSYSERR_NOERROR && winetest_interactive) {
@ -210,7 +209,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid,
/* try valid parameters */ /* try valid parameters */
rc = acmDriverOpen(&had, hadid, 0); rc = acmDriverOpen(&had, hadid, 0);
ok(rc == MMSYSERR_NOERROR, ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER,
"acmDriverOpen(): rc = %08x, should be %08x\n", "acmDriverOpen(): rc = %08x, should be %08x\n",
rc, MMSYSERR_NOERROR); rc, MMSYSERR_NOERROR);