February 2021 - Wine-commits

Henri Verbeet : vkd3d-shader: Add some colour to d3d-asm literals.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: vkd3d Branch: master Commit: 486d8edb7cf360ff261b1faf10dbc881a57eb1f0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=486d8edb7cf360ff261b1fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 11:24:02 2021 +0100 vkd3d-shader: Add some colour to d3d-asm literals. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 +- libs/vkd3d-shader/trace.c | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 96d6140..065b981 100644 --- a/Makefile.am +++ b/Makefile.am @@ -167,7 +167,7 @@ libvkd3d_shader_la_SOURCES = \ libs/vkd3d-shader/vkd3d_shader_private.h libvkd3d_shader_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libs/vkd3d-shader @SPIRV_TOOLS_CFLAGS@ libvkd3d_shader_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 -libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ +libvkd3d_shader_la_LIBADD = libvkd3d-common.la @SPIRV_TOOLS_LIBS@ -lm if HAVE_LD_VERSION_SCRIPT libvkd3d_shader_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libs/vkd3d-shader/vkd3d_shader.map EXTRA_libvkd3d_shader_la_DEPENDENCIES = $(srcdir)/libs/vkd3d-shader/vkd3d_shader.map diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index bb5c373..8450a59 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -25,6 +25,7 @@ #include "vkd3d_shader_private.h" #include <stdio.h> +#include <math.h> static const char * const shader_opcode_names[] = { @@ -303,6 +304,7 @@ shader_input_sysval_semantic_names[] = struct vkd3d_d3d_asm_colours { const char *reset; + const char *literal; const char *opcode; const char *reg; }; @@ -705,31 +707,44 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler, const char *prefix, float f, const char *suffix) { - vkd3d_string_buffer_printf(&compiler->buffer, "%s%.8e%s", prefix, f, suffix); + if (isfinite(f) && signbit(f)) + vkd3d_string_buffer_printf(&compiler->buffer, "%s-%s%.8e%s%s", + prefix, compiler->colours.literal, -f, compiler->colours.reset, suffix); + else + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%.8e%s%s", + prefix, compiler->colours.literal, f, compiler->colours.reset, suffix); } static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler, const char *prefix, int i, const char *suffix) { - vkd3d_string_buffer_printf(&compiler->buffer, "%s%d%s", prefix, i, suffix); + if (i < 0) + vkd3d_string_buffer_printf(&compiler->buffer, "%s-%s%d%s%s", + prefix, compiler->colours.literal, -i, compiler->colours.reset, suffix); + else + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%d%s%s", + prefix, compiler->colours.literal, i, compiler->colours.reset, suffix); } static void shader_print_uint_literal(struct vkd3d_d3d_asm_compiler *compiler, const char *prefix, unsigned int i, const char *suffix) { - vkd3d_string_buffer_printf(&compiler->buffer, "%s%u%s", prefix, i, suffix); + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%u%s%s", + prefix, compiler->colours.literal, i, compiler->colours.reset, suffix); } static void shader_print_hex_literal(struct vkd3d_d3d_asm_compiler *compiler, const char *prefix, unsigned int i, const char *suffix) { - vkd3d_string_buffer_printf(&compiler->buffer, "%s0x%08x%s", prefix, i, suffix); + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s0x%08x%s%s", + prefix, compiler->colours.literal, i, compiler->colours.reset, suffix); } static void shader_print_bool_literal(struct vkd3d_d3d_asm_compiler *compiler, const char *prefix, unsigned int b, const char *suffix) { - vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s", prefix, b ? "true" : "false", suffix); + vkd3d_string_buffer_printf(&compiler->buffer, "%s%s%s%s%s", prefix, + compiler->colours.literal, b ? "true" : "false", compiler->colours.reset, suffix); } static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, @@ -1668,12 +1683,14 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, static const struct vkd3d_d3d_asm_colours no_colours = { .reset = "", + .literal = "", .opcode = "", .reg = "", }; static const struct vkd3d_d3d_asm_colours colours = { .reset = "\x1b[m", + .literal = "\x1b[95m", .opcode = "\x1b[96;1m", .reg = "\x1b[96m", };

