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

Jinoh Kang : riched20: Ensure MEPF_COMPLEX is unset when in password input mode.
by Alexandre Julliard July 12, 2022

July 12, 2022

Module: wine Branch: master Commit: f77f12ba3b1dad9ebdcb116c66b137e9103a0d1b URL: https://gitlab.winehq.org/wine/wine/-/commit/f77f12ba3b1dad9ebdcb116c66b137… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Tue Jul 12 02:28:15 2022 +0900 riched20: Ensure MEPF_COMPLEX is unset when in password input mode. Otherwise, Wine may crash while attempting to fetch the script shaping information, which does not exist since shape_para() was not called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53335 Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/riched20/wrap.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index db3e2806239..8cfb1692ecd 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -835,6 +835,15 @@ static void ME_WrapTextParagraph( ME_TextEditor *editor, ME_Context *c, ME_Parag if (SUCCEEDED( itemize_para( c, para ) )) shape_para( c, para ); } + else + { + /* If the user has just converted a normal rich editor with already + * existing text into a password input, the text may contain paragraphs + * with MEPF_COMPLEX set. Since we don't really shape any paragraphs + * here, we need to ensure that the MEPF_COMPLEX flag is unset. + */ + para->nFlags &= ~MEPF_COMPLEX; + } wc.context = c; wc.para = para;

1 0

Rémi Bernon : mf: Move and rename topology_loader_get_node_type_handler.
by Alexandre Julliard July 12, 2022

July 12, 2022

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 July 12, 2022

July 12, 2022

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

Zebediah Figura : ddraw/tests: Build ddraw1.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard July 12, 2022

July 12, 2022

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 : ddraw/tests: Build ddraw2.c without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard July 12, 2022

July 12, 2022

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

Rémi Bernon : mf/tests: Simplify topology loader tests.
by Alexandre Julliard July 12, 2022

July 12, 2022

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

Rémi Bernon : mf/tests: Add more topology loader media types tests.
by Alexandre Julliard July 12, 2022

July 12, 2022

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

Zebediah Figura : wineusb.sys: Queue pending IRPs after submitting the URB.
by Alexandre Julliard July 12, 2022

July 12, 2022

