[PATCH v2] quartz/tests: Avoid "misleading indentation" warnings.
Zebediah Figura
zfigura at codeweavers.com
Mon Jan 31 11:27:06 CST 2022
From: Fabian Maurer <dark.shadow4 at web.de>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
v2: Use consistent formatting with other tests.
dlls/quartz/tests/acmwrapper.c | 6 ++---
dlls/quartz/tests/filtergraph.c | 38 +++++++++++--------------------
dlls/quartz/tests/videorenderer.c | 3 +--
3 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/dlls/quartz/tests/acmwrapper.c b/dlls/quartz/tests/acmwrapper.c
index 31b32b53ac9..8b9a472c0f3 100644
--- a/dlls/quartz/tests/acmwrapper.c
+++ b/dlls/quartz/tests/acmwrapper.c
@@ -380,8 +380,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);
-todo_wine
- ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName));
+ todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName));
ref = get_refcount(filter);
ok(ref == 3, "Got unexpected refcount %d.\n", ref);
ref = get_refcount(pin);
@@ -412,8 +411,7 @@ todo_wine
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(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName));
+ todo_wine ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", debugstr_w(info.achName));
IBaseFilter_Release(info.pFilter);
hr = IPin_QueryDirection(pin, &dir);
diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c
index a83bfde0806..620a1a56bad 100644
--- a/dlls/quartz/tests/filtergraph.c
+++ b/dlls/quartz/tests/filtergraph.c
@@ -2474,8 +2474,7 @@ static void test_graph_builder_connect(void)
IFilterGraph2_AddFilter(graph, &sink2.IBaseFilter_iface, NULL);
hr = IFilterGraph2_Connect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface);
-todo_wine
- ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr);
+ todo_wine ok(hr == VFW_S_PARTIAL_RENDER, "Got hr %#x.\n", hr);
ok(source_pin.peer == &parser1_pins[0].IPin_iface, "Got peer %p.\n", source_pin.peer);
ok(sink_pin.peer == &parser1_pins[1].IPin_iface, "Got peer %p.\n", sink_pin.peer);
ok(!parser1_pins[2].peer, "Got peer %p.\n", parser1_pins[2].peer);
@@ -3105,32 +3104,24 @@ static void test_connect_direct(void)
/* Swap the pins when connecting. */
hr = IFilterGraph2_ConnectDirect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface, NULL);
ok(hr == S_OK, "Got hr %#x.\n", hr);
-todo_wine
- ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer);
+ todo_wine ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer);
ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt);
-todo_wine
- ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
+ todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface);
-todo_wine
- ok(hr == S_OK, "Got hr %#x.\n", hr);
-todo_wine
- ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
+ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+ todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer);
hr = IFilterGraph2_Connect(graph, &sink_pin.IPin_iface, &source_pin.IPin_iface);
ok(hr == S_OK, "Got hr %#x.\n", hr);
-todo_wine
- ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer);
+ todo_wine ok(sink_pin.peer == &source_pin.IPin_iface, "Got peer %p.\n", sink_pin.peer);
ok(!sink_pin.mt, "Got mt %p.\n", sink_pin.mt);
-todo_wine
- ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
+ todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
hr = IFilterGraph2_Disconnect(graph, &sink_pin.IPin_iface);
-todo_wine
- ok(hr == S_OK, "Got hr %#x.\n", hr);
-todo_wine
- ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
+ todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr);
+ todo_wine ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer);
/* Disconnect() does not disconnect the peer. */
@@ -3304,8 +3295,7 @@ todo_wine
ok(source.ref == 1, "Got outstanding refcount %d.\n", source.ref);
ok(sink.ref == 1, "Got outstanding refcount %d.\n", sink.ref);
ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref);
-todo_wine
- ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref);
+ todo_wine ok(sink_pin.ref == 1, "Got outstanding refcount %d.\n", sink_pin.ref);
ok(!source_pin.peer, "Got peer %p.\n", source_pin.peer);
ok(!sink_pin.peer, "Got peer %p.\n", sink_pin.peer);
}
@@ -3350,8 +3340,7 @@ static void test_sync_source(void)
ok(!filter2.clock, "Got clock %p.\n", filter2.clock);
hr = IMediaFilter_GetSyncSource(filter, &clock);
-todo_wine
- ok(hr == S_FALSE, "Got hr %#x.\n", hr);
+ todo_wine ok(hr == S_FALSE, "Got hr %#x.\n", hr);
ok(!clock, "Got clock %p.\n", clock);
IReferenceClock_Release(systemclock);
@@ -3647,9 +3636,8 @@ static void test_filter_state(void)
hr = IMediaControl_Run(control);
ok(hr == S_OK, "Got hr %#x.\n", hr);
check_filter_state(graph, State_Running);
-todo_wine
- ok(source.start_time > 0 && source.start_time < 500 * 10000,
- "Got time %s.\n", wine_dbgstr_longlong(source.start_time));
+ todo_wine ok(source.start_time > 0 && source.start_time < 500 * 10000,
+ "Got time %s.\n", wine_dbgstr_longlong(source.start_time));
ok(sink.start_time == source.start_time, "Expected time %s, got %s.\n",
wine_dbgstr_longlong(source.start_time), wine_dbgstr_longlong(sink.start_time));
diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c
index 5625971426b..ec212f1b5d6 100644
--- a/dlls/quartz/tests/videorenderer.c
+++ b/dlls/quartz/tests/videorenderer.c
@@ -347,8 +347,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);
-todo_wine
- ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName));
+ todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", debugstr_w(info.achName));
ref = get_refcount(filter);
ok(ref == 3, "Got unexpected refcount %d.\n", ref);
ref = get_refcount(pin);
--
2.34.1
More information about the wine-devel
mailing list