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

Alexandre Julliard : ntdll/tests: Add a few more tests for registry path names.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: a4373db64e9c883c49cf41246d602855d962cb93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4373db64e9c883c49cf4124… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 13:59:43 2022 +0200 ntdll/tests: Add a few more tests for registry path names. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a619241c8e5..a0d07c9fc21 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -412,6 +412,12 @@ static void test_NtOpenKey(void) ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\\\\\" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine + ok( status == STATUS_OBJECT_NAME_INVALID, "NtOpenKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine @@ -425,6 +431,13 @@ static void test_NtOpenKey(void) pNtClose( key ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\\\" ); + status = pNtOpenKey(&key, KEY_READ, &attr); + todo_wine + ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08lx\n", status ); + pNtClose( key ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" ); status = pNtOpenKey(&key, KEY_READ, &attr); todo_wine @@ -493,7 +506,7 @@ static void test_NtCreateKey(void) { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - HANDLE key, subkey; + HANDLE key, subkey, subkey2; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; UNICODE_STRING str; @@ -545,11 +558,20 @@ static void test_NtCreateKey(void) ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\\\subkey" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test\\subkey\\" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_OBJECT_NAME_NOT_FOUND, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey\\" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); @@ -557,6 +579,18 @@ static void test_NtCreateKey(void) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey2\\\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey2\\\\test\\\\" ); + status = pNtCreateKey( &subkey2, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); + pRtlFreeUnicodeString( &str ); + pNtDeleteKey( subkey2 ); + pNtClose( subkey2 ); + pNtDeleteKey( subkey ); + pNtClose( subkey ); + pRtlCreateUnicodeStringFromAsciiz( &str, "test_subkey" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08lx\n", status ); @@ -594,6 +628,14 @@ static void test_NtCreateKey(void) if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry\\\\" ); + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + todo_wine + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed: 0x%08lx\n", status ); + if (!status) pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\Foobar" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); todo_wine

1 0

