May 2022 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/cgi: Improve the CollectionBlock::GetDetailsLink() documentation.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: tools Branch: master Commit: 66e2dde97105abd31f2e84cfe90b174986b7aded URL: https://source.winehq.org/git/tools.git/?a=commit;h=66e2dde97105abd31f2e84c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:38:21 2022 +0200 testbot/cgi: Improve the CollectionBlock::GetDetailsLink() documentation. Specifically, better document the escaping situation. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/CollectionBlock.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm index b2ebb2e..594ed56 100644 --- a/testbot/lib/ObjectModel/CGI/CollectionBlock.pm +++ b/testbot/lib/ObjectModel/CGI/CollectionBlock.pm @@ -200,6 +200,10 @@ sub GetSortedItems($$) Returns the URL of the details page for the current row's object. +If the URL contains parameters those must already be encoded (see uri_escape()) +but the returned URL as a whole may still need to be escaped for use in HTML +documents (notably for the ampersands, see escapeHTML()). + See GenerateDataView() for details about the Row parameter. =back

1 0

Francois Gouget : testbot/web: Show canceled jobs in dark blue.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: tools Branch: master Commit: f8e3a1d3dac11de22da019fd9109cf40d458b301 URL: https://source.winehq.org/git/tools.git/?a=commit;h=f8e3a1d3dac11de22da019f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:39:09 2022 +0200 testbot/web: Show canceled jobs in dark blue. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/WineTestBot.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index a8756df..7b63894 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -387,7 +387,7 @@ pre .badbuild { color: red; } .testfail { color: red; } .boterror { color: #e55600; } -.canceled { color: black; } +.canceled { color: darkblue; } .userrequest { color: #e55600; } .userapproved { color: green; }

1 0

Francois Gouget : testbot/web: Colorize and link the JobDetails page's failure counts.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: tools Branch: master Commit: 626670bed80c5d98723702854112c2d6482f5751 URL: https://source.winehq.org/git/tools.git/?a=commit;h=626670bed80c5d987237028… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:40:12 2022 +0200 testbot/web: Colorize and link the JobDetails page's failure counts. When there are a lot of tasks this makes it easier to identify and go to those that have failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/JobDetails.pl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index b0ef2a7..99c68bc 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -132,6 +132,13 @@ sub GenerateDataView($$$) GenerateTipDateTime($StepTask->Ended, DurationToString($Duration)); return; } + if ($PropertyName eq "TestFailures" and defined $StepTask->TestFailures) + { + my $class = $StepTask->TestFailures ? "testfail" : "success"; + print "<a href='#k", $StepTask->GetKey(), "'><span class='$class'>", + $StepTask->TestFailures, "</span></a>"; + return; + } $self->SUPER::GenerateDataView($Row, $Col); }

1 0

Francois Gouget : testbot/build-patterns: Colorize expanded pattern lines.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: tools Branch: master Commit: 326ed936c6e8ec9a3233de0bc24cefc8e6419612 URL: https://source.winehq.org/git/tools.git/?a=commit;h=326ed936c6e8ec9a3233de0… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue May 3 19:41:34 2022 +0200 testbot/build-patterns: Colorize expanded pattern lines. This makes it easier to identify which pattern lines were previously hidden when there are a lot of them. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/patterns.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/winetest/patterns.js b/winetest/patterns.js index 042620b..65e9cb8 100644 --- a/winetest/patterns.js +++ b/winetest/patterns.js @@ -34,6 +34,11 @@ function expandTest(test) { test.patlines.forEach(patline => { patline.dom.style.display = patline.display; + if (!patline.cb.checked) + { + const label = patline.dom.querySelector('.label'); + label.style.color = 'darkblue'; + } }); test.domexpand.innerHTML = '[-]'; test.domexpand.title = "Apply filters"; @@ -106,6 +111,8 @@ function refreshPage(changes, rerun_checked) { cb.patlines.forEach(patline => { patline.dom.style.display = patline.display; + const label = patline.dom.querySelector('.label'); + label.style.removeProperty('color'); const test = patline.test; test.linecount++; if (test.linecount == 1 && test.id != "summary")

