February 2021 - Wine-Commits

Henri Verbeet : vkd3d-shader: Introduce a helper to print d3d-asm boolean literals.
by Alexandre Julliard Feb. 18, 2021

Feb. 18, 2021

Module: vkd3d Branch: master Commit: 54092b944cc7f5938909fa5ddd406d14028d5d7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=54092b944cc7f5938909fa5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 18 11:24:01 2021 +0100 vkd3d-shader: Introduce a helper to print d3d-asm boolean literals. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 30f7bc1..bb5c373 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -726,6 +726,12 @@ static void shader_print_hex_literal(struct vkd3d_d3d_asm_compiler *compiler, vkd3d_string_buffer_printf(&compiler->buffer, "%s0x%08x%s", prefix, i, 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); +} + static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) { @@ -1601,9 +1607,9 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3DSIH_DEFB: - vkd3d_string_buffer_printf(buffer, " %sb%u%s = %s", compiler->colours.reg, - ins->dst[0].reg.idx[0].offset, compiler->colours.reset, - ins->src[0].reg.u.immconst_uint[0] ? "true" : "false"); + vkd3d_string_buffer_printf(buffer, " %sb%u%s", compiler->colours.reg, + ins->dst[0].reg.idx[0].offset, compiler->colours.reset); + shader_print_bool_literal(compiler, " = ", ins->src[0].reg.u.immconst_uint[0], ""); break; default:

1 0

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

Feb. 18, 2021

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 Feb. 18, 2021

Feb. 18, 2021

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 Feb. 18, 2021

Feb. 18, 2021

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 Feb. 18, 2021

Feb. 18, 2021

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 Feb. 17, 2021

Feb. 17, 2021

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: Do not send events when notifications are disabled.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

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

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

Feb. 17, 2021

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

Jacek Caban : winegcc: Properly set debug info type on msvc targets.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: d281c90c4b2f03b8b554da2bf9e3e25e77953baa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d281c90c4b2f03b8b554da2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 17 21:36:29 2021 +0100 winegcc: Properly set debug info type on msvc targets. Fixes a typo from 9faa5eeddd24a057d9ff522259c9dbdc6203c098. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index e72f234d94b..c812af48670 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -560,12 +560,12 @@ static strarray *get_link_args( struct options *opts, const char *output_name ) strarray_add(link_args, "-Wl,-debug"); strarray_add(link_args, strmake("-Wl,-pdb:%s", opts->debug_file)); } + else if (!opts->strip) + strarray_add(link_args, "-Wl,-debug:dwarf"); if (opts->out_implib) strarray_add(link_args, strmake("-Wl,-implib:%s", opts->out_implib)); - else if (!opts->strip) - strarray_add(link_args, "-Wl,-debug:dwarf"); strarray_add( link_args, strmake( "-Wl,-filealign:%s", opts->file_align ? opts->file_align : "0x1000" )); strarray_addall( link_args, flags );

1 0

Akihiro Sagawa : server: Prevent unloading a registry hive while the key is in use.
by Alexandre Julliard Feb. 17, 2021

Feb. 17, 2021

Module: wine Branch: master Commit: 70c77cdfee49c44542347b222d77bcb95ba7fdaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=70c77cdfee49c44542347b22… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Feb 12 20:30:14 2021 +0900 server: Prevent unloading a registry hive while the key is in use. Otherwise, RegUnLoadKey(HKEY_USERS, "S-1-5-21-0-0-0-1000") erases all HKCU registry. The call is actually done by a certain installer. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/registry.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/registry.c b/server/registry.c index 9b9295b1b68..74da4d1d9a4 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2261,7 +2261,10 @@ DECL_HANDLER(unload_registry) get_req_path( &name, !req->parent ); if ((key = open_key( parent, &name, access, req->attributes ))) { - delete_key( key, 1 ); /* FIXME */ + if (key->obj.handle_count) + set_error( STATUS_CANNOT_DELETE ); + else + delete_key( key, 1 ); /* FIXME */ release_object( key ); } release_object( parent );

1 0