June 2023 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : sapi: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 19659409acceae366c04a96c31f3252c44d7b2cd URL: https://gitlab.winehq.org/wine/wine/-/commit/19659409acceae366c04a96c31f325… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 sapi: Remove DECLSPEC_HIDDEN usage. --- dlls/sapi/sapi_private.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/sapi/sapi_private.h b/dlls/sapi/sapi_private.h index d0cd7669623..94046926b2e 100644 --- a/dlls/sapi/sapi_private.h +++ b/dlls/sapi/sapi_private.h @@ -44,12 +44,12 @@ void async_cancel_queue(struct async_queue *queue); HRESULT async_queue_task(struct async_queue *queue, struct async_task *task); void async_wait_queue_empty(struct async_queue *queue, DWORD timeout); -HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT resource_manager_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT speech_stream_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT mmaudio_out_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; -HRESULT token_create( IUnknown *outer, REFIID iid, void **obj ) DECLSPEC_HIDDEN; +HRESULT data_key_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT file_stream_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT resource_manager_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT speech_stream_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT speech_voice_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT mmaudio_out_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT token_category_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT token_enum_create( IUnknown *outer, REFIID iid, void **obj ); +HRESULT token_create( IUnknown *outer, REFIID iid, void **obj );

1 0

Alistair Leslie-Hughes : mfsrcsnk: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 5459f058507abecb22a75c518a91f8b4b9716856 URL: https://gitlab.winehq.org/wine/wine/-/commit/5459f058507abecb22a75c518a91f8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 mfsrcsnk: Remove DECLSPEC_HIDDEN usage. --- dlls/mfsrcsnk/mfsrcsnk_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mfsrcsnk/mfsrcsnk_private.h b/dlls/mfsrcsnk/mfsrcsnk_private.h index 29249d640f8..6654daebbd3 100644 --- a/dlls/mfsrcsnk/mfsrcsnk_private.h +++ b/dlls/mfsrcsnk/mfsrcsnk_private.h @@ -18,4 +18,4 @@ #include "wine/mfinternal.h" -extern HRESULT wave_sink_factory_create(REFIID riid, void **out) DECLSPEC_HIDDEN; +extern HRESULT wave_sink_factory_create(REFIID riid, void **out);

1 0

Alistair Leslie-Hughes : infosoft: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 73c472e5b5f24f4238e734a9df4bda5eff38fd99 URL: https://gitlab.winehq.org/wine/wine/-/commit/73c472e5b5f24f4238e734a9df4bda… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 infosoft: Remove DECLSPEC_HIDDEN usage. --- dlls/infosoft/infosoft_main.c | 2 +- dlls/infosoft/wordbreaker.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/infosoft/infosoft_main.c b/dlls/infosoft/infosoft_main.c index 04f631d7efc..6a109fafb4c 100644 --- a/dlls/infosoft/infosoft_main.c +++ b/dlls/infosoft/infosoft_main.c @@ -37,7 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(infosoft); -DECLSPEC_HIDDEN extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); +extern HRESULT WINAPI wb_Constructor(IUnknown*, REFIID, LPVOID *); typedef HRESULT (CALLBACK *LPFNCREATEINSTANCE)(IUnknown*, REFIID, LPVOID*); diff --git a/dlls/infosoft/wordbreaker.c b/dlls/infosoft/wordbreaker.c index 0b29a6eb2d1..1946bdc6c47 100644 --- a/dlls/infosoft/wordbreaker.c +++ b/dlls/infosoft/wordbreaker.c @@ -181,7 +181,7 @@ static const IWordBreakerVtbl wordbreaker_vtbl = wb_GetLicenseToUse, }; -DECLSPEC_HIDDEN HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) +HRESULT WINAPI wb_Constructor(IUnknown* pUnkOuter, REFIID riid, LPVOID *ppvObject) { wordbreaker_impl *This; IWordBreaker *wb;

1 0

