February 2024 - Wine-commits

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsics SampleCmp and SampleCmpLevelZero.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: ba4bd651e5e39b0bbf47073f8e58202a5493e1c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ba4bd651e5e39b0bbf47073f8e582… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Feb 22 16:56:38 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsics SampleCmp and SampleCmpLevelZero. --- libs/vkd3d-shader/dxil.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index bcd83f51..ac688e85 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -382,6 +382,8 @@ enum dx_intrinsic_opcode DX_SAMPLE_B = 61, DX_SAMPLE_LOD = 62, DX_SAMPLE_GRAD = 63, + DX_SAMPLE_C = 64, + DX_SAMPLE_C_LZ = 65, DX_TEXTURE_LOAD = 66, DX_TEXTURE_STORE = 67, DX_BUFFER_LOAD = 68, @@ -4336,11 +4338,11 @@ static void instruction_set_texel_offset(struct vkd3d_shader_instruction *ins, static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { + unsigned int clamp_idx = 0, component_count = VKD3D_VEC4_SIZE; struct vkd3d_shader_register coord, ddx, ddy; const struct sm6_value *resource, *sampler; struct vkd3d_shader_src_param *src_params; struct vkd3d_shader_instruction *ins; - unsigned int clamp_idx = 0; resource = operands[0]; sampler = operands[1]; @@ -4378,6 +4380,16 @@ static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_ src_params = instruction_src_params_alloc(ins, 4, sm6); src_param_init_from_value(&src_params[3], operands[9]); break; + case DX_SAMPLE_C: + clamp_idx = 10; + /* fall through */ + case DX_SAMPLE_C_LZ: + instruction_init_with_resource(ins, (op == DX_SAMPLE_C_LZ) ? VKD3DSIH_SAMPLE_C_LZ : VKD3DSIH_SAMPLE_C, + resource, sm6); + src_params = instruction_src_params_alloc(ins, 4, sm6); + src_param_init_from_value(&src_params[3], operands[9]); + component_count = 1; + break; case DX_SAMPLE_GRAD: instruction_init_with_resource(ins, VKD3DSIH_SAMPLE_GRAD, resource, sm6); src_params = instruction_src_params_alloc(ins, 5, sm6); @@ -4404,7 +4416,7 @@ static void sm6_parser_emit_dx_sample(struct sm6_parser *sm6, enum dx_intrinsic_ src_param_init_vector_from_reg(&src_params[2], &sampler->u.handle.reg); instruction_set_texel_offset(ins, &operands[6], sm6); - instruction_dst_param_init_ssa_vector(ins, VKD3D_VEC4_SIZE, sm6); + instruction_dst_param_init_ssa_vector(ins, component_count, sm6); } static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, @@ -4666,6 +4678,8 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_SAMPLE ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, [DX_SAMPLE_B ] = {"o", "HHffffiiiff", sm6_parser_emit_dx_sample}, + [DX_SAMPLE_C ] = {"o", "HHffffiiiff", sm6_parser_emit_dx_sample}, + [DX_SAMPLE_C_LZ ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, [DX_SAMPLE_GRAD ] = {"o", "HHffffiiifffffff", sm6_parser_emit_dx_sample}, [DX_SAMPLE_LOD ] = {"o", "HHffffiiif", sm6_parser_emit_dx_sample}, [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos},

1 0

Henri Verbeet : vkd3d: Disable "robustBufferAccess2" as well when we disable "robustBufferAccess".
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: 773f02d82fb911db89eb8e338c97cc327fc7a0e2 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/773f02d82fb911db89eb8e338c97c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 12:43:48 2024 +0100 vkd3d: Disable "robustBufferAccess2" as well when we disable "robustBufferAccess". >From the validation layers: "If robustBufferAccess2 is enabled then robustBufferAccess must also be enabled (https://www.khronos.org/registry/vulkan/specs/1.2-extensions/html/vkspec.ht…)" --- libs/vkd3d/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 01818458..0f45b68f 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1704,6 +1704,7 @@ static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, { WARN("Disabling robust buffer access for the update after bind feature.\n"); features->robustBufferAccess = VK_FALSE; + physical_device_info->robustness2_features.robustBufferAccess2 = VK_FALSE; } /* Select descriptor heap implementation. Forcing virtual heaps may be useful if

1 0

Henri Verbeet : configure: Build with -Wempty-body.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: 1ed47677650df3ef1ecc6041da4a655810975485 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1ed47677650df3ef1ecc6041da4a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 12:59:49 2024 +0100 configure: Build with -Wempty-body. --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 4cb229d5..7fe70615 100644 --- a/configure.ac +++ b/configure.ac @@ -59,14 +59,15 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-std=c99]) VKD3D_CHECK_CFLAGS([-fvisibility=hidden]) VKD3D_CHECK_CFLAGS([-Wdeclaration-after-statement]) + VKD3D_CHECK_CFLAGS([-Wempty-body]) + VKD3D_CHECK_CFLAGS([-Wenum-conversion]) VKD3D_CHECK_CFLAGS([-Wimplicit-fallthrough]) VKD3D_CHECK_CFLAGS([-Winit-self]) VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) + VKD3D_CHECK_CFLAGS([-Wpointer-arith]) VKD3D_CHECK_CFLAGS([-Wshadow]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) - VKD3D_CHECK_CFLAGS([-Wpointer-arith]) - VKD3D_CHECK_CFLAGS([-Wenum-conversion]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) dnl Check for cross compilers

1 0

Henri Verbeet : configure: Build with -Wshift-overflow=2.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: d155071f2268da0572889365642488a8fddf111d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d155071f2268da057288936564248… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 13:01:24 2024 +0100 configure: Build with -Wshift-overflow=2. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 7fe70615..6d352895 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wmissing-prototypes]) VKD3D_CHECK_CFLAGS([-Wpointer-arith]) VKD3D_CHECK_CFLAGS([-Wshadow]) + VKD3D_CHECK_CFLAGS([-Wshift-overflow=2]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])])

1 0

Henri Verbeet : configure: Build with -Wtype-limits.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: 7029d821bed23e71eafd54d9894ec03f59b606bd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7029d821bed23e71eafd54d9894ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 13:03:16 2024 +0100 configure: Build with -Wtype-limits. libs/vkd3d-shader/tpf.c: In function ‘write_sm4_unary_op_with_two_destinations’: libs/vkd3d-shader/tpf.c:4489:24: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] assert(1 - dst_idx >= 0); ^~ libs/vkd3d-shader/tpf.c: In function ‘write_sm4_binary_op_with_two_destinations’: libs/vkd3d-shader/tpf.c:4549:24: warning: comparison of unsigned expression >= 0 is always true [-Wtype-limits] assert(1 - dst_idx >= 0); ^~ --- configure.ac | 1 + libs/vkd3d-shader/tpf.c | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 6d352895..e2376b0d 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wpointer-arith]) VKD3D_CHECK_CFLAGS([-Wshadow]) VKD3D_CHECK_CFLAGS([-Wshift-overflow=2]) + VKD3D_CHECK_CFLAGS([-Wtype-limits]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) diff --git a/libs/vkd3d-shader/tpf.c b/libs/vkd3d-shader/tpf.c index 10dde985..c6cf1c95 100644 --- a/libs/vkd3d-shader/tpf.c +++ b/libs/vkd3d-shader/tpf.c @@ -4477,7 +4477,7 @@ static void write_sm4_unary_op(const struct tpf_writer *tpf, enum vkd3d_sm4_opco } static void write_sm4_unary_op_with_two_destinations(const struct tpf_writer *tpf, enum vkd3d_sm4_opcode opcode, - const struct hlsl_ir_node *dst, unsigned dst_idx, const struct hlsl_ir_node *src) + const struct hlsl_ir_node *dst, unsigned int dst_idx, const struct hlsl_ir_node *src) { struct sm4_instruction instr; @@ -4486,7 +4486,6 @@ static void write_sm4_unary_op_with_two_destinations(const struct tpf_writer *tp assert(dst_idx < ARRAY_SIZE(instr.dsts)); sm4_dst_from_node(&instr.dsts[dst_idx], dst); - assert(1 - dst_idx >= 0); instr.dsts[1 - dst_idx].reg.type = VKD3DSPR_NULL; instr.dsts[1 - dst_idx].reg.dimension = VSIR_DIMENSION_NONE; instr.dsts[1 - dst_idx].reg.idx_count = 0; @@ -4536,7 +4535,7 @@ static void write_sm4_binary_op_dot(const struct tpf_writer *tpf, enum vkd3d_sm4 } static void write_sm4_binary_op_with_two_destinations(const struct tpf_writer *tpf, - enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned dst_idx, + enum vkd3d_sm4_opcode opcode, const struct hlsl_ir_node *dst, unsigned int dst_idx, const struct hlsl_ir_node *src1, const struct hlsl_ir_node *src2) { struct sm4_instruction instr; @@ -4546,7 +4545,6 @@ static void write_sm4_binary_op_with_two_destinations(const struct tpf_writer *t assert(dst_idx < ARRAY_SIZE(instr.dsts)); sm4_dst_from_node(&instr.dsts[dst_idx], dst); - assert(1 - dst_idx >= 0); instr.dsts[1 - dst_idx].reg.type = VKD3DSPR_NULL; instr.dsts[1 - dst_idx].reg.dimension = VSIR_DIMENSION_NONE; instr.dsts[1 - dst_idx].reg.idx_count = 0;

1 0

Henri Verbeet : configure: Build with -Wwrite-strings.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: vkd3d Branch: master Commit: d65f331efc70454312f1e23653703e67b459d7cc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/d65f331efc70454312f1e23653703… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 22 13:08:36 2024 +0100 configure: Build with -Wwrite-strings. libs/vkd3d-shader/hlsl.c: In function ‘declare_predefined_types’: libs/vkd3d-shader/hlsl.c:3408:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] {"technique", 9}, ^~~~~~~~~~~ ... programs/vkd3d-compiler/main.c: In function ‘parse_formatting’: programs/vkd3d-compiler/main.c:303:10: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] {"colour", VKD3D_SHADER_COMPILE_OPTION_FORMATTING_COLOUR}, ^~~~~~~~ ... macOS tigetstr() takes a non-const char *, so account for that as well. --- configure.ac | 1 + libs/vkd3d-shader/hlsl.c | 2 +- programs/vkd3d-compiler/main.c | 4 ++-- programs/vkd3d-dxbc/main.c | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index e2376b0d..caceb445 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,7 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wtype-limits]) VKD3D_CHECK_CFLAGS([-Wunused-but-set-parameter]) VKD3D_CHECK_CFLAGS([-Wvla]) + VKD3D_CHECK_CFLAGS([-Wwrite-strings]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) dnl Check for cross compilers diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 978c414d..0e75edd4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -3403,7 +3403,7 @@ static void declare_predefined_types(struct hlsl_ctx *ctx) static const struct { - char *name; + const char *name; unsigned int version; } technique_types[] = diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 3fa54aad..fdb1cade 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -295,7 +295,7 @@ static bool parse_formatting(uint32_t *formatting, bool *colour, char *arg) { static const struct formatting_option { - char *name; + const char *name; enum vkd3d_shader_compile_option_formatting_flags value; } opts[] = @@ -694,7 +694,7 @@ static bool has_colour(FILE *f) setupterm(NULL, fileno(f), &ret); if (ret != 1) return false; - supported = !!tigetstr("setaf"); + supported = !!tigetstr((char *)"setaf"); del_curterm(cur_term); return supported; diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index b6786b71..e76bcb63 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -71,7 +71,7 @@ static bool has_colour(void) setupterm(NULL, fileno(stdout), &ret); if (ret != 1) return false; - supported = !!tigetstr("setaf"); + supported = !!tigetstr((char *)"setaf"); del_curterm(cur_term); return supported;

1 0

Brendan McGrath : d2d1/tests: Increase timeout from 1 sec to 5 secs.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: c65ac223a074e2129afe0a0f10cdcd3ec80b87cd URL: https://gitlab.winehq.org/wine/wine/-/commit/c65ac223a074e2129afe0a0f10cdcd… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed Feb 7 13:15:37 2024 +1100 d2d1/tests: Increase timeout from 1 sec to 5 secs. Fixes a test that is frequently failing on the GitLab CI. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56188 --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index efa4da54fd2..0059b2b8bd1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10822,7 +10822,7 @@ static void test_mt_factory(BOOL d3d11) ID2D1Multithread_Enter(multithread); thread = CreateThread(NULL, 0, mt_factory_test_thread_draw_func, ctx.rt, 0, NULL); ok(!!thread, "Failed to create a thread.\n"); - ret = WaitForSingleObject(thread, 1000); + ret = WaitForSingleObject(thread, 5000); ok(ret == WAIT_OBJECT_0, "Didn't expect timeout.\n"); ID2D1Multithread_Leave(multithread); WaitForSingleObject(thread, INFINITE);

1 0

Yuxuan Shui : dmime: Don't skip chunk for MIDI files.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 813b35c9d1045e1a39a5d14d36a11103fc30b15f URL: https://gitlab.winehq.org/wine/wine/-/commit/813b35c9d1045e1a39a5d14d36a111… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Fri Feb 16 17:01:08 2024 +0000 dmime: Don't skip chunk for MIDI files. MIDI files aren't RIFF, calling stream_skip_chunk on it is invalid. --- dlls/dmime/segment.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 82e06f4537d..b0485aaedd9 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -844,7 +844,9 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream } } - stream_skip_chunk(stream, &chunk); + if (chunk.id != mmioFOURCC('M', 'T', 'h', 'd')) + stream_skip_chunk(stream, &chunk); + if (FAILED(hr)) { WARN("Failed to load segment from stream %p, hr %#lx\n", stream, hr);

1 0

Yuxuan Shui : dmime: Read through a MIDI file.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 8710a1cb0a205bbc9960157116c951aadc79dc13 URL: https://gitlab.winehq.org/wine/wine/-/commit/8710a1cb0a205bbc9960157116c951… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Thu Feb 15 18:38:11 2024 +0000 dmime: Read through a MIDI file. Add a dummy track parser, that reads through MIDI tracks and events. To make sure we understand the file structure correctly, no actual tracks or events are generated. Also add test cases to make sure we read through a MIDI file correctly. --- dlls/dmime/midi.c | 136 ++++++++++++++++++++++---- dlls/dmime/tests/dmime.c | 236 ++++++++++++++++++++++++++++++++++++---------- dlls/dmusic/dmusic_midi.h | 3 + 3 files changed, 311 insertions(+), 64 deletions(-)

1 0

Yuxuan Shui : dmime/tests: Improve error reporting from expect_track.
by Alexandre Julliard 22 Feb '24

22 Feb '24

Module: wine Branch: master Commit: 5613917974af472b5c8f401991442c20d77a2ece URL: https://gitlab.winehq.org/wine/wine/-/commit/5613917974af472b5c8f401991442c… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Wed Feb 21 12:48:55 2024 +0000 dmime/tests: Improve error reporting from expect_track. Include a line number of the call site. --- dlls/dmime/tests/dmime.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 6ccb944375c..7e1b419251e 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -1564,7 +1564,7 @@ static void test_segment(void) } static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char *name, DWORD group, - DWORD index, BOOL ignore_guid) + DWORD index, BOOL ignore_guid, const char *file, UINT line) { IDirectMusicTrack *track; IPersistStream *ps; @@ -1576,17 +1576,17 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char else hr = IDirectMusicSegment8_GetTrack(seg, expect, group, index, &track); if (!expect) { - ok(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); + ok_(file, line)(hr == DMUS_E_NOT_FOUND, "GetTrack failed: %#lx, expected DMUS_E_NOT_FOUND\n", hr); return; } - ok(hr == S_OK, "GetTrack failed: %#lx, expected S_OK\n", hr); + ok_(file, line)(hr == S_OK, "GetTrack failed: %#lx, expected S_OK\n", hr); if (FAILED(hr)) return; hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void**)&ps); - ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); + ok_(file, line)(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %#lx\n", hr); hr = IPersistStream_GetClassID(ps, &class); - ok(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); - ok(IsEqualGUID(&class, expect), "For group %#lx index %lu: Expected class %s got %s\n", + ok_(file, line)(hr == S_OK, "IPersistStream_GetClassID failed: %#lx\n", hr); + ok_(file, line)(IsEqualGUID(&class, expect), "For group %#lx index %lu: Expected class %s got %s\n", group, index, name, wine_dbgstr_guid(&class)); IPersistStream_Release(ps); @@ -1594,9 +1594,9 @@ static void _expect_track(IDirectMusicSegment8 *seg, REFCLSID expect, const char } #define expect_track(seg, class, group, index) \ - _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, TRUE) + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, TRUE, __FILE__, __LINE__) #define expect_guid_track(seg, class, group, index) \ - _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, FALSE) + _expect_track(seg, &CLSID_DirectMusic ## class, #class, group, index, FALSE, __FILE__, __LINE__) static void test_midi(void) { @@ -1816,15 +1816,15 @@ static void test_gettrack(void) expect_track(seg, SeqTrack, 0x1, 2); expect_track(seg, TempoTrack, 0x1, 3); expect_track(seg, WaveTrack, 0x1, 4); - _expect_track(seg, NULL, "", 0x1, 5, TRUE); - _expect_track(seg, NULL, "", 0x1, DMUS_SEG_ANYTRACK, TRUE); + _expect_track(seg, NULL, "", 0x1, 5, TRUE, __FILE__, __LINE__); + _expect_track(seg, NULL, "", 0x1, DMUS_SEG_ANYTRACK, TRUE, __FILE__, __LINE__); expect_track(seg, ParamControlTrack, 0x2, 0); expect_track(seg, WaveTrack, 0x80000000, 0); expect_track(seg, SegmentTriggerTrack, 0x3, 2); /* groups 1+2 combined index */ expect_track(seg, SeqTrack, 0x3, 3); /* groups 1+2 combined index */ expect_track(seg, TempoTrack, 0x7, 4); /* groups 1+2+3 combined index */ expect_track(seg, TempoTrack, 0xffffffff, 4); /* all groups combined index */ - _expect_track(seg, NULL, "", 0xffffffff, DMUS_SEG_ANYTRACK, TRUE); + _expect_track(seg, NULL, "", 0xffffffff, DMUS_SEG_ANYTRACK, TRUE, __FILE__, __LINE__); /* Use the GUID in GetTrack */ hr = IDirectMusicSegment8_GetTrack(seg, &CLSID_DirectMusicLyricsTrack, 0, 0, &track);

1 0