[PATCH v2 2/2] hid: Fix HidP_SetUsageValue for usage ranges

[Matthew Tran]

From: Matthew Tran

The original set_usage_value was renamed to set_usage_value_array.
---
 dlls/hid/hidp.c | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c
index a1c5805c19f..2fedb3f9586 100644
--- a/dlls/hid/hidp.c
+++ b/dlls/hid/hidp.c
@@ -495,16 +495,31 @@ NTSTATUS WINAPI HidP_SetScaledUsageValue( HIDP_REPORT_TYPE report_type, USAGE us
     return enum_value_caps( preparsed, report_type, report_len, &filter, set_scaled_usage_value, &params, &count );
 }

+struct set_usage_value_params
+{
+    ULONG value;
+    void *report_buf;
+    USAGE usage;
+};
+
 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;
-    unsigned char *report_buf;
+    struct set_usage_value_params *params = user;
+    unsigned char *report_buf, start_bit, usage_index;

-    if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL;
+    if (caps->flags & HID_VALUE_CAPS_IS_RANGE)
+    {
+        usage_index = params->usage - caps->usage_min;
+        report_buf = (unsigned char *)params->report_buf + caps->start_byte + usage_index * caps->bit_size / 8;
+        start_bit = caps->start_bit + (usage_index * caps->bit_size) % 8;
+    }
+    else
+    {
+        report_buf = (unsigned char *)params->report_buf + caps->start_byte;
+        start_bit = caps->start_bit;
+    }

-    report_buf = (unsigned char *)params->report_buf + caps->start_byte;
-    copy_bits( report_buf, params->value_buf, bit_count, caps->start_bit );
+    copy_bits( report_buf, (unsigned char*) &params->value, caps->bit_size, start_bit );

return HIDP_STATUS_NULL;
 }
@@ -512,7 +527,7 @@ static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user )
 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 )
 {
-    struct usage_value_params params = {.value_buf = &value, .value_len = sizeof(value), .report_buf = report_buf};
+    struct set_usage_value_params params = {.value = value, .report_buf = report_buf, .usage = usage};
     struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data;
     struct caps_filter filter = {.values = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage};
     USHORT count = 1;
@@ -526,6 +541,21 @@ NTSTATUS WINAPI HidP_SetUsageValue( HIDP_REPORT_TYPE report_type, USAGE usage_pa
     return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value, &params, &count );
 }

+static NTSTATUS set_usage_value_array( const struct hid_value_caps *caps, void *user )
+{
+    struct usage_value_params *params = user;
+    ULONG bit_count = caps->bit_size * caps->report_count;
+    unsigned char *report_buf;
+
+    if (caps->flags & HID_VALUE_CAPS_IS_RANGE) return HIDP_STATUS_NOT_VALUE_ARRAY;
+    if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL;
+
+    report_buf = (unsigned char *)params->report_buf + caps->start_byte;
+    copy_bits( report_buf, params->value_buf, bit_count, caps->start_bit );
+
+    return HIDP_STATUS_NULL;
+}
+
 NTSTATUS WINAPI HidP_SetUsageValueArray( 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 )
@@ -542,7 +572,7 @@ NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usa
     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, &params, &count );
+    return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value_array, &params, &count );
 }

struct set_usage_params