June 2022 - Wine-commits - list.winehq.org

Nikolay Sivov : secur32: Add wow64 support to the unixlib.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 2196dd2567cfd7bd87565f008b8887ea109270ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=2196dd2567cfd7bd87565f00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 31 13:05:44 2022 +0300 secur32: Add wow64 support to the unixlib. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/secur32/schannel_gnutls.c | 314 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 314 insertions(+) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 08801cef509..ad319518a7a 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -25,6 +25,7 @@ #include "config.h" +#include <assert.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -1286,4 +1287,317 @@ const unixlib_entry_t __wine_unix_call_funcs[] = schan_set_dtls_timeouts, }; +#ifdef _WIN64 + +typedef ULONG PTR32; + +typedef struct SecBufferDesc32 +{ + ULONG ulVersion; + ULONG cBuffers; + PTR32 pBuffers; +} SecBufferDesc32; + +typedef struct SecBuffer32 +{ + ULONG cbBuffer; + ULONG BufferType; + PTR32 pvBuffer; +} SecBuffer32; + +static NTSTATUS wow64_schan_allocate_certificate_credentials( void *args ) +{ + struct + { + PTR32 c; + ULONG cert_encoding; + ULONG cert_size; + PTR32 cert_blob; + ULONG key_size; + PTR32 key_blob; + } const *params32 = args; + struct allocate_certificate_credentials_params params = + { + ULongToPtr(params32->c), + params32->cert_encoding, + params32->cert_size, + ULongToPtr(params32->cert_blob), + params32->key_size, + ULongToPtr(params32->key_blob), + }; + return schan_allocate_certificate_credentials(&params); +} + +static NTSTATUS wow64_schan_create_session( void *args ) +{ + struct + { + PTR32 cred; + PTR32 session; + } const *params32 = args; + struct create_session_params params = + { + ULongToPtr(params32->cred), + ULongToPtr(params32->session), + }; + return schan_create_session(&params); +} + +static NTSTATUS wow64_schan_free_certificate_credentials( void *args ) +{ + struct + { + PTR32 c; + } const *params32 = args; + struct free_certificate_credentials_params params = + { + ULongToPtr(params32->c), + }; + return schan_free_certificate_credentials(&params); +} + +static NTSTATUS wow64_schan_get_application_protocol( void *args ) +{ + struct + { + schan_session session; + PTR32 protocol; + } const *params32 = args; + struct get_application_protocol_params params = + { + params32->session, + ULongToPtr(params32->protocol), + }; + return schan_get_application_protocol(&params); +} + +static NTSTATUS wow64_schan_get_connection_info( void *args ) +{ + struct + { + schan_session session; + PTR32 info; + } const *params32 = args; + struct get_connection_info_params params = + { + params32->session, + ULongToPtr(params32->info), + }; + return schan_get_connection_info(&params); +} + +static NTSTATUS wow64_schan_get_session_peer_certificate( void *args ) +{ + struct + { + schan_session session; + PTR32 buffer; + PTR32 bufsize; + PTR32 retcount; + } const *params32 = args; + struct get_session_peer_certificate_params params = + { + params32->session, + ULongToPtr(params32->buffer), + ULongToPtr(params32->bufsize), + ULongToPtr(params32->retcount), + }; + return schan_get_session_peer_certificate(&params); +} + +static NTSTATUS wow64_schan_get_unique_channel_binding( void *args ) +{ + struct + { + schan_session session; + PTR32 buffer; + PTR32 bufsize; + } const *params32 = args; + struct get_unique_channel_binding_params params = + { + params32->session, + ULongToPtr(params32->buffer), + ULongToPtr(params32->bufsize), + }; + return schan_get_unique_channel_binding(&params); +} + +static void secbufferdesc_32to64(const SecBufferDesc32 *desc32, SecBufferDesc *desc) +{ + unsigned int i; + + desc->ulVersion = desc32->ulVersion; + desc->cBuffers = desc32->cBuffers; + for (i = 0; i < desc->cBuffers; ++i) + { + SecBuffer32 *buffer32 = ULongToPtr(desc32->pBuffers + i * sizeof(*buffer32)); + desc->pBuffers[i].cbBuffer = buffer32->cbBuffer; + desc->pBuffers[i].BufferType = buffer32->BufferType; + desc->pBuffers[i].pvBuffer = ULongToPtr(buffer32->pvBuffer); + } +} + +static NTSTATUS wow64_schan_handshake( void *args ) +{ + SecBuffer input_buffers[3]; + SecBufferDesc input = { 0, 0, input_buffers }; + SecBuffer output_buffers[3]; + SecBufferDesc output = { 0, 0, output_buffers }; + + struct + { + schan_session session; + PTR32 input; + ULONG input_size; + PTR32 output; + PTR32 input_offset; + PTR32 output_buffer_idx; + PTR32 output_offset; + } const *params32 = args; + struct handshake_params params = + { + params32->session, + params32->input ? &input : NULL, + params32->input_size, + params32->output ? &output : NULL, + ULongToPtr(params32->input_offset), + ULongToPtr(params32->output_buffer_idx), + ULongToPtr(params32->output_offset), + }; + if (params32->input) + { + SecBufferDesc32 *desc32 = ULongToPtr(params32->input); + assert(desc32->cBuffers <= ARRAY_SIZE(input_buffers)); + secbufferdesc_32to64(desc32, &input); + } + if (params32->output) + { + SecBufferDesc32 *desc32 = ULongToPtr(params32->output); + assert(desc32->cBuffers <= ARRAY_SIZE(output_buffers)); + secbufferdesc_32to64(desc32, &output); + } + return schan_handshake(&params); +} + +static NTSTATUS wow64_schan_recv( void *args ) +{ + SecBuffer buffers[3]; + SecBufferDesc input = { 0, 0, buffers }; + + struct + { + schan_session session; + PTR32 input; + ULONG input_size; + PTR32 buffer; + PTR32 length; + } const *params32 = args; + struct recv_params params = + { + params32->session, + params32->input ? &input : NULL, + params32->input_size, + ULongToPtr(params32->buffer), + ULongToPtr(params32->length), + }; + if (params32->input) + { + SecBufferDesc32 *desc32 = ULongToPtr(params32->input); + assert(desc32->cBuffers <= ARRAY_SIZE(buffers)); + secbufferdesc_32to64(desc32, &input); + } + return schan_recv(&params); +} + +static NTSTATUS wow64_schan_send( void *args ) +{ + SecBuffer buffers[3]; + SecBufferDesc output = { 0, 0, buffers }; + + struct + { + schan_session session; + PTR32 output; + PTR32 buffer; + ULONG length; + PTR32 output_buffer_idx; + PTR32 output_offset; + } const *params32 = args; + struct send_params params = + { + params32->session, + params32->output ? &output : NULL, + ULongToPtr(params32->buffer), + params32->length, + ULongToPtr(params32->output_buffer_idx), + ULongToPtr(params32->output_offset), + }; + if (params32->output) + { + SecBufferDesc32 *desc32 = ULongToPtr(params32->output); + assert(desc32->cBuffers <= ARRAY_SIZE(buffers)); + secbufferdesc_32to64(desc32, &output); + } + return schan_send(&params); +} + +static NTSTATUS wow64_schan_set_application_protocols( void *args ) +{ + struct + { + schan_session session; + PTR32 buffer; + unsigned int buflen; + } const *params32 = args; + struct set_application_protocols_params params = + { + params32->session, + ULongToPtr(params32->buffer), + params32->buflen, + }; + return schan_set_application_protocols(&params); +} + +static NTSTATUS wow64_schan_set_session_target( void *args ) +{ + struct + { + schan_session session; + PTR32 target; + } const *params32 = args; + struct set_session_target_params params = + { + params32->session, + ULongToPtr(params32->target), + }; + return schan_set_session_target(&params); +} + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + process_attach, + process_detach, + wow64_schan_allocate_certificate_credentials, + wow64_schan_create_session, + schan_dispose_session, + wow64_schan_free_certificate_credentials, + wow64_schan_get_application_protocol, + wow64_schan_get_connection_info, + schan_get_enabled_protocols, + schan_get_key_signature_algorithm, + schan_get_max_message_size, + schan_get_session_cipher_block_size, + wow64_schan_get_session_peer_certificate, + wow64_schan_get_unique_channel_binding, + wow64_schan_handshake, + wow64_schan_recv, + wow64_schan_send, + wow64_schan_set_application_protocols, + schan_set_dtls_mtu, + wow64_schan_set_session_target, + schan_set_dtls_timeouts, +}; + +#endif /* _WIN64 */ + #endif /* SONAME_LIBGNUTLS */

