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

Alexandre Julliard : server: Prevent infinite symlink recursion in lookup_named_object().
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 9c551448cbfb0627abd2fdd332f511dbe2de4201 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c551448cbfb0627abd2fdd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 14:33:55 2022 +0200 server: Prevent infinite symlink recursion in lookup_named_object(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/object.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/object.c b/server/object.c index 5bb999d1fc7..333f9e7b5d6 100644 --- a/server/object.c +++ b/server/object.c @@ -233,6 +233,7 @@ static void free_object( struct object *obj ) struct object *lookup_named_object( struct object *root, const struct unicode_str *name, unsigned int attr, struct unicode_str *name_left ) { + static int recursion_count; struct object *obj, *parent; struct unicode_str name_tmp = *name, *ptr = &name_tmp; @@ -261,6 +262,13 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st if (!name_tmp.len) ptr = NULL; /* special case for empty path */ + if (recursion_count > 32) + { + set_error( STATUS_INVALID_PARAMETER ); + release_object( parent ); + return NULL; + } + recursion_count++; clear_error(); while ((obj = parent->ops->lookup_name( parent, ptr, attr, root ))) @@ -269,6 +277,8 @@ struct object *lookup_named_object( struct object *root, const struct unicode_st release_object ( parent ); parent = obj; } + + recursion_count--; if (get_error()) { release_object( parent );

1 0

Alexander Wilms : ntoskrnl: Add KeQueryPriorityThread stub.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 1a2aa0b0be155b7045a60c691cb241e4496ac29b URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a2aa0b0be155b7045a60c69… Author: Alexander Wilms <f.alexander.wilms(a)gmail.com> Date: Sun Jul 3 14:38:49 2022 +0200 ntoskrnl: Add KeQueryPriorityThread stub. Signed-off-by: Alexander Wilms <f.alexander.wilms(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f3495796e23..085d0eebaef 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2607,6 +2607,15 @@ ULONGLONG WINAPI KeQueryInterruptTime( void ) return totaltime.QuadPart; } +/*********************************************************************** + * KeQueryPriorityThread (NTOSKRNL.EXE.@) + */ +KPRIORITY WINAPI KeQueryPriorityThread( PKTHREAD Thread ) +{ + FIXME("(%p): stub.\n", Thread); + /* priority must be a value between 0 and 31 */ + return 15; +} /*********************************************************************** * KeQuerySystemTime (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 8ae4bc1f5a9..8b0ee1c4b51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -597,7 +597,7 @@ @ stdcall KeQueryActiveProcessors() @ stdcall KeQueryActiveProcessorCountEx(long) @ stdcall KeQueryInterruptTime() -@ stub KeQueryPriorityThread +@ stdcall KeQueryPriorityThread(ptr) @ stub KeQueryRuntimeThread @ stdcall KeQuerySystemTime(ptr) @ stdcall KeQueryTickCount(ptr)

1 0

Jan Sikorski : wined3d: Add missing copy offset in wined3d_texture_vk_upload_data().
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 4c96a51bdb423793416132430de7e02e6f76c755 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c96a51bdb42379341613243… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Jul 5 12:54:21 2022 +0200 wined3d: Add missing copy offset in wined3d_texture_vk_upload_data(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53307 Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 224252c7f73..a8756f899d7 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5014,7 +5014,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, return; } - wined3d_format_copy_data(src_format, src_bo_addr->addr, src_row_pitch, src_slice_pitch, + wined3d_format_copy_data(src_format, src_bo_addr->addr + src_offset, src_row_pitch, src_slice_pitch, map_ptr, staging_row_pitch, staging_slice_pitch, src_width, src_height, src_depth); range.offset = 0;

1 0

Nikolay Sivov : wmic: Handle properly list for GET verb.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: a2f8f5f93f85a8ab162c909c720f447464820ab5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2f8f5f93f85a8ab162c909c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 18:41:08 2022 +0300 wmic: Handle properly list for GET verb. Instead of querying all properties and then matching to requested one, first check if all requested properties are supported by given class. Then select just that subset. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wmic/main.c | 176 +++++++++++++++++++++++++++++++++------------------ 1 file changed, 116 insertions(+), 60 deletions(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 15b590098e7..cfc20e45ffd 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -61,34 +61,14 @@ static const WCHAR *find_class( const WCHAR *alias ) return NULL; } -static WCHAR *find_prop( IWbemClassObject *class, const WCHAR *prop ) -{ - SAFEARRAY *sa; - WCHAR *ret = NULL; - LONG i, last_index = 0; - BSTR str; - - if (IWbemClassObject_GetNames( class, NULL, WBEM_FLAG_ALWAYS, NULL, &sa ) != S_OK) return NULL; - - SafeArrayGetUBound( sa, 1, &last_index ); - for (i = 0; i <= last_index; i++) - { - SafeArrayGetElement( sa, &i, &str ); - if (!wcsicmp( str, prop )) - { - ret = wcsdup( str ); - break; - } - } - SafeArrayDestroy( sa ); - return ret; -} - static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) { + BOOL output = GetStdHandle(STD_OUTPUT_HANDLE) == handle; + static const WCHAR bomW[] = {0xfeff}; + static BOOL bom; va_list va_args; int len; - DWORD count; + DWORD count, bom_count = 0; WCHAR buffer[8192]; va_start( va_args, msg ); @@ -96,9 +76,16 @@ static int WINAPIV output_string( HANDLE handle, const WCHAR *msg, ... ) va_end( va_args ); if (!WriteConsoleW( handle, buffer, len, &count, NULL )) + { + if (output && !bom) + { + WriteFile( handle, bomW, sizeof(bomW), &bom_count, FALSE ); + bom = TRUE; + } WriteFile( handle, buffer, len * sizeof(WCHAR), &count, FALSE ); + } - return count; + return count + bom_count; } static int output_error( int msg ) @@ -109,46 +96,90 @@ static int output_error( int msg ) return output_string( GetStdHandle(STD_ERROR_HANDLE), L"%s", buffer ); } -static int output_header( const WCHAR *prop, ULONG column_width ) +static int output_text( const WCHAR *str, ULONG column_width ) { - static const WCHAR bomW[] = {0xfeff}; - int len; - DWORD count; - WCHAR buffer[8192]; + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"%-*s", column_width, str ); +} - len = swprintf( buffer, ARRAY_SIZE(buffer), L"%-*s\r\n", column_width, prop ); +static int output_newline( void ) +{ + return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"\r\n" ); +} - if (!WriteConsoleW( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len, &count, NULL )) /* redirected */ +static WCHAR * strip_spaces(WCHAR *start) +{ + WCHAR *str = start, *end; + + while (*str == ' ') + str++; + + end = start + lstrlenW(start) - 1; + while (end >= start && *end == ' ') { - WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), bomW, sizeof(bomW), &count, FALSE ); - WriteFile( GetStdHandle(STD_OUTPUT_HANDLE), buffer, len * sizeof(WCHAR), &count, FALSE ); - count += sizeof(bomW); + *end = '\0'; + end--; } - return count; + return str; } -static int output_line( const WCHAR *str, ULONG column_width ) +static HRESULT process_property_list( IWbemClassObject *obj, const WCHAR *proplist, WCHAR **ret ) { - return output_string( GetStdHandle(STD_OUTPUT_HANDLE), L"%-*s\r\n", column_width, str ); + WCHAR *p, *ctx, *ptr, *stripped; + HRESULT hr = S_OK; + + if (!(p = wcsdup( proplist ))) return E_OUTOFMEMORY; + + if (!(stripped = malloc( (wcslen( proplist ) + 1) * sizeof(**ret) ))) + { + free( p ); + return E_OUTOFMEMORY; + } + *stripped = 0; + + /* Validate that every requested property is supported. */ + ptr = wcstok_s( p, L",", &ctx ); + while (ptr) + { + ptr = strip_spaces( ptr ); + + if (FAILED(IWbemClassObject_Get( obj, ptr, 0, NULL, NULL, NULL ))) + { + hr = E_FAIL; + break; + } + if (*stripped) wcscat( stripped, L"," ); + wcscat( stripped, ptr ); + ptr = wcstok_s( NULL, L",", &ctx ); + } + free( p ); + + if (SUCCEEDED(hr)) + *ret = stripped; + else + { + free( stripped ); + *ret = NULL; + } + + return hr; } -static int query_prop( const WCHAR *class, const WCHAR *propname ) +static int query_prop( const WCHAR *class, const WCHAR *propnames ) { HRESULT hr; IWbemLocator *locator = NULL; IWbemServices *services = NULL; IEnumWbemClassObject *result = NULL; LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY; - BSTR path = NULL, wql = NULL, query = NULL; - WCHAR *prop = NULL; - BOOL first = TRUE; + BSTR path = NULL, wql = NULL, query = NULL, name, str = NULL; + WCHAR *proplist = NULL; int len, ret = -1; IWbemClassObject *obj; ULONG count, width = 0; VARIANT v; - WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propname)); + WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propnames)); CoInitialize( NULL ); CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT, @@ -162,10 +193,27 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) hr = IWbemLocator_ConnectServer( locator, path, NULL, NULL, NULL, 0, NULL, NULL, &services ); if (hr != S_OK) goto done; - len = lstrlenW( class ) + ARRAY_SIZE(L"SELECT * FROM "); + if (!(str = SysAllocString( class ))) goto done; + hr = IWbemServices_GetObject( services, str, 0, NULL, &obj, NULL ); + SysFreeString( str ); + if (hr != S_OK) + { + WARN("Unrecognized class %s.\n", debugstr_w(class)); + goto done; + } + + /* Check that this class supports all requested properties. */ + hr = process_property_list( obj, propnames, &proplist ); + IWbemClassObject_Release( obj ); + if (FAILED(hr)) + { + output_error( STRING_INVALID_QUERY ); + goto done; + } + + len = lstrlenW( class ) + lstrlenW( proplist ) + ARRAY_SIZE(L"SELECT * FROM "); if (!(query = SysAllocStringLen( NULL, len ))) goto done; - lstrcpyW( query, L"SELECT * FROM " ); - lstrcatW( query, class ); + swprintf( query, len, L"SELECT %s FROM %s", proplist, class ); if (!(wql = SysAllocString(L"WQL" ))) goto done; hr = IWbemServices_ExecQuery( services, wql, query, flags, NULL, &result ); @@ -176,38 +224,46 @@ static int query_prop( const WCHAR *class, const WCHAR *propname ) IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; - if (!prop && !(prop = find_prop( obj, propname ))) - { - output_error( STRING_INVALID_QUERY ); - goto done; - } - if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) + while (IWbemClassObject_Next( obj, 0, &name, &v, NULL, NULL ) == S_OK) { VariantChangeType( &v, &v, 0, VT_BSTR ); width = max( lstrlenW( V_BSTR( &v ) ), width ); VariantClear( &v ); + SysFreeString( name ); } + IWbemClassObject_Release( obj ); } width += 2; + /* Header */ + IEnumWbemClassObject_Reset( result ); + IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); + if (count) + { + while (IWbemClassObject_Next( obj, 0, &name, NULL, NULL, NULL ) == S_OK) + { + output_text( name, width ); + SysFreeString( name ); + } + output_newline(); + IWbemClassObject_Release( obj ); + } + + /* Values */ IEnumWbemClassObject_Reset( result ); for (;;) { IEnumWbemClassObject_Next( result, WBEM_INFINITE, 1, &obj, &count ); if (!count) break; - if (first) - { - output_header( prop, width ); - first = FALSE; - } - if (IWbemClassObject_Get( obj, prop, 0, &v, NULL, NULL ) == WBEM_S_NO_ERROR) + while (IWbemClassObject_Next( obj, 0, NULL, &v, NULL, NULL ) == S_OK) { VariantChangeType( &v, &v, 0, VT_BSTR ); - output_line( V_BSTR( &v ), width ); + output_text( V_BSTR( &v ), width ); VariantClear( &v ); } + output_newline(); IWbemClassObject_Release( obj ); } ret = 0; @@ -219,7 +275,7 @@ done: SysFreeString( path ); SysFreeString( query ); SysFreeString( wql ); - free( prop ); + free( proplist ); CoUninitialize(); return ret; }

