- Wine-Commits - list.winehq.org

Bernhard Kölbl : mfmediaengine: Add support for inserting video effects.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: de1dd6cbf79d451ca35cd63810557e3d347e0211 URL: https://gitlab.winehq.org/wine/wine/-/commit/de1dd6cbf79d451ca35cd63810557e… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Mon Dec 5 23:46:20 2022 +0100 mfmediaengine: Add support for inserting video effects. --- dlls/mfmediaengine/main.c | 110 ++++++++++++++++++++++++++++++- dlls/mfmediaengine/tests/mfmediaengine.c | 19 ++---- 2 files changed, 114 insertions(+), 15 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index b3ac236c78e..e3da2fa0752 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -113,6 +113,19 @@ struct rect float left, top, right, bottom; }; +struct effect +{ + IUnknown *object; + BOOL optional; +}; + +struct effects +{ + struct effect *effects; + size_t count; + size_t capacity; +}; + struct media_engine { IMFMediaEngineEx IMFMediaEngineEx_iface; @@ -145,6 +158,7 @@ struct media_engine IMFMediaSource *source; IMFPresentationDescriptor *pd; } presentation; + struct effects video_effects; struct { LONGLONG pts; @@ -1018,6 +1032,46 @@ static HRESULT media_engine_create_source_node(IMFMediaSource *source, IMFPresen return S_OK; } +static HRESULT media_engine_create_effects(struct effect *effects, size_t count, + IMFTopologyNode *src, IMFTopologyNode *sink, IMFTopology *topology) +{ + IMFTopologyNode *last = src; + HRESULT hr = S_OK; + size_t i; + + IMFTopologyNode_AddRef(last); + + for (i = 0; i < count; ++i) + { + IMFTopologyNode *node = NULL; + + if (FAILED(hr = MFCreateTopologyNode(MF_TOPOLOGY_TRANSFORM_NODE, &node))) + { + WARN("Failed to create transform node, hr %#lx", hr); + break; + } + + IMFTopologyNode_SetObject(node, (IUnknown *)effects[i].object); + IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_NOSHUTDOWN_ON_REMOVE, FALSE); + + if (effects[i].optional) + IMFTopologyNode_SetUINT32(node, &MF_TOPONODE_CONNECT_METHOD, MF_CONNECT_AS_OPTIONAL); + + IMFTopology_AddNode(topology, node); + IMFTopologyNode_ConnectOutput(last, 0, node, 0); + + IMFTopologyNode_Release(last); + last = node; + } + + IMFTopologyNode_Release(last); + + if (SUCCEEDED(hr)) + hr = IMFTopologyNode_ConnectOutput(last, 0, sink, 0); + + return hr; +} + static HRESULT media_engine_create_audio_renderer(struct media_engine *engine, IMFTopologyNode **node) { unsigned int category, role; @@ -1105,6 +1159,20 @@ static void media_engine_clear_presentation(struct media_engine *engine) memset(&engine->presentation, 0, sizeof(engine->presentation)); } +static void media_engine_clear_effects(struct effects *effects) +{ + size_t i; + + for (i = 0; i < effects->count; ++i) + { + if (effects->effects[i].object) + IUnknown_Release(effects->effects[i].object); + } + + free(effects->effects); + memset(effects, 0, sizeof(*effects)); +} + static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMediaSource *source) { IMFStreamDescriptor *sd_audio = NULL, *sd_video = NULL; @@ -1227,7 +1295,10 @@ static HRESULT media_engine_create_topology(struct media_engine *engine, IMFMedi { IMFTopology_AddNode(topology, video_src); IMFTopology_AddNode(topology, grabber_node); - IMFTopologyNode_ConnectOutput(video_src, 0, grabber_node, 0); + + if (FAILED(hr = media_engine_create_effects(engine->video_effects.effects, engine->video_effects.count, + video_src, grabber_node, topology))) + WARN("Failed to create video effect nodes, hr %#lx.\n", hr); } if (SUCCEEDED(hr)) @@ -1382,6 +1453,7 @@ static void free_media_engine(struct media_engine *engine) IMFAttributes_Release(engine->attributes); if (engine->resolver) IMFSourceResolver_Release(engine->resolver); + media_engine_clear_effects(&engine->video_effects); media_engine_release_video_frame_resources(engine); media_engine_clear_presentation(engine); if (engine->device_manager) @@ -2587,11 +2659,43 @@ static HRESULT WINAPI media_engine_IsProtected(IMFMediaEngineEx *iface, BOOL *pr return E_NOTIMPL; } +static HRESULT media_engine_insert_effect(struct media_engine *engine, struct effects *effects, IUnknown *object, BOOL is_optional) +{ + HRESULT hr = S_OK; + + if (engine->flags & FLAGS_ENGINE_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else if (!mf_array_reserve((void **)&effects->effects, &effects->capacity, effects->count + 1, sizeof(*effects->effects))) + { + hr = E_OUTOFMEMORY; + } + else + { + effects->effects[effects->count].object = object; + if (object) + { + IUnknown_AddRef(effects->effects[effects->count].object); + } + effects->effects[effects->count].optional = is_optional; + + effects->count++; + } + + return hr; +} + static HRESULT WINAPI media_engine_InsertVideoEffect(IMFMediaEngineEx *iface, IUnknown *effect, BOOL is_optional) { - FIXME("%p, %p, %d stub.\n", iface, effect, is_optional); + struct media_engine *engine = impl_from_IMFMediaEngineEx(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %d.\n", iface, effect, is_optional); + + EnterCriticalSection(&engine->cs); + hr = media_engine_insert_effect(engine, &engine->video_effects, effect, is_optional); + LeaveCriticalSection(&engine->cs); + + return hr; } static HRESULT WINAPI media_engine_InsertAudioEffect(IMFMediaEngineEx *iface, IUnknown *effect, BOOL is_optional) diff --git a/dlls/mfmediaengine/tests/mfmediaengine.c b/dlls/mfmediaengine/tests/mfmediaengine.c index b488f57ba47..8aa9492d32b 100644 --- a/dlls/mfmediaengine/tests/mfmediaengine.c +++ b/dlls/mfmediaengine/tests/mfmediaengine.c @@ -1829,17 +1829,12 @@ static void test_video_effect(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect->IMFTransform_iface, FALSE); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine EXPECT_REF(&video_effect->IMFTransform_iface, 2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + EXPECT_REF(&video_effect->IMFTransform_iface, 2); hr = IMFMediaEngineEx_InsertVideoEffect(media_engine_ex, (IUnknown *)&video_effect2->IMFTransform_iface, FALSE); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine EXPECT_REF(&video_effect2->IMFTransform_iface, 2); - - if (FAILED(hr)) - { - goto done; - } + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + EXPECT_REF(&video_effect2->IMFTransform_iface, 2); url = SysAllocString(L"i420-64x64.avi"); hr = IMFMediaEngineEx_SetSourceFromByteStream(media_engine_ex, stream, url); @@ -1869,7 +1864,7 @@ done: IMFMediaEngineEx_Shutdown(media_engine_ex); ref = IMFMediaEngineEx_Release(media_engine_ex); - ok(!ref, "Unexpected ref %lu.\n", ref); + todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); } if (texture) @@ -1880,12 +1875,12 @@ done: if (video_effect2) { ref = IMFTransform_Release(&video_effect2->IMFTransform_iface); - ok(!ref, "Unexpected ref %lu.\n", ref); + todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); } if (video_effect) { ref = IMFTransform_Release(&video_effect->IMFTransform_iface); - ok(!ref, "Unexpected ref %lu.\n", ref); + todo_wine ok(!ref, "Unexpected ref %lu.\n", ref); } IMFMediaEngineNotify_Release(&notify->IMFMediaEngineNotify_iface);

