mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-01 18:43:37 +00:00
winebus.sys: Return an event from IOHID bus wait on device removal.
Instead of calling bus_unlink_hid_device or IoInvalidateDeviceRelations. Signed-off-by: Rémi Bernon <rbernon@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
9f09e2a3cb
commit
2457113970
|
@ -47,7 +47,6 @@ DEVICE_OBJECT *bus_create_hid_device(const WCHAR *busidW, WORD vid, WORD pid, WO
|
|||
DWORD version, DWORD uid, const WCHAR *serialW, BOOL is_gamepad,
|
||||
const platform_vtbl *vtbl, struct unix_device *unix_device) DECLSPEC_HIDDEN;
|
||||
DEVICE_OBJECT *bus_find_hid_device(const WCHAR *bus_id, void *platform_dev) DECLSPEC_HIDDEN;
|
||||
void bus_unlink_hid_device(DEVICE_OBJECT *device) DECLSPEC_HIDDEN;
|
||||
void process_hid_report(DEVICE_OBJECT *device, BYTE *report, DWORD length) DECLSPEC_HIDDEN;
|
||||
DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function, void *context) DECLSPEC_HIDDEN;
|
||||
|
||||
|
|
|
@ -97,6 +97,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay);
|
|||
|
||||
static IOHIDManagerRef hid_manager;
|
||||
static CFRunLoopRef run_loop;
|
||||
static struct list event_queue = LIST_INIT(event_queue);
|
||||
|
||||
static const WCHAR busidW[] = {'I','O','H','I','D',0};
|
||||
static struct iohid_bus_options options;
|
||||
|
@ -377,19 +378,13 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void *
|
|||
|
||||
static void handle_RemovalCallback(void *context, IOReturn result, void *sender, IOHIDDeviceRef IOHIDDevice)
|
||||
{
|
||||
DEVICE_OBJECT *device;
|
||||
TRACE("OS/X IOHID Device Removed %p\n", IOHIDDevice);
|
||||
IOHIDDeviceRegisterInputReportCallback(IOHIDDevice, NULL, 0, NULL, NULL);
|
||||
/* Note: Yes, we leak the buffer. But according to research there is no
|
||||
safe way to deallocate that buffer. */
|
||||
IOHIDDeviceUnscheduleFromRunLoop(IOHIDDevice, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
|
||||
IOHIDDeviceClose(IOHIDDevice, 0);
|
||||
device = bus_find_hid_device(busidW, IOHIDDevice);
|
||||
if (device)
|
||||
{
|
||||
bus_unlink_hid_device(device);
|
||||
IoInvalidateDeviceRelations(bus_pdo, BusRelations);
|
||||
}
|
||||
bus_event_queue_device_removed(&event_queue, busidW, IOHIDDevice);
|
||||
}
|
||||
|
||||
NTSTATUS iohid_bus_init(void *args)
|
||||
|
@ -415,9 +410,15 @@ NTSTATUS iohid_bus_init(void *args)
|
|||
|
||||
NTSTATUS iohid_bus_wait(void *args)
|
||||
{
|
||||
CFRunLoopRun();
|
||||
struct bus_event *result = args;
|
||||
|
||||
do
|
||||
{
|
||||
if (bus_event_queue_pop(&event_queue, result)) return STATUS_PENDING;
|
||||
} while (CFRunLoopRunInMode(kCFRunLoopDefaultMode, 10, TRUE) != kCFRunLoopRunStopped);
|
||||
|
||||
TRACE("IOHID main loop exiting\n");
|
||||
bus_event_queue_destroy(&event_queue);
|
||||
IOHIDManagerRegisterDeviceMatchingCallback(hid_manager, NULL, NULL);
|
||||
IOHIDManagerRegisterDeviceRemovalCallback(hid_manager, NULL, NULL);
|
||||
CFRelease(hid_manager);
|
||||
|
|
|
@ -374,7 +374,7 @@ DEVICE_OBJECT *bus_enumerate_hid_devices(const WCHAR *bus_id, enum_func function
|
|||
return ret;
|
||||
}
|
||||
|
||||
void bus_unlink_hid_device(DEVICE_OBJECT *device)
|
||||
static void bus_unlink_hid_device(DEVICE_OBJECT *device)
|
||||
{
|
||||
struct device_extension *ext = (struct device_extension *)device->DeviceExtension;
|
||||
|
||||
|
|
Loading…
Reference in a new issue