Commit 19da00a6 authored by Alexandre Julliard's avatar Alexandre Julliard

dsound/tests: Mark some Vmware sound driver failures as broken.

parent 7a151d5e
...@@ -805,8 +805,8 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, ...@@ -805,8 +805,8 @@ static HRESULT test_secondary(LPGUID lpGuid, int play,
wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels);
} }
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK && secondary!=NULL,"IDirectSound_CreateSoundBuffer() " ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
"failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n", "IDirectSound_CreateSoundBuffer() failed to create a %s%ssecondary buffer %s%s%s%sat %dx%dx%d (%s): %08x\n",
has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"", has_3dbuffer?"3D ":"", has_duplicate?"duplicated ":"",
listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"", listener!=NULL||move_sound?"with ":"", move_listener?"moving ":"",
listener!=NULL?"listener ":"", listener!=NULL?"listener ":"",
......
...@@ -326,7 +326,7 @@ static HRESULT test_dsound(LPGUID lpGuid) ...@@ -326,7 +326,7 @@ static HRESULT test_dsound(LPGUID lpGuid)
wfx.nBlockAlign); wfx.nBlockAlign);
bufdesc.lpwfxFormat=&wfx; bufdesc.lpwfxFormat=&wfx;
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK && secondary!=NULL, ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
"IDirectSound_CreateSoundBuffer() failed to create a secondary " "IDirectSound_CreateSoundBuffer() failed to create a secondary "
"buffer %08x\n",rc); "buffer %08x\n",rc);
if (rc==DS_OK && secondary!=NULL) { if (rc==DS_OK && secondary!=NULL) {
...@@ -618,7 +618,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) ...@@ -618,7 +618,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid)
wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels); wfx2.nSamplesPerSec,wfx2.wBitsPerSample,wfx2.nChannels);
} }
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK && secondary!=NULL, ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
"IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc);
if (rc==DS_OK && secondary!=NULL) { if (rc==DS_OK && secondary!=NULL) {
...@@ -729,7 +729,7 @@ static HRESULT test_secondary(LPGUID lpGuid) ...@@ -729,7 +729,7 @@ static HRESULT test_secondary(LPGUID lpGuid)
"should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) "
"and NULL, returned: %08x %p\n", rc, secondary); "and NULL, returned: %08x %p\n", rc, secondary);
else else
ok(rc==DS_OK && secondary!=NULL, ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
"IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc);
} }
else else
...@@ -883,8 +883,8 @@ static HRESULT test_block_align(LPGUID lpGuid) ...@@ -883,8 +883,8 @@ static HRESULT test_block_align(LPGUID lpGuid)
bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec + 1; bufdesc.dwBufferBytes=wfx.nAvgBytesPerSec + 1;
bufdesc.lpwfxFormat=&wfx; bufdesc.lpwfxFormat=&wfx;
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK,"IDirectSound_CreateSoundBuffer() " ok(rc == DS_OK || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
"should have returned DS_OK, returned: %08x\n", rc); "IDirectSound_CreateSoundBuffer() should have returned DS_OK, returned: %08x\n", rc);
if (rc==DS_OK && secondary!=NULL) { if (rc==DS_OK && secondary!=NULL) {
ZeroMemory(&dsbcaps, sizeof(dsbcaps)); ZeroMemory(&dsbcaps, sizeof(dsbcaps));
...@@ -993,7 +993,7 @@ static HRESULT test_frequency(LPGUID lpGuid) ...@@ -993,7 +993,7 @@ static HRESULT test_frequency(LPGUID lpGuid)
wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels); wfx1.nSamplesPerSec,wfx1.wBitsPerSample,wfx1.nChannels);
} }
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK && secondary!=NULL, ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
"IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc);
if (rc==DS_OK && secondary!=NULL) { if (rc==DS_OK && secondary!=NULL) {
......
...@@ -616,8 +616,8 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, ...@@ -616,8 +616,8 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription,
trace(" Testing a secondary buffer at %dx%dx%d\n", trace(" Testing a secondary buffer at %dx%dx%d\n",
wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels); wfx.nSamplesPerSec,wfx.wBitsPerSample,wfx.nChannels);
rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL);
ok(rc==DS_OK&&secondary!=NULL,"IDirectSound_CreateSoundBuffer() " ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */
"failed to create a secondary buffer: %08x\n",rc); "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer: %08x\n",rc);
if (rc==DS_OK&&secondary!=NULL) { if (rc==DS_OK&&secondary!=NULL) {
IKsPropertySet * pPropertySet=NULL; IKsPropertySet * pPropertySet=NULL;
rc=IDirectSoundBuffer_QueryInterface(secondary, rc=IDirectSoundBuffer_QueryInterface(secondary,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment