Module: wine Branch: master Commit: 2388ba40d6c8bae81b4d2c50cf19234758952a67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2388ba40d6c8bae81b4d2c50c...
Author: Eric Pouech eric.pouech@gmail.com Date: Thu Mar 3 08:22:33 2022 +0100
qdvd/tests: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Zebediah Figura zfigura@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/qdvd/tests/Makefile.in | 1 - dlls/qdvd/tests/graph.c | 36 ++++++++++++++++++------------------ dlls/qdvd/tests/navigator.c | 36 ++++++++++++++++++------------------ 3 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/dlls/qdvd/tests/Makefile.in b/dlls/qdvd/tests/Makefile.in index c94ea074c07..fdd769b73e0 100644 --- a/dlls/qdvd/tests/Makefile.in +++ b/dlls/qdvd/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = qdvd.dll IMPORTS = strmiids uuid ole32
diff --git a/dlls/qdvd/tests/graph.c b/dlls/qdvd/tests/graph.c index 93dc4e66a99..7322e2375b7 100644 --- a/dlls/qdvd/tests/graph.c +++ b/dlls/qdvd/tests/graph.c @@ -28,7 +28,7 @@ static IDvdGraphBuilder *create_graph_builder(void) IDvdGraphBuilder *graph = NULL; HRESULT hr = CoCreateInstance(&CLSID_DvdGraphBuilder, NULL, CLSCTX_INPROC_SERVER, &IID_IDvdGraphBuilder, (void **)&graph); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); return graph; }
@@ -49,7 +49,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE;
hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -111,53 +111,53 @@ static void test_aggregation(void) graph = (IDvdGraphBuilder *)0xdeadbeef; hr = CoCreateInstance(&CLSID_DvdGraphBuilder, &test_outer, CLSCTX_INPROC_SERVER, &IID_IDvdGraphBuilder, (void **)&graph); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!graph, "Got interface %p.\n", graph);
hr = CoCreateInstance(&CLSID_DvdGraphBuilder, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref);
ref = IUnknown_AddRef(unk); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref);
ref = IUnknown_Release(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref);
hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); IUnknown_Release(unk2);
hr = IUnknown_QueryInterface(unk, &IID_IDvdGraphBuilder, (void **)&graph); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IDvdGraphBuilder_QueryInterface(graph, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2);
hr = IDvdGraphBuilder_QueryInterface(graph, &IID_IDvdGraphBuilder, (void **)&graph2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(graph2 == (IDvdGraphBuilder *)0xdeadbeef, "Got unexpected IDvdGraphBuilder %p.\n", graph2);
hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!unk2, "Got unexpected IUnknown %p.\n", unk2);
hr = IDvdGraphBuilder_QueryInterface(graph, &test_iid, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2);
IDvdGraphBuilder_Release(graph); ref = IUnknown_Release(unk); - ok(!ref, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(!ref, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); }
START_TEST(graph) diff --git a/dlls/qdvd/tests/navigator.c b/dlls/qdvd/tests/navigator.c index 51999065cf5..fcc8fd7c957 100644 --- a/dlls/qdvd/tests/navigator.c +++ b/dlls/qdvd/tests/navigator.c @@ -28,7 +28,7 @@ static IBaseFilter *create_navigator(void) IBaseFilter *filter = NULL; HRESULT hr = CoCreateInstance(&CLSID_DVDNavigator, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); return filter; }
@@ -49,7 +49,7 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO expected_hr = supported ? S_OK : E_NOINTERFACE;
hr = IUnknown_QueryInterface(iface, iid, (void **)&unk); - ok_(__FILE__, line)(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + ok_(__FILE__, line)(hr == expected_hr, "Got hr %#lx, expected %#lx.\n", hr, expected_hr); if (SUCCEEDED(hr)) IUnknown_Release(unk); } @@ -131,53 +131,53 @@ static void test_aggregation(void) filter = (IBaseFilter *)0xdeadbeef; hr = CoCreateInstance(&CLSID_DVDNavigator, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!filter, "Got interface %p.\n", filter);
hr = CoCreateInstance(&CLSID_DVDNavigator, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); - ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); ok(unk != &test_outer, "Returned IUnknown should not be outer IUnknown.\n"); ref = get_refcount(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref);
ref = IUnknown_AddRef(unk); - ok(ref == 2, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(ref == 2, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref);
ref = IUnknown_Release(unk); - ok(ref == 1, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(ref == 1, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref);
hr = IUnknown_QueryInterface(unk, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == unk, "Got unexpected IUnknown %p.\n", unk2); IUnknown_Release(unk2);
hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr);
hr = IBaseFilter_QueryInterface(filter, &IID_IUnknown, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2);
hr = IBaseFilter_QueryInterface(filter, &IID_IBaseFilter, (void **)&filter2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(filter2 == (IBaseFilter *)0xdeadbeef, "Got unexpected IBaseFilter %p.\n", filter2);
hr = IUnknown_QueryInterface(unk, &test_iid, (void **)&unk2); - ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + ok(hr == E_NOINTERFACE, "Got hr %#lx.\n", hr); ok(!unk2, "Got unexpected IUnknown %p.\n", unk2);
hr = IBaseFilter_QueryInterface(filter, &test_iid, (void **)&unk2); - ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); ok(unk2 == (IUnknown *)0xdeadbeef, "Got unexpected IUnknown %p.\n", unk2);
IBaseFilter_Release(filter); ref = IUnknown_Release(unk); - ok(!ref, "Got unexpected refcount %d.\n", ref); - ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); + ok(!ref, "Got unexpected refcount %ld.\n", ref); + ok(outer_ref == 1, "Got unexpected refcount %ld.\n", outer_ref); }
START_TEST(navigator)