1 0

Bernhard Kölbl : windows.media.speech: Replace STDMETHODCALLTYPE with WINAPI on synthesis functions.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 107d7892856ab8e6e3e9827c121e1f167494ad47 URL: https://source.winehq.org/git/wine.git/?a=commit;h=107d7892856ab8e6e3e9827c… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 11:46:55 2022 +0200 windows.media.speech: Replace STDMETHODCALLTYPE with WINAPI on synthesis functions. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 87 ++++++++++++++++----------------- 1 file changed, 43 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=107d7892856ab8e6e3e9…

1 0

Bernhard Kölbl : windows.media.speech: Refactor function params in synthesizer.c.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 54edfab1238cd4d1ad747b64a5a6cfcb3debdf1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=54edfab1238cd4d1ad747b64… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 12:01:53 2022 +0200 windows.media.speech: Refactor function params in synthesizer.c. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 141 ++++++++++++-------------------- 1 file changed, 52 insertions(+), 89 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54edfab1238cd4d1ad74…

1 0

Bernhard Kölbl : windows.media.speech: Make use of DEFINE_IINSPECTABLE for IClosable from ISpeechSynthesizer.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: f27fbbc8a77783cdfee2c6ea48350aede44f0741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f27fbbc8a77783cdfee2c6ea… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 12:06:38 2022 +0200 windows.media.speech: Make use of DEFINE_IINSPECTABLE for IClosable from ISpeechSynthesizer. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 57 +-------------------------------- 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index cbcb7df1481..d59089d2e08 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -152,11 +152,6 @@ static inline struct speech_synthesizer *impl_from_ISpeechSynthesizer( ISpeechSy return CONTAINING_RECORD(iface, struct speech_synthesizer, ISpeechSynthesizer_iface); } -static inline struct speech_synthesizer *impl_from_IClosable( IClosable *iface ) -{ - return CONTAINING_RECORD(iface, struct speech_synthesizer, IClosable_iface); -} - static HRESULT WINAPI speech_synthesizer_QueryInterface( ISpeechSynthesizer *iface, REFIID iid, void **out ) { struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); @@ -305,61 +300,11 @@ static const struct ISpeechSynthesizer2Vtbl speech_synthesizer2_vtbl = speech_synthesizer2_get_Options, }; -static HRESULT WINAPI closable_QueryInterface( IClosable *iface, REFIID iid, void **out ) -{ - struct speech_synthesizer *impl = impl_from_IClosable(iface); - - return ISpeechSynthesizer_QueryInterface(&impl->ISpeechSynthesizer_iface, iid, out); -} - -static ULONG WINAPI closable_AddRef( IClosable *iface ) -{ - struct speech_synthesizer *impl = impl_from_IClosable(iface); - ULONG ref = InterlockedIncrement(&impl->ref); - - TRACE("iface %p, ref %lu.\n", iface, ref); - - return ref; -} - -static ULONG WINAPI closable_Release( IClosable *iface ) -{ - struct speech_synthesizer *impl = impl_from_IClosable(iface); - ULONG ref = InterlockedDecrement(&impl->ref); - - TRACE("iface %p, ref %lu.\n", iface, ref); - - if (!ref) - free(impl); - - return ref; -} - -static HRESULT WINAPI closable_GetIids( IClosable *iface, ULONG *iid_count, IID **iids ) -{ - FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); - - return E_NOTIMPL; -} - -static HRESULT WINAPI closable_GetRuntimeClassName( IClosable *iface, HSTRING *class_name ) -{ - FIXME("iface %p, class_name %p stub.\n", iface, class_name); - - return E_NOTIMPL; -} - -static HRESULT WINAPI closable_GetTrustLevel( IClosable *iface, TrustLevel *trust_level ) -{ - FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); - - return E_NOTIMPL; -} +DEFINE_IINSPECTABLE(closable, IClosable, struct speech_synthesizer, ISpeechSynthesizer_iface) static HRESULT WINAPI closable_Close( IClosable *iface ) { FIXME("iface %p stub.\n", iface); - return E_NOTIMPL; }

