From: Detlef Riekenberg Subject: [PATCH] qcap: Avoid a crash in a test Message-Id: <20190416171645.240-1-wine.dev@web.de> Date: Tue, 16 Apr 2019 19:16:45 +0200 VfW is not supported on 64-Bit Windows Example crash on Win10 (64bit) 1709 or newer http://test.winehq.org/data/f9301c2b66450a1cdd986e9052fcaa76535ba8b7/win10_cw1-hd6800-1709-t64/qcap:qcap.html http://test.winehq.org/data/f9301c2b66450a1cdd986e9052fcaa76535ba8b7/win10_dr-i7-v3-x64/qcap:qcap.html Patch tested: https://testbot.winehq.org/JobDetails.pl?Key=51059 -- bye bye ... ... Detlef Signed-off-by: Detlef Riekenberg --- dlls/qcap/tests/qcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index a250139940..c460991ec5 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -1771,9 +1771,9 @@ static void test_COM_vfwcapture(void) /* COM aggregation */ hr = CoCreateInstance(&CLSID_VfwCapture, &unk_obj.IUnknown_iface, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&unk_obj.inner_unk); - if (hr == REGDB_E_CLASSNOTREG) + if ((hr == REGDB_E_CLASSNOTREG) || (hr == CLASS_E_CLASSNOTAVAILABLE)) { - win_skip("CLSID_VfwCapture not registered\n"); + win_skip("CLSID_VfwCapture not supported (0x%x)\n", hr); return; } ok(hr == S_OK, "VfwCapture create failed: %08x\n", hr); -- 2.21.0.windows.1