Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/qcap/tests/audiorecord.c | 9 ++---- dlls/qcap/tests/avico.c | 54 +++++++++++++------------------- dlls/qcap/tests/avimux.c | 31 +++++++++--------- dlls/qcap/tests/smartteefilter.c | 36 ++++++++++----------- 4 files changed, 55 insertions(+), 75 deletions(-)
diff --git a/dlls/qcap/tests/audiorecord.c b/dlls/qcap/tests/audiorecord.c index dc74c3cfc15..350ae986b44 100644 --- a/dlls/qcap/tests/audiorecord.c +++ b/dlls/qcap/tests/audiorecord.c @@ -176,18 +176,15 @@ static ULONG WINAPI property_bag_Release(IPropertyBag *iface) ok(0, "Unexpected call.\n"); return 1; } - -static const WCHAR waveinidW[] = {'W','a','v','e','I','n','I','d',0}; -static const WCHAR usemixerW[] = {'U','s','e','M','i','x','e','r',0}; static int ppb_id; static unsigned int ppb_got_read;
static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) { - if (!lstrcmpW(name, usemixerW)) + if (!lstrcmpW(name, L"UseMixer")) return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
- todo_wine ok(!lstrcmpW(name, waveinidW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + todo_wine ok(!lstrcmpW(name, L"WaveInId"), "Got unexpected name %s.\n", wine_dbgstr_w(name)); ok(V_VT(var) == VT_I4, "Got unexpected type %u.\n", V_VT(var)); ok(!log, "Got unexpected error log %p.\n", log); ppb_got_read++; @@ -222,7 +219,7 @@ static void test_property_bag(IMoniker *mon) ok(hr == S_OK, "Got hr %#x.\n", hr);
VariantInit(&var); - hr = IPropertyBag_Read(devenum_bag, waveinidW, &var, NULL); + hr = IPropertyBag_Read(devenum_bag, L"WaveInId", &var, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ppb_id = V_I4(&var);
diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index b4f52f10210..332ca5a8e7d 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -23,11 +23,6 @@ #include "vfw.h" #include "wine/test.h"
-static const WCHAR sink_id[] = {'I','n',0}; -static const WCHAR source_id[] = {'O','u','t',0}; -static const WCHAR sink_name[] = {'I','n','p','u','t',0}; -static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; - static const DWORD test_fourcc = mmioFOURCC('w','t','s','t');
#define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) @@ -74,7 +69,7 @@ static void test_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE);
- IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin);
check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -85,7 +80,7 @@ static void test_interfaces(IBaseFilter *filter) check_interface(pin, &IID_IMediaSeeking, FALSE);
IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin);
todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); @@ -319,7 +314,7 @@ static void test_find_pin(IBaseFilter *filter) hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr);
- hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -327,7 +322,7 @@ static void test_find_pin(IBaseFilter *filter) IPin_Release(pin); IPin_Release(pin2);
- hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -335,9 +330,9 @@ static void test_find_pin(IBaseFilter *filter) IPin_Release(pin); IPin_Release(pin2);
- hr = IBaseFilter_FindPin(filter, sink_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, source_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Output", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr);
IEnumPins_Release(enum_pins); @@ -351,14 +346,14 @@ static void test_pin_info(IBaseFilter *filter) WCHAR *id; IPin *pin;
- hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!lstrcmpW(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter);
hr = IPin_QueryDirection(pin, &dir); @@ -367,19 +362,19 @@ static void test_pin_info(IBaseFilter *filter)
hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id);
IPin_Release(pin);
- hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, source_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!lstrcmpW(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter);
hr = IPin_QueryDirection(pin, &dir); @@ -388,7 +383,7 @@ static void test_pin_info(IBaseFilter *filter)
hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Out"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id);
IPin_Release(pin); @@ -397,7 +392,6 @@ static void test_pin_info(IBaseFilter *filter) static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, LPARAM lparam1, LPARAM lparam2) { - static const WCHAR nameW[] = {'f','o','o',0}; if (winetest_debug > 1) trace("msg %#x, lparam1 %#lx, lparam2 %#lx.\n", msg, lparam1, lparam2);
switch (msg) @@ -415,8 +409,8 @@ static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, info->dwFlags = VIDCF_TEMPORAL; info->dwVersion = 0x10101; info->dwVersionICM = ICVERSION; - lstrcpyW(info->szName, nameW); - lstrcpyW(info->szDescription, nameW); + lstrcpyW(info->szName, L"foo"); + lstrcpyW(info->szDescription, L"foo"); return sizeof(ICINFO); } case ICM_COMPRESS_QUERY: @@ -446,14 +440,12 @@ static ULONG WINAPI property_bag_Release(IPropertyBag *iface) ok(0, "Unexpected call.\n"); return 1; } - -static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; static BSTR ppb_handler; static unsigned int ppb_got_read;
static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) { - ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + ok(!lstrcmpW(name, L"FccHandler"), "Got unexpected name %s.\n", wine_dbgstr_w(name)); ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); ok(!log, "Got unexpected error log %p.\n", log); V_BSTR(var) = SysAllocString(ppb_handler); @@ -489,7 +481,7 @@ static void test_property_bag(IMoniker *mon) ok(hr == S_OK, "Got hr %#x.\n", hr);
VariantInit(&var); - hr = IPropertyBag_Read(devenum_bag, fcchandlerW, &var, NULL); + hr = IPropertyBag_Read(devenum_bag, L"FccHandler", &var, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); ppb_handler = V_BSTR(&var);
@@ -525,7 +517,7 @@ static void test_media_types(IBaseFilter *filter) HRESULT hr; IPin *pin;
- IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin);
hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -572,7 +564,7 @@ static void test_media_types(IBaseFilter *filter)
IPin_Release(pin);
- IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin);
hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -592,7 +584,7 @@ static void test_enum_media_types(IBaseFilter *filter) HRESULT hr; IPin *pin;
- IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin);
hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -623,7 +615,7 @@ static void test_enum_media_types(IBaseFilter *filter) IEnumMediaTypes_Release(enum2); IPin_Release(pin);
- IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin);
hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -709,10 +701,8 @@ static void test_unconnected_filter_state(IBaseFilter *filter)
START_TEST(avico) { - static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', - 'c','m',':','{','3','3','D','9','A','7','6','0','-','9','0','C','8', - '-','1','1','D','0','-','B','D','4','3','-','0','0','A','0','C','9', - '1','1','C','E','8','6','}','\','w','t','s','t',0}; + static const WCHAR test_display_name[] = + L"@device:cm:{33D9A760-90C8-11D0-BD43-00A0C911CE86}\wtst"; ICreateDevEnum *devenum; IEnumMoniker *enummon; IBaseFilter *filter; diff --git a/dlls/qcap/tests/avimux.c b/dlls/qcap/tests/avimux.c index d1a67a01a11..3f43ff569cf 100644 --- a/dlls/qcap/tests/avimux.c +++ b/dlls/qcap/tests/avimux.c @@ -23,9 +23,6 @@ #include "vfw.h" #include "wine/test.h"
-static const WCHAR source_id[] = {'A','V','I',' ','O','u','t',0}; -static const WCHAR sink0_id[] = {'I','n','p','u','t',' ','0','1',0}; - static const GUID testguid = {0xfacade};
static IBaseFilter *create_avi_mux(void) @@ -86,7 +83,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE);
- IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"AVI Out", &pin);
check_interface(pin, &IID_IPin, TRUE); check_interface(pin, &IID_IQualityControl, TRUE); @@ -99,7 +96,7 @@ static void test_interfaces(void)
IPin_Release(pin);
- IBaseFilter_FindPin(filter, sink0_id, &pin); + IBaseFilter_FindPin(filter, L"Input 01", &pin);
check_interface(pin, &IID_IAMStreamControl, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); @@ -343,7 +340,7 @@ static void test_find_pin(void) hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr);
- hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"AVI Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -351,7 +348,7 @@ static void test_find_pin(void) IPin_Release(pin); IPin_Release(pin2);
- hr = IBaseFilter_FindPin(filter, sink0_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input 01", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -374,7 +371,7 @@ static void test_pin_info(void) ULONG ref; IPin *pin;
- hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"AVI Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -385,7 +382,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, source_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"AVI Out"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -398,7 +395,7 @@ static void test_pin_info(void)
hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"AVI Out"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id);
hr = IPin_QueryInternalConnections(pin, NULL, NULL); @@ -406,14 +403,14 @@ static void test_pin_info(void)
IPin_Release(pin);
- hr = IBaseFilter_FindPin(filter, sink0_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input 01", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, sink0_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Input 01"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter);
hr = IPin_QueryDirection(pin, &dir); @@ -422,7 +419,7 @@ static void test_pin_info(void)
hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink0_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Input 01"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id);
hr = IPin_QueryInternalConnections(pin, NULL, NULL); @@ -445,7 +442,7 @@ static void test_media_types(void) ULONG ref; IPin *pin;
- IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"AVI Out", &pin);
hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -498,7 +495,7 @@ static void test_media_types(void) IEnumMediaTypes_Release(enummt); IPin_Release(pin);
- IBaseFilter_FindPin(filter, sink0_id, &pin); + IBaseFilter_FindPin(filter, L"Input 01", &pin);
hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -565,7 +562,7 @@ static void test_enum_media_types(void) HRESULT hr; IPin *pin;
- IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"AVI Out", &pin);
hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -629,7 +626,7 @@ static void test_enum_media_types(void) IEnumMediaTypes_Release(enum2); IPin_Release(pin);
- IBaseFilter_FindPin(filter, sink0_id, &pin); + IBaseFilter_FindPin(filter, L"Input 01", &pin);
hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/qcap/tests/smartteefilter.c b/dlls/qcap/tests/smartteefilter.c index df741ba1284..e5ae66ff2d3 100644 --- a/dlls/qcap/tests/smartteefilter.c +++ b/dlls/qcap/tests/smartteefilter.c @@ -23,10 +23,6 @@ #include "wine/strmbase.h" #include "wine/test.h"
-static const WCHAR sink_id[] = {'I','n','p','u','t',0}; -static const WCHAR capture_id[] = {'C','a','p','t','u','r','e',0}; -static const WCHAR preview_id[] = {'P','r','e','v','i','e','w',0}; - static HANDLE event;
static IBaseFilter *create_smart_tee(void) @@ -90,7 +86,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE);
- IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"Input", &pin);
check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -106,7 +102,7 @@ static void test_interfaces(void)
IPin_Release(pin);
- IBaseFilter_FindPin(filter, capture_id, &pin); + IBaseFilter_FindPin(filter, L"Capture", &pin);
todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -122,7 +118,7 @@ static void test_interfaces(void)
IPin_Release(pin);
- IBaseFilter_FindPin(filter, preview_id, &pin); + IBaseFilter_FindPin(filter, L"Preview", &pin);
todo_wine check_interface(pin, &IID_IAMStreamControl, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -387,7 +383,7 @@ static void test_find_pin(void) hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr);
- hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -395,7 +391,7 @@ static void test_find_pin(void) IPin_Release(pin2); IPin_Release(pin);
- hr = IBaseFilter_FindPin(filter, capture_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Capture", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -403,7 +399,7 @@ static void test_find_pin(void) IPin_Release(pin2); IPin_Release(pin);
- hr = IBaseFilter_FindPin(filter, preview_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Preview", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -427,7 +423,7 @@ static void test_pin_info(void) ULONG ref; IPin *pin;
- hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -438,7 +434,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -451,7 +447,7 @@ static void test_pin_info(void)
hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Input"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id);
hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -459,14 +455,14 @@ static void test_pin_info(void)
IPin_Release(pin);
- hr = IBaseFilter_FindPin(filter, capture_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Capture", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, capture_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Capture"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -479,7 +475,7 @@ static void test_pin_info(void)
hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, capture_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Capture"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id);
hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -487,14 +483,14 @@ static void test_pin_info(void)
IPin_Release(pin);
- hr = IBaseFilter_FindPin(filter, preview_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Preview", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr);
hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, preview_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!lstrcmpW(info.achName, L"Preview"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -507,7 +503,7 @@ static void test_pin_info(void)
hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, preview_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!lstrcmpW(id, L"Preview"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id);
hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -528,7 +524,7 @@ static void test_enum_media_types(void) HRESULT hr; IPin *pin;
- IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"Input", &pin);
hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr);