January 2021 - Wine-commits

Henri Verbeet : wined3d: Trace the available Vulkan extensions.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 53916000f8d1ae64343c52da9b05c96d12a2271a URL: https://source.winehq.org/git/wine.git/?a=commit;h=53916000f8d1ae64343c52da… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 25 15:53:15 2021 +0100 wined3d: Trace the available Vulkan extensions. Like we do for OpenGL. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9a226edc65a..d2ac652ab62 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1853,6 +1853,12 @@ static BOOL enable_vulkan_instance_extensions(uint32_t *extension_count, goto done; } + TRACE("Vulkan instance extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0; i < ARRAY_SIZE(vulkan_instance_extensions); ++i) { if (vulkan_instance_extensions[i].core_since_version <= vk_info->api_version) @@ -2207,6 +2213,12 @@ static bool wined3d_adapter_vk_init_device_extensions(struct wined3d_adapter_vk goto done; } + TRACE("Vulkan device extensions reported:\n"); + for (i = 0; i < count; ++i) + { + TRACE(" - %s.\n", debugstr_a(extensions[i].extensionName)); + } + for (i = 0, enable_count = 0; i < ARRAY_SIZE(info); ++i) { if (info[i].core_since_version <= vk_info->api_version)

1 0

Nikolay Sivov : mfmediaengine: Return current session time in GetCurrentTime().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 3f00fbc2e9dc412a1504861ba1946f6b06444166 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f00fbc2e9dc412a1504861b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 25 17:53:10 2021 +0300 mfmediaengine: Return current session time in GetCurrentTime(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfmediaengine/main.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c index 55585b8b826..5981548c9f8 100644 --- a/dlls/mfmediaengine/main.c +++ b/dlls/mfmediaengine/main.c @@ -99,6 +99,7 @@ struct media_engine MF_MEDIA_ENGINE_READY ready_state; MF_MEDIA_ENGINE_PRELOAD preload; IMFMediaSession *session; + IMFClock *clock; IMFSourceResolver *resolver; BSTR current_source; struct video_frame video_frame; @@ -774,6 +775,8 @@ static void free_media_engine(struct media_engine *engine) { if (engine->callback) IMFMediaEngineNotify_Release(engine->callback); + if (engine->clock) + IMFClock_Release(engine->clock); if (engine->session) IMFMediaSession_Release(engine->session); if (engine->attributes) @@ -987,9 +990,22 @@ static BOOL WINAPI media_engine_IsSeeking(IMFMediaEngine *iface) static double WINAPI media_engine_GetCurrentTime(IMFMediaEngine *iface) { - FIXME("(%p): stub.\n", iface); + struct media_engine *engine = impl_from_IMFMediaEngine(iface); + LONGLONG clocktime; + double ret = 0.0; + MFTIME systime; - return 0.0; + TRACE("%p.\n", iface); + + EnterCriticalSection(&engine->cs); + if (SUCCEEDED(IMFClock_GetCorrelatedTime(engine->clock, 0, &clocktime, &systime))) + { + /* Assume 100ns clock. */ + ret = (double)clocktime / 10000000.0; + } + LeaveCriticalSection(&engine->cs); + + return ret; } static HRESULT WINAPI media_engine_SetCurrentTime(IMFMediaEngine *iface, double time) @@ -1644,6 +1660,9 @@ static HRESULT init_media_engine(DWORD flags, IMFAttributes *attributes, struct if (FAILED(hr = MFCreateMediaSession(NULL, &engine->session))) return hr; + if (FAILED(hr = IMFMediaSession_GetClock(engine->session, &engine->clock))) + return hr; + if (FAILED(hr = IMFMediaSession_BeginGetEvent(engine->session, &engine->session_events, NULL))) return hr;

1 0

Zebediah Figura : wined3d: Make adapter_gl_clear_uav() static.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 2d6462cdee2bd87a49382794e5a554f33c367f09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6462cdee2bd87a49382794… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jan 24 14:29:27 2021 -0600 wined3d: Make adapter_gl_clear_uav() static. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index b6be5854714..d9f70049e6f 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5012,7 +5012,7 @@ static void adapter_gl_flush_context(struct wined3d_context *context) context_gl->gl_info->gl_ops.gl.p_glFlush(); } -void adapter_gl_clear_uav(struct wined3d_context *context, +static void adapter_gl_clear_uav(struct wined3d_context *context, struct wined3d_unordered_access_view *view, const struct wined3d_uvec4 *clear_value) { TRACE("context %p, view %p, clear_value %s.\n", context, view, debug_uvec4(clear_value));

1 0

Alexandre Julliard : ntdll: Load the COR header directly from the file handle.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 7203ad0ecd06b451116fcfe3b08e4d620e853bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7203ad0ecd06b451116fcfe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 12:31:34 2021 +0100 ntdll: Load the COR header directly from the file handle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 63 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3f43062f9f8..fa757fefa90 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2016,11 +2016,49 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, old_prot, &old_prot ); return TRUE; } + +/* check COM header for ILONLY flag, ignoring runtime version */ +static BOOL get_cor_header( HANDLE file, const SECTION_IMAGE_INFORMATION *info, IMAGE_COR20_HEADER *cor ) +{ + IMAGE_DOS_HEADER mz; + IMAGE_NT_HEADERS32 nt; + IO_STATUS_BLOCK io; + LARGE_INTEGER offset; + IMAGE_SECTION_HEADER sec[96]; + unsigned int i, count; + DWORD va, size; + + offset.QuadPart = 0; + if (NtReadFile( file, 0, NULL, NULL, &io, &mz, sizeof(mz), &offset, NULL )) return FALSE; + if (io.Information != sizeof(mz)) return FALSE; + if (mz.e_magic != IMAGE_DOS_SIGNATURE) return FALSE; + offset.QuadPart = mz.e_lfanew; + if (NtReadFile( file, 0, NULL, NULL, &io, &nt, sizeof(nt), &offset, NULL )) return FALSE; + if (io.Information != sizeof(nt)) return FALSE; + if (nt.Signature != IMAGE_NT_SIGNATURE) return FALSE; + if (nt.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return FALSE; + va = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; + size = nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].Size; + if (!va || size < sizeof(*cor)) return FALSE; + offset.QuadPart = offsetof( IMAGE_NT_HEADERS32, OptionalHeader ) + nt.FileHeader.SizeOfOptionalHeader; + count = min( 96, nt.FileHeader.NumberOfSections ); + if (NtReadFile( file, 0, NULL, NULL, &io, &sec, count * sizeof(*sec), &offset, NULL )) return FALSE; + if (io.Information != count * sizeof(*sec)) return FALSE; + for (i = 0; i < count; i++) + { + if (va < sec[i].VirtualAddress) continue; + if (sec[i].Misc.VirtualSize && va - sec[i].VirtualAddress >= sec[i].Misc.VirtualSize) continue; + offset.QuadPart = sec->PointerToRawData + va - sec[i].VirtualAddress; + if (NtReadFile( file, 0, NULL, NULL, &io, cor, sizeof(*cor), &offset, NULL )) return FALSE; + return (io.Information == sizeof(*cor)); + } + return FALSE; +} #endif /* On WoW64 setups, an image mapping can also be created for the other 32/64 CPU */ /* but it cannot necessarily be loaded as a dll, so we need some additional checks */ -static BOOL is_valid_binary( HMODULE module, const SECTION_IMAGE_INFORMATION *info ) +static BOOL is_valid_binary( HANDLE file, const SECTION_IMAGE_INFORMATION *info ) { #ifdef __i386__ return info->Machine == IMAGE_FILE_MACHINE_I386; @@ -2037,13 +2075,11 @@ static BOOL is_valid_binary( HMODULE module, const SECTION_IMAGE_INFORMATION *in if (!info->ImageContainsCode) return TRUE; if (!(info->u.ImageFlags & IMAGE_FLAGS_ComPlusNativeReady)) { - /* check COM header directly, ignoring runtime version */ - DWORD size; - const IMAGE_COR20_HEADER *cor_header = RtlImageDirectoryEntryToData( module, TRUE, - IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR, &size ); - if (!cor_header || !(cor_header->Flags & COMIMAGE_FLAGS_ILONLY)) return FALSE; + IMAGE_COR20_HEADER cor_header; + if (!get_cor_header( file, info, &cor_header )) return FALSE; + if (!(cor_header.Flags & COMIMAGE_FLAGS_ILONLY)) return FALSE; } - return convert_to_pe64( module, info ); + return TRUE; #else return FALSE; /* no wow64 support on other platforms */ #endif @@ -2267,8 +2303,6 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); - NtClose( handle ); - if (!status) { if (*module) @@ -2282,13 +2316,22 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; NtClose( mapping ); } - if (!status && !is_valid_binary( *module, image_info )) + if (!status && !is_valid_binary( handle, image_info )) { TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); NtUnmapViewOfSection( NtCurrentProcess(), *module ); *module = NULL; status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; } +#ifdef _WIN64 + if (!status && + image_info->Machine != IMAGE_FILE_MACHINE_AMD64 && + image_info->Machine != IMAGE_FILE_MACHINE_ARM64) + { + if (!convert_to_pe64( *module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; + } +#endif + NtClose( handle ); return status; }

1 0

Alexandre Julliard : ntdll: Check for valid architecture before mapping the module.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 63b62953683fc62e95d5df8cb975009554aff1a3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63b62953683fc62e95d5df8c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 13:41:16 2021 +0100 ntdll: Check for valid architecture before mapping the module. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 33 ++++++++++++++++----------------- dlls/ntdll/unix/loader.c | 43 +++++++++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fa757fefa90..fec33c8017c 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -1985,6 +1985,8 @@ static BOOL convert_to_pe64( HMODULE module, const SECTION_IMAGE_INFORMATION *in void *addr = module; ULONG i, old_prot; + if (nt->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR32_MAGIC) return TRUE; /* already 64-bit */ + TRACE( "%p\n", module ); if (NtProtectVirtualMemory( NtCurrentProcess(), &addr, &size, PAGE_READWRITE, &old_prot )) @@ -2304,34 +2306,31 @@ static NTSTATUS open_dll_file( UNICODE_STRING *nt_name, WINE_MODREF **pwm, void SECTION_MAP_READ | SECTION_MAP_EXECUTE, NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, handle ); if (!status) + { + NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); + if (!is_valid_binary( handle, image_info )) + { + TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); + status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; + NtClose( mapping ); + } + } + NtClose( handle ); + if (!status) { if (*module) { NtUnmapViewOfSection( NtCurrentProcess(), *module ); *module = NULL; } - NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, ViewShare, 0, PAGE_EXECUTE_READ ); if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - NtClose( mapping ); - } - if (!status && !is_valid_binary( handle, image_info )) - { - TRACE( "%s is for arch %x, continuing search\n", debugstr_us(nt_name), image_info->Machine ); - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - *module = NULL; - status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - } #ifdef _WIN64 - if (!status && - image_info->Machine != IMAGE_FILE_MACHINE_AMD64 && - image_info->Machine != IMAGE_FILE_MACHINE_ARM64) - { - if (!convert_to_pe64( *module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; - } + if (!status && !convert_to_pe64( *module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; #endif - NtClose( handle ); + NtClose( mapping ); + } return status; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 43c769f2d2a..972793ac3e9 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1077,7 +1077,7 @@ static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) /* check a PE library architecture */ -static BOOL is_valid_binary( HMODULE module, const SECTION_IMAGE_INFORMATION *info ) +static BOOL is_valid_binary( const SECTION_IMAGE_INFORMATION *info ) { #ifdef __i386__ return info->Machine == IMAGE_FILE_MACHINE_I386; @@ -1138,7 +1138,7 @@ static inline char *prepend( char *buffer, const char *str, size_t len ) /*********************************************************************** * open_dll_file * - * Open a file for a new dll. Helper for find_dll_file. + * Open a file for a new dll. Helper for open_builtin_file. */ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_INFORMATION *image_info ) { @@ -1187,37 +1187,40 @@ static NTSTATUS open_dll_file( const char *name, void **module, SECTION_IMAGE_IN NtClose( handle ); if (status) return status; - if (*module) - { - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - *module = NULL; - } NtQuerySection( mapping, SectionImageInformation, image_info, sizeof(*image_info), NULL ); - status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - NtClose( mapping ); - if (status) return status; - /* ignore non-builtins */ if (!(image_info->u.ImageFlags & IMAGE_FLAGS_WineBuiltin)) { WARN( "%s found in WINEDLLPATH but not a builtin, ignoring\n", debugstr_a(name) ); status = STATUS_DLL_NOT_FOUND; } - else if (!is_valid_binary( *module, image_info )) + else if (!is_valid_binary( image_info )) { TRACE( "%s is for arch %x, continuing search\n", debugstr_a(name), image_info->Machine ); status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; } - - if (!status) status = add_builtin_module( *module, NULL, &st ); - - if (status) + else { - NtUnmapViewOfSection( NtCurrentProcess(), *module ); - *module = NULL; + if (*module) + { + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; + } + status = NtMapViewOfSection( mapping, NtCurrentProcess(), module, 0, 0, NULL, &len, + ViewShare, 0, PAGE_EXECUTE_READ ); + if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; + + if (!status) + { + status = add_builtin_module( *module, NULL, &st ); + if (status) + { + NtUnmapViewOfSection( NtCurrentProcess(), *module ); + *module = NULL; + } + } } + NtClose( mapping ); return status; }

1 0

Alexandre Julliard : ntdll: Delay mapping a module until we have found the final one to load.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 5fef775ddfc96334ee841c7fce1df8bcadb4fe1c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5fef775ddfc96334ee841c7f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 21 14:27:52 2021 +0100 ntdll: Delay mapping a module until we have found the final one to load. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 108 +++++++++++++++++++---------------------------- dlls/ntdll/unix/loader.c | 98 ++++++++++++++++++++++++------------------ 2 files changed, 100 insertions(+), 106 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5fef775ddfc96334ee84…

1 0

Alexandre Julliard : makefiles: Add missing dependency to wrc for test dll resources.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 852c9c69de224669e5838bbc24642af633c9c620 URL: https://source.winehq.org/git/wine.git/?a=commit;h=852c9c69de224669e5838bbc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jan 24 21:58:53 2021 +0100 makefiles: Add missing dependency to wrc for test dll resources. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 306a50eef5d..913854c7f05 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3083,7 +3083,10 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, strarray_add( &make->clean_files, dll_name ); strarray_add( &make->res_files, strmake( "%s.res", obj )); - output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); + output( "%s.res:", obj_dir_path( make, obj )); + output_filename( obj_dir_path( make, dll_name )); + output_filename( tools_path( make, "wrc" )); + output( "\n" ); output( "\t%secho \"%s.dll TESTDLL \\\"%s\\\"\" | %s -u -o $@\n", cmd_prefix( "WRC" ), obj, output_file, tools_path( make, "wrc" ));