Alistair Leslie-Hughes : msdasql: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 90df243f8e644bccdbd8455417c5838006f2a72f URL: https://gitlab.winehq.org/wine/wine/-/commit/90df243f8e644bccdbd8455417c583… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 msdasql: Remove DECLSPEC_HIDDEN usage. --- dlls/msdasql/msdasql_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_private.h b/dlls/msdasql/msdasql_private.h index 42bb8697030..21b4974cca3 100644 --- a/dlls/msdasql/msdasql_private.h +++ b/dlls/msdasql/msdasql_private.h @@ -16,5 +16,5 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk) DECLSPEC_HIDDEN; -void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) DECLSPEC_HIDDEN; +HRESULT create_db_session(REFIID riid, IUnknown *datasource, HDBC hdbc, void **unk); +void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle);

1 0

Alistair Leslie-Hughes : dpnet/tests: Remove DECLSPEC_HIDDEN usage.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: f934c8879abbacff9c3a9464a2ed24713fb354e7 URL: https://gitlab.winehq.org/wine/wine/-/commit/f934c8879abbacff9c3a9464a2ed24… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 28 18:44:52 2023 +1000 dpnet/tests: Remove DECLSPEC_HIDDEN usage. --- dlls/dpnet/tests/dpnet_test.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dpnet/tests/dpnet_test.h b/dlls/dpnet/tests/dpnet_test.h index 1de25590bdc..aa19c543319 100644 --- a/dlls/dpnet/tests/dpnet_test.h +++ b/dlls/dpnet/tests/dpnet_test.h @@ -24,9 +24,9 @@ enum firewall_op APP_REMOVE }; -extern BOOL is_firewall_enabled(void) DECLSPEC_HIDDEN; -extern BOOL is_process_elevated(void) DECLSPEC_HIDDEN; -extern HRESULT set_firewall( enum firewall_op op ) DECLSPEC_HIDDEN; -extern BOOL is_stub_dll(const char *filename) DECLSPEC_HIDDEN; +extern BOOL is_firewall_enabled(void); +extern BOOL is_process_elevated(void); +extern HRESULT set_firewall( enum firewall_op op ); +extern BOOL is_stub_dll(const char *filename); #endif

1 0