1 0

Bernhard Kölbl : mfmediaengine/tests: Add tests for video effects.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 621d153d45f8a29155e16bdbdbbb8b7320c80668 URL: https://gitlab.winehq.org/wine/wine/-/commit/621d153d45f8a29155e16bdbdbbb8b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Fri Mar 10 22:58:33 2023 +0100 mfmediaengine/tests: Add tests for video effects. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/mfmediaengine/tests/mfmediaengine.c | 534 +++++++++++++++++++++++++++++++ 1 file changed, 534 insertions(+)

1 0

Hans Leidekker : secur32: Reduce indentation level in schan_QueryContextAttributesA/W().
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: b605d822da83667067c63374a9c4a7b5945b052b URL: https://gitlab.winehq.org/wine/wine/-/commit/b605d822da83667067c63374a9c4a7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 16:07:23 2023 +0200 secur32: Reduce indentation level in schan_QueryContextAttributesA/W(). --- dlls/secur32/schannel.c | 313 +++++++++++++++++++++++------------------------- 1 file changed, 147 insertions(+), 166 deletions(-)

1 0

Hans Leidekker : secur32/tests: Get rid of workarounds for old Windows versions.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 472150bf2ed73aab2c0a6e9b168c4e36683ec73f URL: https://gitlab.winehq.org/wine/wine/-/commit/472150bf2ed73aab2c0a6e9b168c4e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 14:54:44 2023 +0200 secur32/tests: Get rid of workarounds for old Windows versions. --- dlls/secur32/tests/schannel.c | 378 ++++++++++++++++++------------------------ 1 file changed, 160 insertions(+), 218 deletions(-)