1 0

Bernhard Kölbl : windows.media.speech: Remove redundant speech prefix.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: b9923764286399e69455ed135ca878725c783412 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9923764286399e69455ed13… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 12:20:40 2022 +0200 windows.media.speech: Remove redundant speech prefix. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 86 ++++++++++++++++----------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index d59089d2e08..4299750adf6 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -139,7 +139,7 @@ static struct voice_information_vector all_voices = 0 }; -struct speech_synthesizer +struct synthesizer { ISpeechSynthesizer ISpeechSynthesizer_iface; ISpeechSynthesizer2 ISpeechSynthesizer2_iface; @@ -147,14 +147,14 @@ struct speech_synthesizer LONG ref; }; -static inline struct speech_synthesizer *impl_from_ISpeechSynthesizer( ISpeechSynthesizer *iface ) +static inline struct synthesizer *impl_from_ISpeechSynthesizer( ISpeechSynthesizer *iface ) { - return CONTAINING_RECORD(iface, struct speech_synthesizer, ISpeechSynthesizer_iface); + return CONTAINING_RECORD(iface, struct synthesizer, ISpeechSynthesizer_iface); } -static HRESULT WINAPI speech_synthesizer_QueryInterface( ISpeechSynthesizer *iface, REFIID iid, void **out ) +static HRESULT WINAPI synthesizer_QueryInterface( ISpeechSynthesizer *iface, REFIID iid, void **out ) { - struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); + struct synthesizer *impl = impl_from_ISpeechSynthesizer(iface); TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); @@ -186,9 +186,9 @@ static HRESULT WINAPI speech_synthesizer_QueryInterface( ISpeechSynthesizer *ifa return E_NOINTERFACE; } -static ULONG WINAPI speech_synthesizer_AddRef( ISpeechSynthesizer *iface ) +static ULONG WINAPI synthesizer_AddRef( ISpeechSynthesizer *iface ) { - struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); + struct synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedIncrement(&impl->ref); TRACE("iface %p, ref %lu.\n", iface, ref); @@ -196,9 +196,9 @@ static ULONG WINAPI speech_synthesizer_AddRef( ISpeechSynthesizer *iface ) return ref; } -static ULONG WINAPI speech_synthesizer_Release( ISpeechSynthesizer *iface ) +static ULONG WINAPI synthesizer_Release( ISpeechSynthesizer *iface ) { - struct speech_synthesizer *impl = impl_from_ISpeechSynthesizer(iface); + struct synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedDecrement(&impl->ref); TRACE("iface %p, ref %lu.\n", iface, ref); @@ -209,98 +209,98 @@ static ULONG WINAPI speech_synthesizer_Release( ISpeechSynthesizer *iface ) return ref; } -static HRESULT WINAPI speech_synthesizer_GetIids( ISpeechSynthesizer *iface, ULONG *iid_count, IID **iids ) +static HRESULT WINAPI synthesizer_GetIids( ISpeechSynthesizer *iface, ULONG *iid_count, IID **iids ) { FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); return E_NOTIMPL; } -static HRESULT WINAPI speech_synthesizer_GetRuntimeClassName( ISpeechSynthesizer *iface, HSTRING *class_name ) +static HRESULT WINAPI synthesizer_GetRuntimeClassName( ISpeechSynthesizer *iface, HSTRING *class_name ) { FIXME("iface %p, class_name %p stub.\n", iface, class_name); return E_NOTIMPL; } -static HRESULT WINAPI speech_synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, TrustLevel *trust_level ) +static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, TrustLevel *trust_level ) { FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); return E_NOTIMPL; } -static HRESULT WINAPI speech_synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesizer *iface, HSTRING text, - IAsyncOperation_SpeechSynthesisStream **operation ) +static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesizer *iface, HSTRING text, + IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation); return E_NOTIMPL; } -static HRESULT WINAPI speech_synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesizer *iface, HSTRING ssml, - IAsyncOperation_SpeechSynthesisStream **operation ) +static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesizer *iface, HSTRING ssml, + IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation); return E_NOTIMPL; } -static HRESULT WINAPI speech_synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value ) +static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value ) { FIXME("iface %p, value %p stub.\n", iface, value); return E_NOTIMPL; } -static HRESULT WINAPI speech_synthesizer_get_Voice( ISpeechSynthesizer *iface, IVoiceInformation **value ) +static HRESULT WINAPI synthesizer_get_Voice( ISpeechSynthesizer *iface, IVoiceInformation **value ) { FIXME("iface %p, value %p stub.\n", iface, value); return E_NOTIMPL; } -static const struct ISpeechSynthesizerVtbl speech_synthesizer_vtbl = +static const struct ISpeechSynthesizerVtbl synthesizer_vtbl = { /* IUnknown methods */ - speech_synthesizer_QueryInterface, - speech_synthesizer_AddRef, - speech_synthesizer_Release, + synthesizer_QueryInterface, + synthesizer_AddRef, + synthesizer_Release, /* IInspectable methods */ - speech_synthesizer_GetIids, - speech_synthesizer_GetRuntimeClassName, - speech_synthesizer_GetTrustLevel, + synthesizer_GetIids, + synthesizer_GetRuntimeClassName, + synthesizer_GetTrustLevel, /* ISpeechSynthesizer methods */ - speech_synthesizer_SynthesizeTextToStreamAsync, - speech_synthesizer_SynthesizeSsmlToStreamAsync, - speech_synthesizer_put_Voice, - speech_synthesizer_get_Voice, + synthesizer_SynthesizeTextToStreamAsync, + synthesizer_SynthesizeSsmlToStreamAsync, + synthesizer_put_Voice, + synthesizer_get_Voice, }; -DEFINE_IINSPECTABLE(speech_synthesizer2, ISpeechSynthesizer2, struct speech_synthesizer, ISpeechSynthesizer_iface) +DEFINE_IINSPECTABLE(synthesizer2, ISpeechSynthesizer2, struct synthesizer, ISpeechSynthesizer_iface) -static HRESULT WINAPI speech_synthesizer2_get_Options( ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value ) +static HRESULT WINAPI synthesizer2_get_Options( ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value ) { FIXME("iface %p, value %p stub.\n", iface, value); return E_NOTIMPL; } -static const struct ISpeechSynthesizer2Vtbl speech_synthesizer2_vtbl = +static const struct ISpeechSynthesizer2Vtbl synthesizer2_vtbl = { /* IUnknown methods */ - speech_synthesizer2_QueryInterface, - speech_synthesizer2_AddRef, - speech_synthesizer2_Release, + synthesizer2_QueryInterface, + synthesizer2_AddRef, + synthesizer2_Release, /* IInspectable methods */ - speech_synthesizer2_GetIids, - speech_synthesizer2_GetRuntimeClassName, - speech_synthesizer2_GetTrustLevel, + synthesizer2_GetIids, + synthesizer2_GetRuntimeClassName, + synthesizer2_GetTrustLevel, /* ISpeechSynthesizer2 methods */ - speech_synthesizer2_get_Options, + synthesizer2_get_Options, }; -DEFINE_IINSPECTABLE(closable, IClosable, struct speech_synthesizer, ISpeechSynthesizer_iface) +DEFINE_IINSPECTABLE(closable, IClosable, struct synthesizer, ISpeechSynthesizer_iface) static HRESULT WINAPI closable_Close( IClosable *iface ) { @@ -403,7 +403,7 @@ static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLev static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { - struct speech_synthesizer *obj; + struct synthesizer *obj; TRACE("iface %p, instance %p.\n", iface, instance); @@ -413,8 +413,8 @@ static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInsp return E_OUTOFMEMORY; } - obj->ISpeechSynthesizer_iface.lpVtbl = &speech_synthesizer_vtbl; - obj->ISpeechSynthesizer2_iface.lpVtbl = &speech_synthesizer2_vtbl; + obj->ISpeechSynthesizer_iface.lpVtbl = &synthesizer_vtbl; + obj->ISpeechSynthesizer2_iface.lpVtbl = &synthesizer2_vtbl; obj->IClosable_iface.lpVtbl = &closable_vtbl; obj->ref = 1; *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface;

1 0

Bernhard Kölbl : windows.media.speech: Make use of DEFINE_IINSPECTABLE for IInstalledVoicesStatic from SpeechSynthesizer statics.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: f450d538b370974f5021f08b586d2a314d5537c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f450d538b370974f5021f08b… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 12:58:13 2022 +0200 windows.media.speech: Make use of DEFINE_IINSPECTABLE for IInstalledVoicesStatic from SpeechSynthesizer statics. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 41 +-------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 4299750adf6..3b9e9377394 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -334,11 +334,6 @@ static inline struct synthesizer_statics *impl_from_IActivationFactory( IActivat return CONTAINING_RECORD(iface, struct synthesizer_statics, IActivationFactory_iface); } -static inline struct synthesizer_statics *impl_from_IInstalledVoicesStatic( IInstalledVoicesStatic *iface ) -{ - return CONTAINING_RECORD(iface, struct synthesizer_statics, IInstalledVoicesStatic_iface); -} - static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID iid, void **out ) { struct synthesizer_statics *impl = impl_from_IActivationFactory(iface); @@ -434,41 +429,7 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; -static HRESULT WINAPI installed_voices_static_QueryInterface( IInstalledVoicesStatic *iface, REFIID iid, void **out ) -{ - struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface); - return IActivationFactory_QueryInterface(&impl->IActivationFactory_iface, iid, out); -} - -static ULONG WINAPI installed_voices_static_AddRef( IInstalledVoicesStatic *iface ) -{ - struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface); - return IActivationFactory_AddRef(&impl->IActivationFactory_iface); -} - -static ULONG WINAPI installed_voices_static_Release( IInstalledVoicesStatic *iface ) -{ - struct synthesizer_statics *impl = impl_from_IInstalledVoicesStatic(iface); - return IActivationFactory_Release(&impl->IActivationFactory_iface); -} - -static HRESULT WINAPI installed_voices_static_GetIids( IInstalledVoicesStatic *iface, ULONG *iid_count, IID **iids ) -{ - FIXME("iface %p, iid_count %p, iids %p stub!\n", iface, iid_count, iids); - return E_NOTIMPL; -} - -static HRESULT WINAPI installed_voices_static_GetRuntimeClassName( IInstalledVoicesStatic *iface, HSTRING *class_name ) -{ - FIXME("iface %p, class_name %p stub!\n", iface, class_name); - return E_NOTIMPL; -} - -static HRESULT WINAPI installed_voices_static_GetTrustLevel( IInstalledVoicesStatic *iface, TrustLevel *trust_level ) -{ - FIXME("iface %p, trust_level %p stub!\n", iface, trust_level); - return E_NOTIMPL; -} +DEFINE_IINSPECTABLE(installed_voices_static, IInstalledVoicesStatic, struct synthesizer_statics, IActivationFactory_iface) static HRESULT WINAPI installed_voices_static_get_AllVoices( IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value ) {

1 0

Bernhard Kölbl : windows.media.speech: Simplify QueryInterface functions in synthesizer.c.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 973b8b903e7fe56605b69704636880d609a82d63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=973b8b903e7fe56605b69704… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 15:49:36 2022 +0200 windows.media.speech: Simplify QueryInterface functions in synthesizer.c. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 3b9e9377394..4b158d7e8e4 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -36,14 +36,15 @@ static inline struct voice_information_vector *impl_from_IVectorView_VoiceInform static HRESULT WINAPI vector_view_voice_information_QueryInterface( IVectorView_VoiceInformation *iface, REFIID iid, void **out ) { + struct voice_information_vector *impl = impl_from_IVectorView_VoiceInformation(iface); + TRACE("iface %p, iid %s, out %p stub!\n", iface, debugstr_guid(iid), out); if (IsEqualGUID(iid, &IID_IUnknown) || IsEqualGUID(iid, &IID_IInspectable) || IsEqualGUID(iid, &IID_IVectorView_VoiceInformation)) { - IUnknown_AddRef(iface); - *out = iface; + IInspectable_AddRef((*out = &impl->IVectorView_VoiceInformation_iface)); return S_OK; } @@ -162,22 +163,19 @@ static HRESULT WINAPI synthesizer_QueryInterface( ISpeechSynthesizer *iface, REF IsEqualGUID(iid, &IID_IInspectable) || IsEqualGUID(iid, &IID_ISpeechSynthesizer)) { - IUnknown_AddRef(iface); - *out = iface; + IInspectable_AddRef((*out = &impl->ISpeechSynthesizer_iface)); return S_OK; } if (IsEqualGUID(iid, &IID_ISpeechSynthesizer2)) { - IUnknown_AddRef(iface); - *out = &impl->ISpeechSynthesizer2_iface; + IInspectable_AddRef((*out = &impl->ISpeechSynthesizer2_iface)); return S_OK; } if (IsEqualGUID(iid, &IID_IClosable)) { - IUnknown_AddRef(iface); - *out = &impl->IClosable_iface; + IInspectable_AddRef((*out = &impl->IClosable_iface)); return S_OK; } @@ -345,15 +343,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID IsEqualGUID(iid, &IID_IAgileObject) || IsEqualGUID(iid, &IID_IActivationFactory)) { - IUnknown_AddRef(iface); - *out = iface; + IInspectable_AddRef((*out = &impl->IActivationFactory_iface)); return S_OK; } if (IsEqualGUID(iid, &IID_IInstalledVoicesStatic)) { - IUnknown_AddRef(iface); - *out = &impl->IInstalledVoicesStatic_iface; + IInspectable_AddRef((*out = &impl->IInstalledVoicesStatic_iface)); return S_OK; }

1 0

Bernhard Kölbl : windows.media.speech: Remove some empty lines.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: f5e63aaee9473fac65fa034ff7c6339d56710ed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f5e63aaee9473fac65fa034f… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 15:51:34 2022 +0200 windows.media.speech: Remove some empty lines. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 4b158d7e8e4..7a1a43be889 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -188,9 +188,7 @@ static ULONG WINAPI synthesizer_AddRef( ISpeechSynthesizer *iface ) { struct synthesizer *impl = impl_from_ISpeechSynthesizer(iface); ULONG ref = InterlockedIncrement(&impl->ref); - TRACE("iface %p, ref %lu.\n", iface, ref); - return ref; } @@ -210,21 +208,18 @@ static ULONG WINAPI synthesizer_Release( ISpeechSynthesizer *iface ) static HRESULT WINAPI synthesizer_GetIids( ISpeechSynthesizer *iface, ULONG *iid_count, IID **iids ) { FIXME("iface %p, iid_count %p, iids %p stub.\n", iface, iid_count, iids); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_GetRuntimeClassName( ISpeechSynthesizer *iface, HSTRING *class_name ) { FIXME("iface %p, class_name %p stub.\n", iface, class_name); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_GetTrustLevel( ISpeechSynthesizer *iface, TrustLevel *trust_level ) { FIXME("iface %p, trust_level %p stub.\n", iface, trust_level); - return E_NOTIMPL; } @@ -232,7 +227,6 @@ static HRESULT WINAPI synthesizer_SynthesizeTextToStreamAsync( ISpeechSynthesize IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, text, operation); - return E_NOTIMPL; } @@ -240,21 +234,18 @@ static HRESULT WINAPI synthesizer_SynthesizeSsmlToStreamAsync( ISpeechSynthesize IAsyncOperation_SpeechSynthesisStream **operation ) { FIXME("iface %p, text %p, operation %p stub.\n", iface, ssml, operation); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_put_Voice( ISpeechSynthesizer *iface, IVoiceInformation *value ) { FIXME("iface %p, value %p stub.\n", iface, value); - return E_NOTIMPL; } static HRESULT WINAPI synthesizer_get_Voice( ISpeechSynthesizer *iface, IVoiceInformation **value ) { FIXME("iface %p, value %p stub.\n", iface, value); - return E_NOTIMPL; } @@ -280,7 +271,6 @@ DEFINE_IINSPECTABLE(synthesizer2, ISpeechSynthesizer2, struct synthesizer, ISpee static HRESULT WINAPI synthesizer2_get_Options( ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value ) { FIXME("iface %p, value %p stub.\n", iface, value); - return E_NOTIMPL; }

1 0

Bernhard Kölbl : windows.media.speech: Rename variable out to impl in factory_ActivateInstance.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 7090d6c2160565e8294ccad4ab0c1fc0978e556d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7090d6c2160565e8294ccad4… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 15:59:55 2022 +0200 windows.media.speech: Rename variable out to impl in factory_ActivateInstance. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 7a1a43be889..3aa04ed9fbd 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -384,21 +384,22 @@ static HRESULT WINAPI factory_GetTrustLevel( IActivationFactory *iface, TrustLev static HRESULT WINAPI factory_ActivateInstance( IActivationFactory *iface, IInspectable **instance ) { - struct synthesizer *obj; + struct synthesizer *impl; TRACE("iface %p, instance %p.\n", iface, instance); - if (!(obj = calloc(1, sizeof(*obj)))) + if (!(impl = calloc(1, sizeof(*impl)))) { *instance = NULL; return E_OUTOFMEMORY; } - obj->ISpeechSynthesizer_iface.lpVtbl = &synthesizer_vtbl; - obj->ISpeechSynthesizer2_iface.lpVtbl = &synthesizer2_vtbl; - obj->IClosable_iface.lpVtbl = &closable_vtbl; - obj->ref = 1; - *instance = (IInspectable *)&obj->ISpeechSynthesizer_iface; + impl->ISpeechSynthesizer_iface.lpVtbl = &synthesizer_vtbl; + impl->ISpeechSynthesizer2_iface.lpVtbl = &synthesizer2_vtbl; + impl->IClosable_iface.lpVtbl = &closable_vtbl; + impl->ref = 1; + + *instance = (IInspectable *)&impl->ISpeechSynthesizer_iface; return S_OK; }

1 0

Bernhard Kölbl : windows.media.speech: Add some comments to describe the code regions in synthesizer.c.
by Alexandre Julliard 02 Jun '22

02 Jun '22

Module: wine Branch: master Commit: 2cee81537f4cc0a8dc6b37e23a0f58faaa26b536 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cee81537f4cc0a8dc6b37e2… Author: Bernhard Kölbl <besentv(a)gmail.com> Date: Thu Jun 2 16:09:35 2022 +0200 windows.media.speech: Add some comments to describe the code regions in synthesizer.c. Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com> --- dlls/windows.media.speech/synthesizer.c | 48 +++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/dlls/windows.media.speech/synthesizer.c b/dlls/windows.media.speech/synthesizer.c index 3aa04ed9fbd..e8c9f0a280d 100644 --- a/dlls/windows.media.speech/synthesizer.c +++ b/dlls/windows.media.speech/synthesizer.c @@ -23,6 +23,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(speech); +/* + * + * IVectorView_VoiceInformation + * + */ + struct voice_information_vector { IVectorView_VoiceInformation IVectorView_VoiceInformation_iface; @@ -140,6 +146,12 @@ static struct voice_information_vector all_voices = 0 }; +/* + * + * SpeechSynthesizer runtimeclass + * + */ + struct synthesizer { ISpeechSynthesizer ISpeechSynthesizer_iface; @@ -148,6 +160,12 @@ struct synthesizer LONG ref; }; +/* + * + * ISpeechSynthesizer for SpeechSynthesizer runtimeclass + * + */ + static inline struct synthesizer *impl_from_ISpeechSynthesizer( ISpeechSynthesizer *iface ) { return CONTAINING_RECORD(iface, struct synthesizer, ISpeechSynthesizer_iface); @@ -266,6 +284,12 @@ static const struct ISpeechSynthesizerVtbl synthesizer_vtbl = synthesizer_get_Voice, }; +/* + * + * ISpeechSynthesizer2 for SpeechSynthesizer runtimeclass + * + */ + DEFINE_IINSPECTABLE(synthesizer2, ISpeechSynthesizer2, struct synthesizer, ISpeechSynthesizer_iface) static HRESULT WINAPI synthesizer2_get_Options( ISpeechSynthesizer2 *iface, ISpeechSynthesizerOptions **value ) @@ -288,6 +312,12 @@ static const struct ISpeechSynthesizer2Vtbl synthesizer2_vtbl = synthesizer2_get_Options, }; +/* + * + * IClosable for SpeechSynthesizer runtimeclass + * + */ + DEFINE_IINSPECTABLE(closable, IClosable, struct synthesizer, ISpeechSynthesizer_iface) static HRESULT WINAPI closable_Close( IClosable *iface ) @@ -310,6 +340,12 @@ static const struct IClosableVtbl closable_vtbl = closable_Close, }; +/* + * + * Static interfaces for SpeechSynthesizer runtimeclass + * + */ + struct synthesizer_statics { IActivationFactory IActivationFactory_iface; @@ -317,6 +353,12 @@ struct synthesizer_statics LONG ref; }; +/* + * + * IActivationFactory for SpeechSynthesizer runtimeclass + * + */ + static inline struct synthesizer_statics *impl_from_IActivationFactory( IActivationFactory *iface ) { return CONTAINING_RECORD(iface, struct synthesizer_statics, IActivationFactory_iface); @@ -416,6 +458,12 @@ static const struct IActivationFactoryVtbl factory_vtbl = factory_ActivateInstance, }; +/* + * + * IInstalledVoicesStatic for SpeechSynthesizer runtimeclass + * + */ + DEFINE_IINSPECTABLE(installed_voices_static, IInstalledVoicesStatic, struct synthesizer_statics, IActivationFactory_iface) static HRESULT WINAPI installed_voices_static_get_AllVoices( IInstalledVoicesStatic *iface, IVectorView_VoiceInformation **value )

1 0