1 0

Anton Baskanov : winegstreamer: Commit allocator on pause in MPEG audio decoder.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: f91f4348356285ede39915f0d10ffae11c4871e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91f4348356285ede39915f0… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 2 19:28:28 2022 +0700 winegstreamer: Commit allocator on pause in MPEG audio decoder. 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/mpegaudio.c | 2 +- dlls/winegstreamer/quartz_transform.c | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index a2d20b52d9d..296f5f479a0 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -1005,7 +1005,7 @@ static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(hr == S_OK, "Got hr %#lx.\n", hr); if (hr == S_OK) IMediaSample_Release(sample); diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 183fb823d40..375c549aad5 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -66,10 +66,37 @@ static void transform_destroy(struct strmbase_filter *iface) free(filter); } +static HRESULT transform_init_stream(struct strmbase_filter *iface) +{ + struct transform *filter = impl_from_strmbase_filter(iface); + HRESULT hr; + + if (filter->source.pin.peer) + { + hr = IMemAllocator_Commit(filter->source.pAllocator); + if (FAILED(hr)) + ERR("Failed to commit allocator, hr %#lx.\n", hr); + } + + return S_OK; +} + +static HRESULT transform_cleanup_stream(struct strmbase_filter *iface) +{ + struct transform *filter = impl_from_strmbase_filter(iface); + + if (filter->source.pin.peer) + IMemAllocator_Decommit(filter->source.pAllocator); + + return S_OK; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = transform_get_pin, .filter_destroy = transform_destroy, + .filter_init_stream = transform_init_stream, + .filter_cleanup_stream = transform_cleanup_stream, }; static HRESULT transform_sink_query_accept(struct strmbase_pin *pin, const AM_MEDIA_TYPE *mt)

1 0

Anton Baskanov : winegstreamer: Set allocator properties for MPEG audio decoder sink.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: aacf6bcd0f0cb619906f4199d65a70eaf57ec5a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aacf6bcd0f0cb619906f4199… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 2 19:28:25 2022 +0700 winegstreamer: Set allocator properties for MPEG audio decoder sink. 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/winegstreamer/quartz_transform.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 4995177875b..183fb823d40 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -37,6 +37,7 @@ struct transform_ops HRESULT (*sink_query_accept)(struct transform *filter, const AM_MEDIA_TYPE *mt); HRESULT (*source_query_accept)(struct transform *filter, const AM_MEDIA_TYPE *mt); HRESULT (*source_get_media_type)(struct transform *filter, unsigned int index, AM_MEDIA_TYPE *mt); + HRESULT (*source_decide_buffer_size)(struct transform *filter, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props); }; static inline struct transform *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -111,12 +112,20 @@ static HRESULT transform_source_get_media_type(struct strmbase_pin *pin, unsigne return filter->ops->source_get_media_type(filter, index, mt); } +static HRESULT WINAPI transform_source_DecideBufferSize(struct strmbase_source *pin, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) +{ + struct transform *filter = impl_from_strmbase_filter(pin->pin.filter); + + return filter->ops->source_decide_buffer_size(filter, allocator, props); +} + static const struct strmbase_source_ops source_ops = { .base.pin_query_accept = transform_source_query_accept, .base.pin_get_media_type = transform_source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, + .pfnDecideBufferSize = transform_source_DecideBufferSize, }; static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struct transform_ops *ops, struct transform **out) @@ -235,11 +244,27 @@ static HRESULT mpeg_audio_codec_source_get_media_type(struct transform *filter, return S_OK; } +static HRESULT mpeg_audio_codec_source_decide_buffer_size(struct transform *filter, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) +{ + MPEG1WAVEFORMAT *input_format = (MPEG1WAVEFORMAT *)filter->sink.pin.mt.pbFormat; + WAVEFORMATEX *output_format = (WAVEFORMATEX *)filter->source.pin.mt.pbFormat; + LONG frame_samples = (input_format->fwHeadLayer & ACM_MPEG_LAYER2) ? 1152 : 384; + LONG frame_size = frame_samples * output_format->nBlockAlign; + ALLOCATOR_PROPERTIES ret_props; + + props->cBuffers = max(props->cBuffers, 8); + props->cbBuffer = max(props->cbBuffer, frame_size * 4); + props->cbAlign = max(props->cbAlign, 1); + + return IMemAllocator_SetProperties(allocator, props, &ret_props); +} + static const struct transform_ops mpeg_audio_codec_transform_ops = { mpeg_audio_codec_sink_query_accept, mpeg_audio_codec_source_query_accept, mpeg_audio_codec_source_get_media_type, + mpeg_audio_codec_source_decide_buffer_size, }; HRESULT mpeg_audio_codec_create(IUnknown *outer, IUnknown **out)