1 0

Dmitry Timoshkov : d2d1/tests: Fix compilation with clang.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 3f36d7e25b1668685493caffb319f34f8b84bacb URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f36d7e25b1668685493caff… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jul 5 08:27:54 2022 +0300 d2d1/tests: Fix compilation with clang. ../wine.src/dlls/d2d1/tests/d2d1.c:11078:11: error: cannot combine with previous 'type-name' declaration specifier INT32 _int32; ^ ../wine.src/dlls/d2d1/tests/d2d1.c:11078:5: warning: declaration does not declare anything [-Wmissing-declarations] INT32 _int32; ^~~~~~~~~~~~ Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 1a964475168..3a38d593625 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -11082,7 +11082,7 @@ static void test_effect_properties(BOOL d3d11) UINT32 count, data; WCHAR buffer[128]; float mat[20]; - INT32 _int32; + INT32 val; CLSID clsid; BOOL cached; HRESULT hr; @@ -11181,9 +11181,9 @@ static void test_effect_properties(BOOL d3d11) ok(!wcscmp(buffer, L"Int32Prop"), "Unexpected name %s.\n", wine_dbgstr_w(buffer)); prop_type = ID2D1Effect_GetType(effect, index); ok(prop_type == D2D1_PROPERTY_TYPE_INT32, "Unexpected type %u.\n", prop_type); - hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&_int32, sizeof(_int32)); + hr = ID2D1Effect_GetValue(effect, index, D2D1_PROPERTY_TYPE_INT32, (BYTE *)&val, sizeof(val)); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); - ok(_int32 == -2, "Unexpected value %d.\n", _int32); + ok(val == -2, "Unexpected value %d.\n", val); /* UInt32 property. */ index = ID2D1Effect_GetPropertyIndex(effect, L"UInt32Prop");

