ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hidclass.sys: Properly quit hid_device_thread when both completion event and halt event are signaled.

Browse Source 
Signed-off-by: Changhui Liu <liuchanghui@linuxdeepin.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Changhui Liu 2016-01-20 14:11:42 +08:00 committed by Alexandre Julliard
parent a443318d18
commit 3f2055b1cf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dlls/hidclass.sys/device.c
View File

@ -261,7 +261,7 @@ static DWORD CALLBACK hid_device_thread(void *args)
NTSTATUS ntrc; NTSTATUS ntrc;
BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension;
events[0] = CreateEventA(NULL, FALSE, FALSE, NULL); events[0] = CreateEventA(NULL, TRUE, FALSE, NULL);
events[1] = ext->halt_event; events[1] = ext->halt_event;
if (ext->information.Polled) if (ext->information.Polled)
@ -336,12 +336,13 @@ static DWORD CALLBACK hid_device_thread(void *args)
if (ntrc == STATUS_PENDING) if (ntrc == STATUS_PENDING)
{ {
rc = WaitForMultipleObjects(2, events, FALSE, INFINITE); WaitForMultipleObjects(2, events, FALSE, INFINITE);
if (rc == WAIT_OBJECT_0 + 1)
exit_now = TRUE;
} }
rc = WaitForSingleObject(ext->halt_event, 0);
if (rc == WAIT_OBJECT_0)
exit_now = TRUE;
if (!exit_now && irp->IoStatus.u.Status == STATUS_SUCCESS) if (!exit_now && irp->IoStatus.u.Status == STATUS_SUCCESS)
{ {
packet->reportId = buffer[0]; packet->reportId = buffer[0];
@ -368,7 +369,7 @@ static DWORD CALLBACK hid_device_thread(void *args)
void HID_StartDeviceThread(DEVICE_OBJECT *device) void HID_StartDeviceThread(DEVICE_OBJECT *device)
{ {
BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; BASE_DEVICE_EXTENSION *ext = device->DeviceExtension;
ext->halt_event = CreateEventA(NULL, FALSE, FALSE, NULL); ext->halt_event = CreateEventA(NULL, TRUE, FALSE, NULL);
ext->thread = CreateThread(NULL, 0, hid_device_thread, device, 0, NULL); ext->thread = CreateThread(NULL, 0, hid_device_thread, device, 0, NULL);
} }