diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index dca00d8ae53..88dab2ad5af 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -875,8 +875,8 @@ static HRESULT test_for_driver(LPGUID lpGuid) /* Create the DirectSound object */ rc=DirectSoundCreate(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -1156,6 +1156,9 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, if (rc == DSERR_NODRIVER) { trace(" No Driver\n"); return 1; + } else if (rc == DSERR_ALLOCATED) { + trace(" Already In Use\n"); + return 1; } trace(" Testing the primary buffer\n"); diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 3ca42a9c1c8..d1160cbbf08 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -789,8 +789,8 @@ static HRESULT test_for_driver8(LPGUID lpGuid) /* Create the DirectSound object */ rc=DirectSoundCreate8(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate8() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -1071,6 +1071,9 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, if (rc == DSERR_NODRIVER) { trace(" No Driver\n"); return 1; + } else if (rc == DSERR_ALLOCATED) { + trace(" Already In Use\n"); + return 1; } trace(" Testing the primary buffer\n"); diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0592b1f8bb7..a0eb895de3a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -249,8 +249,8 @@ static HRESULT test_dsound(LPGUID lpGuid) /* Create the DirectSound object */ rc=DirectSoundCreate(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -349,8 +349,8 @@ static HRESULT test_primary(LPGUID lpGuid) /* Create the DirectSound object */ rc=DirectSoundCreate(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -491,8 +491,8 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) /* Create the DirectSound object */ rc=DirectSoundCreate(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -628,8 +628,8 @@ static HRESULT test_secondary(LPGUID lpGuid) /* Create the DirectSound object */ rc=DirectSoundCreate(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -725,7 +725,9 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); rc = test_dsound(lpGuid); if (rc == DSERR_NODRIVER) - trace(" No Driver\n"); + trace(" No Driver\n"); + else if (rc == DSERR_ALLOCATED) + trace(" Already In Use\n"); else { test_primary(lpGuid); test_primary_secondary(lpGuid); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 0807006d4d7..07cb74ac4dd 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -260,8 +260,8 @@ static HRESULT test_dsound8(LPGUID lpGuid) /* Create the DirectSound8 object */ rc=pDirectSoundCreate8(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate8() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -371,8 +371,8 @@ static HRESULT test_primary8(LPGUID lpGuid) /* Create the DirectSound object */ rc=pDirectSoundCreate8(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate8() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -513,8 +513,8 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) /* Create the DirectSound object */ rc=pDirectSoundCreate8(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate8() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -650,8 +650,8 @@ static HRESULT test_secondary8(LPGUID lpGuid) /* Create the DirectSound object */ rc=pDirectSoundCreate8(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate8() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) return rc; @@ -748,6 +748,8 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, rc = test_dsound8(lpGuid); if (rc == DSERR_NODRIVER) trace(" No Driver\n"); + else if (rc == DSERR_ALLOCATED) + trace(" Already In Use\n"); else { test_primary8(lpGuid); test_primary_secondary8(lpGuid); diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index a86dff93649..1f6f43eeadc 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -268,11 +268,13 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); rc=DirectSoundCreate(lpGuid,&dso,NULL); - ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %s\n", - DXGetErrorString8(rc)); + ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, + "DirectSoundCreate() failed: %s\n",DXGetErrorString8(rc)); if (rc!=DS_OK) { if (rc==DSERR_NODRIVER) trace(" No Driver\n"); + else if (rc == DSERR_ALLOCATED) + trace(" Already In Use\n"); goto EXIT; }