1 0

Henri Verbeet : vkd3d-shader: Add some colour to d3d-asm write masks.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: vkd3d Branch: master Commit: 71f1dd5792e67711c46423fcc1bb69a829f91547 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=71f1dd5792e67711c46423f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 11:24:03 2021 +0100 vkd3d-shader: Add some colour to d3d-asm write masks. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 8450a59..06f6254 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -307,6 +307,7 @@ struct vkd3d_d3d_asm_colours const char *literal; const char *opcode; const char *reg; + const char *write_mask; }; struct vkd3d_d3d_asm_compiler @@ -1090,7 +1091,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, { static const char write_mask_chars[] = "xyzw"; - shader_addline(buffer, "."); + shader_addline(buffer, ".%s", compiler->colours.write_mask); if (write_mask & VKD3DSP_WRITEMASK_0) shader_addline(buffer, "%c", write_mask_chars[0]); if (write_mask & VKD3DSP_WRITEMASK_1) @@ -1099,6 +1100,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, shader_addline(buffer, "%c", write_mask_chars[2]); if (write_mask & VKD3DSP_WRITEMASK_3) shader_addline(buffer, "%c", write_mask_chars[3]); + shader_addline(buffer, "%s", compiler->colours.reset); } } @@ -1686,6 +1688,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .literal = "", .opcode = "", .reg = "", + .write_mask = "", }; static const struct vkd3d_d3d_asm_colours colours = { @@ -1693,6 +1696,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .literal = "\x1b[95m", .opcode = "\x1b[96;1m", .reg = "\x1b[96m", + .write_mask = "\x1b[93m", }; formatting = VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT

1 0

Henri Verbeet : vkd3d-shader: Add some colour to d3d-asm swizzles.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: vkd3d Branch: master Commit: 364621fa77175bc4874ed241d1fd8d768325247c URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=364621fa77175bc4874ed24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 11:24:04 2021 +0100 vkd3d-shader: Add some colour to d3d-asm swizzles. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 06f6254..742fbce 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -307,6 +307,7 @@ struct vkd3d_d3d_asm_colours const char *literal; const char *opcode; const char *reg; + const char *swizzle; const char *write_mask; }; @@ -1158,12 +1159,14 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler, && swizzle_x == swizzle_z && swizzle_x == swizzle_w) { - shader_addline(buffer, ".%c", swizzle_chars[swizzle_x]); + shader_addline(buffer, ".%s%c%s", compiler->colours.swizzle, + swizzle_chars[swizzle_x], compiler->colours.reset); } else { - shader_addline(buffer, ".%c%c%c%c", swizzle_chars[swizzle_x], swizzle_chars[swizzle_y], - swizzle_chars[swizzle_z], swizzle_chars[swizzle_w]); + shader_addline(buffer, ".%s%c%c%c%c%s", compiler->colours.swizzle, + swizzle_chars[swizzle_x], swizzle_chars[swizzle_y], + swizzle_chars[swizzle_z], swizzle_chars[swizzle_w], compiler->colours.reset); } } if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG) @@ -1688,6 +1691,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .literal = "", .opcode = "", .reg = "", + .swizzle = "", .write_mask = "", }; static const struct vkd3d_d3d_asm_colours colours = @@ -1696,6 +1700,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data, .literal = "\x1b[95m", .opcode = "\x1b[96;1m", .reg = "\x1b[96m", + .swizzle = "\x1b[93m", .write_mask = "\x1b[93m", };

1 0