Rémi Bernon : winegstreamer: Keep the caller result in create_object_context.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 5a9450db7f2660b929184164ffba1e9604ac5179 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a9450db7f2660b929184164ffba1e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 19 16:48:10 2023 +0200 winegstreamer: Keep the caller result in create_object_context. --- dlls/winegstreamer/media_source.c | 52 +++++++++++++++------------------------ 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index cc501ce5c59..891961a6ccd 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1779,6 +1779,7 @@ struct create_object_context IUnknown IUnknown_iface; LONG refcount; + IMFAsyncResult *result; IMFByteStream *stream; WCHAR *url; }; @@ -1823,6 +1824,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) if (!refcount) { + IMFAsyncResult_Release(context->result); IMFByteStream_Release(context->stream); free(context->url); free(context); @@ -1843,7 +1845,7 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa { struct stream_handler *handler = impl_from_IMFByteStreamHandler(iface); struct create_object_context *context; - IMFAsyncResult *caller, *item; + IMFAsyncResult *result; HRESULT hr; TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); @@ -1856,12 +1858,12 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (flags != MF_RESOLUTION_MEDIASOURCE) FIXME("Unimplemented flags %#lx\n", flags); - if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &result))) return hr; if (!(context = calloc(1, sizeof(*context)))) { - IMFAsyncResult_Release(caller); + IMFAsyncResult_Release(result); return E_OUTOFMEMORY; } @@ -1869,25 +1871,21 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa context->refcount = 1; context->stream = stream; IMFByteStream_AddRef(context->stream); + context->result = result; + IMFAsyncResult_AddRef(context->result); if (url) context->url = wcsdup(url); - hr = MFCreateAsyncResult(&context->IUnknown_iface, &handler->IMFAsyncCallback_iface, (IUnknown *)caller, &item); + hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_IO, &handler->IMFAsyncCallback_iface, &context->IUnknown_iface); IUnknown_Release(&context->IUnknown_iface); - if (SUCCEEDED(hr)) - { - if (SUCCEEDED(hr = MFPutWorkItemEx(MFASYNC_CALLBACK_QUEUE_IO, item))) - { - if (cancel_cookie) - { - *cancel_cookie = (IUnknown *)caller; - IUnknown_AddRef(*cancel_cookie); - } - } - IMFAsyncResult_Release(item); + if (SUCCEEDED(hr) && cancel_cookie) + { + *cancel_cookie = (IUnknown *)result; + IUnknown_AddRef(*cancel_cookie); } - IMFAsyncResult_Release(caller); + + IMFAsyncResult_Release(result); return hr; } @@ -1983,27 +1981,19 @@ static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *if static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct stream_handler *handler = impl_from_IMFAsyncCallback(iface); - IUnknown *object, *context_object; + IUnknown *object, *state = IMFAsyncResult_GetStateNoAddRef(result); struct create_object_context *context; struct result_entry *entry; - IMFAsyncResult *caller; HRESULT hr; - caller = (IMFAsyncResult *)IMFAsyncResult_GetStateNoAddRef(result); - - if (FAILED(hr = IMFAsyncResult_GetObject(result, &context_object))) - { - WARN("Expected context set for callee result.\n"); - return hr; - } - - context = impl_from_IUnknown(context_object); + if (!state || !(context = impl_from_IUnknown(state))) + return E_INVALIDARG; if (FAILED(hr = media_source_create(context->stream, (IMFMediaSource **)&object))) WARN("Failed to create media source, hr %#lx\n", hr); else { - if (FAILED(hr = result_entry_create(caller, MF_OBJECT_MEDIASOURCE, object, &entry))) + if (FAILED(hr = result_entry_create(context->result, MF_OBJECT_MEDIASOURCE, object, &entry))) WARN("Failed to create handler result, hr %#lx\n", hr); else { @@ -2015,10 +2005,8 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM IUnknown_Release(object); } - IUnknown_Release(&context->IUnknown_iface); - - IMFAsyncResult_SetStatus(caller, hr); - MFInvokeCallback(caller); + IMFAsyncResult_SetStatus(context->result, hr); + MFInvokeCallback(context->result); return S_OK; }

1 0

Rémi Bernon : winegstreamer: Simplify media source creation flags handling.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: cdecf17dd0de27171312408320fb3685a6e22665 URL: https://gitlab.winehq.org/wine/wine/-/commit/cdecf17dd0de27171312408320fb36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 28 09:50:27 2023 +0200 winegstreamer: Simplify media source creation flags handling. --- dlls/winegstreamer/media_source.c | 40 +++++++++++++++------------------------ 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index a5423411096..0fb41c0e8db 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1780,7 +1780,6 @@ struct create_object_context IMFByteStream *stream; WCHAR *url; - DWORD flags; }; static struct create_object_context *impl_from_IUnknown(IUnknown *iface) @@ -1853,6 +1852,9 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (!stream) return E_INVALIDARG; + if (flags != MF_RESOLUTION_MEDIASOURCE) + FIXME("Unimplemented flags %#lx\n", flags); + if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) return hr; @@ -1864,7 +1866,6 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa context->IUnknown_iface.lpVtbl = &create_object_context_vtbl; context->refcount = 1; - context->flags = flags; context->stream = stream; IMFByteStream_AddRef(context->stream); if (url) @@ -1978,37 +1979,27 @@ static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *if return E_NOTIMPL; } -static HRESULT stream_handler_create_object(struct stream_handler *handler, WCHAR *url, IMFByteStream *stream, DWORD flags, - IUnknown **out_object, MF_OBJECT_TYPE *out_obj_type) +static HRESULT stream_handler_create_object(struct stream_handler *handler, WCHAR *url, IMFByteStream *stream, + IUnknown **out_object) { - TRACE("%p, %s, %p, %#lx, %p, %p.\n", handler, debugstr_w(url), stream, flags, out_object, out_obj_type); + HRESULT hr; + struct media_source *new_source; - if (flags & MF_RESOLUTION_MEDIASOURCE) - { - HRESULT hr; - struct media_source *new_source; + TRACE("%p, %s, %p, %p.\n", handler, debugstr_w(url), stream, out_object); - if (FAILED(hr = media_source_constructor(stream, &new_source))) - return hr; + if (FAILED(hr = media_source_constructor(stream, &new_source))) + return hr; - TRACE("->(%p)\n", new_source); + TRACE("->(%p)\n", new_source); - *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; - *out_obj_type = MF_OBJECT_MEDIASOURCE; + *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; - return S_OK; - } - else - { - FIXME("Unhandled flags %#lx.\n", flags); - return E_NOTIMPL; - } + return S_OK; } static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct stream_handler *handler = impl_from_IMFAsyncCallback(iface); - MF_OBJECT_TYPE obj_type = MF_OBJECT_INVALID; IUnknown *object = NULL, *context_object; struct create_object_context *context; struct result_entry *entry; @@ -2025,12 +2016,11 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM context = impl_from_IUnknown(context_object); - if (FAILED(hr = stream_handler_create_object(handler, context->url, context->stream, - context->flags, &object, &obj_type))) + if (FAILED(hr = stream_handler_create_object(handler, context->url, context->stream, &object))) WARN("Failed to create object, hr %#lx\n", hr); else { - if (FAILED(hr = result_entry_create(caller, obj_type, object, &entry))) + if (FAILED(hr = result_entry_create(caller, MF_OBJECT_MEDIASOURCE, object, &entry))) WARN("Failed to create handler result, hr %#lx\n", hr); else {

