wine-commits July 2022

wine-commits@winehq.org

1 participants
639 discussions

Rémi Bernon : mf: Use topology_node_get_type_handler in MFGetTopoNodeCurrentType.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 177046a137635a697830f23406d84b72b588784d URL: https://gitlab.winehq.org/wine/wine/-/commit/177046a137635a697830f23406d84b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 8 11:24:28 2022 +0200 mf: Use topology_node_get_type_handler in MFGetTopoNodeCurrentType. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/topology.c | 59 +++++++++++++++++------------------------------------- 1 file changed, 18 insertions(+), 41 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 29f34445bc5..e158ba1fc82 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1820,7 +1820,8 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } -static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTypeHandler **handler) +static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, DWORD stream, + BOOL output, IMFMediaTypeHandler **handler) { MF_TOPOLOGY_TYPE node_type; IMFStreamSink *stream_sink; @@ -1833,6 +1834,9 @@ static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTyp switch (node_type) { case MF_TOPOLOGY_OUTPUT_NODE: + if (output || stream) + return MF_E_INVALIDSTREAMNUMBER; + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) { hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); @@ -1840,6 +1844,9 @@ static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTyp } break; case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (!output || stream) + return MF_E_INVALIDSTREAMNUMBER; + if (SUCCEEDED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, &IID_IMFStreamDescriptor, (void **)&sd))) { @@ -1860,10 +1867,8 @@ static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTyp */ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type) { - IMFMediaTypeHandler *type_handler; + IMFMediaTypeHandler *handler; MF_TOPOLOGY_TYPE node_type; - IMFStreamSink *stream_sink; - IMFStreamDescriptor *sd; IMFTransform *transform; UINT32 primary_output; HRESULT hr; @@ -1873,42 +1878,15 @@ HRESULT WINAPI MFGetTopoNodeCurrentType(IMFTopologyNode *node, DWORD stream, BOO if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) return hr; - switch (node_type) + if (SUCCEEDED(hr = topology_node_get_type_handler(node, stream, output, &handler))) { - case MF_TOPOLOGY_OUTPUT_NODE: - if (output || stream) - return MF_E_INVALIDSTREAMNUMBER; - - if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, &type_handler); - IMFStreamSink_Release(stream_sink); - - if (SUCCEEDED(hr)) - { - hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, type); - IMFMediaTypeHandler_Release(type_handler); - } - } - break; - case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (!output || stream) - return MF_E_INVALIDSTREAMNUMBER; - - if (FAILED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, &IID_IMFStreamDescriptor, - (void **)&sd))) - { - return hr; - } + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + IMFMediaTypeHandler_Release(handler); + return hr; + } - hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &type_handler); - IMFStreamDescriptor_Release(sd); - if (SUCCEEDED(hr)) - { - hr = IMFMediaTypeHandler_GetCurrentMediaType(type_handler, type); - IMFMediaTypeHandler_Release(type_handler); - } - break; + switch (node_type) + { case MF_TOPOLOGY_TRANSFORM_NODE: if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFTransform, (void **)&transform))) { @@ -2291,10 +2269,9 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context TRACE("attempting to connect %p:%u to %p:%u\n", source, output_index, sink, input_index); - if (FAILED(hr = topology_node_get_type_handler(source, &source_handler))) + if (FAILED(hr = topology_node_get_type_handler(source, output_index, TRUE, &source_handler))) goto done; - - if (FAILED(hr = topology_node_get_type_handler(sink, &sink_handler))) + if (FAILED(hr = topology_node_get_type_handler(sink, input_index, FALSE, &sink_handler))) goto done; if (FAILED(IMFTopologyNode_GetUINT32(source, &MF_TOPONODE_CONNECT_METHOD, &source_method)))

1 0

Rémi Bernon : mf: Move and rename topology_loader_get_node_type_handler.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 6c2b8fd3a4dadc0f6061c11e0bbc05326d504423 URL: https://gitlab.winehq.org/wine/wine/-/commit/6c2b8fd3a4dadc0f6061c11e0bbc05… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 8 11:18:43 2022 +0200 mf: Move and rename topology_loader_get_node_type_handler. To topology_node_get_type_handler. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/topology.c | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/dlls/mf/topology.c b/dlls/mf/topology.c index 34c20dbc735..29f34445bc5 100644 --- a/dlls/mf/topology.c +++ b/dlls/mf/topology.c @@ -1820,6 +1820,41 @@ HRESULT WINAPI MFCreateTopologyNode(MF_TOPOLOGY_TYPE node_type, IMFTopologyNode return hr; } +static HRESULT topology_node_get_type_handler(IMFTopologyNode *node, IMFMediaTypeHandler **handler) +{ + MF_TOPOLOGY_TYPE node_type; + IMFStreamSink *stream_sink; + IMFStreamDescriptor *sd; + HRESULT hr; + + if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) + return hr; + + switch (node_type) + { + case MF_TOPOLOGY_OUTPUT_NODE: + if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) + { + hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); + IMFStreamSink_Release(stream_sink); + } + break; + case MF_TOPOLOGY_SOURCESTREAM_NODE: + if (SUCCEEDED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, + &IID_IMFStreamDescriptor, (void **)&sd))) + { + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, handler); + IMFStreamDescriptor_Release(sd); + } + break; + default: + WARN("Unexpected node type %u.\n", node_type); + return MF_E_UNEXPECTED; + } + + return hr; +} + /*********************************************************************** * MFGetTopoNodeCurrentType (mf.@) */ @@ -2168,41 +2203,6 @@ static HRESULT connect_to_converter(struct transform_output_type *output_type, s typedef HRESULT (*p_topology_loader_connect_func)(struct topoloader_context *context, IMFTopologyNode *upstream_node, unsigned int output_index, IMFTopologyNode *downstream_node, unsigned int input_index); -static HRESULT topology_loader_get_node_type_handler(IMFTopologyNode *node, IMFMediaTypeHandler **handler) -{ - MF_TOPOLOGY_TYPE node_type; - IMFStreamSink *stream_sink; - IMFStreamDescriptor *sd; - HRESULT hr; - - if (FAILED(hr = IMFTopologyNode_GetNodeType(node, &node_type))) - return hr; - - switch (node_type) - { - case MF_TOPOLOGY_OUTPUT_NODE: - if (SUCCEEDED(hr = topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink))) - { - hr = IMFStreamSink_GetMediaTypeHandler(stream_sink, handler); - IMFStreamSink_Release(stream_sink); - } - break; - case MF_TOPOLOGY_SOURCESTREAM_NODE: - if (SUCCEEDED(hr = IMFTopologyNode_GetUnknown(node, &MF_TOPONODE_STREAM_DESCRIPTOR, - &IID_IMFStreamDescriptor, (void **)&sd))) - { - hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, handler); - IMFStreamDescriptor_Release(sd); - } - break; - default: - WARN("Unexpected node type %u.\n", node_type); - return MF_E_UNEXPECTED; - } - - return hr; -} - static HRESULT topology_loader_get_mft_categories(IMFMediaTypeHandler *handler, GUID *decode_cat, GUID *convert_cat) { GUID major; @@ -2291,10 +2291,10 @@ static HRESULT topology_loader_connect_source_to_sink(struct topoloader_context TRACE("attempting to connect %p:%u to %p:%u\n", source, output_index, sink, input_index); - if (FAILED(hr = topology_loader_get_node_type_handler(source, &source_handler))) + if (FAILED(hr = topology_node_get_type_handler(source, &source_handler))) goto done; - if (FAILED(hr = topology_loader_get_node_type_handler(sink, &sink_handler))) + if (FAILED(hr = topology_node_get_type_handler(sink, &sink_handler))) goto done; if (FAILED(IMFTopologyNode_GetUINT32(source, &MF_TOPONODE_CONNECT_METHOD, &source_method)))

1 0

Rémi Bernon : mf/tests: Add more topology loader connect method tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: fb513fcc0742390338a30e0df13111bf21de0920 URL: https://gitlab.winehq.org/wine/wine/-/commit/fb513fcc0742390338a30e0df13111… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 4 17:42:54 2022 +0200 mf/tests: Add more topology loader connect method tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 70 +++++++++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 24 deletions(-)

1 0

Rémi Bernon : mf/tests: Add more topology loader media types tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 142e6e78619975bd064a73110b8999fc9fe7ae84 URL: https://gitlab.winehq.org/wine/wine/-/commit/142e6e78619975bd064a73110b8999… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 13:27:54 2022 +0200 mf/tests: Add more topology loader media types tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 150 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 121 insertions(+), 29 deletions(-)

1 0

Rémi Bernon : mf/tests: Simplify topology loader tests.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 2db8a0a94efd3d45f2888c96f293670112414533 URL: https://gitlab.winehq.org/wine/wine/-/commit/2db8a0a94efd3d45f2888c96f29367… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 1 13:27:54 2022 +0200 mf/tests: Simplify topology loader tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/tests/mf.c | 193 ++++++++++++++++------------------------------------- 1 file changed, 56 insertions(+), 137 deletions(-)

1 0

Zebediah Figura : ddraw/tests: Build ddraw2.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0af510467b176daff66b9bc9ec07b51859ff656a URL: https://gitlab.winehq.org/wine/wine/-/commit/0af510467b176daff66b9bc9ec07b5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Jul 10 22:20:26 2022 -0500 ddraw/tests: Build ddraw2.c without -DWINE_NO_LONG_TYPES. --- dlls/ddraw/tests/ddraw2.c | 4507 ++++++++++++++++++++++----------------------- 1 file changed, 2239 insertions(+), 2268 deletions(-)

1 0

Zebediah Figura : ddraw/tests: Build ddraw1.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 92793a6e73daf1cbbe3386d0a8c1887073e9e50e URL: https://gitlab.winehq.org/wine/wine/-/commit/92793a6e73daf1cbbe3386d0a8c188… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 8 00:09:23 2022 -0500 ddraw/tests: Build ddraw1.c without -DWINE_NO_LONG_TYPES. --- dlls/ddraw/tests/ddraw1.c | 3930 ++++++++++++++++++++++----------------------- 1 file changed, 1948 insertions(+), 1982 deletions(-)

1 0

Zebediah Figura : wineusb.sys: Move the event queue and device list to the Unix library.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: e4cefae1269d3d79d4638d3488a0264a19b1e442 URL: https://gitlab.winehq.org/wine/wine/-/commit/e4cefae1269d3d79d4638d3488a026… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 5 23:53:45 2022 -0500 wineusb.sys: Move the event queue and device list to the Unix library. Since the device hotplug callbacks both queue events and create unix_device objects, we need to move both at the same time. --- dlls/wineusb.sys/unixlib.c | 415 ++++++++++++++++++++++++++++++++++++++++++ dlls/wineusb.sys/unixlib.h | 47 +++++ dlls/wineusb.sys/wineusb.c | 435 ++------------------------------------------- 3 files changed, 480 insertions(+), 417 deletions(-)

1 0

Zebediah Figura : wineusb.sys: Move the event threads to IRP_MN_START_DEVICE.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 0427ccb141950bd73721d952536dab18730527ff URL: https://gitlab.winehq.org/wine/wine/-/commit/0427ccb141950bd73721d952536dab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 5 23:28:38 2022 -0500 wineusb.sys: Move the event threads to IRP_MN_START_DEVICE. To correspond with the shutdown in IRP_MN_REMOVE_DEVICE. --- dlls/wineusb.sys/wineusb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 66fe3778d64..c7363739bcf 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -487,6 +487,9 @@ static NTSTATUS fdo_pnp(IRP *irp) } case IRP_MN_START_DEVICE: + libusb_event_thread = CreateThread(NULL, 0, libusb_event_thread_proc, NULL, 0, NULL); + event_thread = CreateThread(NULL, 0, event_thread_proc, NULL, 0, NULL); + if ((ret = libusb_hotplug_register_callback(NULL, LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, LIBUSB_HOTPLUG_ENUMERATE, LIBUSB_HOTPLUG_MATCH_ANY, LIBUSB_HOTPLUG_MATCH_ANY, @@ -1154,9 +1157,6 @@ 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; driver->DriverUnload = driver_unload; driver->MajorFunction[IRP_MJ_PNP] = driver_pnp;

1 0

