Commit 6255936c authored by Robert Reif's avatar Robert Reif Committed by Alexandre Julliard

dsound: Duplex test fix.

parent 53c469f1
...@@ -124,8 +124,8 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -124,8 +124,8 @@ static void IDirectSoundFullDuplex_tests(void)
CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex,
(void**)&dsfdo); (void**)&dsfdo);
ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG, ok(rc==S_OK||rc==REGDB_E_CLASSNOTREG,
"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s\n", "CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n",
DXGetErrorString8(rc)); DXGetErrorString8(rc), rc);
if (rc==REGDB_E_CLASSNOTREG) { if (rc==REGDB_E_CLASSNOTREG) {
trace(" Class Not Registered\n"); trace(" Class Not Registered\n");
return; return;
...@@ -138,8 +138,8 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -138,8 +138,8 @@ static void IDirectSoundFullDuplex_tests(void)
rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL,
CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex,
(void**)&dsfdo); (void**)&dsfdo);
ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s\n", ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n",
DXGetErrorString8(rc)); DXGetErrorString8(rc), rc);
if (dsfdo) if (dsfdo)
IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultCapture, IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultCapture,
&DSDEVID_DefaultPlayback); &DSDEVID_DefaultPlayback);
...@@ -149,8 +149,8 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -149,8 +149,8 @@ static void IDirectSoundFullDuplex_tests(void)
rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL, rc=CoCreateInstance(&CLSID_DirectSoundFullDuplex, NULL,
CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex, CLSCTX_INPROC_SERVER, &IID_IDirectSoundFullDuplex,
(void**)&dsfdo); (void**)&dsfdo);
ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s\n", ok(rc==S_OK,"CoCreateInstance(CLSID_DirectSoundFullDuplex) failed: %s (0x%08lx)\n",
DXGetErrorString8(rc)); DXGetErrorString8(rc), rc);
if (dsfdo) if (dsfdo)
IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultVoiceCapture, IDirectSoundFullDuplex_test(dsfdo, FALSE, &DSDEVID_DefaultVoiceCapture,
&DSDEVID_DefaultVoicePlayback); &DSDEVID_DefaultVoicePlayback);
...@@ -162,7 +162,7 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -162,7 +162,7 @@ static void IDirectSoundFullDuplex_tests(void)
(void**)&dsfdo); (void**)&dsfdo);
ok(rc==E_NOINTERFACE, ok(rc==E_NOINTERFACE,
"CoCreateInstance(CLSID_DirectSoundFullDuplex,CLSID_DirectSoundPrivate) " "CoCreateInstance(CLSID_DirectSoundFullDuplex,CLSID_DirectSoundPrivate) "
"should have failed: %s\n",DXGetErrorString8(rc)); "should have failed: %s (0x%08lx)\n",DXGetErrorString8(rc), rc);
ZeroMemory(&wfex, sizeof(wfex)); ZeroMemory(&wfex, sizeof(wfex));
wfex.wFormatTag = WAVE_FORMAT_PCM; wfex.wFormatTag = WAVE_FORMAT_PCM;
...@@ -188,8 +188,8 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -188,8 +188,8 @@ static void IDirectSoundFullDuplex_tests(void)
rc=pDirectSoundFullDuplexCreate(NULL,NULL,&DSCBufferDesc,&DSBufferDesc, rc=pDirectSoundFullDuplexCreate(NULL,NULL,&DSCBufferDesc,&DSBufferDesc,
get_hwnd(),DSSCL_EXCLUSIVE ,&dsfdo,&pDSCBuffer8, get_hwnd(),DSSCL_EXCLUSIVE ,&dsfdo,&pDSCBuffer8,
&pDSBuffer8,NULL); &pDSBuffer8,NULL);
ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL,
"DirectSoundFullDuplexCreate(NULL) failed: %s\n",DXGetErrorString8(rc)); "DirectSoundFullDuplexCreate(NULL,NULL) failed: %s\n",DXGetErrorString8(rc));
if (rc==S_OK && dsfdo) if (rc==S_OK && dsfdo)
IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL);
...@@ -198,7 +198,7 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -198,7 +198,7 @@ static void IDirectSoundFullDuplex_tests(void)
&DSDEVID_DefaultPlayback,&DSCBufferDesc, &DSDEVID_DefaultPlayback,&DSCBufferDesc,
&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE,&dsfdo, &DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE,&dsfdo,
&pDSCBuffer8,&pDSBuffer8,NULL); &pDSCBuffer8,&pDSBuffer8,NULL);
ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL,
"DirectSoundFullDuplexCreate(DSDEVID_DefaultCapture," "DirectSoundFullDuplexCreate(DSDEVID_DefaultCapture,"
"DSDEVID_DefaultPlayback) failed: %s\n", "DSDEVID_DefaultPlayback) failed: %s\n",
DXGetErrorString8(rc)); DXGetErrorString8(rc));
...@@ -210,7 +210,7 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -210,7 +210,7 @@ static void IDirectSoundFullDuplex_tests(void)
&DSDEVID_DefaultVoicePlayback, &DSDEVID_DefaultVoicePlayback,
&DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE, &DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE,
&dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL); &dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL);
ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL,
"DirectSoundFullDuplexCreate(DSDEVID_DefaultVoiceCapture," "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoiceCapture,"
"DSDEVID_DefaultVoicePlayback) failed: %s\n", "DSDEVID_DefaultVoicePlayback) failed: %s\n",
DXGetErrorString8(rc)); DXGetErrorString8(rc));
...@@ -222,7 +222,7 @@ static void IDirectSoundFullDuplex_tests(void) ...@@ -222,7 +222,7 @@ static void IDirectSoundFullDuplex_tests(void)
&DSDEVID_DefaultVoiceCapture, &DSDEVID_DefaultVoiceCapture,
&DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE, &DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE,
&dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL); &dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL);
ok(rc==DSERR_NODRIVER, ok(rc==DSERR_NODRIVER||rc==DSERR_INVALIDCALL,
"DirectSoundFullDuplexCreate(DSDEVID_DefaultVoicePlayback," "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoicePlayback,"
"DSDEVID_DefaultVoiceCapture) should have failed: %s\n", "DSDEVID_DefaultVoiceCapture) should have failed: %s\n",
DXGetErrorString8(rc)); DXGetErrorString8(rc));
......
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