1 0

Zebediah Figura : wined3d: Do not use vkCmdClearColorImage() to clear compressed images.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: ee9bcbb9f915d8a254180ebc9c1d80952d97ada2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee9bcbb9f915d8a254180ebc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 29 13:00:16 2022 -0500 wined3d: Do not use vkCmdClearColorImage() to clear compressed images. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52922 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/texture.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5fd38b49132..49650f2839e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5257,9 +5257,10 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, } } -static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, +static bool wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, unsigned int sub_resource_idx, struct wined3d_context *context) { + struct wined3d_texture_sub_resource *sub_resource = &texture_vk->t.sub_resources[sub_resource_idx]; struct wined3d_context_vk *context_vk = wined3d_context_vk(context); const struct wined3d_format *format = texture_vk->t.resource.format; const struct wined3d_vk_info *vk_info = context_vk->vk_info; @@ -5270,12 +5271,24 @@ static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, VkImageAspectFlags aspect_mask; VkImage vk_image; + if (texture_vk->t.resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + { + struct wined3d_bo_address addr; + + if (!wined3d_texture_prepare_location(&texture_vk->t, sub_resource_idx, context, WINED3D_LOCATION_SYSMEM)) + return false; + wined3d_texture_get_bo_address(&texture_vk->t, sub_resource_idx, &addr, WINED3D_LOCATION_SYSMEM); + memset(addr.addr, 0, sub_resource->size); + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_SYSMEM); + return true; + } + vk_image = texture_vk->image.vk_image; if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) { ERR("Failed to get command buffer.\n"); - return; + return false; } aspect_mask = vk_aspect_mask_from_format(format); @@ -5305,6 +5318,9 @@ static void wined3d_texture_vk_clear(struct wined3d_texture_vk *texture_vk, VK_ACCESS_TRANSFER_WRITE_BIT, vk_access_mask_from_bind_flags(texture_vk->t.resource.bind_flags), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, texture_vk->layout, vk_image, &vk_range); wined3d_context_vk_reference_texture(context_vk, texture_vk); + + wined3d_texture_validate_location(&texture_vk->t, sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + return true; } static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_vk, @@ -5319,8 +5335,11 @@ static BOOL wined3d_texture_vk_load_texture(struct wined3d_texture_vk *texture_v if (sub_resource->locations & WINED3D_LOCATION_CLEARED) { - wined3d_texture_vk_clear(texture_vk, sub_resource_idx, context); - return TRUE; + if (!wined3d_texture_vk_clear(texture_vk, sub_resource_idx, context)) + return FALSE; + + if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) + return TRUE; } if (!(sub_resource->locations & wined3d_texture_sysmem_locations))

1 0

