Aric Stewart : msacm32/tests: msacm32 can enumerate drivers that cannot be loaded or have their details queried . Deal with this properly.

Alexandre Julliard julliard at winehq.org
Mon Aug 24 10:08:02 CDT 2009


Module: wine
Branch: master
Commit: bfe83b22c287fea231e1b1d29d150921e7f1ca6a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=bfe83b22c287fea231e1b1d29d150921e7f1ca6a

Author: Aric Stewart <aric at codeweavers.com>
Date:   Fri Aug 21 09:22:56 2009 -0500

msacm32/tests: msacm32 can enumerate drivers that cannot be loaded or have their details queried. Deal with this properly.

---

 dlls/msacm32/tests/msacm.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c
index 956b785..c528f78 100644
--- a/dlls/msacm32/tests/msacm.c
+++ b/dlls/msacm32/tests/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,7 +119,7 @@ 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);
 
@@ -210,7 +210,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);
 




More information about the wine-cvs mailing list