[janderwald] 54115: [HID] - Implement HidD_GetIndexedString, HidD_GetMsGenreDescriptor, HidD_GetConfiguration, HidD_SetConfiguration, HidP_GetUsagesEx
Author: janderwald Date: Thu Oct 13 17:51:13 2011 New Revision: 54115
URL: http://svn.reactos.org/svn/reactos?rev=54115&view=rev Log: [HID] - Implement HidD_GetIndexedString, HidD_GetMsGenreDescriptor, HidD_GetConfiguration, HidD_SetConfiguration, HidP_GetUsagesEx
Modified: branches/usb-bringup/dll/win32/hid/hid.c branches/usb-bringup/dll/win32/hid/stubs.c
Modified: branches/usb-bringup/dll/win32/hid/hid.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/dll/win32/hid/hid.c?... ============================================================================== --- branches/usb-bringup/dll/win32/hid/hid.c [iso-8859-1] (original) +++ branches/usb-bringup/dll/win32/hid/hid.c [iso-8859-1] Thu Oct 13 17:51:13 2011 @@ -70,7 +70,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_FLUSH_QUEUE, NULL, 0, NULL, 0, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -150,7 +150,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -182,7 +182,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -201,7 +201,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -219,7 +219,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(ULONG), - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -238,7 +238,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_GET_PHYSICAL_DESCRIPTOR, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -254,7 +254,7 @@ { HID_COLLECTION_INFORMATION hci; DWORD RetLen; - BOOL Ret; + BOOLEAN Ret;
if(PreparsedData == NULL) { @@ -279,7 +279,7 @@ Ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, *PreparsedData, hci.DescriptorSize, - &RetLen, NULL); + &RetLen, NULL) != 0;
if(!Ret) { @@ -312,7 +312,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -331,7 +331,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -394,7 +394,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -412,7 +412,7 @@ return DeviceIoControl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(ULONG), NULL, 0, - &RetLen, NULL); + &RetLen, NULL) != 0; }
@@ -431,7 +431,112 @@ return DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, - &RetLen, NULL); -} + &RetLen, NULL) != 0; +} + +/* + * HidD_GetIndexedString EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_GetIndexedString(IN HANDLE HidDeviceObject, + IN ULONG StringIndex, + OUT PVOID Buffer, + IN ULONG BufferLength) +{ + DWORD RetLen; + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_INDEXED_STRING, + &StringIndex, sizeof(ULONG), + Buffer, BufferLength, + &RetLen, NULL) != 0; +} + +/* + * HidD_GetMsGenreDescriptor EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject, + OUT PVOID Buffer, + IN ULONG BufferLength) +{ + DWORD RetLen; + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_MS_GENRE_DESCRIPTOR, + 0, 0, + Buffer, BufferLength, + &RetLen, NULL) != 0; +} + +/* + * HidD_GetConfiguration EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_GetConfiguration(IN HANDLE HidDeviceObject, + OUT PHIDD_CONFIGURATION Configuration, + IN ULONG ConfigurationLength) +{ + + // magic cookie + Configuration->cookie = (PVOID)HidD_GetConfiguration; + + return DeviceIoControl(HidDeviceObject, IOCTL_HID_GET_DRIVER_CONFIG, + 0, 0, + &Configuration->size, ConfigurationLength - sizeof(ULONG), + (PULONG)&Configuration->cookie, NULL) != 0; +} + +/* + * HidD_SetConfiguration EXPORTED + * + * @implemented + */ +HIDAPI +BOOLEAN WINAPI +HidD_SetConfiguration(IN HANDLE HidDeviceObject, + IN PHIDD_CONFIGURATION Configuration, + IN ULONG ConfigurationLength) +{ + BOOLEAN Ret = FALSE; + + if (Configuration->cookie == (PVOID)HidD_GetConfiguration) + { + Ret = DeviceIoControl(HidDeviceObject, IOCTL_HID_SET_DRIVER_CONFIG, + 0, 0, + (PVOID)&Configuration->size, ConfigurationLength - sizeof(ULONG), + (PULONG)&Configuration->cookie, NULL) != 0; + } + else + { + SetLastError(ERROR_INVALID_PARAMETER); + } + + return Ret; +} + +/* + * HidP_GetUsagesEx EXPORTED + * + * @implemented + */ +HIDAPI +NTSTATUS WINAPI +HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType, + IN USHORT LinkCollection, + OUT PUSAGE_AND_PAGE ButtonList, + IN OUT ULONG *UsageLength, + IN PHIDP_PREPARSED_DATA PreparsedData, + IN PCHAR Report, + IN ULONG ReportLength) +{ + return HidP_GetUsages(ReportType, ButtonList->UsagePage, LinkCollection, &ButtonList->Usage, UsageLength, PreparsedData, Report, ReportLength); +} +
/* EOF */
Modified: branches/usb-bringup/dll/win32/hid/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/dll/win32/hid/stubs.... ============================================================================== --- branches/usb-bringup/dll/win32/hid/stubs.c [iso-8859-1] (original) +++ branches/usb-bringup/dll/win32/hid/stubs.c [iso-8859-1] Thu Oct 13 17:51:13 2011 @@ -15,63 +15,6 @@ * @unimplemented */ HIDAPI -BOOLEAN WINAPI -HidD_GetConfiguration(IN HANDLE HidDeviceObject, - OUT PHIDD_CONFIGURATION Configuration, - IN ULONG ConfigurationLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI -BOOLEAN WINAPI -HidD_GetIndexedString(IN HANDLE HidDeviceObject, - IN ULONG StringIndex, - OUT PVOID Buffer, - IN ULONG BufferLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI -BOOLEAN WINAPI -HidD_GetMsGenreDescriptor(IN HANDLE HidDeviceObject, - OUT PVOID Buffer, - IN ULONG BufferLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI -BOOLEAN WINAPI -HidD_SetConfiguration(IN HANDLE HidDeviceObject, - IN PHIDD_CONFIGURATION Configuration, - IN ULONG ConfigurationLength) -{ - UNIMPLEMENTED; - return FALSE; -} - - -/* - * @unimplemented - */ -HIDAPI NTSTATUS WINAPI HidP_GetCaps(IN PHIDP_PREPARSED_DATA PreparsedData, OUT PHIDP_CAPS Capabilities) @@ -246,24 +189,6 @@ */ HIDAPI NTSTATUS WINAPI -HidP_GetUsagesEx(IN HIDP_REPORT_TYPE ReportType, - IN USHORT LinkCollection, - OUT PUSAGE_AND_PAGE ButtonList, - IN OUT ULONG *UsageLength, - IN PHIDP_PREPARSED_DATA PreparsedData, - IN PCHAR Report, - IN ULONG ReportLength) -{ - UNIMPLEMENTED; - return HIDP_STATUS_NOT_IMPLEMENTED; -} - - -/* - * @unimplemented - */ -HIDAPI -NTSTATUS WINAPI HidP_InitializeReportForID(IN HIDP_REPORT_TYPE ReportType, IN UCHAR ReportID, IN PHIDP_PREPARSED_DATA PreparsedData,
-
janderwald＠svn.reactos.org