1 0

Rémi Bernon : winegstreamer: Return a IMFMediaSource from media_source_constructor.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 70efc785d521c5bd15fcb95c7ffae9d0a74df007 URL: https://gitlab.winehq.org/wine/wine/-/commit/70efc785d521c5bd15fcb95c7ffae9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 28 09:52:35 2023 +0200 winegstreamer: Return a IMFMediaSource from media_source_constructor. --- dlls/winegstreamer/media_source.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 0fb41c0e8db..cc501ce5c59 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1520,7 +1520,7 @@ static void media_source_init_descriptors(struct media_source *source) } } -static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_source **out_media_source) +static HRESULT media_source_create(IMFByteStream *bytestream, IMFMediaSource **out) { unsigned int stream_count = UINT_MAX; struct media_source *object; @@ -1622,10 +1622,11 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ media_source_init_descriptors(object); object->state = SOURCE_STOPPED; - *out_media_source = object; + *out = &object->IMFMediaSource_iface; + TRACE("Created IMFMediaSource %p\n", *out); return S_OK; - fail: +fail: WARN("Failed to construct MFMediaSource, hr %#lx.\n", hr); while (object->streams && object->stream_count--) @@ -1979,28 +1980,10 @@ static HRESULT WINAPI stream_handler_callback_GetParameters(IMFAsyncCallback *if return E_NOTIMPL; } -static HRESULT stream_handler_create_object(struct stream_handler *handler, WCHAR *url, IMFByteStream *stream, - IUnknown **out_object) -{ - HRESULT hr; - struct media_source *new_source; - - TRACE("%p, %s, %p, %p.\n", handler, debugstr_w(url), stream, out_object); - - if (FAILED(hr = media_source_constructor(stream, &new_source))) - return hr; - - TRACE("->(%p)\n", new_source); - - *out_object = (IUnknown*)&new_source->IMFMediaSource_iface; - - return S_OK; -} - static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct stream_handler *handler = impl_from_IMFAsyncCallback(iface); - IUnknown *object = NULL, *context_object; + IUnknown *object, *context_object; struct create_object_context *context; struct result_entry *entry; IMFAsyncResult *caller; @@ -2016,8 +1999,8 @@ static HRESULT WINAPI stream_handler_callback_Invoke(IMFAsyncCallback *iface, IM context = impl_from_IUnknown(context_object); - if (FAILED(hr = stream_handler_create_object(handler, context->url, context->stream, &object))) - WARN("Failed to create object, hr %#lx\n", hr); + if (FAILED(hr = media_source_create(context->stream, (IMFMediaSource **)&object))) + WARN("Failed to create media source, hr %#lx\n", hr); else { if (FAILED(hr = result_entry_create(caller, MF_OBJECT_MEDIASOURCE, object, &entry)))