1 0

Hans Leidekker : secur32/tests: Fix a test failure.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 9a56d5ff1f1724a332eba62129ded569c28a1649 URL: https://gitlab.winehq.org/wine/wine/-/commit/9a56d5ff1f1724a332eba62129ded5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 14:57:22 2023 +0200 secur32/tests: Fix a test failure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55114 --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 9be79cd3805..fc5d501ff39 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -2018,6 +2018,7 @@ static void test_connection_shutdown(void) ok( status == SEC_E_OK, "got %08lx.\n", status ); ok( buf->cbBuffer == sizeof(message), "got cbBuffer %#lx.\n", buf->cbBuffer ); ok( !memcmp( buf->pvBuffer, message, sizeof(message) ), "message data mismatch.\n" ); + free_buffers( &buffers[0] ); alert.dwTokenType = SCHANNEL_ALERT; alert.dwAlertType = TLS1_ALERT_FATAL; @@ -2031,7 +2032,6 @@ static void test_connection_shutdown(void) NULL, 0, NULL, &buffers[1], &attrs, NULL ); ok( status == SEC_E_OK, "got %08lx.\n", status ); - free_buffers( &buffers[0] ); free_buffers( &buffers[1] ); DeleteSecurityContext( &context ); FreeCredentialsHandle( &cred_handle );

1 0

Hans Leidekker : secur32: Fix a couple of return values.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: wine Branch: master Commit: 4d7c36ddb026aa93c39b4721f0bd33e146e787dd URL: https://gitlab.winehq.org/wine/wine/-/commit/4d7c36ddb026aa93c39b4721f0bd33… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jun 23 14:17:36 2023 +0200 secur32: Fix a couple of return values. --- dlls/secur32/schannel.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 8d446af8fe1..7b5c79f3764 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -312,7 +312,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesA( { case SECPKG_CRED_ATTR_NAMES: FIXME("SECPKG_CRED_ATTR_NAMES: stub\n"); - ret = SEC_E_UNSUPPORTED_FUNCTION; + ret = SEC_E_NO_CREDENTIALS; break; default: ret = schan_QueryCredentialsAttributes(phCredential, ulAttribute, @@ -394,7 +394,7 @@ static SECURITY_STATUS get_cert(const void *credentials, CERT_CONTEXT const **ce default: FIXME("unhandled version %lu\n", cred->dwVersion); - return SEC_E_INTERNAL_ERROR; + return SEC_E_UNKNOWN_CREDENTIALS; } if (!cert_count) status = SEC_E_NO_CREDENTIALS; @@ -570,7 +570,7 @@ static SECURITY_STATUS acquire_credentials_handle(ULONG fCredentialUse, status = SEC_E_OK; } - else if (fCredentialUse & SECPKG_CRED_INBOUND) + else if (!fCredentialUse || (fCredentialUse & SECPKG_CRED_INBOUND)) { return SEC_E_NO_CREDENTIALS; }

1 0

Evan Tang : vkd3d: Make CopyResource use a temp buffer for depth <-> color copies.
by Alexandre Julliard July 6, 2023

July 6, 2023

