hid: Fix HidP_MaxUsageListLength to handle UsagePage == 0 properly.

Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

hid: Fix HidP_MaxUsageListLength to handle UsagePage == 0 properly.
86f4aa19 · Aric Stewart · Alexandre Julliard · 20a4842a · 86f4aa19
Commit 86f4aa19 authored Nov 03, 2016 by Aric Stewart Committed by Alexandre Julliard Nov 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

hidp.c dlls/hid/hidp.c +2 -1

No files found.
--- a/dlls/hid/hidp.c
+++ b/dlls/hid/hidp.c
@@ -510,7 +510,8 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag
        int j;
        for (j = 0; j < report->elementCount; j++)
        {
-            if (report->Elements[j].caps.button.UsagePage == UsagePage)
+            if (report->Elements[j].ElementType == ButtonElement &&
+               (UsagePage == 0 || report->Elements[j].caps.button.UsagePage == UsagePage))
            {
                if (report->Elements[j].caps.button.IsRange)
                    count += (report->Elements[j].caps.button.u.Range.UsageMax -