1 0

Hans Leidekker : bcrypt: Add RC4 algorithm stub.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 9742fe8996625c6e9a5876a732de7dd794408987 URL: https://gitlab.winehq.org/wine/wine/-/commit/9742fe8996625c6e9a5876a732de7d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 28 15:48:53 2023 +0200 bcrypt: Add RC4 algorithm stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55160 --- dlls/bcrypt/bcrypt_internal.h | 1 + dlls/bcrypt/bcrypt_main.c | 32 +++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 30 ++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_internal.h b/dlls/bcrypt/bcrypt_internal.h index 98223e90ac6..5dc21484ccb 100644 --- a/dlls/bcrypt/bcrypt_internal.h +++ b/dlls/bcrypt/bcrypt_internal.h @@ -117,6 +117,7 @@ enum alg_id /* cipher */ ALG_ID_3DES, ALG_ID_AES, + ALG_ID_RC4, /* hash */ ALG_ID_SHA256, diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index ca5b934a8d5..2c09f03db9a 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -104,6 +104,7 @@ builtin_algorithms[] = { { BCRYPT_3DES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 522, 0, 0 }, { BCRYPT_AES_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, + { BCRYPT_RC4_ALGORITHM, BCRYPT_CIPHER_INTERFACE, 654, 0, 0 }, { BCRYPT_SHA256_ALGORITHM, BCRYPT_HASH_INTERFACE, 286, 32, 512 }, { BCRYPT_SHA384_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 48, 1024 }, { BCRYPT_SHA512_ALGORITHM, BCRYPT_HASH_INTERFACE, 382, 64, 1024 }, @@ -202,7 +203,7 @@ static const struct algorithm pseudo_algorithms[] = {{ MAGIC_ALG }, ALG_ID_SHA256 }, {{ MAGIC_ALG }, ALG_ID_SHA384 }, {{ MAGIC_ALG }, ALG_ID_SHA512 }, - {{ 0 }}, /* RC4 */ + {{ MAGIC_ALG }, ALG_ID_RC4 }, {{ MAGIC_ALG }, ALG_ID_RNG }, {{ MAGIC_ALG }, ALG_ID_MD5, 0, BCRYPT_ALG_HANDLE_HMAC_FLAG }, {{ MAGIC_ALG }, ALG_ID_SHA1, 0, BCRYPT_ALG_HANDLE_HMAC_FLAG }, @@ -568,6 +569,7 @@ struct hash struct hash_impl inner; }; +#define BLOCK_LENGTH_RC4 1 #define BLOCK_LENGTH_3DES 8 #define BLOCK_LENGTH_AES 16 @@ -708,6 +710,20 @@ static NTSTATUS get_aes_property( enum chain_mode mode, const WCHAR *prop, UCHAR return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS get_rc4_property( enum chain_mode mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) +{ + if (!wcscmp( prop, BCRYPT_BLOCK_LENGTH )) + { + *ret_size = sizeof(ULONG); + if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL; + if (buf) *(ULONG *)buf = BLOCK_LENGTH_RC4; + return STATUS_SUCCESS; + } + + FIXME( "unsupported property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS get_rsa_property( enum chain_mode mode, const WCHAR *prop, UCHAR *buf, ULONG size, ULONG *ret_size ) { if (!wcscmp( prop, BCRYPT_PADDING_SCHEMES )) @@ -746,6 +762,9 @@ static NTSTATUS get_alg_property( const struct algorithm *alg, const WCHAR *prop case ALG_ID_AES: return get_aes_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RC4: + return get_rc4_property( alg->mode, prop, buf, size, ret_size ); + case ALG_ID_RSA: return get_rsa_property( alg->mode, prop, buf, size, ret_size ); @@ -813,6 +832,17 @@ static NTSTATUS set_alg_property( struct algorithm *alg, const WCHAR *prop, UCHA FIXME( "unsupported aes algorithm property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; + case ALG_ID_RC4: + if (!wcscmp( prop, BCRYPT_CHAINING_MODE )) + { + if (!wcscmp( (WCHAR *)value, BCRYPT_CHAIN_MODE_NA )) return STATUS_SUCCESS; + + FIXME( "unsupported mode %s\n", debugstr_w((WCHAR *)value) ); + return STATUS_NOT_IMPLEMENTED; + } + FIXME( "unsupported rc4 algorithm property %s\n", debugstr_w(prop) ); + return STATUS_NOT_IMPLEMENTED; + default: FIXME( "unsupported algorithm %u\n", alg->id ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 4d7277c3152..f58df8bcbbd 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -3561,6 +3561,35 @@ static void test_SecretAgreement(void) ok(status == STATUS_SUCCESS, "got %#lx\n", status); } +static void test_RC4(void) +{ + BCRYPT_ALG_HANDLE alg; + NTSTATUS status; + ULONG len, size; + + status = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RC4_ALGORITHM, NULL, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + + len = size = 0; + status = BCryptGetProperty(alg, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(len, "expected non-zero len\n"); + ok(size == sizeof(len), "got %lu\n", size); + + len = size = 0; + status = BCryptGetProperty(alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); + ok(len == 1, "got %lu\n", len); + ok(size == sizeof(len), "got %lu\n", size); + + size = sizeof(BCRYPT_CHAIN_MODE_NA); + status = BCryptSetProperty(alg, BCRYPT_CHAINING_MODE, (UCHAR *)BCRYPT_CHAIN_MODE_NA, size, 0); + ok(!status, "got %#lx\n", status); + + status = BCryptCloseAlgorithmProvider(alg, 0); + ok(status == STATUS_SUCCESS, "got %#lx\n", status); +} + START_TEST(bcrypt) { HMODULE module; @@ -3597,6 +3626,7 @@ START_TEST(bcrypt) test_DSA(); test_SecretAgreement(); test_rsa_encrypt(); + test_RC4(); FreeLibrary(module); }

