February 2021 - Wine-Commits

Zebediah Figura : winegstreamer: Move wg_parser_destroy() to the Unix library.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 9147fefbb2e3192d2679e7d0b984a621949ccd1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9147fefbb2e3192d2679e7d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 16:18:58 2021 -0600 winegstreamer: Move wg_parser_destroy() to the Unix library. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/gstdemux.c | 18 +----------------- dlls/winegstreamer/wg_parser.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 7aaf25e395e..15a20749786 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -210,6 +210,7 @@ struct unix_funcs struct wg_parser *(CDECL *wg_avi_parser_create)(void); struct wg_parser *(CDECL *wg_mpeg_audio_parser_create)(void); struct wg_parser *(CDECL *wg_wave_parser_create)(void); + void (CDECL *wg_parser_destroy)(struct wg_parser *parser); }; extern const struct unix_funcs *unix_funcs; diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index b4f95df67da..db1825e34a1 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1225,22 +1225,6 @@ static struct strmbase_pin *parser_get_pin(struct strmbase_filter *base, unsigne return NULL; } -static void wg_parser_destroy(struct wg_parser *parser) -{ - if (parser->bus) - { - gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); - gst_object_unref(parser->bus); - } - - pthread_mutex_destroy(&parser->mutex); - pthread_cond_destroy(&parser->init_cond); - pthread_cond_destroy(&parser->read_cond); - pthread_cond_destroy(&parser->read_done_cond); - - free(parser); -} - static void parser_destroy(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); @@ -1259,7 +1243,7 @@ static void parser_destroy(struct strmbase_filter *iface) IAsyncReader_Release(filter->reader); filter->reader = NULL; - wg_parser_destroy(filter->wg_parser); + unix_funcs->wg_parser_destroy(filter->wg_parser); strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 3a67a195dff..071694f77cc 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -1011,12 +1011,29 @@ static struct wg_parser * CDECL wg_wave_parser_create(void) return parser; } +static void CDECL wg_parser_destroy(struct wg_parser *parser) +{ + if (parser->bus) + { + gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); + gst_object_unref(parser->bus); + } + + pthread_mutex_destroy(&parser->mutex); + pthread_cond_destroy(&parser->init_cond); + pthread_cond_destroy(&parser->read_cond); + pthread_cond_destroy(&parser->read_done_cond); + + free(parser); +} + static const struct unix_funcs funcs = { wg_decodebin_parser_create, wg_avi_parser_create, wg_mpeg_audio_parser_create, wg_wave_parser_create, + wg_parser_destroy, }; NTSTATUS CDECL __wine_init_unix_lib(HMODULE module, DWORD reason, const void *ptr_in, void *ptr_out)

1 0

Zebediah Figura : wined3d: Support WINED3D_RTYPE_BUFFER in wined3d_check_device_format().
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: da9726a16c9a785b86be6a847156192c7c622ce9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da9726a16c9a785b86be6a84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 20:33:29 2021 -0600 wined3d: Support WINED3D_RTYPE_BUFFER in wined3d_check_device_format(). 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/directx.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5c0998ba54c..c673f61e429 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1781,6 +1781,19 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_3D; break; + case WINED3D_RTYPE_BUFFER: + if (wined3d_format_is_typeless(format)) + { + TRACE("Requested WINED3D_RTYPE_BUFFER, but format %s is typeless.\n", debug_d3dformat(check_format_id)); + return WINED3DERR_NOTAVAILABLE; + } + + allowed_usage = WINED3DUSAGE_DYNAMIC; + allowed_bind_flags = WINED3D_BIND_SHADER_RESOURCE + | WINED3D_BIND_UNORDERED_ACCESS; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_BUFFER; + break; + default: FIXME("Unhandled resource type %s.\n", debug_d3dresourcetype(resource_type)); return WINED3DERR_NOTAVAILABLE;

1 0

Alexandre Julliard : Release 6.2.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 4f7e621dc58fd82924e64c695dc61a78c55fd44e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f7e621dc58fd82924e64c69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 12 21:35:58 2021 +0100 Release 6.2. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 899 ++++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 477 insertions(+), 445 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f7e621dc58fd82924e6…