Anton Baskanov : quartz/tests: Add tests for MPEG audio decoder source allocator.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 7c20724b0d29cee02010a3114575315b9fc9d439 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c20724b0d29cee02010a311… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Mon May 2 19:28:26 2022 +0700 quartz/tests: Add tests for MPEG audio decoder source allocator. 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/mpegaudio.c | 136 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/mpegaudio.c b/dlls/quartz/tests/mpegaudio.c index 19765fe5b2b..acbe5f30c11 100644 --- a/dlls/quartz/tests/mpegaudio.c +++ b/dlls/quartz/tests/mpegaudio.c @@ -832,6 +832,7 @@ struct testfilter { struct strmbase_filter filter; struct strmbase_source source; + struct strmbase_sink sink; const AM_MEDIA_TYPE *mt; }; @@ -852,6 +853,7 @@ static void testfilter_destroy(struct strmbase_filter *iface) { struct testfilter *filter = impl_from_strmbase_filter(iface); strmbase_source_cleanup(&filter->source); + strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); } @@ -873,12 +875,31 @@ static const struct strmbase_source_ops testsource_ops = .pfnDecideAllocator = testsource_DecideAllocator, }; +static HRESULT testsink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface->filter); + + if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &filter->sink.IMemInputPin_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + +static const struct strmbase_sink_ops testsink_ops = +{ + .base.pin_query_interface = testsink_query_interface, +}; + static void testfilter_init(struct testfilter *filter) { static const GUID clsid = {0xabacab}; memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); strmbase_source_init(&filter->source, &filter->filter, L"source", &testsource_ops); + strmbase_sink_init(&filter->sink, &filter->filter, L"sink", &testsink_ops, NULL); } static void test_sink_allocator(IMemInputPin *input) @@ -931,10 +952,117 @@ static void test_sink_allocator(IMemInputPin *input) IMemAllocator_Release(ret_allocator); } +static void test_source_allocator(IFilterGraph2 *graph, IMediaControl *control, + IPin *sink, IPin *source, struct testfilter *testsource, struct testfilter *testsink) +{ + ALLOCATOR_PROPERTIES props, req_props = {2, 30000, 32, 0}; + IMemAllocator *allocator; + IMediaSample *sample; + WAVEFORMATEX format; + AM_MEDIA_TYPE mt; + HRESULT hr; + + hr = IFilterGraph2_ConnectDirect(graph, &testsource->source.pin.IPin_iface, sink, &mp2_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + init_pcm_mt(&mt, &format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!!testsink->sink.pAllocator, "Expected an allocator.\n"); + hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 9216, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#lx.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr == S_OK) + IMediaSample_Release(sample); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + hr = IMemAllocator_GetBuffer(testsink->sink.pAllocator, &sample, NULL, NULL, 0); + ok(hr == VFW_E_NOT_COMMITTED, "Got hr %#lx.\n", hr); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); + + init_pcm_mt(&mt, &format, 1, 32000, 8); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!!testsink->sink.pAllocator, "Expected an allocator.\n"); + hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 4608, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + testsink->sink.pAllocator = allocator; + + hr = IMemAllocator_SetProperties(allocator, &req_props, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + init_pcm_mt(&mt, &format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(testsink->sink.pAllocator == allocator, "Expected an allocator.\n"); + hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 9216, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); + + IFilterGraph2_Disconnect(graph, sink); + IFilterGraph2_Disconnect(graph, &testsource->source.pin.IPin_iface); + + hr = IFilterGraph2_ConnectDirect(graph, &testsource->source.pin.IPin_iface, sink, &mp1_mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + init_pcm_mt(&mt, &format, 1, 32000, 16); + hr = IFilterGraph2_ConnectDirect(graph, source, &testsink->sink.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + + ok(!!testsink->sink.pAllocator, "Expected an allocator.\n"); + hr = IMemAllocator_GetProperties(testsink->sink.pAllocator, &props); + ok(hr == S_OK, "Got hr %#lx.\n", hr); + ok(props.cBuffers == 8, "Got %ld buffers.\n", props.cBuffers); + ok(props.cbBuffer == 3072, "Got size %ld.\n", props.cbBuffer); + ok(props.cbAlign == 1, "Got alignment %ld.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %ld.\n", props.cbPrefix); + + IFilterGraph2_Disconnect(graph, source); + IFilterGraph2_Disconnect(graph, &testsink->sink.pin.IPin_iface); + + IFilterGraph2_Disconnect(graph, sink); + IFilterGraph2_Disconnect(graph, &testsource->source.pin.IPin_iface); +} + static void test_connect_pin(void) { IBaseFilter *filter = create_mpeg_audio_codec(); - struct testfilter testsource; + struct testfilter testsource, testsink; IPin *sink, *source, *peer; IEnumMediaTypes *enummt; WAVEFORMATEX req_format; @@ -950,6 +1078,8 @@ static void test_connect_pin(void) CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); testfilter_init(&testsource); + testfilter_init(&testsink); + IFilterGraph2_AddFilter(graph, &testsink.filter.IBaseFilter_iface, L"sink"); IFilterGraph2_AddFilter(graph, &testsource.filter.IBaseFilter_iface, L"source"); IFilterGraph2_AddFilter(graph, filter, L"MPEG audio decoder"); IBaseFilter_FindPin(filter, L"In", &sink); @@ -957,6 +1087,8 @@ static void test_connect_pin(void) IPin_QueryInterface(sink, &IID_IMemInputPin, (void **)&meminput); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + test_source_allocator(graph, control, sink, source, &testsource, &testsink); + /* Test sink connection. */ peer = (IPin *)0xdeadbeef; @@ -1087,6 +1219,8 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %ld.\n", ref); ref = IBaseFilter_Release(&testsource.filter.IBaseFilter_iface); ok(!ref, "Got outstanding refcount %ld.\n", ref); + ref = IBaseFilter_Release(&testsink.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %ld.\n", ref); } START_TEST(mpegaudio)

1 0

Jacek Caban : win32u: Copy implementation of AdjustWindowRectEx from user32.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: 033cad432e1d93a0ddf5a5b71a989f31441f588c URL: https://source.winehq.org/git/wine.git/?a=commit;h=033cad432e1d93a0ddf5a5b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 15 20:43:19 2022 +0200 win32u: Copy implementation of AdjustWindowRectEx from user32. It will be useful for drivers as well. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 1 - dlls/win32u/defwnd.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 1 - dlls/win32u/window.c | 4 +--- 4 files changed, 39 insertions(+), 5 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index fa849e9cf2d..b282056d8c8 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -159,7 +159,6 @@ static void CDECL free_win_ptr( WND *win ) static const struct user_callbacks user_funcs = { - AdjustWindowRectEx, CopyImage, EndMenu, ImmProcessKey, diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 0080d4f7cc6..7455a91980c 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -31,6 +31,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(win); +/*********************************************************************** + * AdjustWindowRectEx (win32u.so) + */ +BOOL WINAPI AdjustWindowRectEx( RECT *rect, DWORD style, BOOL menu, DWORD ex_style ) +{ + NONCLIENTMETRICSW ncm; + int adjust = 0; + + ncm.cbSize = sizeof(ncm); + NtUserSystemParametersInfo( SPI_GETNONCLIENTMETRICS, 0, &ncm, 0 ); + + if ((ex_style & (WS_EX_STATICEDGE|WS_EX_DLGMODALFRAME)) == WS_EX_STATICEDGE) + adjust = 1; /* for the outer frame always present */ + else if ((ex_style & WS_EX_DLGMODALFRAME) || (style & (WS_THICKFRAME|WS_DLGFRAME))) + adjust = 2; /* outer */ + + if (style & WS_THICKFRAME) + adjust += ncm.iBorderWidth + ncm.iPaddedBorderWidth; /* The resize border */ + + if ((style & (WS_BORDER|WS_DLGFRAME)) || (ex_style & WS_EX_DLGMODALFRAME)) + adjust++; /* The other border */ + + InflateRect( rect, adjust, adjust ); + + if ((style & WS_CAPTION) == WS_CAPTION) + { + if (ex_style & WS_EX_TOOLWINDOW) + rect->top -= ncm.iSmCaptionHeight + 1; + else + rect->top -= ncm.iCaptionHeight + 1; + } + if (menu) rect->top -= ncm.iMenuHeight + 1; + + if (ex_style & WS_EX_CLIENTEDGE) + InflateRect( rect, get_system_metrics(SM_CXEDGE), get_system_metrics(SM_CYEDGE) ); + return TRUE; +} + static BOOL set_window_text( HWND hwnd, const void *text, BOOL ansi ) { static const WCHAR emptyW[] = { 0 }; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index c870037f7b3..6e25e0ec0db 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -32,7 +32,6 @@ struct hardware_msg_data; struct user_callbacks { - BOOL (WINAPI *pAdjustWindowRectEx)( RECT *, DWORD, BOOL, DWORD ); HANDLE (WINAPI *pCopyImage)( HANDLE, UINT, INT, INT, UINT ); BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index edafc522d14..9231f98539e 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -3683,9 +3683,7 @@ static MINMAXINFO get_min_max_info( HWND hwnd ) adjusted_style = style; get_client_rect( NtUserGetAncestor( hwnd, GA_PARENT ), &rc ); - if (user_callbacks) - user_callbacks->pAdjustWindowRectEx( &rc, adjusted_style, - (style & WS_POPUP) && get_menu( hwnd ), exstyle); + AdjustWindowRectEx( &rc, adjusted_style, (style & WS_POPUP) && get_menu( hwnd ), exstyle ); xinc = -rc.left; yinc = -rc.top;

1 0

Jacek Caban : win32u: Move NtUserSetSystemMenu implementation from user32.
by Alexandre Julliard May 2, 2022

May 2, 2022

Module: wine Branch: master Commit: d2d715b2016f3f10f0918938594b4ed6a4dbb068 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d715b2016f3f10f0918938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 02:06:31 2022 +0200 win32u: Move NtUserSetSystemMenu implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 18 ------------------ dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/menu.c | 23 +++++++++++++++-------- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 1 + dlls/win32u/wrappers.c | 6 ++++++ 9 files changed, 25 insertions(+), 30 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 2e9121598fa..64e5d35ba39 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3925,24 +3925,6 @@ HMENU WINAPI CreateMenu(void) } -/******************************************************************* - * SetSystemMenu (USER32.@) - */ -BOOL WINAPI SetSystemMenu( HWND hwnd, HMENU hMenu ) -{ - WND *wndPtr = WIN_GetPtr( hwnd ); - - if (wndPtr && wndPtr != WND_OTHER_PROCESS && wndPtr != WND_DESKTOP) - { - if (wndPtr->hSysMenu) NtUserDestroyMenu( wndPtr->hSysMenu ); - wndPtr->hSysMenu = MENU_GetSysMenu( hwnd, hMenu ); - WIN_ReleasePtr( wndPtr ); - return TRUE; - } - return FALSE; -} - - /********************************************************************** * GetMenu (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 8bccdab69c6..1ae27b2482f 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -707,7 +707,7 @@ @ stdcall SetSysColors(long ptr ptr) NtUserSetSysColors @ stdcall SetSysColorsTemp(ptr ptr long) @ stdcall SetSystemCursor(long long) -@ stdcall SetSystemMenu(long long) +@ stdcall SetSystemMenu(long long) NtUserSetSystemMenu @ stdcall SetSystemTimer(long long long ptr) @ stdcall SetTaskmanWindow (long) @ stdcall SetThreadDesktop(long) NtUserSetThreadDesktop diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 358177d33d2..fa849e9cf2d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -164,7 +164,6 @@ static const struct user_callbacks user_funcs = EndMenu, ImmProcessKey, ImmTranslateMessage, - SetSystemMenu, free_win_ptr, MENU_GetSysMenu, MENU_IsMenuActive, diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index 6cc63800201..f6790690188 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1212,6 +1212,7 @@ static struct unix_funcs unix_funcs = NtUserSetMenu, NtUserSetParent, NtUserSetSysColors, + NtUserSetSystemMenu, NtUserSetWindowLong, NtUserSetWindowLongPtr, NtUserSetWindowPos, diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c index 0da21675e68..a6aeae045e2 100644 --- a/dlls/win32u/menu.c +++ b/dlls/win32u/menu.c @@ -465,14 +465,6 @@ BOOL WINAPI NtUserDestroyMenu( HMENU handle ) return TRUE; } -/******************************************************************* - * NtUserSetSystemMenu (win32u.@) - */ -BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ) -{ - return user_callbacks && user_callbacks->pSetSystemMenu( hwnd, menu ); -} - /******************************************************************* * set_window_menu * @@ -1072,6 +1064,21 @@ HMENU WINAPI NtUserGetSystemMenu( HWND hwnd, BOOL revert ) return revert ? 0 : retvalue; } +/********************************************************************** + * NtUserSetSystemMenu (win32u.@) + */ +BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ) +{ + WND *win = get_win_ptr( hwnd ); + + if (!win || win == WND_OTHER_PROCESS || win == WND_DESKTOP) return FALSE; + + if (win->hSysMenu) NtUserDestroyMenu( win->hSysMenu ); + win->hSysMenu = user_callbacks ? user_callbacks->get_sys_menu( hwnd, menu ) : NULL; + release_win_ptr( win ); + return TRUE; +} + /********************************************************************** * NtUserSetMenuDefaultItem (win32u.@) */ diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index acc3fdf6290..c870037f7b3 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -37,7 +37,6 @@ struct user_callbacks BOOL (WINAPI *pEndMenu)(void); BOOL (WINAPI *pImmProcessKey)(HWND, HKL, UINT, LPARAM, DWORD); BOOL (WINAPI *pImmTranslateMessage)(HWND, UINT, WPARAM, LPARAM); - BOOL (WINAPI *pSetSystemMenu)( HWND hwnd, HMENU menu ); void (CDECL *free_win_ptr)( struct tagWND *win ); HMENU (CDECL *get_sys_menu)( HWND hwnd, HMENU popup ); HWND (CDECL *is_menu_active)(void); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d94324b1290..d6a51c1d3b9 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1229,7 +1229,7 @@ @ stub NtUserSetShellWindowEx @ stdcall NtUserSetSysColors(long ptr ptr) @ stub NtUserSetSystemCursor -@ stub NtUserSetSystemMenu +@ stdcall NtUserSetSystemMenu(long long) @ stdcall -syscall NtUserSetSystemTimer(long long long) @ stub NtUserSetTargetForResourceBrokering @ stdcall -syscall NtUserSetThreadDesktop(long) diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c40d2cb2a6f..ea6d67750b4 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -282,6 +282,7 @@ struct unix_funcs BOOL (WINAPI *pNtUserSetMenu)( HWND hwnd, HMENU menu ); HWND (WINAPI *pNtUserSetParent)( HWND hwnd, HWND parent ); BOOL (WINAPI *pNtUserSetSysColors)( INT count, const INT *colors, const COLORREF *values ); + BOOL (WINAPI *pNtUserSetSystemMenu)( HWND hwnd, HMENU menu ); LONG (WINAPI *pNtUserSetWindowLong)( HWND hwnd, INT offset, LONG newval, BOOL ansi ); LONG_PTR (WINAPI *pNtUserSetWindowLongPtr)( HWND hwnd, INT offset, LONG_PTR newval, BOOL ansi ); BOOL (WINAPI *pNtUserSetWindowPos)( HWND hwnd, HWND after, INT x, INT y, INT cx, INT cy, UINT flags ); diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index e3e0781bdde..6219b0fa49c 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -1185,6 +1185,12 @@ BOOL WINAPI NtUserSetSysColors( INT count, const INT *colors, const COLORREF *va return unix_funcs->pNtUserSetSysColors( count, colors, values ); } +BOOL WINAPI NtUserSetSystemMenu( HWND hwnd, HMENU menu ) +{ + if (!unix_funcs) return FALSE; + return unix_funcs->pNtUserSetSystemMenu( hwnd, menu ); +} + LONG WINAPI NtUserSetWindowLong( HWND hwnd, INT offset, LONG newval, BOOL ansi ) { if (!unix_funcs) return 0;

1 0