Author: cwittich Date: Tue Dec 22 12:48:05 2009 New Revision: 44708 URL: http://svn.reactos.org/svn/reactos?rev=44708&view=rev Log: sync msacm32_winetest with wine 1.1.35
Modified: trunk/rostests/winetests/msacm32/msacm.c Modified: trunk/rostests/winetests/msacm32/msacm.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msacm32/msacm.c?rev=44708&r1=44707&r2=44708&view=diff ============================================================================== --- trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msacm32/msacm.c [iso-8859-1] Tue Dec 22 12:48:05 2009 @@ -94,7 +94,7 @@ /* 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 @@ /* 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 @@ /* 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);