1 0

Zebediah Figura : winebus.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 141fdcc0efe923a83db9794d9855ef295bd9bece URL: https://source.winehq.org/git/wine.git/?a=commit;h=141fdcc0efe923a83db9794d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:50 2021 -0600 winebus.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed. Microsoft doesn't really clearly document this, but their driver samples return it here, and so do remove locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 396a9d07123..8d3dec4779a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -370,7 +370,7 @@ void bus_remove_hid_device(DEVICE_OBJECT *device) while ((entry = RemoveHeadList(&ext->irp_queue)) != &ext->irp_queue) { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.s.ListEntry); - irp->IoStatus.u.Status = STATUS_CANCELLED; + irp->IoStatus.u.Status = STATUS_DELETE_PENDING; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); }

1 0

Zebediah Figura : hidclass.sys: No longer track devices in a list.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 5294ebc9a0f17efc5eba1ed5981275a500e01190 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5294ebc9a0f17efc5eba1ed5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:48 2021 -0600 hidclass.sys: No longer track devices in a list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 7 ------- dlls/hidclass.sys/main.c | 2 -- dlls/hidclass.sys/pnp.c | 27 +-------------------------- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 8ffd489a0ee..889b8c625c0 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -72,12 +72,6 @@ void RingBuffer_Destroy(struct ReportRingBuffer *buffer) DECLSPEC_HIDDEN; struct ReportRingBuffer* RingBuffer_Create(UINT buffer_size) DECLSPEC_HIDDEN; NTSTATUS RingBuffer_SetSize(struct ReportRingBuffer *buffer, UINT size) DECLSPEC_HIDDEN; -typedef struct _hiddevice -{ - struct list entry; - DEVICE_OBJECT *device; -} hid_device; - typedef struct _minidriver { struct list entry; @@ -88,7 +82,6 @@ typedef struct _minidriver PDRIVER_ADD_DEVICE AddDevice; PDRIVER_DISPATCH PNPDispatch; - struct list device_list; } minidriver; NTSTATUS call_minidriver(ULONG code, DEVICE_OBJECT *device, void *in_buff, ULONG in_size, void *out_buff, ULONG out_size) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index cef58217f5e..50657b80f5e 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -81,8 +81,6 @@ NTSTATUS WINAPI HidRegisterMinidriver(HID_MINIDRIVER_REGISTRATION *registration) driver->minidriver = *registration; list_add_tail(&minidriver_list, &driver->entry); - list_init(&driver->device_list); - return STATUS_SUCCESS; } diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 13b07e4e379..a50e7382466 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -72,7 +72,6 @@ static NTSTATUS get_device_id(DEVICE_OBJECT *device, BUS_QUERY_ID_TYPE type, WCH NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { WCHAR device_id[MAX_DEVICE_ID_LEN], instance_id[MAX_DEVICE_ID_LEN]; - hid_device *hiddev; DEVICE_OBJECT *device = NULL; NTSTATUS status; minidriver *minidriver; @@ -97,18 +96,12 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) TRACE("Adding device to PDO %p, id %s\\%s.\n", PDO, debugstr_w(device_id), debugstr_w(instance_id)); minidriver = find_minidriver(driver); - hiddev = HeapAlloc(GetProcessHeap(), 0, sizeof(*hiddev)); - if (!hiddev) - return STATUS_NO_MEMORY; - - status = HID_CreateDevice(PDO, &minidriver->minidriver, &hiddev->device); + status = HID_CreateDevice(PDO, &minidriver->minidriver, &device); if (status != STATUS_SUCCESS) { ERR("Failed to create HID object (%x)\n",status); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } - device = hiddev->device; ext = device->DeviceExtension; InitializeListHead(&ext->irp_queue); @@ -120,7 +113,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver AddDevice failed (%x)\n",status); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -131,7 +123,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Minidriver failed to get Attributes(%x)\n",status); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -146,7 +137,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot get Device Descriptor(%x)\n",status); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } for (i = 0; i < descriptor.bNumDescriptors; i++) @@ -157,7 +147,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("No Report Descriptor found in reply\n"); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -169,7 +158,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) ERR("Cannot get Report Descriptor(%x)\n",status); HID_DeleteDevice(device); HeapFree(GetProcessHeap(), 0, reportDescriptor); - HeapFree(GetProcessHeap(), 0, hiddev); return status; } @@ -180,12 +168,9 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) { ERR("Cannot parse Report Descriptor\n"); HID_DeleteDevice(device); - HeapFree(GetProcessHeap(), 0, hiddev); return STATUS_NOT_SUPPORTED; } - list_add_tail(&(minidriver->device_list), &hiddev->entry); - ext->information.DescriptorSize = ext->preparseData->dwSize; lstrcpyW(ext->instance_id, instance_id); @@ -208,7 +193,6 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) static NTSTATUS remove_device(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; - hid_device *hiddev; NTSTATUS rc = STATUS_NOT_SUPPORTED; rc = IoSetDeviceInterfaceState(&ext->link_name, FALSE); @@ -224,15 +208,6 @@ static NTSTATUS remove_device(minidriver *minidriver, DEVICE_OBJECT *device, IRP if (irp) rc = minidriver->PNPDispatch(device, irp); HID_DeleteDevice(device); - LIST_FOR_EACH_ENTRY(hiddev, &minidriver->device_list, hid_device, entry) - { - if (hiddev->device == device) - { - list_remove(&hiddev->entry); - HeapFree(GetProcessHeap(), 0, hiddev); - break; - } - } return rc; }

