Signed-off-by: Rémi Bernon rbernon@codeweavers.com --- dlls/hid/hidp.c | 157 ++++++++++------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 41 ++++---- 2 files changed, 73 insertions(+), 125 deletions(-)
diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index afd69281f0d..94dc4212067 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -155,44 +155,6 @@ static void copy_bits( unsigned char *dst, const unsigned char *src, int count, *dst = (bits & mask) | (*dst & ~mask); }
-static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, PULONG value) -{ - - if ((startBit + valueSize) / 8 > reportLength) - return HIDP_STATUS_INVALID_REPORT_LENGTH; - - if (valueSize == 1) - { - ULONG byte_index = startBit / 8; - ULONG bit_index = startBit - (byte_index * 8); - INT mask = (1 << bit_index); - *value = !!(report[byte_index] & mask); - } - else - { - ULONG remaining_bits = valueSize; - ULONG byte_index = startBit / 8; - ULONG bit_index = startBit % 8; - ULONG data = 0; - ULONG shift = 0; - while (remaining_bits) - { - ULONG copy_bits = 8 - bit_index; - if (remaining_bits < copy_bits) - copy_bits = remaining_bits; - - data |= ((report[byte_index] >> bit_index) & ((1 << copy_bits) - 1)) << shift; - - shift += copy_bits; - bit_index = 0; - byte_index++; - remaining_bits -= copy_bits; - } - *value = data; - } - return HIDP_STATUS_SUCCESS; -} - NTSTATUS WINAPI HidP_GetButtonCaps( HIDP_REPORT_TYPE report_type, HIDP_BUTTON_CAPS *caps, USHORT *caps_count, PHIDP_PREPARSED_DATA preparsed_data ) { @@ -207,14 +169,7 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca
if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA;
- *caps = preparsed->caps; - caps->NumberInputButtonCaps = preparsed->new_caps.NumberInputButtonCaps; - caps->NumberOutputButtonCaps = preparsed->new_caps.NumberOutputButtonCaps; - caps->NumberFeatureButtonCaps = preparsed->new_caps.NumberFeatureButtonCaps; - caps->NumberInputValueCaps = preparsed->new_caps.NumberInputValueCaps; - caps->NumberOutputValueCaps = preparsed->new_caps.NumberOutputValueCaps; - caps->NumberFeatureValueCaps = preparsed->new_caps.NumberFeatureValueCaps; - + *caps = preparsed->new_caps; return HIDP_STATUS_SUCCESS; }
@@ -699,79 +654,71 @@ ULONG WINAPI HidP_MaxDataListLength( HIDP_REPORT_TYPE report_type, PHIDP_PREPARS return count; }
-NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, ULONG *DataLength, - PHIDP_PREPARSED_DATA PreparsedData,CHAR *Report, ULONG ReportLength) +struct find_all_data_params { - WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT r_count = 0; - int i,uCount = 0; - NTSTATUS rc; - - TRACE("(%i, %p, %p(%i), %p, %p, %i)\n", ReportType, DataList, DataLength, - DataLength?*DataLength:0, PreparsedData, Report, ReportLength); - - if (data->magic != HID_MAGIC) - return 0; - - if (ReportType != HidP_Input && ReportType != HidP_Output && ReportType != HidP_Feature) - return HIDP_STATUS_INVALID_REPORT_TYPE; - - r_count = data->reportCount[ReportType]; - report = &data->reports[data->reportIdx[ReportType][(BYTE)Report[0]]]; + HIDP_DATA *data; + HIDP_DATA *data_end; + char *report_buf; +};
- if (!r_count || (report->reportID && report->reportID != Report[0])) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; +static NTSTATUS find_all_data( const struct hid_value_caps *caps, void *user ) +{ + struct find_all_data_params *params = user; + HIDP_DATA *data = params->data, *data_end = params->data_end; + ULONG bit, last, bit_count = caps->bit_size * caps->report_count; + char *report_buf = params->report_buf;
- for (i = 0; i < report->elementCount; i++) + if (!caps->bit_size) return HIDP_STATUS_SUCCESS; + if (caps->bit_size == 1) { - WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; - if (element->caps.BitSize == 1) + for (bit = caps->start_bit, last = bit + caps->usage_max - caps->usage_min; bit <= last; bit++) { - int k; - for (k=0; k < element->bitCount; k++) + if (!(report_buf[bit / 8] & (1 << (bit % 8)))) continue; + if (data < data_end) { - UINT v = 0; - NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit + k, 1, &v); - if (rc != HIDP_STATUS_SUCCESS) - return rc; - if (v) - { - if (uCount < *DataLength) - { - DataList[uCount].DataIndex = element->caps.Range.DataIndexMin + k; - DataList[uCount].On = v; - } - uCount++; - } + data->DataIndex = caps->data_index_min + bit - caps->start_bit; + data->On = 1; } + data++; } - else + } + else if (caps->report_count == 1) + { + if (data < data_end) { - if (uCount < *DataLength) - { - UINT v; - NTSTATUS rc = get_report_data((BYTE*)Report, ReportLength, - element->valueStartBit, element->bitCount, &v); - if (rc != HIDP_STATUS_SUCCESS) - return rc; - DataList[uCount].DataIndex = element->caps.NotRange.DataIndex; - DataList[uCount].RawValue = v; - } - uCount++; + data->DataIndex = caps->data_index_min; + data->RawValue = 0; + if ((bit_count + 7) / 8 > sizeof(data->RawValue)) return HIDP_STATUS_BUFFER_TOO_SMALL; + copy_bits( (void *)&data->RawValue, (void *)report_buf, bit_count, -caps->start_bit ); } + data++; }
- if (*DataLength < uCount) - rc = HIDP_STATUS_BUFFER_TOO_SMALL; - else - rc = HIDP_STATUS_SUCCESS; + params->data = data; + return HIDP_STATUS_SUCCESS; +} + +NTSTATUS WINAPI HidP_GetData( HIDP_REPORT_TYPE report_type, HIDP_DATA *data, ULONG *data_len, + PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) +{ + struct find_all_data_params params = {.data = data, .data_end = data + *data_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {}; + NTSTATUS status; + USHORT limit = -1;
- *DataLength = uCount; + TRACE( "report_type %d, data %p, data_len %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, data, data_len, preparsed_data, report_buf, report_len );
- return rc; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + status = enum_value_caps( preparsed, report_type, report_len, &filter, find_all_data, ¶ms, &limit ); + *data_len = params.data - data; + if (status != HIDP_STATUS_SUCCESS) return status; + + if (params.data > params.data_end) return HIDP_STATUS_BUFFER_TOO_SMALL; + return HIDP_STATUS_SUCCESS; }
NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 101366bf50b..f9bb9e87cda 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1500,6 +1500,26 @@ static void test_pnp_driver(struct testsign_context *ctx) (val).member, (exp).member) #define check_member(val, exp, fmt, member) check_member_(__FILE__, __LINE__, val, exp, fmt, member)
+#define check_hidp_caps(a, b) check_hidp_caps_(__LINE__, a, b) +static inline void check_hidp_caps_(int line, HIDP_CAPS *caps, const HIDP_CAPS *exp) +{ + check_member_(__FILE__, line, *caps, *exp, "%04x", Usage); + check_member_(__FILE__, line, *caps, *exp, "%04x", UsagePage); + check_member_(__FILE__, line, *caps, *exp, "%d", InputReportByteLength); + check_member_(__FILE__, line, *caps, *exp, "%d", OutputReportByteLength); + check_member_(__FILE__, line, *caps, *exp, "%d", FeatureReportByteLength); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberLinkCollectionNodes); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberInputButtonCaps); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberInputValueCaps); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberInputDataIndices); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberOutputButtonCaps); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberOutputValueCaps); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberOutputDataIndices); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureButtonCaps); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureValueCaps); + check_member_(__FILE__, line, *caps, *exp, "%d", NumberFeatureDataIndices); +} + #define check_hidp_link_collection_node(a, b) check_hidp_link_collection_node_(__LINE__, a, b) static inline void check_hidp_link_collection_node_(int line, HIDP_LINK_COLLECTION_NODE *node, const HIDP_LINK_COLLECTION_NODE *exp) @@ -1827,23 +1847,7 @@ static void test_hidp(HANDLE file, int report_id) ok(status == HIDP_STATUS_INVALID_PREPARSED_DATA, "HidP_GetCaps returned %#x\n", status); status = HidP_GetCaps(preparsed_data, &caps); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetCaps returned %#x\n", status); - check_member(caps, expect_hidp_caps[report_id], "%04x", Usage); - check_member(caps, expect_hidp_caps[report_id], "%04x", UsagePage); - check_member(caps, expect_hidp_caps[report_id], "%d", InputReportByteLength); - check_member(caps, expect_hidp_caps[report_id], "%d", OutputReportByteLength); - check_member(caps, expect_hidp_caps[report_id], "%d", FeatureReportByteLength); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberLinkCollectionNodes); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputButtonCaps); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputValueCaps); - todo_wine - check_member(caps, expect_hidp_caps[report_id], "%d", NumberInputDataIndices); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberOutputButtonCaps); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberOutputValueCaps); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberOutputDataIndices); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberFeatureButtonCaps); - check_member(caps, expect_hidp_caps[report_id], "%d", NumberFeatureValueCaps); - todo_wine - check_member(caps, expect_hidp_caps[report_id], "%d", NumberFeatureDataIndices); + check_hidp_caps(&caps, &expect_hidp_caps[report_id]);
collection_count = 0; status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); @@ -2238,7 +2242,6 @@ static void test_hidp(HANDLE file, int report_id) value = 1; status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetData returned %#x\n", status); - todo_wine ok(value == 9, "got data count %d, expected %d\n", value, 9); memset(data, 0, sizeof(data)); status = HidP_GetData(HidP_Input, data, &value, preparsed_data, report, caps.InputReportByteLength); @@ -2246,9 +2249,7 @@ static void test_hidp(HANDLE file, int report_id) for (i = 0; i < ARRAY_SIZE(expect_data); ++i) { winetest_push_context("data[%d]", i); - todo_wine_if(i >= 4) check_member(data[i], expect_data[i], "%d", DataIndex); - todo_wine_if(i == 6 || i == 7 || i == 8) check_member(data[i], expect_data[i], "%d", RawValue); winetest_pop_context(); }