Rémi Bernon : winebus.sys: Remove the DEVICE_OBJECT arg on device_start.
Module: wine Branch: master Commit: cdaf1d9a7f97f02ab92c11f288aaf0cf55d4b195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdaf1d9a7f97f02ab92c11f28... Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 15 09:04:46 2021 +0200 winebus.sys: Remove the DEVICE_OBJECT arg on device_start. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_iohid.c | 2 +- dlls/winebus.sys/bus_sdl.c | 2 +- dlls/winebus.sys/bus_udev.c | 4 ++-- dlls/winebus.sys/main.c | 7 +------ dlls/winebus.sys/unix_private.h | 2 +- dlls/winebus.sys/unixlib.c | 9 ++++----- dlls/winebus.sys/unixlib.h | 7 ------- 7 files changed, 10 insertions(+), 23 deletions(-) diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index c16c780bc76..8bdd7857ae6 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -151,7 +151,7 @@ static int iohid_device_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS iohid_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS iohid_device_start(struct unix_device *iface) { DWORD length; struct platform_private *private = impl_from_unix_device(iface); diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6eafcb75285..6a6f364edf6 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -502,7 +502,7 @@ static int sdl_device_compare(struct unix_device *iface, void *context) return impl_from_unix_device(iface)->id - PtrToUlong(context); } -static NTSTATUS sdl_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS sdl_device_start(struct unix_device *iface) { struct platform_private *ext = impl_from_unix_device(iface); if (ext->sdl_controller) return build_mapped_report_descriptor(ext); diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index b94af8db71c..23b649ff511 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -616,7 +616,7 @@ static int udev_device_compare(struct unix_device *iface, void *platform_dev) return strcmp(udev_device_get_syspath(dev1), udev_device_get_syspath(dev2)); } -static NTSTATUS hidraw_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS hidraw_device_start(struct unix_device *iface) { EnterCriticalSection(&udev_cs); start_polling_device(iface); @@ -813,7 +813,7 @@ static void lnxev_device_destroy(struct unix_device *iface) udev_device_unref(ext->base.udev_device); } -static NTSTATUS lnxev_device_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS lnxev_device_start(struct unix_device *iface) { struct wine_input_private *ext = input_impl_from_unix_device(iface); NTSTATUS status; diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 3e63a84adcc..162787c4e4a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -160,12 +160,7 @@ static int unix_device_compare(DEVICE_OBJECT *device, void *context) static NTSTATUS unix_device_start(DEVICE_OBJECT *device) { struct device_extension *ext = (struct device_extension *)device->DeviceExtension; - struct device_start_params params = - { - .iface = ext->unix_device, - .device = device - }; - return winebus_call(device_start, ¶ms); + return winebus_call(device_start, ext->unix_device); } static NTSTATUS unix_device_get_report_descriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *out_length) diff --git a/dlls/winebus.sys/unix_private.h b/dlls/winebus.sys/unix_private.h index 611873db17f..3f8d73d033a 100644 --- a/dlls/winebus.sys/unix_private.h +++ b/dlls/winebus.sys/unix_private.h @@ -33,7 +33,7 @@ struct unix_device_vtbl { void (*destroy)(struct unix_device *iface); int (*compare)(struct unix_device *iface, void *platform_dev); - NTSTATUS (*start)(struct unix_device *iface, DEVICE_OBJECT *device); + NTSTATUS (*start)(struct unix_device *iface); void (*stop)(struct unix_device *iface); NTSTATUS (*get_report_descriptor)(struct unix_device *iface, BYTE *buffer, DWORD length, DWORD *out_length); void (*set_output_report)(struct unix_device *iface, HID_XFER_PACKET *packet, IO_STATUS_BLOCK *io); diff --git a/dlls/winebus.sys/unixlib.c b/dlls/winebus.sys/unixlib.c index b91de06e73c..87cc7de3474 100644 --- a/dlls/winebus.sys/unixlib.c +++ b/dlls/winebus.sys/unixlib.c @@ -56,7 +56,7 @@ static int mouse_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS mouse_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS mouse_start(struct unix_device *iface) { struct mouse_device *impl = mouse_from_unix_device(iface); @@ -160,7 +160,7 @@ static int keyboard_compare(struct unix_device *iface, void *context) return 0; } -static NTSTATUS keyboard_start(struct unix_device *iface, DEVICE_OBJECT *device) +static NTSTATUS keyboard_start(struct unix_device *iface) { struct keyboard_device *impl = keyboard_from_unix_device(iface); @@ -284,9 +284,8 @@ static NTSTATUS unix_device_compare(void *args) static NTSTATUS unix_device_start(void *args) { - struct device_start_params *params = args; - struct unix_device *iface = params->iface; - return iface->vtbl->start(iface, params->device); + struct unix_device *iface = args; + return iface->vtbl->start(iface); } static NTSTATUS unix_device_get_report_descriptor(void *args) diff --git a/dlls/winebus.sys/unixlib.h b/dlls/winebus.sys/unixlib.h index 47256e80740..61684d0c0af 100644 --- a/dlls/winebus.sys/unixlib.h +++ b/dlls/winebus.sys/unixlib.h @@ -24,7 +24,6 @@ #include <windef.h> #include <winbase.h> #include <winternl.h> -#include <ddk/wdm.h> #include <ddk/hidclass.h> #include <hidusage.h> @@ -112,12 +111,6 @@ struct device_compare_params void *context; }; -struct device_start_params -{ - struct unix_device *iface; - DEVICE_OBJECT *device; -}; - struct device_descriptor_params { struct unix_device *iface;
participants (1)
-
Alexandre Julliard