1 0

Zebediah Figura : hidclass.sys: Do not manually clean up devices on unload.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 76daa6b70cf9e34e187736ecb08ebeedb5922dfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=76daa6b70cf9e34e187736ec… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:47 2021 -0600 hidclass.sys: Do not manually clean up devices on unload. We can rely on ntoskrnl to do this for us. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/hid.h | 1 - dlls/hidclass.sys/main.c | 6 ------ dlls/hidclass.sys/pnp.c | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/hidclass.sys/hid.h b/dlls/hidclass.sys/hid.h index 36d13c009d7..8ffd489a0ee 100644 --- a/dlls/hidclass.sys/hid.h +++ b/dlls/hidclass.sys/hid.h @@ -109,7 +109,6 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) DECLSPEC_HIDDE /* Pseudo-Plug and Play support*/ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT* PDO) DECLSPEC_HIDDEN; -NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT* device, IRP* irp) DECLSPEC_HIDDEN; /* Parsing HID Report Descriptors into preparsed data */ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) DECLSPEC_HIDDEN; diff --git a/dlls/hidclass.sys/main.c b/dlls/hidclass.sys/main.c index e169c429efb..cef58217f5e 100644 --- a/dlls/hidclass.sys/main.c +++ b/dlls/hidclass.sys/main.c @@ -48,12 +48,6 @@ static VOID WINAPI UnloadDriver(DRIVER_OBJECT *driver) md = find_minidriver(driver); if (md) { - hid_device *device, *next; - TRACE("%i devices to unload\n", list_count(&md->device_list)); - LIST_FOR_EACH_ENTRY_SAFE(device, next, &md->device_list, hid_device, entry) - { - PNP_RemoveDevice(md, device->device, NULL); - } if (md->DriverUnload) md->DriverUnload(md->minidriver.DriverObject); list_remove(&md->entry); diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 27de1e1b04b..13b07e4e379 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -205,7 +205,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return STATUS_SUCCESS; } -NTSTATUS PNP_RemoveDevice(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) +static NTSTATUS remove_device(minidriver *minidriver, DEVICE_OBJECT *device, IRP *irp) { BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; hid_device *hiddev; @@ -306,7 +306,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_REMOVE_DEVICE: { - return PNP_RemoveDevice(minidriver, device, irp); + return remove_device(minidriver, device, irp); } default: {

1 0

Zebediah Figura : winebus.sys: Return success from IRP_MN_QUERY_CAPABILITIES.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: dece98fb59913a89e1e47ec0c31aff60f3aad664 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dece98fb59913a89e1e47ec0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:46 2021 -0600 winebus.sys: Return success from IRP_MN_QUERY_CAPABILITIES. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 2388033ceda..396a9d07123 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -600,16 +600,17 @@ static NTSTATUS pdo_pnp_dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_QUERY_ID: TRACE("IRP_MN_QUERY_ID\n"); status = handle_IRP_MN_QUERY_ID(device, irp); - irp->IoStatus.u.Status = status; break; case IRP_MN_QUERY_CAPABILITIES: TRACE("IRP_MN_QUERY_CAPABILITIES\n"); + status = STATUS_SUCCESS; break; default: FIXME("Unhandled function %08x\n", irpsp->MinorFunction); break; } + irp->IoStatus.u.Status = status; IoCompleteRequest(irp, IO_NO_INCREMENT); return status; }

