Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- return if pCreateFX is NULL. The diff looks very odd but a "git show -w" looks very clean.
dlls/xaudio2_7/tests/xaudio2.c | 104 ++++++++++++++++----------------- 1 file changed, 50 insertions(+), 54 deletions(-)
diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 4ead8d8de4..f2bffdf29f 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1000,28 +1000,9 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) return; }
- if(pCreateFX){ - for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - IUnknown_Release(fx_unk); - } - - hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); - if(SUCCEEDED(hr)) - IUnknown_Release(fx_unk); - } - - hr = pCreateFX(avm_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ + hr = pCreateFX(const_clsids[i], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); @@ -1031,16 +1012,33 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) IUnknown_Release(fx_unk); }
- hr = pCreateFX(ar_clsids[version - 20], &fx_unk); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&fx_unk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(fx_unk); - } + } + + hr = pCreateFX(avm_clsids[version - 20], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); + } + + hr = pCreateFX(ar_clsids[version - 20], &fx_unk); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); }
FreeLibrary(xapofxdll); @@ -1083,29 +1081,9 @@ static void test_xapo_creation_modern(const char *module) return; }
- if(pCreateFX){ - for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ - hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); - if(SUCCEEDED(hr)){ - IXAPO *xapo; - hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); - ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); - if(SUCCEEDED(hr)) - IXAPO_Release(xapo); - IUnknown_Release(fx_unk); - } - - hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, - &IID_IUnknown, (void**)&fx_unk); - ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); - if(SUCCEEDED(hr)) - IUnknown_Release(fx_unk); - } - - /* test legacy CLSID */ - hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); - ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){ + hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); @@ -1114,6 +1092,24 @@ static void test_xapo_creation_modern(const char *module) IXAPO_Release(xapo); IUnknown_Release(fx_unk); } + + hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&fx_unk); + ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr); + if(SUCCEEDED(hr)) + IUnknown_Release(fx_unk); + } + + /* test legacy CLSID */ + hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0); + ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr); + if(SUCCEEDED(hr)){ + IXAPO *xapo; + hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo); + ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr); + if(SUCCEEDED(hr)) + IXAPO_Release(xapo); + IUnknown_Release(fx_unk); }
pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter");
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=49023
Your paranoid android.
=== debian9 (32 bit report) ===
Report errors: The report seems to have been truncated
=== debian9 (32 bit WoW report) ===
Report errors: The report seems to have been truncated
Signed-off-by: Andrew Eikum aeikum@codeweavers.com
On Fri, Mar 08, 2019 at 09:16:53PM +0100, Michael Stefaniuc wrote:
Signed-off-by: Michael Stefaniuc mstefani@winehq.org
return if pCreateFX is NULL. The diff looks very odd but a "git show -w" looks very clean.
dlls/xaudio2_7/tests/xaudio2.c | 104 ++++++++++++++++----------------- 1 file changed, 50 insertions(+), 54 deletions(-)
diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 4ead8d8de4..f2bffdf29f 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1000,28 +1000,9 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) return; }
- if(pCreateFX){
for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){hr = pCreateFX(const_clsids[i], &fx_unk);ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr);if(SUCCEEDED(hr)){IXAPO *xapo;hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);if(SUCCEEDED(hr))IXAPO_Release(xapo);IUnknown_Release(fx_unk);}hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,&IID_IUnknown, (void**)&fx_unk);ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);if(SUCCEEDED(hr))IUnknown_Release(fx_unk);}hr = pCreateFX(avm_clsids[version - 20], &fx_unk);ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr);
- for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){
hr = pCreateFX(const_clsids[i], &fx_unk);ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);@@ -1031,16 +1012,33 @@ static void test_xapo_creation_legacy(const char *module, unsigned int version) IUnknown_Release(fx_unk); }
hr = pCreateFX(ar_clsids[version - 20], &fx_unk);ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr);if(SUCCEEDED(hr)){IXAPO *xapo;hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);if(SUCCEEDED(hr))IXAPO_Release(xapo);
hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,&IID_IUnknown, (void**)&fx_unk);ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);if(SUCCEEDED(hr)) IUnknown_Release(fx_unk);
}
}
hr = pCreateFX(avm_clsids[version - 20], &fx_unk);
ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(avm_clsids[version - 20]), hr);
if(SUCCEEDED(hr)){
IXAPO *xapo;hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);if(SUCCEEDED(hr))IXAPO_Release(xapo);IUnknown_Release(fx_unk);}
hr = pCreateFX(ar_clsids[version - 20], &fx_unk);
ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(ar_clsids[version - 20]), hr);
if(SUCCEEDED(hr)){
IXAPO *xapo;hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO27, (void**)&xapo);ok(hr == S_OK, "Couldn't get IXAPO27 interface: %08x\n", hr);if(SUCCEEDED(hr))IXAPO_Release(xapo);IUnknown_Release(fx_unk);}
FreeLibrary(xapofxdll);
@@ -1083,29 +1081,9 @@ static void test_xapo_creation_modern(const char *module) return; }
- if(pCreateFX){
for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0);ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr);if(SUCCEEDED(hr)){IXAPO *xapo;hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo);ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr);if(SUCCEEDED(hr))IXAPO_Release(xapo);IUnknown_Release(fx_unk);}hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,&IID_IUnknown, (void**)&fx_unk);ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);if(SUCCEEDED(hr))IUnknown_Release(fx_unk);}/* test legacy CLSID */hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0);ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr);
- for(i = 0; i < ARRAY_SIZE(const_clsids); ++i){
hr = pCreateFX(const_clsids[i], &fx_unk, NULL, 0);ok(hr == S_OK, "%s: CreateFX(%s) failed: %08x\n", module, wine_dbgstr_guid(const_clsids[i]), hr); if(SUCCEEDED(hr)){ IXAPO *xapo; hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo);@@ -1114,6 +1092,24 @@ static void test_xapo_creation_modern(const char *module) IXAPO_Release(xapo); IUnknown_Release(fx_unk); }
hr = CoCreateInstance(const_clsids[i], NULL, CLSCTX_INPROC_SERVER,&IID_IUnknown, (void**)&fx_unk);ok(hr == REGDB_E_CLASSNOTREG, "CoCreateInstance should have failed: %08x\n", hr);if(SUCCEEDED(hr))IUnknown_Release(fx_unk);}
/* test legacy CLSID */
hr = pCreateFX(&CLSID_AudioVolumeMeter27, &fx_unk, NULL, 0);
ok(hr == S_OK, "%s: CreateFX(CLSID_AudioVolumeMeter) failed: %08x\n", module, hr);
if(SUCCEEDED(hr)){
IXAPO *xapo;hr = IUnknown_QueryInterface(fx_unk, &IID_IXAPO, (void**)&xapo);ok(hr == S_OK, "Couldn't get IXAPO interface: %08x\n", hr);if(SUCCEEDED(hr))IXAPO_Release(xapo);IUnknown_Release(fx_unk);}
pCAVM = (void*)GetProcAddress(xaudio2dll, "CreateAudioVolumeMeter");
-- 2.20.1
-
Andrew Eikum -
Marvin -
Michael Stefaniuc