Hans Leidekker : winetest: Add directory to test client certificate authentication.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: tools Branch: master Commit: bdc6311cb8b60ee80a7585906db236d810ab642d URL: https://source.winehq.org/git/tools.git/?a=commit;h=bdc6311cb8b60ee80a75859… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 18 14:39:31 2021 +0100 winetest: Add directory to test client certificate authentication. This needs the following change inside the SSL VirtualHost section: <Directory /path/to/winetest/tests/clientcert> SSLVerifyClient optional_no_ca </Directory> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/tests/clientcert/index.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/winetest/tests/clientcert/index.html b/winetest/tests/clientcert/index.html new file mode 100644 index 0000000..bed858b --- /dev/null +++ b/winetest/tests/clientcert/index.html @@ -0,0 +1,4 @@ +<html><body> +<h1>Hello world!</h1> +This is a test page for the Wine regression test suite. +</body></html>

1 0

Francois Gouget : testbot/web: Show more information for running jobs on the main page.
by Alexandre Julliard 18 Feb '21

18 Feb '21

Module: tools Branch: master Commit: 2f49fe526933148cb66fd19793d4994033e5b32d URL: https://source.winehq.org/git/tools.git/?a=commit;h=2f49fe526933148cb66fd19… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Feb 18 16:15:02 2021 +0100 testbot/web: Show more information for running jobs on the main page. The Status column of the main page now distinguishes jobs that actually have a task running from those that merely have some completed tasks. It also shows the running failure count for these jobs, which makes it easier to identify those that have failures before they are completed. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/index.pl | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index c88adfc..cc32bdb 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -122,19 +122,42 @@ sub GenerateDataCell($$$$) ); my $Status = $Item->Status; my $HTMLStatus = $HTMLChunks{$Status} || $Status; - if ($Status eq "completed" || $Status eq "boterror" || $Status eq "canceled") + if ($Status eq "completed" || $Status eq "running" || $Status eq "boterror" || $Status eq "canceled") { my $JobInfo = $self->{JobsInfo}->{$Item->Id}; - if (!exists $JobInfo->{TestFailures}) + + my $FailuresPrefix; + if ($Status eq "completed") + { + $FailuresPrefix = ""; + } + elsif ($Status ne "running") { print $HTMLStatus; + $FailuresPrefix = " - "; + } + elsif ($JobInfo->{IsRunning}) + { + $JobInfo->{DoneTasks} ||= 0; + print "running ($JobInfo->{DoneTasks}/$JobInfo->{TaskCount})</a>"; + $FailuresPrefix = " - "; } else { - $HTMLStatus = $Status eq "completed" ? "" : "$HTMLStatus - "; + $JobInfo->{DoneTasks} ||= 0; + print "queued ($JobInfo->{DoneTasks}/$JobInfo->{TaskCount})"; + $FailuresPrefix = " - "; + } + + if (exists $JobInfo->{TestFailures}) + { my $class = $JobInfo->{TestFailures} ? "testfail" : "success"; my $s = $JobInfo->{TestFailures} == 1 ? "" : "s"; - print "$HTMLStatus$JobInfo->{TestFailures} test failure$s"; + print "$FailuresPrefix$JobInfo->{TestFailures} test failure$s"; + } + elsif ($Status eq "completed") + { + print $HTMLStatus; } } else @@ -314,6 +337,16 @@ sub GenerateBody($) foreach my $Task (@{$Tasks->GetItems()}) { my $JobInfo = ($JobsCollectionBlock->{JobsInfo}->{$Task->JobId} ||= {}); + $JobInfo->{TaskCount}++; + if ($Task->Status eq "running") + { + $JobInfo->{IsRunning} = 1; + } + elsif ($Task->Status ne "queued") + { + $JobInfo->{DoneTasks}++; + } + my $TestFailures = $Task->TestFailures; $JobInfo->{TestFailures} += $TestFailures if (defined $TestFailures); }

1 0