1 0

Zebediah Figura : winegstreamer: Avoid using Wine debug functions in no_more_pads().
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 7875d8dd878b31b70d9bc537f5ce08b511287ffa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7875d8dd878b31b70d9bc537… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:42 2021 -0600 winegstreamer: Avoid using Wine debug functions in no_more_pads(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e85e54c2e34..56b8225c3df 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1398,7 +1398,8 @@ static gboolean activate_mode(GstPad *pad, GstObject *parent, GstPadMode mode, g static void no_more_pads(GstElement *decodebin, gpointer user) { struct parser *filter = user; - TRACE("filter %p.\n", filter); + + GST_DEBUG("filter %p.", filter); pthread_mutex_lock(&filter->mutex); filter->no_more_pads = true;

1 0

Zebediah Figura : winegstreamer: Don't force no_more_pads() onto a Wine thread.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: e785880a96d677acaa06667d006e329516a1923a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e785880a96d677acaa06667d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:43 2021 -0600 winegstreamer: Don't force no_more_pads() onto a Wine thread. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 10 ---------- dlls/winegstreamer/gst_cbs.h | 2 -- dlls/winegstreamer/gstdemux.c | 10 ++-------- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index b9effe73a5b..ebef533779d 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -174,16 +174,6 @@ gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, return cbdata.u.activate_mode_data.ret; } -void no_more_pads_wrapper(GstElement *element, gpointer user) -{ - struct cb_data cbdata = { NO_MORE_PADS }; - - cbdata.u.no_more_pads_data.element = element; - cbdata.u.no_more_pads_data.user = user; - - call_cb(&cbdata); -} - GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) { diff --git a/dlls/winegstreamer/gst_cbs.h b/dlls/winegstreamer/gst_cbs.h index 0e262c12db8..ce74e76edae 100644 --- a/dlls/winegstreamer/gst_cbs.h +++ b/dlls/winegstreamer/gst_cbs.h @@ -33,7 +33,6 @@ enum CB_TYPE { EXISTING_NEW_PAD, QUERY_FUNCTION, ACTIVATE_MODE, - NO_MORE_PADS, REQUEST_BUFFER_SRC, EVENT_SRC, EVENT_SINK, @@ -135,7 +134,6 @@ void perform_cb_media_source(struct cb_data *data) DECLSPEC_HIDDEN; void existing_new_pad_wrapper(GstElement *bin, GstPad *pad, gpointer user) DECLSPEC_HIDDEN; gboolean query_function_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) DECLSPEC_HIDDEN; gboolean activate_mode_wrapper(GstPad *pad, GstObject *parent, GstPadMode mode, gboolean activate) DECLSPEC_HIDDEN; -void no_more_pads_wrapper(GstElement *decodebin, gpointer user) DECLSPEC_HIDDEN; GstFlowReturn request_buffer_src_wrapper(GstPad *pad, GstObject *parent, guint64 ofs, guint len, GstBuffer **buf) DECLSPEC_HIDDEN; gboolean event_src_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; gboolean event_sink_wrapper(GstPad *pad, GstObject *parent, GstEvent *event) DECLSPEC_HIDDEN; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 56b8225c3df..22df838e4df 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1765,7 +1765,7 @@ static BOOL decodebin_parser_init_gst(struct parser *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); g_signal_connect(element, "autoplug-select", G_CALLBACK(autoplug_blacklist), filter); - g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); + g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); filter->their_sink = gst_element_get_static_pad(element, "sink"); @@ -2443,12 +2443,6 @@ void perform_cb_gstdemux(struct cb_data *cbdata) cbdata->u.activate_mode_data.ret = activate_mode(data->pad, data->parent, data->mode, data->activate); break; } - case NO_MORE_PADS: - { - struct no_more_pads_data *data = &cbdata->u.no_more_pads_data; - no_more_pads(data->element, data->user); - break; - } case REQUEST_BUFFER_SRC: { struct getrange_data *data = &cbdata->u.getrange_data; @@ -2645,7 +2639,7 @@ static BOOL avi_splitter_init_gst(struct parser *filter) g_signal_connect(element, "pad-added", G_CALLBACK(existing_new_pad_wrapper), filter); g_signal_connect(element, "pad-removed", G_CALLBACK(removed_decoded_pad_wrapper), filter); - g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads_wrapper), filter); + g_signal_connect(element, "no-more-pads", G_CALLBACK(no_more_pads), filter); filter->their_sink = gst_element_get_static_pad(element, "sink");