1 0

Tim Clem : mountmgr.sys: Always set the return size from dhcp_request implementations.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 6c465ae8efeecc7580629dc8a9c26198b743c2da URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c465ae8efeecc7580629dc8… Author: Tim Clem <tclem(a)codeweavers.com> Date: Tue Jul 5 10:41:32 2022 -0700 mountmgr.sys: Always set the return size from dhcp_request implementations. Also return STATUS_SUCCESS rather than 0 in early-out cases. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- dlls/mountmgr.sys/dbus.c | 3 ++- dlls/mountmgr.sys/diskarb.c | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 81c9f89d246..051f735b219 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -777,8 +777,9 @@ NTSTATUS dhcp_request( void *args ) ULONG ret = 0; params->req->offset = params->req->size = 0; + *params->ret_size = 0; - if (!(reply = dhcp4_config_option_request( params->unix_name, map_option(params->req->id), &value ))) return 0; + if (!(reply = dhcp4_config_option_request( params->unix_name, map_option(params->req->id), &value ))) return STATUS_SUCCESS; switch (params->req->id) { diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 462ff82c691..4bcd72c8916 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -293,18 +293,19 @@ NTSTATUS dhcp_request( void *args ) params->req->offset = 0; params->req->size = 0; + *params->ret_size = 0; if (!service_id) return 0; if (!(dict = SCDynamicStoreCopyDHCPInfo( NULL, service_id ))) { CFRelease( service_id ); - return 0; + return STATUS_SUCCESS; } CFRelease( service_id ); if (!(value = DHCPInfoGetOptionData( dict, map_option(params->req->id) ))) { CFRelease( dict ); - return 0; + return STATUS_SUCCESS; } len = CFDataGetLength( value );

1 0

Nikolay Sivov : mf/evr: Consistently check for shutdown flag within a lock.
by Alexandre Julliard 05 Jul '22

05 Jul '22

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

Nikolay Sivov : mf/sar: Consistently check for shutdown flag within a lock.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: 568b4bc902857a4c1666fb5e83c85c1d4b2e1a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=568b4bc902857a4c1666fb5e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 4 22:00:46 2022 +0300 mf/sar: Consistently check for shutdown flag within a lock. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/sar.c | 52 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 31 insertions(+), 21 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 33040be3ed0..5504cc17472 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -451,21 +451,26 @@ static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *ifa static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) { struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); + HRESULT hr = S_OK; TRACE("%p.\n", iface); + EnterCriticalSection(&renderer->cs); + if (renderer->flags & SAR_SHUT_DOWN) - return MF_E_SHUTDOWN; + hr = MF_E_SHUTDOWN; + else + { + renderer->flags |= SAR_SHUT_DOWN; + IMFMediaEventQueue_Shutdown(renderer->event_queue); + IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); + audio_renderer_set_presentation_clock(renderer, NULL); + audio_renderer_release_audio_client(renderer); + } - EnterCriticalSection(&renderer->cs); - renderer->flags |= SAR_SHUT_DOWN; - IMFMediaEventQueue_Shutdown(renderer->event_queue); - IMFMediaEventQueue_Shutdown(renderer->stream_event_queue); - audio_renderer_set_presentation_clock(renderer, NULL); - audio_renderer_release_audio_client(renderer); LeaveCriticalSection(&renderer->cs); - return S_OK; + return hr; } static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = @@ -1364,19 +1369,22 @@ static HRESULT WINAPI audio_renderer_stream_ProcessSample(IMFStreamSink *iface, if (!sample) return E_POINTER; - if (renderer->flags & SAR_SHUT_DOWN) - return MF_E_STREAMSINK_REMOVED; - EnterCriticalSection(&renderer->cs); - if (renderer->state == STREAM_STATE_RUNNING) - hr = stream_queue_sample(renderer, sample); - renderer->flags &= ~SAR_SAMPLE_REQUESTED; - - if (renderer->queued_frames < renderer->max_frames && renderer->state == STREAM_STATE_RUNNING) + if (renderer->flags & SAR_SHUT_DOWN) + hr = MF_E_STREAMSINK_REMOVED; + else { - IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, &GUID_NULL, S_OK, NULL); - renderer->flags |= SAR_SAMPLE_REQUESTED; + if (renderer->state == STREAM_STATE_RUNNING) + hr = stream_queue_sample(renderer, sample); + renderer->flags &= ~SAR_SAMPLE_REQUESTED; + + if (renderer->queued_frames < renderer->max_frames && renderer->state == STREAM_STATE_RUNNING) + { + IMFMediaEventQueue_QueueEventParamVar(renderer->stream_event_queue, MEStreamSinkRequestSample, + &GUID_NULL, S_OK, NULL); + renderer->flags |= SAR_SAMPLE_REQUESTED; + } } LeaveCriticalSection(&renderer->cs); @@ -1414,11 +1422,13 @@ static HRESULT WINAPI audio_renderer_stream_PlaceMarker(IMFStreamSink *iface, MF TRACE("%p, %d, %p, %p.\n", iface, marker_type, marker_value, context_value); + EnterCriticalSection(&renderer->cs); + if (renderer->flags & SAR_SHUT_DOWN) - return MF_E_STREAMSINK_REMOVED; + hr = MF_E_STREAMSINK_REMOVED; + else + hr = stream_place_marker(renderer, marker_type, context_value); - EnterCriticalSection(&renderer->cs); - hr = stream_place_marker(renderer, marker_type, context_value); LeaveCriticalSection(&renderer->cs); return hr;

1 0

Nikolay Sivov : mf/samplegrabber: Consistently check for shutdown flag within a lock.
by Alexandre Julliard 05 Jul '22

05 Jul '22

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

Alexandre Julliard : advapi32/tests: Remove some workarounds for older Windows versions.
by Alexandre Julliard 05 Jul '22

05 Jul '22

Module: wine Branch: master Commit: e76c07d4e7a5ae86200d123a287de20e041035fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=e76c07d4e7a5ae86200d123a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 5 12:31:54 2022 +0200 advapi32/tests: Remove some workarounds for older Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/registry.c | 254 +++++++++++++++-------------------------- 1 file changed, 90 insertions(+), 164 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e76c07d4e7a5ae86200d…

1 0