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

hid: Implement HidP_GetScaledUsageValue.

This commit is contained in:
Aric Stewart 2015-06-30 07:40:41 -05:00 committed by Alexandre Julliard
parent 1174fc63ad
commit 098efa1edc
3 changed files with 57 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/hid/hid.spec
View File

@ -23,7 +23,7 @@
@ stub HidP_GetData @ stub HidP_GetData
@ stub HidP_GetExtendedAttributes @ stub HidP_GetExtendedAttributes
@ stub HidP_GetLinkCollectionNodes @ stub HidP_GetLinkCollectionNodes
@ stub HidP_GetScaledUsageValue @ stdcall HidP_GetScaledUsageValue(long long long long ptr ptr ptr long)
@ stub HidP_GetSpecificButtonCaps @ stub HidP_GetSpecificButtonCaps
@ stub HidP_GetSpecificValueCaps @ stub HidP_GetSpecificValueCaps
@ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long) @ stdcall HidP_GetUsageValue(long long long long ptr ptr ptr long)

65
dlls/hid/hidp.c
View File

@ -150,22 +150,20 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData,
return HIDP_STATUS_SUCCESS; return HIDP_STATUS_SUCCESS;
} }
static NTSTATUS find_value(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection,
NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report,
USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, WINE_HID_ELEMENT **element)
PCHAR Report, ULONG ReportLength)
{ {
PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData;
WINE_HID_REPORT *report = NULL; WINE_HID_REPORT *report = NULL;
USHORT v_count = 0, r_count = 0; USHORT v_count = 0, r_count = 0;
int i; int i;
TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, TRACE("(%i, %x, %i, %i, %p, %p)\n", ReportType, UsagePage, LinkCollection, Usage,
PreparsedData, Report, ReportLength); PreparsedData, Report);
if (data->magic != HID_MAGIC) if (data->magic != HID_MAGIC)
return HIDP_STATUS_INVALID_PREPARSED_DATA; return HIDP_STATUS_INVALID_PREPARSED_DATA;
switch(ReportType) switch(ReportType)
{ {
case HidP_Input: case HidP_Input:
@ -206,15 +204,62 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage,
report->Elements[i].caps.value.UsagePage == UsagePage && report->Elements[i].caps.value.UsagePage == UsagePage &&
report->Elements[i].caps.value.u.NotRange.Usage == Usage) report->Elements[i].caps.value.u.NotRange.Usage == Usage)
{ {
return get_report_data((BYTE*)Report, ReportLength, *element = &report->Elements[i];
report->Elements[i].valueStartBit, return HIDP_STATUS_SUCCESS;
report->Elements[i].bitCount, UsageValue);
} }
} }
return HIDP_STATUS_USAGE_NOT_FOUND; return HIDP_STATUS_USAGE_NOT_FOUND;
} }
NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage,
USHORT LinkCollection, USAGE Usage, PLONG UsageValue,
PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength)
{
NTSTATUS rc;
WINE_HID_ELEMENT *element;
TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue,
PreparsedData, Report, ReportLength);
rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element);
if (rc == HIDP_STATUS_SUCCESS)
{
ULONG rawValue;
rc = get_report_data((BYTE*)Report, ReportLength,
element->valueStartBit, element->bitCount, &rawValue);
if (rc != HIDP_STATUS_SUCCESS)
return rc;
if (element->caps.value.BitSize == 16)
rawValue = (short)rawValue;
*UsageValue = rawValue;
}
return rc;
}
NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection,
USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData,
PCHAR Report, ULONG ReportLength)
{
WINE_HID_ELEMENT *element;
NTSTATUS rc;
TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue,
PreparsedData, Report, ReportLength);
rc = find_value(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, &element);
if (rc == HIDP_STATUS_SUCCESS)
{
return get_report_data((BYTE*)Report, ReportLength,
element->valueStartBit, element->bitCount, UsageValue);
}
return rc;
}
NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection,
PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData, PUSAGE UsageList, PULONG UsageLength, PHIDP_PREPARSED_DATA PreparsedData,

1
include/ddk/hidpi.h
View File

@ -143,6 +143,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage,
NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData); NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS ValueCaps, PUSHORT ValueCapsLength, PHIDP_PREPARSED_DATA PreparsedData);
NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength); NTSTATUS WINAPI HidP_InitializeReportForID(HIDP_REPORT_TYPE ReportType, UCHAR ReportID, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);
ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData); ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, PHIDP_PREPARSED_DATA PreparsedData);
NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PLONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength);
#ifndef FACILITY_HID_ERROR_CODE #ifndef FACILITY_HID_ERROR_CODE
#define FACILITY_HID_ERROR_CODE 0x11 #define FACILITY_HID_ERROR_CODE 0x11