Skip to content

Cancelioex fix #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mspisars merged 2 commits into from
Oct 30, 2017
Merged

Cancelioex fix #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3cd447
Get and use CancelIoEx if available
amullins83 Jan 8, 2015
087604a
Merge branch 'use_cancelioex' of https://github.com/amullins83/hidapi…
mspisars Oct 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion windows/hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,8 @@ extern "C" {
static BOOLEAN initialized = FALSE;
#endif /* HIDAPI_USE_DDK */

static HMODULE kernel_lib_handle = NULL;

struct hid_device_ {
HANDLE device_handle;
BOOL blocking;
Expand Down Expand Up @@ -262,6 +264,11 @@ int HID_API_EXPORT hid_exit(void)
if (lib_handle)
FreeLibrary(lib_handle);
lib_handle = NULL;

if (kernel_lib_handle)
FreeLibrary(kernel_lib_handle);
kernel_lib_handle = NULL;

initialized = FALSE;
#endif
return 0;
Expand Down Expand Up @@ -806,11 +813,31 @@ int HID_API_EXPORT HID_API_CALL hid_get_feature_report(hid_device *dev, unsigned
#endif
}

typedef BOOL (WINAPI *CancolIoEx_)(HANDLE, LPOVERLAPPED);

void HID_API_EXPORT HID_API_CALL hid_close(hid_device *dev)
{
static CancolIoEx_ CancelIoEx = NULL;
static BOOL didTryToLoadKernelLib = FALSE;

if (!dev)
return;
CancelIo(dev->device_handle);

if (!kernel_lib_handle && !didTryToLoadKernelLib) {
kernel_lib_handle = LoadLibraryA("kernel32.dll");
didTryToLoadKernelLib = TRUE;
if (kernel_lib_handle) {
CancelIoEx = GetProcAddress(kernel_lib_handle, "CancelIoEx");
}
}

if (CancelIoEx) {
CancelIoEx(dev->device_handle, &dev->ol);
}
else {
CancelIo(dev->device_handle);
}

free_hid_device(dev);
}

Expand Down