Module: vkd3d Branch: master Commit: 574239e3e32b4e5e7bc349d464c8c185a4317e97 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/574239e3e32b4e5e7bc349d464c8c… Author: Evan Tang <etang(a)codeweavers.com> Date: Mon Jul 3 16:43:39 2023 -0500 vkd3d: Make CopyResource use a temp buffer for depth <-> color copies. depth <-> color copies aren't allowed in Vulkan --- libs/vkd3d/command.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index de355ccd..53cb5d95 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3625,7 +3625,7 @@ static HRESULT d3d12_command_list_allocate_transfer_buffer(struct d3d12_command_ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_command_list *list, struct d3d12_resource *dst_resource, unsigned int dst_sub_resource_idx, const struct vkd3d_format *dst_format, struct d3d12_resource *src_resource, - unsigned int src_sub_resource_idx, const struct vkd3d_format *src_format) + unsigned int src_sub_resource_idx, const struct vkd3d_format *src_format, unsigned int layer_count) { const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const D3D12_RESOURCE_DESC *dst_desc = &dst_resource->desc; @@ -3652,6 +3652,7 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com buffer_image_copy.bufferImageHeight = 0; vk_image_subresource_layers_from_d3d12(&buffer_image_copy.imageSubresource, src_format, src_sub_resource_idx, src_desc->MipLevels); + buffer_image_copy.imageSubresource.layerCount = layer_count; src_miplevel_idx = buffer_image_copy.imageSubresource.mipLevel; buffer_image_copy.imageOffset.x = 0; buffer_image_copy.imageOffset.y = 0; @@ -3659,7 +3660,7 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com vk_extent_3d_from_d3d12_miplevel(&buffer_image_copy.imageExtent, src_desc, src_miplevel_idx); buffer_size = src_format->byte_count * buffer_image_copy.imageExtent.width * - buffer_image_copy.imageExtent.height * buffer_image_copy.imageExtent.depth; + buffer_image_copy.imageExtent.height * buffer_image_copy.imageExtent.depth * layer_count; if (FAILED(hr = d3d12_command_list_allocate_transfer_buffer(list, buffer_size, &transfer_buffer))) { ERR("Failed to allocate transfer buffer, hr %#x.\n", hr); @@ -3685,6 +3686,7 @@ static void d3d12_command_list_copy_incompatible_texture_region(struct d3d12_com vk_image_subresource_layers_from_d3d12(&buffer_image_copy.imageSubresource, dst_format, dst_sub_resource_idx, dst_desc->MipLevels); + buffer_image_copy.imageSubresource.layerCount = layer_count; dst_miplevel_idx = buffer_image_copy.imageSubresource.mipLevel; assert(d3d12_resource_desc_get_width(src_desc, src_miplevel_idx) == @@ -3814,7 +3816,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic { d3d12_command_list_copy_incompatible_texture_region(list, dst_resource, dst->u.SubresourceIndex, dst_format, - src_resource, src->u.SubresourceIndex, src_format); + src_resource, src->u.SubresourceIndex, src_format, 1); return; } @@ -3836,6 +3838,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); struct d3d12_resource *dst_resource, *src_resource; + const struct vkd3d_format *dst_format, *src_format; const struct vkd3d_vk_device_procs *vk_procs; VkBufferCopy vk_buffer_copy; VkImageCopy vk_image_copy; @@ -3868,16 +3871,29 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm else { layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc); + dst_format = dst_resource->format; + src_format = src_resource->format; assert(d3d12_resource_is_texture(dst_resource)); assert(d3d12_resource_is_texture(src_resource)); assert(dst_resource->desc.MipLevels == src_resource->desc.MipLevels); assert(layer_count == d3d12_resource_desc_get_layer_count(&src_resource->desc)); + if (src_format->vk_aspect_mask != dst_format->vk_aspect_mask) + { + for (i = 0; i < dst_resource->desc.MipLevels; ++i) + { + d3d12_command_list_copy_incompatible_texture_region(list, + dst_resource, i, dst_format, + src_resource, i, src_format, layer_count); + } + return; + } + for (i = 0; i < dst_resource->desc.MipLevels; ++i) { vk_image_copy_from_d3d12(&vk_image_copy, i, i, &src_resource->desc, &dst_resource->desc, - src_resource->format, dst_resource->format, NULL, 0, 0, 0); + src_format, dst_format, NULL, 0, 0, 0); vk_image_copy.dstSubresource.layerCount = layer_count; vk_image_copy.srcSubresource.layerCount = layer_count; VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image,

1 0

Alex Henrie : cmd: Allow numbered redirects at the beginning of a line.
by Alexandre Julliard July 5, 2023

July 5, 2023

