[PATCH 4/5] qcap/tests: Get rid of test_AviCo().
Zebediah Figura
z.figura12 at gmail.com
Mon Apr 8 18:02:36 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/qcap/tests/qcap.c | 137 -----------------------------------------
1 file changed, 137 deletions(-)
diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c
index 20ab2e97fa..a250139940 100644
--- a/dlls/qcap/tests/qcap.c
+++ b/dlls/qcap/tests/qcap.c
@@ -59,7 +59,6 @@ DEFINE_EXPECT(ReceiveConnection);
DEFINE_EXPECT(GetAllocatorRequirements);
DEFINE_EXPECT(NotifyAllocator);
DEFINE_EXPECT(Reconnect);
-DEFINE_EXPECT(Read_FccHandler);
DEFINE_EXPECT(MediaSeeking_GetPositions);
DEFINE_EXPECT(MemAllocator_GetProperties);
DEFINE_EXPECT(MemInputPin_QueryInterface_IStream);
@@ -74,28 +73,6 @@ DEFINE_EXPECT(MediaSample_GetActualDataLength);
DEFINE_EXPECT(MediaSample_GetSize);
DEFINE_EXPECT(MediaSample_GetMediaTime);
-static int strcmp_wa(LPCWSTR strw, const char *stra)
-{
- CHAR buf[512];
- WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL);
- return lstrcmpA(stra, buf);
-}
-
-static BSTR a2bstr(const char *str)
-{
- BSTR ret;
- int len;
-
- if(!str)
- return NULL;
-
- len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
- ret = SysAllocStringLen(NULL, len-1);
- MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len);
-
- return ret;
-}
-
typedef enum {
SOURCE_FILTER,
SINK_FILTER,
@@ -1737,119 +1714,6 @@ static void test_AviMux(char *arg)
ok(ref == 0, "IStream was not destroyed (%d)\n", ref);
}
-static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv)
-{
- if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IPropertyBag, riid)) {
- *ppv = iface;
- return S_OK;
- }
-
- ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid));
- *ppv = NULL;
- return E_NOINTERFACE;
-}
-
-static ULONG WINAPI PropertyBag_AddRef(IPropertyBag *iface)
-{
- return 2;
-}
-
-static ULONG WINAPI PropertyBag_Release(IPropertyBag *iface)
-{
- return 1;
-}
-
-static HRESULT WINAPI PropertyBag_Read(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog)
-{
- ok(!pErrorLog, "pErrorLog = %p\n", pErrorLog);
-
- if(!strcmp_wa(pszPropName, "FccHandler")) {
- CHECK_EXPECT(Read_FccHandler);
- V_VT(pVar) = VT_BSTR;
- V_BSTR(pVar) = a2bstr("mrle");
- return S_OK;
- }
-
- ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName));
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI PropertyBag_Write(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar)
-{
- ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName));
- return E_NOTIMPL;
-}
-
-static const IPropertyBagVtbl PropertyBagVtbl = {
- PropertyBag_QueryInterface,
- PropertyBag_AddRef,
- PropertyBag_Release,
- PropertyBag_Read,
- PropertyBag_Write
-};
-
-static IPropertyBag PropertyBag = { &PropertyBagVtbl };
-
-static void test_AviCo(void)
-{
- IPersistPropertyBag *persist_bag;
- IPin *pin, *in_pin, *out_pin;
- IEnumPins *enum_pins;
- IBaseFilter *avico;
- PIN_INFO pin_info;
- HRESULT hres;
-
- static const WCHAR inputW[] = {'I','n','p','u','t',0};
- static const WCHAR outputW[] = {'O','u','t','p','u','t',0};
-
- hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico);
- if(hres == REGDB_E_CLASSNOTREG || hres == CLASS_E_CLASSNOTAVAILABLE) {
- win_skip("CLSID_AVICo not registered/available\n");
- return;
- }
- ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres);
-
- hres = IBaseFilter_QueryInterface(avico, &IID_IPin, (void**)&pin);
- ok(hres == E_NOINTERFACE, "QueryInterface(IID_IPin) returned: %08x\n", hres);
-
- hres = IBaseFilter_QueryInterface(avico, &IID_IPersistPropertyBag, (void**)&persist_bag);
- ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres);
-
- SET_EXPECT(Read_FccHandler);
- hres = IPersistPropertyBag_Load(persist_bag, &PropertyBag, NULL);
- ok(hres == S_OK, "Load failed: %08x\n", hres);
- CHECK_CALLED(Read_FccHandler);
-
- IPersistPropertyBag_Release(persist_bag);
-
- hres = IBaseFilter_EnumPins(avico, &enum_pins);
- ok(hres == S_OK, "EnumPins failed: %08x\n", hres);
-
- hres = IEnumPins_Next(enum_pins, 1, &in_pin, NULL);
- ok(hres == S_OK, "Next failed: %08x\n", hres);
-
- hres = IPin_QueryPinInfo(in_pin, &pin_info);
- ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres);
- ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n");
- ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir);
- todo_wine ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName));
-
- hres = IEnumPins_Next(enum_pins, 1, &out_pin, NULL);
- ok(hres == S_OK, "Next failed: %08x\n", hres);
-
- hres = IPin_QueryPinInfo(out_pin, &pin_info);
- ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres);
- ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n");
- ok(pin_info.dir == PINDIR_OUTPUT, "pin_info.dir = %d\n", pin_info.dir);
- todo_wine ok(!lstrcmpW(pin_info.achName, outputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName));
-
- IEnumPins_Release(enum_pins);
-
- IPin_Release(in_pin);
- IPin_Release(out_pin);
- IBaseFilter_Release(avico);
-}
-
/* Outer IUnknown for COM aggregation tests */
struct unk_impl {
IUnknown IUnknown_iface;
@@ -2005,7 +1869,6 @@ START_TEST(qcap)
test_AviMux_QueryInterface();
test_AviMux(arg_c>2 ? arg_v[2] : NULL);
- test_AviCo();
test_COM_vfwcapture();
CoUninitialize();
--
2.21.0
More information about the wine-devel
mailing list