1 0

Rémi Bernon : widl: Support WinRT parameterized type parsing.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: ed21c294815d3e1eff9dca861f4af16096cc1ce7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed21c294815d3e1eff9dca86… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 11 17:37:27 2021 +0100 widl: Support WinRT parameterized type parsing. And add IVectorView<T> and IIterator<T> parameterized interfaces to windows.foundation.idl for illustration and future use. They won't generate any additional code until they are fully specialized. This is a WIDL-specific feature, but MIDL has some magic knowledge of these Windows.Foundation.Collections interface templates, and we need a way to instruct WIDL about them too. Having these interfaces declared in the IDL, guarded with __WIDL__ ifdef is easier and more flexible than re-creating the types by hand in WIDL source. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.idl | 29 +++++++++++++++ tools/widl/expr.c | 2 ++ tools/widl/header.c | 8 +++-- tools/widl/parser.y | 82 +++++++++++++++++++++++++++++++++++------- tools/widl/typegen.c | 6 ++++ tools/widl/typelib.c | 2 ++ tools/widl/typetree.c | 39 ++++++++++++++++++++ tools/widl/typetree.h | 4 +++ tools/widl/widltypes.h | 9 +++++ 9 files changed, 166 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ed21c294815d3e1eff9d…

1 0

Zebediah Figura : wineusb.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: 181fe28f685453920a04d2234a9a838b7c619407 URL: https://source.winehq.org/git/wine.git/?a=commit;h=181fe28f685453920a04d223… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 11 18:56:49 2021 -0600 wineusb.sys: Return STATUS_DELETE_PENDING rather than STATUS_CANCELLED when a device is removed. Microsoft doesn't really clearly document this, but their driver samples return it here, and so do remove locks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index f70197704b1..f46f17d66f4 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -391,7 +391,7 @@ static NTSTATUS pdo_pnp(DEVICE_OBJECT *device_obj, IRP *irp) while ((entry = RemoveHeadList(&device->irp_list)) != &device->irp_list) { irp = CONTAINING_RECORD(entry, IRP, Tail.Overlay.ListEntry); - irp->IoStatus.Status = STATUS_CANCELLED; + irp->IoStatus.Status = STATUS_DELETE_PENDING; irp->IoStatus.Information = 0; IoCompleteRequest(irp, IO_NO_INCREMENT); }

1 0

Brendan Shanks : ntdll: Always use MAP_FAILED as mmap()'s error value.
by Alexandre Julliard Feb. 12, 2021

Feb. 12, 2021

Module: wine Branch: master Commit: b79b158d6b29a6e9fc8ce49446cc349339bd953d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b79b158d6b29a6e9fc8ce494… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Feb 11 21:37:51 2021 -0800 ntdll: Always use MAP_FAILED as mmap()'s error value. Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 26a3ca0d2dd..e0346a28ea3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1807,7 +1807,7 @@ static NTSTATUS map_file_into_view( struct file_view *view, int fd, size_t start /* only try mmap if media is not removable (or if we require write access) */ if (!removable || (flags & MAP_SHARED)) { - if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != (void *)-1) + if (mmap( (char *)view->base + start, size, prot, flags, fd, offset ) != MAP_FAILED) goto done; switch (errno) @@ -1970,7 +1970,7 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) if (!*removable) { - if (mmap( ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, 0 ) != (void *)-1) + if (mmap( ptr, size, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_FIXED|MAP_PRIVATE, fd, 0 ) != MAP_FAILED) return STATUS_SUCCESS; switch (errno)

1 0