Alexandre Julliard : ntdll: Fix returned error for NtCreateKey with empty name.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 95ddb7576d13d3b4bb1aa213a045771cb70a3d17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ddb7576d13d3b4bb1aa213… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:03:34 2022 +0200 ntdll: Fix returned error for NtCreateKey with empty name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 1 - dlls/ntdll/unix/registry.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index a0d07c9fc21..e791271ed17 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -603,7 +603,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_OBJECT_PATH_SYNTAX_BAD, "NtCreateKey failed: 0x%08lx\n", status ); pRtlFreeUnicodeString( &str ); diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 8901c350868..47547d42f09 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -81,6 +81,7 @@ NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI *key = 0; if (attr->Length != sizeof(OBJECT_ATTRIBUTES)) return STATUS_INVALID_PARAMETER; + if (!attr->ObjectName->Length && !attr->RootDirectory) return STATUS_OBJECT_PATH_SYNTAX_BAD; if ((ret = alloc_object_attributes( attr, &objattr, &len ))) return ret; TRACE( "(%p,%s,%s,%x,%x,%p)\n", attr->RootDirectory, debugstr_us(attr->ObjectName),

1 0

Alexandre Julliard : server: Return the standard status code when the key exists in NtCreateKey.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 68a69b51bb82541f57b83e7674341a1417f1e8e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68a69b51bb82541f57b83e76… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:18:26 2022 +0200 server: Return the standard status code when the key exists in NtCreateKey. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/registry.c | 12 +++++++++++- include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 - server/registry.c | 10 ++++------ server/request.h | 1 - server/trace.c | 1 - 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c index 47547d42f09..9c98bf48399 100644 --- a/dlls/ntdll/unix/registry.c +++ b/dlls/ntdll/unix/registry.c @@ -95,10 +95,19 @@ NTSTATUS WINAPI NtCreateKey( HANDLE *key, ACCESS_MASK access, const OBJECT_ATTRI if (class) wine_server_add_data( req, class->Buffer, class->Length ); ret = wine_server_call( req ); *key = wine_server_ptr_handle( reply->hkey ); - if (dispos && !ret) *dispos = reply->created ? REG_CREATED_NEW_KEY : REG_OPENED_EXISTING_KEY; } SERVER_END_REQ; + if (ret == STATUS_OBJECT_NAME_EXISTS) + { + if (dispos) *dispos = REG_OPENED_EXISTING_KEY; + ret = STATUS_SUCCESS; + } + else if (ret == STATUS_SUCCESS) + { + if (dispos) *dispos = REG_CREATED_NEW_KEY; + } + TRACE( "<- %p\n", *key ); free( objattr ); return ret; @@ -700,6 +709,7 @@ NTSTATUS WINAPI NtLoadKey( const OBJECT_ATTRIBUTES *attr, OBJECT_ATTRIBUTES *fil req->file = wine_server_obj_handle( key ); wine_server_add_data( req, objattr, len ); ret = wine_server_call( req ); + if (ret == STATUS_OBJECT_NAME_EXISTS) ret = STATUS_SUCCESS; } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ce1b2630f53..0f39333919b 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -2191,7 +2191,7 @@ struct create_key_reply { struct reply_header __header; obj_handle_t hkey; - int created; + char __pad_12[4]; }; @@ -6304,7 +6304,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 752 +#define SERVER_PROTOCOL_VERSION 753 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index a8beccaf468..6cb6275f2f2 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1718,7 +1718,6 @@ struct process_info VARARG(class,unicode_str); /* class name */ @REPLY obj_handle_t hkey; /* handle to the created key */ - int created; /* has it been newly created? */ @END /* Open a registry key */ diff --git a/server/registry.c b/server/registry.c index 70a304a4c86..d3c1e5e7ad1 100644 --- a/server/registry.c +++ b/server/registry.c @@ -803,12 +803,11 @@ static struct key *open_key( struct key *key, const struct unicode_str *name, un static struct key *create_key( struct key *key, const struct unicode_str *name, const struct unicode_str *class, unsigned int options, unsigned int access, unsigned int attributes, - const struct security_descriptor *sd, int *created ) + const struct security_descriptor *sd ) { int index; struct unicode_str token, next; - *created = 0; if (!(key = open_key_prefix( key, name, access, &token, &index ))) return NULL; if (!token.len) /* the key already exists */ @@ -827,6 +826,7 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, if (debug_level > 1) dump_operation( key, NULL, "Open" ); if (key->flags & KEY_PREDEF) set_error( STATUS_PREDEFINED_HANDLE ); grab_object( key ); + set_error( STATUS_OBJECT_NAME_EXISTS ); return key; } @@ -844,7 +844,6 @@ static struct key *create_key( struct key *key, const struct unicode_str *name, set_error( STATUS_CHILD_MUST_BE_VOLATILE ); return NULL; } - *created = 1; make_dirty( key ); if (!(key = alloc_subkey( key, &token, index, current_time ))) return NULL; @@ -2212,7 +2211,7 @@ DECL_HANDLER(create_key) if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { if ((key = create_key( parent, &name, &class, req->options, access, - objattr->attributes, sd, &reply->created ))) + objattr->attributes, sd ))) { reply->hkey = alloc_handle( current->process, key, access, objattr->attributes ); release_object( key ); @@ -2367,8 +2366,7 @@ DECL_HANDLER(load_registry) if ((parent = get_parent_hkey_obj( objattr->rootdir ))) { - int dummy; - if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, sd, &dummy ))) + if ((key = create_key( parent, &name, NULL, 0, KEY_WOW64_64KEY, 0, sd ))) { load_registry( key, req->file ); release_object( key ); diff --git a/server/request.h b/server/request.h index cbb4c5d7a01..dc9c4e82029 100644 --- a/server/request.h +++ b/server/request.h @@ -1174,7 +1174,6 @@ C_ASSERT( FIELD_OFFSET(struct create_key_request, access) == 12 ); C_ASSERT( FIELD_OFFSET(struct create_key_request, options) == 16 ); C_ASSERT( sizeof(struct create_key_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_key_reply, hkey) == 8 ); -C_ASSERT( FIELD_OFFSET(struct create_key_reply, created) == 12 ); C_ASSERT( sizeof(struct create_key_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct open_key_request, parent) == 12 ); C_ASSERT( FIELD_OFFSET(struct open_key_request, access) == 16 ); diff --git a/server/trace.c b/server/trace.c index 4d4789d050a..c3dd1199f06 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2295,7 +2295,6 @@ static void dump_create_key_request( const struct create_key_request *req ) static void dump_create_key_reply( const struct create_key_reply *req ) { fprintf( stderr, " hkey=%04x", req->hkey ); - fprintf( stderr, ", created=%d", req->created ); } static void dump_open_key_request( const struct open_key_request *req )

1 0

Alexandre Julliard : server: Fix access check for NtQueryKey.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: ec8edb66df7fdcfe15c5b8499b95026b9c769189 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec8edb66df7fdcfe15c5b849… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:08:43 2022 +0200 server: Fix access check for NtQueryKey. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 1 - server/registry.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index e791271ed17..242a5b5e898 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2153,7 +2153,6 @@ static void test_NtRenameKey(void) info = (KEY_NAME_INFORMATION *)buffer; status = pNtQueryKey(subkey, KeyNameInformation, info, sizeof(buffer), &size); - todo_wine ok(!status, "Unexpected status %#lx.\n", status); if (status == STATUS_SUCCESS) { diff --git a/server/registry.c b/server/registry.c index 6fe44b4351d..70a304a4c86 100644 --- a/server/registry.c +++ b/server/registry.c @@ -2272,8 +2272,7 @@ DECL_HANDLER(enum_key) { struct key *key; - if ((key = get_hkey_obj( req->hkey, - req->index == -1 ? KEY_QUERY_VALUE : KEY_ENUMERATE_SUB_KEYS ))) + if ((key = get_hkey_obj( req->hkey, req->index == -1 ? 0 : KEY_ENUMERATE_SUB_KEYS ))) { enum_key( key, req->index, req->info_class, reply ); release_object( key );

1 0

Nikolay Sivov : mf/samplegrabber: Consistently check for shutdown flag within a lock.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: ec097bc1b0194c335dc5745cc5963c45d9682743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec097bc1b0194c335dc5745c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 22:05:37 2022 +0300 mf/samplegrabber: Consistently check for shutdown flag within a lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/samplegrabber.c | 48 +++++++++++++++++++++++------------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index f711f6d8c44..2d9f8109aca 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -507,32 +507,29 @@ static HRESULT WINAPI sample_grabber_stream_Flush(IMFStreamSink *iface) { struct sample_grabber *grabber = impl_from_IMFStreamSink(iface); struct scheduled_item *item, *next_item; + HRESULT hr = S_OK; TRACE("%p.\n", iface); - if (grabber->is_shut_down) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&grabber->cs); - LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) + if (grabber->is_shut_down) + hr = MF_E_STREAMSINK_REMOVED; + else { - /* Samples are discarded, markers are processed immediately. */ - switch (item->type) + LIST_FOR_EACH_ENTRY_SAFE(item, next_item, &grabber->items, struct scheduled_item, entry) { - case ITEM_TYPE_SAMPLE: - break; - case ITEM_TYPE_MARKER: + /* Samples are discarded, markers are processed immediately. */ + if (item->type == ITEM_TYPE_MARKER) sample_grabber_stream_report_marker(grabber, &item->u.marker.context, E_ABORT); - break; - } - stream_release_pending_item(item); + stream_release_pending_item(item); + } } LeaveCriticalSection(&grabber->cs); - return S_OK; + return hr; } static const IMFStreamSinkVtbl sample_grabber_stream_vtbl = @@ -924,9 +921,6 @@ static HRESULT WINAPI sample_grabber_sink_GetStreamSinkByIndex(IMFMediaSink *ifa TRACE("%p, %lu, %p.\n", iface, index, stream); - if (grabber->is_shut_down) - return MF_E_SHUTDOWN; - EnterCriticalSection(&grabber->cs); if (grabber->is_shut_down) @@ -1057,18 +1051,22 @@ static HRESULT WINAPI sample_grabber_sink_Shutdown(IMFMediaSink *iface) TRACE("%p.\n", iface); - if (grabber->is_shut_down) - return MF_E_SHUTDOWN; - EnterCriticalSection(&grabber->cs); - grabber->is_shut_down = TRUE; - sample_grabber_release_pending_items(grabber); - if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) + + if (grabber->is_shut_down) + hr = MF_E_SHUTDOWN; + else { - sample_grabber_set_presentation_clock(grabber, NULL); - IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); - IMFMediaEventQueue_Shutdown(grabber->event_queue); + grabber->is_shut_down = TRUE; + sample_grabber_release_pending_items(grabber); + if (SUCCEEDED(hr = IMFSampleGrabberSinkCallback_OnShutdown(sample_grabber_get_callback(grabber)))) + { + sample_grabber_set_presentation_clock(grabber, NULL); + IMFMediaEventQueue_Shutdown(grabber->stream_event_queue); + IMFMediaEventQueue_Shutdown(grabber->event_queue); + } } + LeaveCriticalSection(&grabber->cs); return hr;