1 0

Rémi Bernon : winegstreamer: Return early if no byte stream was provided.
by Alexandre Julliard June 28, 2023

June 28, 2023

Module: wine Branch: master Commit: 929889ac8d4fb079d2d6b7c94b7d693fb62fc986 URL: https://gitlab.winehq.org/wine/wine/-/commit/929889ac8d4fb079d2d6b7c94b7d69… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 6 14:30:39 2023 +0200 winegstreamer: Return early if no byte stream was provided. --- dlls/winegstreamer/media_source.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 985aab8e434..a5423411096 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1823,8 +1823,7 @@ static ULONG WINAPI create_object_context_Release(IUnknown *iface) if (!refcount) { - if (context->stream) - IMFByteStream_Release(context->stream); + IMFByteStream_Release(context->stream); free(context->url); free(context); } @@ -1852,6 +1851,8 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa if (cancel_cookie) *cancel_cookie = NULL; + if (!stream) + return E_INVALIDARG; if (FAILED(hr = MFCreateAsyncResult(NULL, callback, state, &caller))) return hr; @@ -1865,16 +1866,9 @@ static HRESULT WINAPI stream_handler_BeginCreateObject(IMFByteStreamHandler *ifa context->refcount = 1; context->flags = flags; context->stream = stream; - if (context->stream) - IMFByteStream_AddRef(context->stream); + IMFByteStream_AddRef(context->stream); if (url) context->url = wcsdup(url); - if (!context->stream) - { - IMFAsyncResult_Release(caller); - IUnknown_Release(&context->IUnknown_iface); - return E_OUTOFMEMORY; - } hr = MFCreateAsyncResult(&context->IUnknown_iface, &handler->IMFAsyncCallback_iface, (IUnknown *)caller, &item); IUnknown_Release(&context->IUnknown_iface);

1 0