From 6387acbd9a5a170b82bc0ed634355acc625c0510 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Tue, 22 Dec 2009 11:48:05 +0000 Subject: [PATCH] sync msacm32_winetest with wine 1.1.35 svn path=/trunk/; revision=44708 --- rostests/winetests/msacm32/msacm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/rostests/winetests/msacm32/msacm.c b/rostests/winetests/msacm32/msacm.c index 956b78554bd..b68ff8c2aa7 100644 --- a/rostests/winetests/msacm32/msacm.c +++ b/rostests/winetests/msacm32/msacm.c @@ -94,7 +94,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, /* MSDN says this should fail but it doesn't in practice */ dd.cbStruct = 4; rc = acmDriverDetails(hadid, &dd, 0); - ok(rc == MMSYSERR_NOERROR, + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, "acmDriverDetails(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); @@ -119,17 +119,16 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, /* try valid parameters */ rc = acmDriverDetails(hadid, &dd, 0); - ok(rc == MMSYSERR_NOERROR, + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NOTSUPPORTED, "acmDriverDetails(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); /* cbStruct should contain size of returned data (at most sizeof(dd)) TODO: should it be *exactly* sizeof(dd), as tested here? */ - if (rc == MMSYSERR_NOERROR) { + if (rc == MMSYSERR_NOERROR) { ok(dd.cbStruct == sizeof(dd), - "acmDriverDetails(): cbStruct = %08x, should be %08lx\n", - dd.cbStruct, (unsigned long)sizeof(dd)); + "acmDriverDetails(): cbStruct = %08x\n", dd.cbStruct); } if (rc == MMSYSERR_NOERROR && winetest_interactive) { @@ -210,7 +209,7 @@ static BOOL CALLBACK DriverEnumProc(HACMDRIVERID hadid, /* try valid parameters */ rc = acmDriverOpen(&had, hadid, 0); - ok(rc == MMSYSERR_NOERROR, + ok(rc == MMSYSERR_NOERROR || rc == MMSYSERR_NODRIVER, "acmDriverOpen(): rc = %08x, should be %08x\n", rc, MMSYSERR_NOERROR); -- 2.17.1