1 0

Nikolay Sivov : mf/evr: Consistently check for shutdown flag within a lock.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 5981f2ed735a2a130dcc743ef9bb6d2ab0b33197 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5981f2ed735a2a130dcc743e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 21:55:32 2022 +0300 mf/evr: Consistently check for shutdown flag within a lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/evr.c | 115 +++++++++++++++++++++++++++++++++------------------------- 1 file changed, 66 insertions(+), 49 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index c9506af9143..db7053a1405 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1432,38 +1432,43 @@ static HRESULT WINAPI video_renderer_sink_GetPresentationClock(IMFMediaSink *ifa static HRESULT WINAPI video_renderer_sink_Shutdown(IMFMediaSink *iface) { struct video_renderer *renderer = impl_from_IMFMediaSink(iface); + HRESULT hr = S_OK; size_t i; TRACE("%p.\n", iface); - if (renderer->flags & EVR_SHUT_DOWN) - return MF_E_SHUTDOWN; - EnterCriticalSection(&renderer->cs); - renderer->flags |= EVR_SHUT_DOWN; - /* Detach streams from the sink. */ - for (i = 0; i < renderer->stream_count; ++i) + + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else { - struct video_stream *stream = renderer->streams[i]; + renderer->flags |= EVR_SHUT_DOWN; + /* Detach streams from the sink. */ + for (i = 0; i < renderer->stream_count; ++i) + { + struct video_stream *stream = renderer->streams[i]; - EnterCriticalSection(&stream->cs); - stream->parent = NULL; - LeaveCriticalSection(&stream->cs); + EnterCriticalSection(&stream->cs); + stream->parent = NULL; + LeaveCriticalSection(&stream->cs); - IMFMediaEventQueue_Shutdown(stream->event_queue); - IMFStreamSink_Release(&stream->IMFStreamSink_iface); - IMFMediaSink_Release(iface); - renderer->streams[i] = NULL; + IMFMediaEventQueue_Shutdown(stream->event_queue); + IMFStreamSink_Release(&stream->IMFStreamSink_iface); + IMFMediaSink_Release(iface); + renderer->streams[i] = NULL; + } + free(renderer->streams); + renderer->stream_count = 0; + renderer->stream_size = 0; + IMFMediaEventQueue_Shutdown(renderer->event_queue); + video_renderer_set_presentation_clock(renderer, NULL); + video_renderer_release_services(renderer); } - free(renderer->streams); - renderer->stream_count = 0; - renderer->stream_size = 0; - IMFMediaEventQueue_Shutdown(renderer->event_queue); - video_renderer_set_presentation_clock(renderer, NULL); - video_renderer_release_services(renderer); + LeaveCriticalSection(&renderer->cs); - return S_OK; + return hr; } static const IMFMediaSinkVtbl video_renderer_sink_vtbl = @@ -1742,52 +1747,64 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra return hr; } -static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, - IMFVideoPresenter *presenter) +static HRESULT video_renderer_create_mixer_and_presenter(struct video_renderer *renderer, + IMFTransform **mixer, IMFVideoPresenter **presenter) { - struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); HRESULT hr; - TRACE("%p, %p, %p.\n", iface, mixer, presenter); - - EnterCriticalSection(&renderer->cs); - - if (renderer->flags & EVR_SHUT_DOWN) + if (*mixer) { - LeaveCriticalSection(&renderer->cs); - return MF_E_SHUTDOWN; + IMFTransform_AddRef(*mixer); } - - video_renderer_uninitialize(renderer); - - if (mixer) - IMFTransform_AddRef(mixer); - else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer))) + else if (FAILED(hr = video_renderer_create_mixer(NULL, mixer))) { WARN("Failed to create default mixer object, hr %#lx.\n", hr); - LeaveCriticalSection(&renderer->cs); return hr; } - if (presenter) - IMFVideoPresenter_AddRef(presenter); - else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter))) + if (*presenter) + { + IMFVideoPresenter_AddRef(*presenter); + } + else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, presenter))) { WARN("Failed to create default presenter, hr %#lx.\n", hr); - LeaveCriticalSection(&renderer->cs); - IMFTransform_Release(mixer); + IMFTransform_Release(*mixer); return hr; } - /* FIXME: check clock state */ - /* FIXME: check that streams are not initialized */ + return S_OK; +} - hr = video_renderer_initialize(renderer, mixer, presenter); +static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + struct video_renderer *renderer = impl_from_IMFVideoRenderer(iface); + HRESULT hr; - LeaveCriticalSection(&renderer->cs); + TRACE("%p, %p, %p.\n", iface, mixer, presenter); - IMFTransform_Release(mixer); - IMFVideoPresenter_Release(presenter); + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + hr = MF_E_SHUTDOWN; + else + { + video_renderer_uninitialize(renderer); + + if (SUCCEEDED(hr = video_renderer_create_mixer_and_presenter(renderer, &mixer, &presenter))) + { + /* FIXME: check clock state */ + /* FIXME: check that streams are not initialized */ + + hr = video_renderer_initialize(renderer, mixer, presenter); + + IMFTransform_Release(mixer); + IMFVideoPresenter_Release(presenter); + } + } + + LeaveCriticalSection(&renderer->cs); return hr; }

