March 2022 - Wine-commits - list.winehq.org

Zebediah Figura : d3dcompiler: Use a single definition for both d3d10 and d3d11 reflection interfaces.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 2198235cf19355f80aa0e6771f6ec9e3b1b391f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2198235cf19355f80aa0e677… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 14:24:05 2022 +0100 d3dcompiler: Use a single definition for both d3d10 and d3d11 reflection interfaces. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 508 +++------------------------------------ 1 file changed, 40 insertions(+), 468 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2198235cf19355f80aa0…

1 0

Zebediah Figura : d3d10: Do not define D3DReflect().
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: a23192f33841a1f143e6a08660a9c17ba8992217 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a23192f33841a1f143e6a086… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 14:24:06 2022 +0100 d3d10: Do not define D3DReflect(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index f15cdfa0467..91cc20cdded 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -1918,8 +1918,7 @@ HRESULT WINAPI D3D10ReflectShader(const void *data, SIZE_T data_size, ID3D10Shad return S_OK; } -#endif - +#else HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void **reflector) { struct d3dcompiler_shader_reflection *object; @@ -1978,3 +1977,4 @@ HRESULT WINAPI D3DReflect(const void *data, SIZE_T data_size, REFIID riid, void return S_OK; } +#endif

1 0

Matteo Bruni : d3dcompiler/tests: Use hexadecimal constants in a few ok() checks.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: b05c797a6903b438a4c4f3762a781866cd1e01b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b05c797a6903b438a4c4f376… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 3 14:24:07 2022 +0100 d3dcompiler/tests: Use hexadecimal constants in a few ok() checks. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/reflection.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dcompiler_43/tests/reflection.c b/dlls/d3dcompiler_43/tests/reflection.c index bd9179779e9..f2b7f094de6 100644 --- a/dlls/d3dcompiler_43/tests/reflection.c +++ b/dlls/d3dcompiler_43/tests/reflection.c @@ -435,9 +435,9 @@ static void test_reflection_desc_vs(void) hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(sdesc11.Version == 65601, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65601); - ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); - ok(sdesc11.Flags == 256, "GetDesc failed, got %u, expected %u\n", sdesc11.Flags, 256); + ok(sdesc11.Version == 0x10041, "Unexpected Version %#x.\n", sdesc11.Version); + ok(!strcmp(sdesc11.Creator, (char *)shader_creator), "Unexpected Creator \"%s\".\n", sdesc11.Creator); + ok(sdesc11.Flags == 0x100, "Unexpected Flags %#x.\n", sdesc11.Flags); ok(sdesc11.ConstantBuffers == 0, "GetDesc failed, got %u, expected %u\n", sdesc11.ConstantBuffers, 0); ok(sdesc11.BoundResources == 0, "GetDesc failed, got %u, expected %u\n", sdesc11.BoundResources, 0); ok(sdesc11.InputParameters == 15, "GetDesc failed, got %u, expected %u\n", sdesc11.InputParameters, 15); @@ -786,9 +786,9 @@ static void test_reflection_desc_ps(void) hr = ref11->lpVtbl->GetDesc(ref11, &sdesc11); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(sdesc11.Version == 65, "GetDesc failed, got %u, expected %u\n", sdesc11.Version, 65); - ok(strcmp(sdesc11.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc11.Creator, (char*)shader_creator); - ok(sdesc11.Flags == 256, "GetDesc failed, got %u, expected %u\n", sdesc11.Flags, 256); + ok(sdesc11.Version == 0x41, "Unexpected Version %#x.\n", sdesc11.Version); + ok(!strcmp(sdesc11.Creator, (char *)shader_creator), "Unexpected Creator \"%s\".\n", sdesc11.Creator); + ok(sdesc11.Flags == 0x100, "Unexpected Flags %#x.\n", sdesc11.Flags); ok(sdesc11.ConstantBuffers == 0, "GetDesc failed, got %u, expected %u\n", sdesc11.ConstantBuffers, 0); ok(sdesc11.BoundResources == 4, "GetDesc failed, got %u, expected %u\n", sdesc11.BoundResources, 4); ok(sdesc11.InputParameters == 8, "GetDesc failed, got %u, expected %u\n", sdesc11.InputParameters, 8); @@ -1652,10 +1652,10 @@ static void test_reflection_constant_buffer(void) hr = ref11->lpVtbl->GetDesc(ref11, &sdesc); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - expected = D3D_COMPILER_VERSION ? 80 : 64; - ok(sdesc.Version == expected, "Got unexpected version %u.\n", sdesc.Version); - ok(strcmp(sdesc.Creator, (char*) shader_creator) == 0, "GetDesc failed, got \"%s\", expected \"%s\"\n", sdesc.Creator, (char*)shader_creator); - ok(sdesc.Flags == 256, "GetDesc failed, got %u, expected %u\n", sdesc.Flags, 256); + expected = D3D_COMPILER_VERSION ? 0x50 : 0x40; + ok(sdesc.Version == expected, "Unexpected Version %#x.\n", sdesc.Version); + ok(!strcmp(sdesc.Creator, (char *)shader_creator), "Unexpected Creator \"%s\".\n", sdesc.Creator); + ok(sdesc.Flags == 0x100, "Unexpected Flags %#x.\n", sdesc.Flags); ok(sdesc.ConstantBuffers == 2, "GetDesc failed, got %u, expected %u\n", sdesc.ConstantBuffers, 2); expected = D3D_COMPILER_VERSION ? 1 : 2; ok(sdesc.BoundResources == expected, "Got unexpected BoundResources %u.\n", sdesc.BoundResources);

1 0

Matteo Bruni : wined3d: Fix typo in WARN() message.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 6b7ccb76abd30ce0c0791c2e026b0c0c7060be21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b7ccb76abd30ce0c0791c2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 2 18:07:00 2022 -0600 wined3d: Fix typo in WARN() message. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 3c7139aea70..ef153e5dd5f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4639,7 +4639,7 @@ static void state_cs_uav_binding(struct wined3d_context *context, static void state_uav_warn(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - WARN("ARB_image_load_store is not supported by OpenGL implementation.\n"); + WARN("ARB_shader_image_load_store is not supported by this OpenGL implementation.\n"); } static void state_so(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id)

1 0

Eric Pouech : qasf/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 71ee9086908f690aca0e58df3a29e51457758887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71ee9086908f690aca0e58df… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 08:22:15 2022 +0100 qasf/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/tests/Makefile.in | 1 - dlls/qasf/tests/asfreader.c | 84 +++--- dlls/qasf/tests/dmowrapper.c | 672 +++++++++++++++++++++---------------------- 3 files changed, 378 insertions(+), 379 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=71ee9086908f690aca0e…

1 0

Eric Pouech : qdvd/tests: Enable compilation with long types.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 2388ba40d6c8bae81b4d2c50cf19234758952a67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2388ba40d6c8bae81b4d2c50… Author: Eric Pouech <eric.pouech(a)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(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)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)

1 0

Zebediah Figura : devenum/tests: Remove workarounds from test_moniker_isequal().
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 6506533f716daf76044e663e188aab0245516deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=6506533f716daf76044e663e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Mar 3 11:40:54 2022 -0600 devenum/tests: Remove workarounds from test_moniker_isequal(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/devenum.c | 111 +++++++++++++++++++++---------------------- 1 file changed, 53 insertions(+), 58 deletions(-) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 3e0d6f57dc3..1a1e48e1a4b 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -150,91 +150,85 @@ static void test_devenum(void) static void test_moniker_isequal(void) { - HRESULT res; ICreateDevEnum *create_devenum = NULL; IEnumMoniker *enum_moniker0 = NULL, *enum_moniker1 = NULL; IMoniker *moniker0 = NULL, *moniker1 = NULL; + HRESULT hr; - res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, + hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); - if (FAILED(res)) - { - skip("Cannot create SystemDeviceEnum object (%x)\n", res); - return; - } + ok(hr == S_OK, "Got hr %#x.\n", hr); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (SUCCEEDED(res)) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK + && IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) { - if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && - IEnumMoniker_Next(enum_moniker0, 1, &moniker1, NULL) == S_OK) - { - res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker0, moniker1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should fail (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker1, moniker0); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - IMoniker_Release(moniker0); - IMoniker_Release(moniker1); - } - else - skip("Cannot get moniker for testing.\n"); + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + { + skip("Cannot get moniker for testing.\n"); } IEnumMoniker_Release(enum_moniker0); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_AudioRendererCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (SUCCEEDED(res)) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_AudioRendererCategory, &enum_moniker1, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK + && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { - if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && - IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) - { - res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker0, moniker1); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_FALSE, "IMoniker_IsEqual should failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker1, moniker0); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); - IMoniker_Release(moniker0); - IMoniker_Release(moniker1); - } - else - skip("Cannot get moniker for testing.\n"); + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + { + skip("Cannot get moniker for testing.\n"); } IEnumMoniker_Release(enum_moniker0); IEnumMoniker_Release(enum_moniker1); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - res = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); - ok(SUCCEEDED(res), "Cannot create enum moniker (res = %x)\n", res); - if (SUCCEEDED(res)) + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker0, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = ICreateDevEnum_CreateClassEnumerator(create_devenum, &CLSID_LegacyAmFilterCategory, &enum_moniker1, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK + && IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) { - if (IEnumMoniker_Next(enum_moniker0, 1, &moniker0, NULL) == S_OK && - IEnumMoniker_Next(enum_moniker1, 1, &moniker1, NULL) == S_OK) - { - res = IMoniker_IsEqual(moniker0, moniker1); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker0, moniker1); + ok(hr == S_OK, "Got hr %#x.\n", hr); - res = IMoniker_IsEqual(moniker1, moniker0); - ok(res == S_OK, "IMoniker_IsEqual failed (res = %x)\n", res); + hr = IMoniker_IsEqual(moniker1, moniker0); + ok(hr == S_OK, "Got hr %#x.\n", hr); - IMoniker_Release(moniker0); - IMoniker_Release(moniker1); - } - else - skip("Cannot get moniker for testing.\n"); + IMoniker_Release(moniker0); + IMoniker_Release(moniker1); + } + else + { + skip("Cannot get moniker for testing.\n"); } IEnumMoniker_Release(enum_moniker0); IEnumMoniker_Release(enum_moniker1); ICreateDevEnum_Release(create_devenum); - - return; } static BOOL find_moniker(const GUID *class, IMoniker *needle) @@ -277,6 +271,7 @@ static void test_register_filter(void) rgf2.dwMerit = MERIT_UNLIKELY; S2(U(rgf2)).cPins2 = 0; + hr = IFilterMapper2_RegisterFilter(mapper2, &CLSID_TestFilter, L"devenum test", &mon, NULL, NULL, &rgf2); if (hr == E_ACCESSDENIED) {

1 0

Eric Pouech : devenum/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 7f0c59f360eaba2ff4f343ac54884feb4e50a73a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0c59f360eaba2ff4f343ac… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 11:40:55 2022 -0600 devenum/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/tests/Makefile.in | 1 - dlls/devenum/tests/devenum.c | 266 ++++++++++++++++++++--------------------- 2 files changed, 133 insertions(+), 134 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7f0c59f360eaba2ff4f3…

1 0

Eric Pouech : qcap/tests: Use int instead of LONG for the arguments to IAMStreamConfig::GetNumberOfCapabilities().
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 05d3b1d8f31890c36dd3601e2cc0f2ab41385734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05d3b1d8f31890c36dd3601e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 11:40:56 2022 -0600 qcap/tests: Use int instead of LONG for the arguments to IAMStreamConfig::GetNumberOfCapabilities(). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/videocapture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/videocapture.c b/dlls/qcap/tests/videocapture.c index 4e9dca7d837..a96aeb6740c 100644 --- a/dlls/qcap/tests/videocapture.c +++ b/dlls/qcap/tests/videocapture.c @@ -84,11 +84,12 @@ static void test_media_types(IPin *pin) static void test_stream_config(IPin *pin) { VIDEOINFOHEADER *video_info, *video_info2; - LONG depth, compression, count, size, i; IEnumMediaTypes *enum_media_types; AM_MEDIA_TYPE *format, *format2; IAMStreamConfig *stream_config; VIDEO_STREAM_CONFIG_CAPS vscc; + LONG depth, compression; + int count, size, i; HRESULT hr; hr = IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **)&stream_config);

1 0

Eric Pouech : qedit/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 03 Mar '22

03 Mar '22

Module: wine Branch: master Commit: 0fb1d1f2aea5138c322738dfe73a52cf516d0b38 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fb1d1f2aea5138c322738df… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Mar 3 11:40:58 2022 -0600 qedit/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/Makefile.in | 1 - dlls/qedit/tests/mediadet.c | 313 +++++++++++++------------- dlls/qedit/tests/nullrenderer.c | 370 +++++++++++++++---------------- dlls/qedit/tests/samplegrabber.c | 462 +++++++++++++++++++-------------------- dlls/qedit/tests/timeline.c | 74 +++---- 5 files changed, 609 insertions(+), 611 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0fb1d1f2aea5138c3227…

1 0