Module: wine Branch: master Commit: eba7092f0aba75b71175f0426ad05a4d880250a3 URL: https://gitlab.winehq.org/wine/wine/-/commit/eba7092f0aba75b71175f0426ad05a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Jun 30 23:24:45 2023 -0600 cmd: Allow numbered redirects at the beginning of a line. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55124 --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 6 ++++++ programs/cmd/wcmdmain.c | 6 +++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index eaee2900bc9..0cb05041fa9 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -176,6 +176,15 @@ del foo echo foo> foo echo foo7 7>> foo || (echo not supported & del foo) if exist foo (type foo) else echo not supported +echo --- redirect at beginning of line +>foo (echo foo) +type foo +1>foo (echo foo1) +type foo +2>foo (echo foo2 >&2) +type foo +>>foo (echo fooA) +type foo echo --- redirections within IF statements if 1==1 echo foo1>bar type bar & del bar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 411eae303ac..16f9d647b8a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -204,6 +204,12 @@ food2 food21 @todo_wine(a)foo7@space@@space@@or_broken(a)not supported(a)space@ @todo_wine(a)foo@or_broken(a)not supported +--- redirect at beginning of line +foo +foo1 +foo2(a)space@ +foo2(a)space@ +fooA --- redirections within IF statements foo1 foo2 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index de6e721b26a..298606f6caa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2070,9 +2070,9 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* See if 1>, 2> etc, in which case we have some patching up to do (provided there's a preceding whitespace, and enough chars read so far) */ - if (curStringLen > 2 - && (*(curPos-1)>='1') && (*(curPos-1)<='9') - && ((*(curPos-2)==' ') || (*(curPos-2)=='\t'))) { + if (curPos[-1] >= '1' && curPos[-1] <= '9' + && (curStringLen == 1 || + curPos[-2] == ' ' || curPos[-2] == '\t')) { curStringLen--; curString[curStringLen] = 0x00; curCopyTo[(*curLen)++] = *(curPos-1);

1 0

Bernhard Kölbl : include: Add VoiceCommandSet runtimeclass with its dependencies.
by Alexandre Julliard July 5, 2023

July 5, 2023

Module: wine Branch: master Commit: 9f9f799ad9453a9996f67ae88e1ea2bf7f8ccc05 URL: https://gitlab.winehq.org/wine/wine/-/commit/9f9f799ad9453a9996f67ae88e1ea2… Author: Bernhard Kölbl <bkoelbl(a)codeweavers.com> Date: Wed Jul 5 15:32:36 2023 +0200 include: Add VoiceCommandSet runtimeclass with its dependencies. --- include/windows.media.speechrecognition.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/windows.media.speechrecognition.idl b/include/windows.media.speechrecognition.idl index 79107aab1bf..36f94823218 100644 --- a/include/windows.media.speechrecognition.idl +++ b/include/windows.media.speechrecognition.idl @@ -60,6 +60,7 @@ namespace Windows { interface ISpeechRecognizerStatics2; interface ISpeechRecognizerTimeouts; interface ISpeechRecognizerUIOptions; + interface IVoiceCommandSet; runtimeclass SpeechContinuousRecognitionCompletedEventArgs; runtimeclass SpeechContinuousRecognitionResultGeneratedEventArgs; runtimeclass SpeechContinuousRecognitionSession; @@ -74,6 +75,7 @@ namespace Windows { runtimeclass SpeechRecognizerStateChangedEventArgs; runtimeclass SpeechRecognizerTimeouts; runtimeclass SpeechRecognizerUIOptions; + runtimeclass VoiceCommandSet; } } } @@ -471,6 +473,22 @@ namespace Windows { [propput] HRESULT ShowConfirmation([in] boolean value); } + [ + contract(Windows.Phone.PhoneContract, 1.0), + deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0), + exclusiveto(Windows.Media.SpeechRecognition.VoiceCommandSet), + uuid(0bedda75-46e6-4b11-a088-5c68632899b5) + ] + interface IVoiceCommandSet : IInspectable + { + [deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0)] + [propget] HRESULT Language([out, retval] HSTRING *value); + [deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0)] + [propget] HRESULT Name([out, retval] HSTRING *value); + [deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0)] + HRESULT SetPhraseListAsync([in] HSTRING phrase_list_name, [in] Windows.Foundation.Collections.IIterable<HSTRING> *phrase_list, [out, retval] Windows.Foundation.IAsyncAction **update_action); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), @@ -610,6 +628,16 @@ namespace Windows { { [default] interface Windows.Media.SpeechRecognition.ISpeechRecognizerUIOptions; } + + [ + contract(Windows.Phone.PhoneContract, 1.0), + deprecated("Use Windows.ApplicationModel.VoiceCommands.VoiceCommandDefinition", deprecate, Windows.Phone.PhoneContract, 1.0), + marshaling_behavior(agile) + ] + runtimeclass VoiceCommandSet + { + [default] interface Windows.Media.SpeechRecognition.IVoiceCommandSet; + } } } }