1 0

Rémi Bernon : winegstreamer: Fix ColorConvert transform GetCurrent(Input|Output)Type.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: a3b3708134a8956c79929764df7271b2a153f5f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3b3708134a8956c79929764… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 29 23:13:45 2022 +0200 winegstreamer: Fix ColorConvert transform GetCurrent(Input|Output)Type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winegstreamer/color_convert.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 66a86aa4602..b47832b2c30 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -466,7 +466,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { struct color_convert *impl = impl_from_IMFTransform(iface); - IMFMediaType *ret; HRESULT hr; TRACE("iface %p, id %#lx, type %p.\n", iface, id, type); @@ -477,16 +476,18 @@ static HRESULT WINAPI transform_GetInputCurrentType(IMFTransform *iface, DWORD i if (!impl->input_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = MFCreateMediaType(&ret))) + if (FAILED(hr = MFCreateMediaType(type))) return hr; - return IMFMediaType_CopyAllItems(impl->input_type, (IMFAttributes *)ret); + if (FAILED(hr = IMFMediaType_CopyAllItems(impl->input_type, (IMFAttributes *)*type))) + IMFMediaType_Release(*type); + + return hr; } static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD id, IMFMediaType **type) { struct color_convert *impl = impl_from_IMFTransform(iface); - IMFMediaType *ret; HRESULT hr; TRACE("iface %p, id %#lx, type %p.\n", iface, id, type); @@ -497,10 +498,13 @@ static HRESULT WINAPI transform_GetOutputCurrentType(IMFTransform *iface, DWORD if (!impl->output_type) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = MFCreateMediaType(&ret))) + if (FAILED(hr = MFCreateMediaType(type))) return hr; - return IMFMediaType_CopyAllItems(impl->output_type, (IMFAttributes *)ret); + if (FAILED(hr = IMFMediaType_CopyAllItems(impl->output_type, (IMFAttributes *)*type))) + IMFMediaType_Release(*type); + + return hr; } static HRESULT WINAPI transform_GetInputStatus(IMFTransform *iface, DWORD id, DWORD *flags)