Zebediah Figura : wineusb.sys: Move the event handling loop to the Unix library.
by Alexandre Julliard 12 Jul '22

12 Jul '22

Module: wine Branch: master Commit: 92ae93d752a80c1d9dd28bbeac733ef5e4b49bfc URL: https://gitlab.winehq.org/wine/wine/-/commit/92ae93d752a80c1d9dd28bbeac733e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Jul 5 23:20:26 2022 -0500 wineusb.sys: Move the event handling loop to the Unix library. --- dlls/wineusb.sys/unixlib.c | 29 +++++++++++++++++++++++++++++ dlls/wineusb.sys/unixlib.h | 2 ++ dlls/wineusb.sys/wineusb.c | 14 ++------------ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/dlls/wineusb.sys/unixlib.c b/dlls/wineusb.sys/unixlib.c index cdc84d98ede..ee8679e33a2 100644 --- a/dlls/wineusb.sys/unixlib.c +++ b/dlls/wineusb.sys/unixlib.c @@ -22,6 +22,7 @@ #pragma makedep unix #endif +#include <stdbool.h> #include <libusb.h> #include "ntstatus.h" #define WIN32_NO_STATUS @@ -32,6 +33,32 @@ WINE_DEFAULT_DEBUG_CHANNEL(wineusb); +static bool thread_shutdown; + +static NTSTATUS usb_main_loop(void *args) +{ + int ret; + + TRACE("Starting libusb event thread.\n"); + + while (!thread_shutdown) + { + if ((ret = libusb_handle_events(NULL))) + ERR("Error handling events: %s\n", libusb_strerror(ret)); + } + + TRACE("Shutting down libusb event thread.\n"); + return STATUS_SUCCESS; +} + +static NTSTATUS usb_exit(void *args) +{ + thread_shutdown = true; + libusb_interrupt_event_handler(NULL); + + return STATUS_SUCCESS; +} + static NTSTATUS usb_cancel_transfer(void *args) { const struct usb_cancel_transfer_params *params = args; @@ -46,5 +73,7 @@ static NTSTATUS usb_cancel_transfer(void *args) const unixlib_entry_t __wine_unix_call_funcs[] = { #define X(name) [unix_ ## name] = name + X(usb_main_loop), + X(usb_exit), X(usb_cancel_transfer), }; diff --git a/dlls/wineusb.sys/unixlib.h b/dlls/wineusb.sys/unixlib.h index d046062cd5f..6c037b20eef 100644 --- a/dlls/wineusb.sys/unixlib.h +++ b/dlls/wineusb.sys/unixlib.h @@ -32,6 +32,8 @@ struct usb_cancel_transfer_params enum unix_funcs { + unix_usb_main_loop, + unix_usb_exit, unix_usb_cancel_transfer, }; diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 9e8d78ccf05..66fe3778d64 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -376,7 +376,6 @@ static void remove_usb_device(libusb_device *libusb_device) } } -static BOOL thread_shutdown; static HANDLE libusb_event_thread, event_thread; static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device, @@ -393,19 +392,11 @@ static int LIBUSB_CALL hotplug_cb(libusb_context *context, libusb_device *device static DWORD CALLBACK libusb_event_thread_proc(void *arg) { static const struct usb_event shutdown_event = {.type = USB_EVENT_SHUTDOWN}; - int ret; - - TRACE("Starting libusb event thread.\n"); - while (!thread_shutdown) - { - if ((ret = libusb_handle_events(NULL))) - ERR("Error handling events: %s\n", libusb_strerror(ret)); - } + __wine_unix_call(unix_handle, unix_usb_main_loop, NULL); queue_event(&shutdown_event); - TRACE("Shutting down libusb event thread.\n"); return 0; } @@ -517,8 +508,7 @@ static NTSTATUS fdo_pnp(IRP *irp) struct usb_device *device, *cursor; libusb_hotplug_deregister_callback(NULL, hotplug_cb_handle); - thread_shutdown = TRUE; - libusb_interrupt_event_handler(NULL); + __wine_unix_call(unix_handle, unix_usb_exit, NULL); WaitForSingleObject(libusb_event_thread, INFINITE); CloseHandle(libusb_event_thread); WaitForSingleObject(event_thread, INFINITE);

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2022