Module: wine Branch: master Commit: b3a47cf17e7e6f5176bab04e5034bf41700f592f URL: https://gitlab.winehq.org/wine/wine/-/commit/b3a47cf17e7e6f5176bab04e5034bf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed May 25 17:00:02 2022 -0500 wineusb.sys: Queue pending IRPs after submitting the URB. --- dlls/wineusb.sys/wineusb.c | 105 +++++++++++++++++++++++++++++---------------- 1 file changed, 67 insertions(+), 38 deletions(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index 396591db451..9e8d78ccf05 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -829,15 +829,6 @@ static void LIBUSB_CALL transfer_cb(struct libusb_transfer *transfer) queue_event(&event); } -static void queue_irp(struct usb_device *device, IRP *irp, struct libusb_transfer *transfer) -{ - IoMarkIrpPending(irp); - irp->Tail.Overlay.DriverContext[0] = transfer; - EnterCriticalSection(&wineusb_cs); - InsertTailList(&device->irp_list, &irp->Tail.Overlay.ListEntry); - LeaveCriticalSection(&wineusb_cs); -} - struct pipe { unsigned char endpoint; @@ -869,10 +860,10 @@ static struct pipe get_pipe(HANDLE handle) return u.pipe; } -static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) +static NTSTATUS unix_submit_urb(struct unix_device *device, IRP *irp) { URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; - libusb_device_handle *handle = device->unix_device->handle; + libusb_device_handle *handle = device->handle; struct libusb_transfer *transfer; int ret; @@ -880,30 +871,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) switch (urb->UrbHeader.Function) { - case URB_FUNCTION_ABORT_PIPE: - { - LIST_ENTRY *entry, *mark; - - /* The documentation states that URB_FUNCTION_ABORT_PIPE may - * complete before outstanding requests complete, so we don't need - * to wait for them. */ - EnterCriticalSection(&wineusb_cs); - mark = &device->irp_list; - for (entry = mark->Flink; entry != mark; entry = entry->Flink) - { - IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - struct usb_cancel_transfer_params params = - { - .transfer = queued_irp->Tail.Overlay.DriverContext[0], - }; - - __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); - } - LeaveCriticalSection(&wineusb_cs); - - return STATUS_SUCCESS; - } - case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: { struct _URB_PIPE_REQUEST *req = &urb->UrbPipeRequest; @@ -925,6 +892,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; + irp->Tail.Overlay.DriverContext[0] = transfer; if (pipe.type == UsbdPipeTypeBulk) { @@ -943,7 +911,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return USBD_STATUS_INVALID_PIPE_HANDLE; } - queue_irp(device, irp, transfer); transfer->flags = LIBUSB_TRANSFER_FREE_TRANSFER; ret = libusb_submit_transfer(transfer); if (ret < 0) @@ -962,6 +929,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; + irp->Tail.Overlay.DriverContext[0] = transfer; if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) { @@ -969,7 +937,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_NO_MEMORY; } - queue_irp(device, irp, transfer); libusb_fill_control_setup(buffer, LIBUSB_ENDPOINT_IN | LIBUSB_REQUEST_TYPE_STANDARD | LIBUSB_RECIPIENT_DEVICE, LIBUSB_REQUEST_GET_DESCRIPTOR, (req->DescriptorType << 8) | req->Index, @@ -1019,6 +986,7 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) if (!(transfer = libusb_alloc_transfer(0))) return STATUS_NO_MEMORY; + irp->Tail.Overlay.DriverContext[0] = transfer; if (!(buffer = malloc(sizeof(struct libusb_control_setup) + req->TransferBufferLength))) { @@ -1026,7 +994,6 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_NO_MEMORY; } - queue_irp(device, irp, transfer); libusb_fill_control_setup(buffer, req_type, req->Request, req->Value, req->Index, req->TransferBufferLength); if (!(req->TransferFlags & USBD_TRANSFER_DIRECTION_IN)) @@ -1047,6 +1014,68 @@ static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS usb_submit_urb(struct usb_device *device, IRP *irp) +{ + URB *urb = IoGetCurrentIrpStackLocation(irp)->Parameters.Others.Argument1; + NTSTATUS status; + + TRACE("type %#x.\n", urb->UrbHeader.Function); + + switch (urb->UrbHeader.Function) + { + case URB_FUNCTION_ABORT_PIPE: + { + LIST_ENTRY *entry, *mark; + + /* The documentation states that URB_FUNCTION_ABORT_PIPE may + * complete before outstanding requests complete, so we don't need + * to wait for them. */ + EnterCriticalSection(&wineusb_cs); + mark = &device->irp_list; + for (entry = mark->Flink; entry != mark; entry = entry->Flink) + { + IRP *queued_irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); + struct usb_cancel_transfer_params params = + { + .transfer = queued_irp->Tail.Overlay.DriverContext[0], + }; + + __wine_unix_call(unix_handle, unix_usb_cancel_transfer, &params); + } + LeaveCriticalSection(&wineusb_cs); + + return STATUS_SUCCESS; + } + + case URB_FUNCTION_SYNC_RESET_PIPE_AND_CLEAR_STALL: + case URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER: + case URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE: + case URB_FUNCTION_SELECT_CONFIGURATION: + case URB_FUNCTION_VENDOR_INTERFACE: + { + /* Hold the wineusb lock while submitting and queuing, and + * similarly hold it in complete_irp(). That way, if libusb reports + * completion between submitting and queuing, we won't try to + * dequeue the IRP until it's actually been queued. */ + EnterCriticalSection(&wineusb_cs); + status = unix_submit_urb(device->unix_device, irp); + if (status == STATUS_PENDING) + { + IoMarkIrpPending(irp); + InsertTailList(&device->irp_list, &irp->Tail.Overlay.ListEntry); + } + LeaveCriticalSection(&wineusb_cs); + + return status; + } + + default: + FIXME("Unhandled function %#x.\n", urb->UrbHeader.Function); + } + + return STATUS_NOT_IMPLEMENTED; +} + static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device_obj, IRP *irp) { IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp);

1 0

Zebediah Figura : wineusb.sys: Move the event queue and device list to the Unix library.
by Alexandre Julliard July 12, 2022

July 12, 2022

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 July 12, 2022

July 12, 2022

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