Anton Baskanov : quartz/tests: Add tests for IMediaEventEx::SetNotifyFlags.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 9d51ccc03d66983e63a4eb5fc04f1fd799b2f2a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d51ccc03d66983e63a4eb5f… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Feb 17 13:09:01 2021 +0700 quartz/tests: Add tests for IMediaEventEx::SetNotifyFlags. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 130 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 130 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e4b72958e10..835a735667a 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5148,6 +5148,135 @@ static void test_autoplug_uyvy(void) ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); } +static void test_set_notify_flags(void) +{ + IFilterGraph2 *graph = create_graph(); + IMediaEventSink *media_event_sink; + IMediaControl *media_control; + IMediaEventEx *media_event; + struct testfilter filter; + LONG_PTR param1, param2; + HANDLE event; + HWND window; + BSTR status; + HRESULT hr; + ULONG ref; + LONG code; + MSG msg; + + window = CreateWindowA("static", NULL, WS_OVERLAPPEDWINDOW, + 50, 50, 150, 150, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create window.\n"); + status = SysAllocString(L"status"); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEventEx, (void **)&media_event); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEventSink, (void **)&media_event_sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&filter, NULL, 0); + filter.IAMFilterMiscFlags_iface.lpVtbl = &testmiscflags_vtbl; + filter.misc_flags = AM_FILTER_MISC_FLAGS_IS_RENDERER; + + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_GetEventHandle(media_event, (OAEVENT *)&event); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_SetNotifyWindow(media_event, (OAHWND)window, WM_USER, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + while (PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE)); + + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + ok(!PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE), "Window should not be notified.\n"); + + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaEventEx_SetNotifyFlags(media_event, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(media_control); + IMediaEventEx_Release(media_event); + IMediaEventSink_Release(media_event_sink); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); + + SysFreeString(status); + DestroyWindow(window); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -5172,6 +5301,7 @@ START_TEST(filtergraph) test_add_source_filter(); test_window_threading(); test_autoplug_uyvy(); + test_set_notify_flags(); CoUninitialize(); test_render_with_multithread();

1 0

Anton Baskanov : quartz/tests: Add tests for event notifications.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 7d0fe79f1d10f96851918708fa220c679be3d7b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d0fe79f1d10f96851918708… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Feb 17 13:09:02 2021 +0700 quartz/tests: Add tests for event notifications. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 129 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 129 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 835a735667a..7d4cfce2628 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5277,6 +5277,134 @@ static void test_set_notify_flags(void) DestroyWindow(window); } +#define check_events(a, b, c, d) check_events_(__LINE__, a, b, c, d) +static void check_events_(unsigned int line, IMediaEventEx *media_event, + int expected_ec_complete_count, int expected_ec_status_count, BOOL todo) +{ + int ec_complete_count = 0; + int ec_status_count = 0; + LONG_PTR param1, param2; + HRESULT hr; + LONG code; + for (;;) + { + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + if (hr != S_OK) + break; + if (code == EC_COMPLETE) + ++ec_complete_count; + if (code == EC_STATUS) + ++ec_status_count; + } + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + todo_wine_if(todo) ok_(__FILE__, line)(ec_complete_count == expected_ec_complete_count, + "Expected %d EC_COMPLETE events.\n", expected_ec_complete_count); + ok_(__FILE__, line)(ec_status_count == expected_ec_status_count, + "Expected %d EC_STATUS events.\n", expected_ec_status_count); +} + +static void test_events(void) +{ + IFilterGraph2 *graph = create_graph(); + IMediaEventSink *media_event_sink; + IMediaControl *media_control; + IMediaEventEx *media_event; + struct testfilter filter; + LONG_PTR param1, param2; + HANDLE event; + BSTR status; + HRESULT hr; + ULONG ref; + LONG code; + + status = SysAllocString(L"status"); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEventEx, (void **)&media_event); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEventSink, (void **)&media_event_sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&filter, NULL, 0); + filter.IAMFilterMiscFlags_iface.lpVtbl = &testmiscflags_vtbl; + filter.misc_flags = AM_FILTER_MISC_FLAGS_IS_RENDERER; + + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_GetEventHandle(media_event, (OAEVENT *)&event); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 1, 2, FALSE); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 0, 2, TRUE); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + check_events(media_event, 1, 2, FALSE); + + SetEvent(event); + + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(media_control); + IMediaEventEx_Release(media_event); + IMediaEventSink_Release(media_event_sink); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); + + SysFreeString(status); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -5302,6 +5430,7 @@ START_TEST(filtergraph) test_window_threading(); test_autoplug_uyvy(); test_set_notify_flags(); + test_events(); CoUninitialize(); test_render_with_multithread();

1 0

Anton Baskanov : quartz: Do not send events when notifications are disabled.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: c6a3072051fb88edd3847c750c2ec852f11870f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6a3072051fb88edd3847c75… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Wed Feb 17 13:09:03 2021 +0700 quartz: Do not send events when notifications are disabled. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 29 ++++++++++++++++++----------- dlls/quartz/tests/filtergraph.c | 6 +++--- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 58038829217..8c1cd6232e4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5288,15 +5288,22 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCo TRACE("Process EC_COMPLETE notification\n"); if (++This->EcCompleteCount == This->nRenderers) { - evt.lEventCode = EC_COMPLETE; - evt.lParam1 = S_OK; - evt.lParam2 = 0; - TRACE("Send EC_COMPLETE to app\n"); - EventsQueue_PutEvent(&This->evqueue, &evt); - if (!This->notif.disabled && This->notif.hWnd) - { - TRACE("Send Window message\n"); - PostMessageW(This->notif.hWnd, This->notif.msg, 0, This->notif.instance); + if (!This->notif.disabled) + { + evt.lEventCode = EC_COMPLETE; + evt.lParam1 = S_OK; + evt.lParam2 = 0; + TRACE("Send EC_COMPLETE to app\n"); + EventsQueue_PutEvent(&This->evqueue, &evt); + if (This->notif.hWnd) + { + TRACE("Send Window message\n"); + PostMessageW(This->notif.hWnd, This->notif.msg, 0, This->notif.instance); + } + } + else + { + SetEvent(This->evqueue.msg_event); } This->CompletionStatus = EC_COMPLETE; This->got_ec_complete = 1; @@ -5307,13 +5314,13 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, LONG EventCo { /* FIXME: Not handled yet */ } - else + else if (!This->notif.disabled) { evt.lEventCode = EventCode; evt.lParam1 = EventParam1; evt.lParam2 = EventParam2; EventsQueue_PutEvent(&This->evqueue, &evt); - if (!This->notif.disabled && This->notif.hWnd) + if (This->notif.hWnd) PostMessageW(This->notif.hWnd, This->notif.msg, 0, This->notif.instance); } diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 7d4cfce2628..55c70702e47 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5207,12 +5207,12 @@ static void test_set_notify_flags(void) hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)status, (LONG_PTR)status); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); ok(!PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE), "Window should not be notified.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); - todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, (LONG_PTR)&filter.IBaseFilter_iface); @@ -5242,7 +5242,7 @@ static void test_set_notify_flags(void) ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); - todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + ok(hr == E_ABORT, "Got hr %#x.\n", hr); todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n");