1 0

Fabian Maurer : user32: Ignore invalid parameters in DrawTextEx when HDC is invalid.
by Alexandre Julliard July 5, 2023

July 5, 2023

Module: wine Branch: master Commit: 35c8f15bc67f7602438fe0c39a69ff6ddf6b8297 URL: https://gitlab.winehq.org/wine/wine/-/commit/35c8f15bc67f7602438fe0c39a69ff… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Jun 12 22:02:45 2023 +0200 user32: Ignore invalid parameters in DrawTextEx when HDC is invalid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47089 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/text.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/text.c | 21 ++++++++++++++++----- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index 317fb9a6a29..90fe7421b02 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -519,6 +519,38 @@ static void test_DrawTextCalcRect(void) ok(textheight==0,"Got textheight from DrawTextExW\n"); ok(dtp.uiLengthDrawn==1337, "invalid dtp.uiLengthDrawn = %i\n",dtp.uiLengthDrawn); } + + /* When passing invalid DC, other parameters must be ignored - no crashes on invalid pointers */ + SetLastError(0xdeadbeef); + textheight = DrawTextExW((HDC)0xdeadbeef, emptystringW, 100000, (LPRECT)0xdeadbeef, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExW((HDC)0xdeadbeef, (LPWSTR)0xdeadbeef, 100000, &rect, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExW((HDC)0xdeadbeef, 0, -1, (LPRECT)0xdeadbeef, DT_CALCRECT, 0); + ok(textheight == 0, "Got textheight from DrawTextExW\n"); + ok(GetLastError() == 0xdeadbeef,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExA((HDC)0xdeadbeef, emptystring, 100000, (LPRECT)0xdeadbeef, 0, 0); + ok(textheight == 0, "Got textheight from DrawTextExA\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_HANDLE,"Got error %lu\n", GetLastError()); + + SetLastError(0xdeadbeef); + textheight = DrawTextExA((HDC)0xdeadbeef, 0, -1, (LPRECT)0xdeadbeef, DT_CALCRECT, 0); + ok(textheight == 0, "Got textheight from DrawTextExA\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == ERROR_INVALID_HANDLE,"Got error %lu\n", GetLastError()); + + if (0) + { + /* Crashes */ + textheight = DrawTextExA((HDC)0xdeadbeef, (LPSTR)0xdeadbeef, 100, &rect, 0, 0); + } } /* More test cases from bug 12226 */ diff --git a/dlls/user32/text.c b/dlls/user32/text.c index 86946e6a53a..788ed10269c 100644 --- a/dlls/user32/text.c +++ b/dlls/user32/text.c @@ -874,8 +874,7 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, int len, lh, count=i_count; TEXTMETRICW tm; int lmargin = 0, rmargin = 0; - int x = rect->left, y = rect->top; - int width = rect->right - rect->left; + int x, y, width; int max_width = 0; int last_line; int tabwidth /* to keep gcc happy */ = 0; @@ -897,7 +896,13 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR str, INT i_count, if (flags & DT_SINGLELINE) flags &= ~DT_WORDBREAK; - GetTextMetricsW(hdc, &tm); + if (!GetTextMetricsW(hdc, &tm)) + return 0; + + x = rect->left; + y = rect->top; + width = rect->right - rect->left; + if (flags & DT_EXTERNALLEADING) lh = tm.tmHeight + tm.tmExternalLeading; else @@ -1086,18 +1091,24 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR str, INT count, DWORD wmax; DWORD amax; UINT cp; + TEXTMETRICA tm; + + if (!GetTextMetricsA(hdc, &tm)) + { + SetLastError(ERROR_INVALID_HANDLE); + return 0; + } if (!count) return 0; if (!str && count > 0) return 0; if( !str || ((count == -1) && !(count = strlen(str)))) { int lh; - TEXTMETRICA tm; if (dtp && dtp->cbSize != sizeof(DRAWTEXTPARAMS)) return 0; - GetTextMetricsA(hdc, &tm); + if (flags & DT_EXTERNALLEADING) lh = tm.tmHeight + tm.tmExternalLeading; else

1 0