[PATCH 1/5] hid: Introduce new copy_bits helper for HidP_SetUsageValueArray.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 70 ++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +-- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8d893f6327d..827de20c634 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -70,6 +70,7 @@ struct caps_filter { BOOLEAN buttons; BOOLEAN values; + BOOLEAN array; USAGE usage_page; USHORT collection; USAGE usage; @@ -102,6 +103,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { if (!match_value_caps( caps, filter )) continue; if (filter->report_id && caps->report_id != filter->report_id) continue; + else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -114,6 +116,44 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR return HIDP_STATUS_SUCCESS; } +/* copy count bits from src, starting at (-shift) bit if < 0, to dst starting at (shift) bit if > 0 */ +static void copy_bits( unsigned char *dst, const unsigned char *src, int count, int shift ) +{ + unsigned char bits, mask; + size_t src_shift = shift < 0 ? (-shift & 7) : 0; + size_t dst_shift = shift > 0 ? (shift & 7) : 0; + if (shift < 0) src += -shift / 8; + if (shift > 0) dst += shift / 8; + + if (src_shift == 0 && dst_shift == 0) + { + memcpy( dst, src, count / 8 ); + dst += count / 8; + src += count / 8; + count &= 7; + } + + if (!count) return; + + bits = *dst << (8 - dst_shift); + count += dst_shift; + + while (count > 8) + { + *dst = bits >> (8 - dst_shift); + bits = *(unsigned short *)src++ >> src_shift; + *dst++ |= bits << dst_shift; + count -= 8; + } + + bits >>= (8 - dst_shift); + if (count <= 8 - src_shift) bits |= (*src >> src_shift) << dst_shift; + else bits |= (*(unsigned short *)src >> src_shift) << dst_shift; + + mask = (1 << count) - 1; + *dst = (bits & mask) | (*dst & ~mask); +} + static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, PULONG value) { @@ -323,6 +363,13 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT return HIDP_STATUS_USAGE_NOT_FOUND; } +struct usage_value_params +{ + void *value_buf; + USHORT value_len; + void *report_buf; +}; + static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) { UINT bit_count = element->bitCount; @@ -514,6 +561,15 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ return count; } +static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + copy_bits( params->report_buf, params->value_buf, bit_count, caps->start_bit ); + return HIDP_STATUS_NULL; +} + NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) @@ -539,11 +595,19 @@ NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usa USAGE usage, char *value_buf, USHORT value_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - FIXME( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " - "preparsed_data %p, report_buf %p, report_len %u stub!\n", + struct usage_value_params params = {.value_buf = value_buf, .value_len = value_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .array = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; + + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u.\n", report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); - return HIDP_STATUS_NOT_IMPLEMENTED; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value, ¶ms, &count ); } struct set_usage_params diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ca030599299..3185b0f7893 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2021,15 +2021,14 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, sizeof(buffer), preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValueArray returned %#x\n", status); memset(buffer, 0xcd, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 0, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 8, preparsed_data, report, caps.InputReportByteLength); + todo_wine ok(status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_GetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, @@ -2365,13 +2364,10 @@ static void test_hidp(HANDLE file, int report_id) memset(buffer, 0xff, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 0, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 64, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValueArray returned %#x\n", status); - todo_wine ok(!memcmp(report + 9, buffer, 8), "unexpected report data\n"); memset(buffer, 0, sizeof(buffer)); -- 2.32.0
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 81 ++++++++---------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 2 files changed, 22 insertions(+), 60 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 827de20c634..929426ef536 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -234,46 +234,6 @@ static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } -static NTSTATUS get_report_data_array(BYTE *report, UINT reportLength, UINT startBit, UINT elemSize, - UINT numElements, PCHAR values, UINT valuesSize) -{ - BYTE byte, *end, *p = report + startBit / 8; - ULONG size = elemSize * numElements; - ULONG m, bit_index = startBit % 8; - BYTE *data = (BYTE*)values; - - if ((startBit + size) / 8 > reportLength) - return HIDP_STATUS_INVALID_REPORT_LENGTH; - - if (valuesSize < (size + 7) / 8) - return HIDP_STATUS_BUFFER_TOO_SMALL; - - end = report + (startBit + size + 7) / 8; - - data--; - byte = *p++; - while (p != end) - { - *(++data) = byte >> bit_index; - byte = *p++; - *data |= byte << (8 - bit_index); - } - - /* Handle the end and mask out bits beyond */ - m = (startBit + size) % 8; - m = m ? m : 8; - - if (m > bit_index) - *(++data) = (byte >> bit_index) & ((1 << (m - bit_index)) - 1); - else - *data &= (1 << (m + 8 - bit_index)) - 1; - - if (++data < (BYTE*)values + valuesSize) - memset(data, 0, (BYTE*)values + valuesSize - 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 ) { @@ -419,6 +379,15 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag return rc; } +static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + memset( params->value_buf, 0, params->value_len ); + copy_bits( params->value_buf, params->report_buf, bit_count, -caps->start_bit ); + return HIDP_STATUS_NULL; +} NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, @@ -441,29 +410,23 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, return rc; } - -NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, - PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +NTSTATUS WINAPI HidP_GetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, char *value_buf, USHORT value_len, + PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - WINE_HID_ELEMENT element; - NTSTATUS rc; - - TRACE("(%i, %x, %i, %i, %p, %u, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - UsageValueByteLength, PreparsedData, Report, ReportLength); - - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); + struct usage_value_params params = {.value_buf = value_buf, .value_len = value_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .array = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; - if (rc == HIDP_STATUS_SUCCESS) - { - if (element.caps.IsRange || element.caps.ReportCount <= 1 || !element.bitCount) - return HIDP_STATUS_NOT_VALUE_ARRAY; + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); - return get_report_data_array((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, - element.caps.ReportCount, UsageValue, UsageValueByteLength); - } + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - return rc; + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, get_usage_value, ¶ms, &count ); } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 3185b0f7893..ee0134ec39d 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2378,7 +2378,6 @@ static void test_hidp(HANDLE file, int report_id) 64, preparsed_data, report, caps.FeatureReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValueArray returned %#x\n", status); memset(buffer + 16, 0xff, 8); - todo_wine ok(!memcmp(buffer, buffer + 16, 16), "unexpected report value\n"); HidD_FreePreparsedData(preparsed_data); -- 2.32.0
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 68 +++++------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +-- 2 files changed, 12 insertions(+), 62 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 929426ef536..24b11d519e2 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -192,48 +192,6 @@ static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } -static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, ULONG 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); - if (value) - report[byte_index] |= (1 << bit_index); - else - report[byte_index] &= ~(1 << bit_index); - } - else - { - ULONG byte_index = (startBit + valueSize - 1) / 8; - ULONG data = value; - ULONG remainingBits = valueSize; - while (remainingBits) - { - BYTE subvalue = data & 0xff; - - data >>= 8; - - if (remainingBits >= 8) - { - report[byte_index] = subvalue; - byte_index --; - remainingBits -= 8; - } - else if (remainingBits > 0) - { - BYTE mask = (0xff << (8-remainingBits)) & subvalue; - report[byte_index] |= mask; - remainingBits = 0; - } - } - } - 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 ) { @@ -533,25 +491,21 @@ static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) return HIDP_STATUS_NULL; } -NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, - CHAR *Report, ULONG ReportLength) +NTSTATUS WINAPI HidP_SetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE usage, + ULONG value, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - WINE_HID_ELEMENT element; - NTSTATUS rc; + struct usage_value_params params = {.value_buf = &value, .value_len = sizeof(value), .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; - TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value %u, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value, preparsed_data, report_buf, report_len ); - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); - - if (rc == HIDP_STATUS_SUCCESS) - { - return set_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, UsageValue); - } + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - return rc; + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value, ¶ms, &count ); } NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ee0134ec39d..c0421c23fbc 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2093,7 +2093,6 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - todo_wine ok(value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff); value = 0x3fffffff; @@ -2292,13 +2291,12 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength + 1); - todo_wine ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_SetUsageValue returned %#x\n", status); report[0] = 1 - report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine + todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_SetUsageValue returned %#x\n", status); report[0] = 2; @@ -2310,7 +2308,6 @@ static void test_hidp(HANDLE file, int report_id) report[0] = report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_SetUsageValue returned %#x\n", status); status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, @@ -2323,7 +2320,6 @@ static void test_hidp(HANDLE file, int report_id) buffer[0] = report_id; value = HID_USAGE_HAPTICS_WAVEFORM_RUMBLE; memcpy(buffer + 1, &value, 2); - todo_wine ok(!memcmp(buffer, report, sizeof(buffer)), "unexpected report data\n"); status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, -- 2.32.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93097 Your paranoid android. === w8 (32 bit report) === ntoskrnl.exe: driver.c:759: Test failed: got 0 === debiant2 (32 bit report) === hid: device: Timeout === debiant2 (32 bit French report) === ntoskrnl.exe: ntoskrnl: Timeout
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 26 +++++++++++--------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 5 +---- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 24b11d519e2..948f0c7c4dc 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -347,25 +347,21 @@ static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) return HIDP_STATUS_NULL; } -NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, - PCHAR Report, ULONG ReportLength) +NTSTATUS WINAPI HidP_GetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, USAGE usage, + ULONG *value, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - WINE_HID_ELEMENT element; - NTSTATUS rc; - - TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + struct usage_value_params params = {.value_buf = value, .value_len = sizeof(*value), .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value, preparsed_data, report_buf, report_len ); - if (rc == HIDP_STATUS_SUCCESS) - { - return get_report_data((BYTE*)Report, ReportLength, - element.valueStartBit, element.bitCount, UsageValue); - } + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - return rc; + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, get_usage_value, ¶ms, &count ); } NTSTATUS WINAPI HidP_GetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c0421c23fbc..b29660d4773 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2330,12 +2330,11 @@ static void test_hidp(HANDLE file, int report_id) ok(status == HIDP_STATUS_INVALID_REPORT_TYPE, "HidP_GetUsageValue returned %#x\n", status); status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength + 1); - todo_wine ok(status == HIDP_STATUS_INVALID_REPORT_LENGTH, "HidP_GetUsageValue returned %#x\n", status); report[0] = 1 - report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine + todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_GetUsageValue returned %#x\n", status); report[0] = 2; @@ -2346,14 +2345,12 @@ static void test_hidp(HANDLE file, int report_id) report[0] = report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_USAGE_NOT_FOUND, "HidP_GetUsageValue returned %#x\n", status); value = 0xdeadbeef; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValue returned %#x\n", status); - todo_wine ok(value == HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, "got value %x, expected %#x\n", value, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE); -- 2.32.0
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hid/hidp.c | 137 ++++++++--------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 - 2 files changed, 36 insertions(+), 105 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 948f0c7c4dc..59f18276b38 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -217,70 +217,6 @@ NTSTATUS WINAPI HidP_GetCaps( PHIDP_PREPARSED_DATA preparsed_data, HIDP_CAPS *ca return HIDP_STATUS_SUCCESS; } -static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - USHORT bit_size, WINE_HID_ELEMENT *element) -{ - PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; - WINE_HID_ELEMENT *elems = HID_ELEMS(data); - WINE_HID_REPORT *report = NULL; - USHORT v_count = 0, r_count = 0; - int i; - - TRACE("(%i, %x, %i, %i, %p, %p)\n", ReportType, UsagePage, LinkCollection, Usage, - PreparsedData, Report); - - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; - switch(ReportType) - { - case HidP_Input: - v_count = data->caps.NumberInputValueCaps; - break; - case HidP_Output: - v_count = data->caps.NumberOutputValueCaps; - break; - case HidP_Feature: - v_count = data->caps.NumberFeatureValueCaps; - break; - default: - return HIDP_STATUS_INVALID_REPORT_TYPE; - } - r_count = data->reportCount[ReportType]; - report = &data->reports[data->reportIdx[ReportType][(BYTE)Report[0]]]; - - if (!r_count || !v_count) - return HIDP_STATUS_USAGE_NOT_FOUND; - - if (report->reportID && report->reportID != Report[0]) - return HIDP_STATUS_REPORT_DOES_NOT_EXIST; - - for (i = 0; i < report->elementCount; i++) - { - HIDP_VALUE_CAPS *value = &elems[report->elementIdx + i].caps; - - if ((elems[report->elementIdx + i].caps.BitSize == 1) != (bit_size == 1) || - value->UsagePage != UsagePage) - continue; - - if (value->IsRange && value->Range.UsageMin <= Usage && Usage <= value->Range.UsageMax) - { - *element = elems[report->elementIdx + i]; - element->valueStartBit += value->BitSize * (Usage - value->Range.UsageMin); - element->bitCount = elems[report->elementIdx + i].caps.BitSize; - return HIDP_STATUS_SUCCESS; - } - else if (value->NotRange.Usage == Usage) - { - *element = elems[report->elementIdx + i]; - element->bitCount = elems[report->elementIdx + i].caps.BitSize; - return HIDP_STATUS_SUCCESS; - } - } - - return HIDP_STATUS_USAGE_NOT_FOUND; -} - struct usage_value_params { void *value_buf; @@ -288,53 +224,52 @@ struct usage_value_params void *report_buf; }; -static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) +static LONG sign_extend( ULONG value, const struct hid_value_caps *caps ) { - UINT bit_count = element->bitCount; - - if ((value & (1 << (bit_count - 1))) - && element->caps.BitSize != 1 - && element->caps.LogicalMin < 0) - { - value -= (1 << bit_count); - } - return value; + UINT sign = 1 << (caps->bit_size - 1); + if (sign <= 1 || caps->logical_min >= 0) return value; + return value - ((value & sign) << 1); } -static LONG logical_to_physical(LONG value, const WINE_HID_ELEMENT *element) +static NTSTATUS get_scaled_usage_value( const struct hid_value_caps *caps, void *user ) { - if (element->caps.PhysicalMin || element->caps.PhysicalMax) - { - value = (((ULONGLONG)(value - element->caps.LogicalMin) - * (element->caps.PhysicalMax - element->caps.PhysicalMin)) - / (element->caps.LogicalMax - element->caps.LogicalMin)) - + element->caps.PhysicalMin; - } - return value; + struct usage_value_params *params = user; + ULONG unsigned_value = 0, bit_count = caps->bit_size * caps->report_count; + LONG signed_value, *value = params->value_buf; + + if ((bit_count + 7) / 8 > sizeof(unsigned_value)) return HIDP_STATUS_BUFFER_TOO_SMALL; + if (sizeof(LONG) > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + copy_bits( (unsigned char *)&unsigned_value, params->report_buf, bit_count, -caps->start_bit ); + signed_value = sign_extend( unsigned_value, caps ); + + if (caps->logical_min > caps->logical_max || caps->physical_min > caps->physical_max) + return HIDP_STATUS_BAD_LOG_PHY_VALUES; + if (caps->logical_min > signed_value || caps->logical_max < signed_value) + return HIDP_STATUS_VALUE_OUT_OF_RANGE; + + if (!caps->physical_min && !caps->physical_max) *value = signed_value; + else *value = caps->physical_min + MulDiv( signed_value - caps->logical_min, caps->physical_max - caps->physical_min, + caps->logical_max - caps->logical_min ); + return HIDP_STATUS_NULL; } -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 WINAPI HidP_GetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, LONG *value, PHIDP_PREPARSED_DATA preparsed_data, + char *report_buf, ULONG report_len ) { - NTSTATUS rc; - WINE_HID_ELEMENT element; - TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - PreparsedData, Report, ReportLength); + struct usage_value_params params = {.value_buf = value, .value_len = sizeof(*value), .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage }; + USHORT count = 1; - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value %p, preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value, preparsed_data, report_buf, report_len ); - 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; - *UsageValue = logical_to_physical(sign_extend(rawValue, &element), &element); - } + *value = 0; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - return rc; + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, get_scaled_usage_value, ¶ms, &count ); } static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index b29660d4773..432bc168259 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2085,9 +2085,7 @@ static void test_hidp(HANDLE file, int report_id) value = 0xdeadbeef; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_VALUE_OUT_OF_RANGE, "HidP_GetScaledUsageValue returned %#x\n", status); - todo_wine ok(value == 0, "got value %x, expected %#x\n", value, 0); value = 0xdeadbeef; status = HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, @@ -2103,7 +2101,6 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetScaledUsageValue returned %#x\n", status); - todo_wine ok(value == 0x7fffffff, "got value %x, expected %#x\n", value, 0x7fffffff); value = 0; @@ -2133,7 +2130,6 @@ static void test_hidp(HANDLE file, int report_id) value = 0xdeadbeef; status = HidP_GetScaledUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, (LONG *)&value, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BAD_LOG_PHY_VALUES, "HidP_GetScaledUsageValue returned %#x\n", status); ok(value == 0, "got value %x, expected %#x\n", value, 0); -- 2.32.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=93099 Your paranoid android. === w8 (32 bit report) === ntoskrnl.exe: driver.c:759: Test failed: got 0
participants (2)
-
Marvin -
Rémi Bernon