1 0

Rémi Bernon : widl: Rename ifref_list_t to typeref_list_t.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 84966c9b5938841cb08625dba97a53518bd4b3cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=84966c9b5938841cb08625db… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:32 2021 +0100 widl: Rename ifref_list_t to typeref_list_t. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/parser.y | 10 +++++----- tools/widl/typetree.c | 10 +++++----- tools/widl/typetree.h | 16 ++++++++-------- tools/widl/widltypes.h | 8 ++++---- tools/widl/write_msft.c | 2 +- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 7579e84d6f3..7fec5da2726 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -57,7 +57,7 @@ static attr_t *make_custom_attr(UUID *id, expr_t *pval); static expr_list_t *append_expr(expr_list_t *list, expr_t *expr); static var_t *declare_var(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_t *decl, int top); static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, declarator_list_t *decls); -static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref); +static typeref_list_t *append_typeref(typeref_list_t *list, typeref_t *ref); static typeref_t *make_typeref(type_t *type); static var_list_t *append_var_list(var_list_t *list, var_list_t *vars); static declarator_list_t *append_declarator(declarator_list_t *list, declarator_t *p); @@ -138,7 +138,7 @@ static typelib_t *current_typelib; warning_t *warning; warning_list_t *warning_list; typeref_t *typeref; - ifref_list_t *ifref_list; + typeref_list_t *typeref_list; char *str; UUID *uuid; unsigned int num; @@ -294,8 +294,8 @@ static typelib_t *current_typelib; %type <type> type_parameter %type <type_list> type_parameters %type <typeref> class_interface -%type <ifref_list> class_interfaces -%type <ifref_list> requires required_types +%type <typeref_list> class_interfaces +%type <typeref_list> requires required_types %type <var> arg ne_union_field union_field s_field case enum enum_member declaration %type <var> funcdef %type <var_list> m_args arg_list args dispint_meths @@ -1814,7 +1814,7 @@ static var_list_t *set_var_types(attr_list_t *attrs, decl_spec_t *decl_spec, dec return var_list; } -static ifref_list_t *append_typeref(ifref_list_t *list, typeref_t *ref) +static typeref_list_t *append_typeref(typeref_list_t *list, typeref_t *ref) { if (!ref) return list; if (!list) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index d2a43a36c01..bafd8d9879f 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -425,7 +425,7 @@ type_t *type_interface_declare(char *name, struct namespace *namespace) return type; } -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires) { if (iface->defined) error_loc("interface %s already defined at %s:%d\n", @@ -526,7 +526,7 @@ type_t *type_coclass_declare(char *name) return type; } -type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces) +type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, typeref_list_t *ifaces) { if (coclass->defined) error_loc("coclass %s already defined at %s:%d\n", @@ -546,10 +546,10 @@ type_t *type_runtimeclass_declare(char *name, struct namespace *namespace) return type; } -type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces) +type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typeref_list_t *ifaces) { typeref_t *ref, *required, *tmp; - ifref_list_t *requires; + typeref_list_t *requires; if (runtimeclass->defined) error_loc("runtimeclass %s already defined at %s:%d\n", @@ -614,7 +614,7 @@ type_t *type_parameterized_interface_declare(char *name, struct namespace *names return type; } -type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires) +type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires) { type_t *iface; if (type->defined) diff --git a/tools/widl/typetree.h b/tools/widl/typetree.h index 7c2e9d40026..aa08c299c20 100644 --- a/tools/widl/typetree.h +++ b/tools/widl/typetree.h @@ -53,17 +53,17 @@ type_t *type_new_encapsulated_union(char *name, var_t *switch_field, var_t *unio type_t *type_new_bitfield(type_t *field_type, const expr_t *bits); type_t *type_runtimeclass_declare(char *name, struct namespace *namespace); type_t *type_interface_declare(char *name, struct namespace *namespace); -type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); +type_t *type_interface_define(type_t *iface, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires); type_t *type_dispinterface_declare(char *name); type_t *type_dispinterface_define(type_t *iface, attr_list_t *attrs, var_list_t *props, var_list_t *methods); type_t *type_dispinterface_define_from_iface(type_t *dispiface, attr_list_t *attrs, type_t *iface); type_t *type_module_define(type_t* module, attr_list_t *attrs, statement_list_t *stmts); -type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, ifref_list_t *ifaces); -type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, ifref_list_t *ifaces); +type_t *type_coclass_define(type_t *coclass, attr_list_t *attrs, typeref_list_t *ifaces); +type_t *type_runtimeclass_define(type_t *runtimeclass, attr_list_t *attrs, typeref_list_t *ifaces); type_t *type_apicontract_declare(char *name, struct namespace *namespace); type_t *type_apicontract_define(type_t *apicontract, attr_list_t *attrs); type_t *type_parameterized_interface_declare(char *name, struct namespace *namespace, type_list_t *params); -type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, ifref_list_t *requires); +type_t *type_parameterized_interface_define(type_t *type, attr_list_t *attrs, type_t *inherit, statement_list_t *stmts, typeref_list_t *requires); int type_is_equal(const type_t *type1, const type_t *type2); const char *type_get_name(const type_t *type, enum name_type name_type); char *gen_name(void); @@ -183,7 +183,7 @@ static inline type_t *type_iface_get_inherit(const type_t *type) return type->details.iface->inherit; } -static inline ifref_list_t *type_iface_get_requires(const type_t *type) +static inline typeref_list_t *type_iface_get_requires(const type_t *type) { type = type_get_real_type(type); assert(type_get_type(type) == TYPE_INTERFACE); @@ -341,14 +341,14 @@ static inline type_t *type_alias_get_aliasee_type(const type_t *type) return type->details.alias.aliasee.type; } -static inline ifref_list_t *type_coclass_get_ifaces(const type_t *type) +static inline typeref_list_t *type_coclass_get_ifaces(const type_t *type) { type = type_get_real_type(type); assert(type_get_type(type) == TYPE_COCLASS); return type->details.coclass.ifaces; } -static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) +static inline typeref_list_t *type_runtimeclass_get_ifaces(const type_t *type) { type = type_get_real_type(type); assert(type_get_type(type) == TYPE_RUNTIMECLASS); @@ -357,7 +357,7 @@ static inline ifref_list_t *type_runtimeclass_get_ifaces(const type_t *type) static inline type_t *type_runtimeclass_get_default_iface(const type_t *type) { - ifref_list_t *ifaces = type_runtimeclass_get_ifaces(type); + typeref_list_t *ifaces = type_runtimeclass_get_ifaces(type); typeref_t *ref; if (!ifaces) return NULL; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 8e83fc059fb..e2b8608fabb 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -60,7 +60,7 @@ typedef struct list str_list_t; typedef struct list expr_list_t; typedef struct list var_list_t; typedef struct list declarator_list_t; -typedef struct list ifref_list_t; +typedef struct list typeref_list_t; typedef struct list user_type_list_t; typedef struct list context_handle_list_t; typedef struct list generic_handle_list_t; @@ -386,7 +386,7 @@ struct iface_details struct _type_t *inherit; struct _type_t *disp_inherit; struct _type_t *async_iface; - ifref_list_t *requires; + typeref_list_t *requires; }; struct module_details @@ -406,7 +406,7 @@ struct array_details struct coclass_details { - ifref_list_t *ifaces; + typeref_list_t *ifaces; }; struct basic_details @@ -433,7 +433,7 @@ struct alias_details struct runtimeclass_details { - ifref_list_t *ifaces; + typeref_list_t *ifaces; }; struct parameterized_details diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index fb532f7a227..49659123ddd 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -2336,7 +2336,7 @@ static void add_coclass_typeinfo(msft_typelib_t *typelib, type_t *cls) MSFT_RefRecord *ref, *first = NULL, *first_source = NULL; int have_default = 0, have_default_source = 0; const attr_t *attr; - ifref_list_t *ifaces; + typeref_list_t *ifaces; if (-1 < cls->typelib_idx) return;

1 0

Rémi Bernon : widl: Replace type_list_t with typeref_list_t.
by Alexandre Julliard 17 Feb '21

17 Feb '21

Module: wine Branch: master Commit: 94b5af4b3444f337186fa59d3fa6932aafefdc8f URL: https://source.winehq.org/git/wine.git/?a=commit;h=94b5af4b3444f337186fa59d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 17 19:33:33 2021 +0100 widl: Replace type_list_t with typeref_list_t. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/client.c | 14 +++++++------- tools/widl/header.c | 16 ++++++++-------- tools/widl/parser.y | 26 ++++---------------------- tools/widl/typegen.c | 12 ++++++------ tools/widl/typetree.c | 2 +- tools/widl/typetree.h | 2 +- tools/widl/widltypes.h | 10 ++-------- tools/widl/write_msft.c | 10 +++++----- 8 files changed, 34 insertions(+), 58 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=94b5af4b3444f337186f…

1 0