hid: Refine initialization of UsageLength in HidP_GetUsages.

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

hid: Refine initialization of UsageLength in HidP_GetUsages.
e724d67f · Aric Stewart · Alexandre Julliard · c86bf9dc · e724d67f
Commit e724d67f authored Dec 08, 2016 by Aric Stewart Committed by Alexandre Julliard Dec 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

hidp.c dlls/hid/hidp.c +5 -4

No files found.
--- a/dlls/hid/hidp.c
+++ b/dlls/hid/hidp.c
@@ -278,10 +278,11 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH
    TRACE("(%i, %x, %i, %p, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, UsageList,
          UsageLength, PreparsedData, Report, ReportLength);

-    *UsageLength = 0;
-
    if (data->magic != HID_MAGIC)
+    {
+        *UsageLength = 0;
        return HIDP_STATUS_INVALID_PREPARSED_DATA;
+    }

    switch(ReportType)
    {
@@ -344,11 +345,11 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH
        }
    }

+    *UsageLength = uCount;
+
    if (!found)
        return HIDP_STATUS_USAGE_NOT_FOUND;

-    *UsageLength = uCount;
-
    return HIDP_STATUS_SUCCESS;
 }