1 0

Zebediah Figura : wineusb.sys: Remove devices through the event thread.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 4ed25028052a8e40a065cdf1aacf418083ccadeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ed25028052a8e40a065cdf1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 24 18:39:08 2022 -0500 wineusb.sys: Remove devices through the event thread. --- dlls/wineusb.sys/wineusb.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index b3d14e91839..b8bcb816e95 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -113,12 +113,18 @@ static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; enum usb_event_type { + USB_EVENT_REMOVE_DEVICE, USB_EVENT_SHUTDOWN, }; struct usb_event { enum usb_event_type type; + + union + { + struct unix_device *removed_device; + } u; }; static struct usb_event *usb_events; @@ -348,13 +354,18 @@ static void remove_unix_device(struct unix_device *unix_device) static void remove_usb_device(libusb_device *libusb_device) { struct unix_device *unix_device; + struct usb_event usb_event; TRACE("Removing device %p.\n", libusb_device); LIST_FOR_EACH_ENTRY(unix_device, &unix_device_list, struct unix_device, entry) { if (libusb_get_device(unix_device->handle) == libusb_device) - remove_unix_device(unix_device); + { + usb_event.type = USB_EVENT_REMOVE_DEVICE; + usb_event.u.removed_device = unix_device; + queue_event(&usb_event); + } } } @@ -403,6 +414,11 @@ static DWORD CALLBACK event_thread_proc(void *arg) switch (event.type) { + case USB_EVENT_REMOVE_DEVICE: + TRACE("Got remove event for device %p.\n", event.u.removed_device); + remove_unix_device(event.u.removed_device); + break; + case USB_EVENT_SHUTDOWN: TRACE("Shutting down client event thread.\n"); return 0;

1 0

Zebediah Figura : wineusb.sys: Spawn a separate thread to consume Unix library events.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: 443489709654cf19e3a34216db33bcf62cd9cd62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=443489709654cf19e3a34216… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 11 18:43:23 2022 -0500 wineusb.sys: Spawn a separate thread to consume Unix library events. --- dlls/wineusb.sys/wineusb.c | 99 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index cfa88616a8f..b3d14e91839 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -20,6 +20,7 @@ #include <assert.h> #include <stdarg.h> +#include <stdbool.h> #include <stdlib.h> #include <pthread.h> #include <libusb.h> @@ -107,6 +108,71 @@ static DEVICE_OBJECT *bus_fdo, *bus_pdo; static libusb_hotplug_callback_handle hotplug_cb_handle; +static pthread_cond_t event_cond = PTHREAD_COND_INITIALIZER; +static pthread_mutex_t event_mutex = PTHREAD_MUTEX_INITIALIZER; + +enum usb_event_type +{ + USB_EVENT_SHUTDOWN, +}; + +struct usb_event +{ + enum usb_event_type type; +}; + +static struct usb_event *usb_events; +static size_t usb_event_count, usb_events_capacity; + +static bool array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + unsigned int new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return true; + + max_capacity = ~(size_t)0 / size; + if (count > max_capacity) + return false; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = realloc(*elements, new_capacity * size))) + return false; + + *elements = new_elements; + *capacity = new_capacity; + + return true; +} + +static void queue_event(const struct usb_event *event) +{ + pthread_mutex_lock(&event_mutex); + if (array_reserve((void **)&usb_events, &usb_events_capacity, usb_event_count + 1, sizeof(*usb_events))) + usb_events[usb_event_count++] = *event; + else + ERR("Failed to queue event.\n"); + pthread_mutex_unlock(&event_mutex); + pthread_cond_signal(&event_cond); +} + +static void get_event(struct usb_event *event) +{ + pthread_mutex_lock(&event_mutex); + while (!usb_event_count) + pthread_cond_wait(&event_cond, &event_mutex); + *event = usb_events[0]; + if (--usb_event_count) + memmove(usb_events, usb_events + 1, usb_event_count * sizeof(*usb_events)); + pthread_mutex_unlock(&event_mutex); +} + static void destroy_unix_device(struct unix_device *unix_device) { pthread_mutex_lock(&unix_device_mutex); @@ -293,7 +359,7 @@ static void remove_usb_device(libusb_device *libusb_device) } static BOOL thread_shutdown; -static HANDLE event_thread; +static HANDLE libusb_event_thread, event_thread; static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device, libusb_hotplug_event event, void *user_data) @@ -306,11 +372,12 @@ static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device return 0; } -static DWORD CALLBACK event_thread_proc(void *arg) +static DWORD CALLBACK libusb_event_thread_proc(void *arg) { + static const struct usb_event shutdown_event = {.type = USB_EVENT_SHUTDOWN}; int ret; - TRACE("Starting event thread.\n"); + TRACE("Starting libusb event thread.\n"); while (!thread_shutdown) { @@ -318,10 +385,31 @@ static DWORD CALLBACK event_thread_proc(void *arg) ERR("Error handling events: %s\n", libusb_strerror(ret)); } - TRACE("Shutting down event thread.\n"); + queue_event(&shutdown_event); + + TRACE("Shutting down libusb event thread.\n"); return 0; } +static DWORD CALLBACK event_thread_proc(void *arg) +{ + struct usb_event event; + + TRACE("Starting client event thread.\n"); + + for (;;) + { + get_event(&event); + + switch (event.type) + { + case USB_EVENT_SHUTDOWN: + TRACE("Shutting down client event thread.\n"); + return 0; + } + } +} + static NTSTATUS fdo_pnp(IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); @@ -391,6 +479,8 @@ static NTSTATUS fdo_pnp(IRP *irp) libusb_hotplug_deregister_callback(NULL, hotplug_cb_handle); thread_shutdown = TRUE; libusb_interrupt_event_handler(NULL); + WaitForSingleObject(libusb_event_thread, INFINITE); + CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE); CloseHandle(event_thread); @@ -1007,6 +1097,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) return STATUS_UNSUCCESSFUL; } + libusb_event_thread = CreateThread(NULL, 0, libusb_event_thread_proc, NULL, 0, NULL); event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); driver->DriverExtension->AddDevice = driver_add_device;

1 0

Rémi Bernon : mf/tests: Add more MFGetTopoNodeCurrentType tests.
by Alexandre Julliard July 5, 2022

July 5, 2022

Module: wine Branch: master Commit: b43e4a54e2ab646570bc2a08d0ebccd6e15e245b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b43e4a54e2ab646570bc2a08… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 08:48:23 2022 +0200 mf/tests: Add more MFGetTopoNodeCurrentType tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 351 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 321 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b43e4a54e2ab646570bc…

1 0