1 0

Zebediah Figura : winegstreamer: Use pthread condition variables to queue stream events.
by Alexandre Julliard 25 Jan '21

25 Jan '21

Module: wine Branch: master Commit: 54e012b5b7ca55f4b6866a39f4c98292d544e48c URL: https://source.winehq.org/git/wine.git/?a=commit;h=54e012b5b7ca55f4b6866a39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jan 23 12:43:44 2021 -0600 winegstreamer: Use pthread condition variables to queue stream events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 73 +++++++++++++++++++++---------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 22df838e4df..d16a8d28dd4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -60,8 +60,6 @@ struct parser LONGLONG filesize; - CRITICAL_SECTION cs; - /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ @@ -117,7 +115,7 @@ struct parser_source SourceSeeking seek; CRITICAL_SECTION flushing_cs; - CONDITION_VARIABLE event_cv, event_empty_cv; + pthread_cond_t event_cond, event_empty_cond; bool flushing, eos; struct parser_event event; HANDLE thread; @@ -686,18 +684,18 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct { struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); while (!pin->flushing && pin->event.type != PARSER_EVENT_NONE) - SleepConditionVariableCS(&pin->event_empty_cv, &filter->cs, INFINITE); + pthread_cond_wait(&pin->event_empty_cond, &filter->mutex); if (pin->flushing) { - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); TRACE("Filter is flushing; discarding event.\n"); return GST_FLOW_FLUSHING; } pin->event = *event; - LeaveCriticalSection(&filter->cs); - WakeConditionVariable(&pin->event_cv); + pthread_mutex_unlock(&filter->mutex); + pthread_cond_signal(&pin->event_cond); TRACE("Event queued.\n"); return GST_FLOW_OK; } @@ -755,10 +753,10 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_FLUSH_START: if (pin->pin.pin.peer) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); pin->flushing = true; - WakeConditionVariable(&pin->event_empty_cv); + pthread_cond_signal(&pin->event_empty_cond); switch (pin->event.type) { @@ -773,7 +771,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) } pin->event.type = PARSER_EVENT_NONE; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); } break; @@ -781,9 +779,9 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) gst_segment_init(pin->segment, GST_FORMAT_TIME); if (pin->pin.pin.peer) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); pin->flushing = false; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); } break; @@ -1037,14 +1035,14 @@ static DWORD CALLBACK stream_thread(void *arg) struct parser_event event; EnterCriticalSection(&pin->flushing_cs); - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); while (!filter->flushing && pin->event.type == PARSER_EVENT_NONE) - SleepConditionVariableCS(&pin->event_cv, &filter->cs, INFINITE); + pthread_cond_wait(&pin->event_cond, &filter->mutex); if (filter->flushing) { - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); LeaveCriticalSection(&pin->flushing_cs); TRACE("Filter is flushing.\n"); continue; @@ -1052,16 +1050,16 @@ static DWORD CALLBACK stream_thread(void *arg) if (!pin->event.type) { - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); LeaveCriticalSection(&pin->flushing_cs); continue; } event = pin->event; pin->event.type = PARSER_EVENT_NONE; - WakeConditionVariable(&pin->event_empty_cv); + pthread_cond_signal(&pin->event_empty_cond); - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); TRACE("Got event of type %#x.\n", event.type); @@ -1598,8 +1596,6 @@ static void parser_destroy(struct strmbase_filter *iface) pthread_cond_destroy(&filter->init_cond); pthread_mutex_destroy(&filter->mutex); - filter->cs.DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&filter->cs); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); heap_free(filter); @@ -1616,9 +1612,9 @@ static HRESULT parser_init_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = true; - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = false; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); /* DirectShow retains the old seek positions, but resets to them every time * it transitions from stopped -> paused. */ @@ -1656,9 +1652,9 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) return S_OK; filter->streaming = false; - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = true; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -1667,7 +1663,7 @@ static HRESULT parser_cleanup_stream(struct strmbase_filter *iface) if (!pin->pin.pin.peer) continue; - WakeConditionVariable(&pin->event_cv); + pthread_cond_signal(&pin->event_cond); } for (i = 0; i < filter->source_count; ++i) @@ -1893,8 +1889,6 @@ static void parser_init_common(struct parser *object) { pthread_mutex_init(&object->mutex, NULL); pthread_cond_init(&object->init_cond, NULL); - InitializeCriticalSection(&object->cs); - object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": parser.cs"); object->flushing = true; } @@ -2044,15 +2038,15 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = true; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) { if (filter->sources[i]->pin.pin.peer) { - WakeConditionVariable(&pin->event_cv); + pthread_cond_signal(&pin->event_cond); IPin_BeginFlush(filter->sources[i]->pin.pin.peer); } } @@ -2093,9 +2087,9 @@ static HRESULT WINAPI GST_Seeking_SetPositions(IMediaSeeking *iface, if (!(current_flags & AM_SEEKING_NoFlush)) { - EnterCriticalSection(&filter->cs); + pthread_mutex_lock(&filter->mutex); filter->flushing = false; - LeaveCriticalSection(&filter->cs); + pthread_mutex_unlock(&filter->mutex); for (i = 0; i < filter->source_count; ++i) { @@ -2329,6 +2323,9 @@ static void free_source_pin(struct parser_source *pin) gst_object_unref(pin->my_sink); gst_segment_free(pin->segment); + pthread_cond_destroy(&pin->event_cond); + pthread_cond_destroy(&pin->event_empty_cond); + pin->flushing_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pin->flushing_cs); @@ -2365,8 +2362,8 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate); - InitializeConditionVariable(&pin->event_cv); - InitializeConditionVariable(&pin->event_empty_cv); + pthread_cond_init(&pin->event_cond, NULL); + pthread_cond_init(&pin->event_empty_cond, NULL); BaseFilterImpl_IncrementPinVersion(&filter->filter); InitializeCriticalSection(&pin->flushing_cs); @@ -2394,13 +2391,13 @@ static HRESULT GST_RemoveOutputPins(struct parser *This) return S_OK; /* Unblock all of our streams. */ - EnterCriticalSection(&This->cs); + pthread_mutex_lock(&This->mutex); for (i = 0; i < This->source_count; ++i) { This->sources[i]->flushing = true; - WakeConditionVariable(&This->sources[i]->event_empty_cv); + pthread_cond_signal(&This->sources[i]->event_empty_cond); } - LeaveCriticalSection(&This->cs); + pthread_mutex_unlock(&This->mutex); gst_element_set_state(This->container, GST_STATE_NULL); gst_pad_unlink(This->my_src, This->their_sink);

1 0