ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

hidclass.sys: Some descriptor values should be unsigned. 

Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Aric Stewart 2016-12-06 13:11:49 -06:00 committed by Alexandre Julliard
parent ea9df98c69
commit b5646efe39
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
dlls/hidclass.sys/descriptor.c
View File

@ -383,7 +383,7 @@ static void debug_print_preparsed(WINE_HIDP_PREPARSED_DATA *data)
} }
} }
static int getValue(int bsize, int source) static int getValue(int bsize, int source, BOOL allow_negative)
{ {
int mask = 0xff; int mask = 0xff;
int negative = 0x80; int negative = 0x80;
@ -401,7 +401,7 @@ static int getValue(int bsize, int source)
outofrange = (outofrange<<8); outofrange = (outofrange<<8);
} }
value = (source&mask); value = (source&mask);
if (value&negative) if (allow_negative && value&negative)
value = -1 * (outofrange - value); value = -1 * (outofrange - value);
return value; return value;
} }
@ -566,34 +566,34 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l
switch(bTag) switch(bTag)
{ {
case TAG_GLOBAL_USAGE_PAGE: case TAG_GLOBAL_USAGE_PAGE:
caps->UsagePage = getValue(bSize, itemVal); caps->UsagePage = getValue(bSize, itemVal, FALSE);
break; break;
case TAG_GLOBAL_LOGICAL_MINIMUM: case TAG_GLOBAL_LOGICAL_MINIMUM:
caps->LogicalMin = getValue(bSize, itemVal); caps->LogicalMin = getValue(bSize, itemVal, TRUE);
break; break;
case TAG_GLOBAL_LOGICAL_MAXIMUM: case TAG_GLOBAL_LOGICAL_MAXIMUM:
caps->LogicalMax = getValue(bSize, itemVal); caps->LogicalMax = getValue(bSize, itemVal, TRUE);
break; break;
case TAG_GLOBAL_PHYSICAL_MINIMUM: case TAG_GLOBAL_PHYSICAL_MINIMUM:
caps->PhysicalMin = getValue(bSize, itemVal); caps->PhysicalMin = getValue(bSize, itemVal, TRUE);
break; break;
case TAG_GLOBAL_PHYSICAL_MAXIMUM: case TAG_GLOBAL_PHYSICAL_MAXIMUM:
caps->PhysicalMax = getValue(bSize, itemVal); caps->PhysicalMax = getValue(bSize, itemVal, TRUE);
break; break;
case TAG_GLOBAL_UNIT_EXPONENT: case TAG_GLOBAL_UNIT_EXPONENT:
caps->UnitsExp = getValue(bSize, itemVal); caps->UnitsExp = getValue(bSize, itemVal, TRUE);
break; break;
case TAG_GLOBAL_UNIT: case TAG_GLOBAL_UNIT:
caps->Units = getValue(bSize, itemVal); caps->Units = getValue(bSize, itemVal, TRUE);
break; break;
case TAG_GLOBAL_REPORT_SIZE: case TAG_GLOBAL_REPORT_SIZE:
caps->BitSize = getValue(bSize, itemVal); caps->BitSize = getValue(bSize, itemVal, FALSE);
break; break;
case TAG_GLOBAL_REPORT_ID: case TAG_GLOBAL_REPORT_ID:
caps->ReportID = getValue(bSize, itemVal); caps->ReportID = getValue(bSize, itemVal, FALSE);
break; break;
case TAG_GLOBAL_REPORT_COUNT: case TAG_GLOBAL_REPORT_COUNT:
caps->ReportCount = getValue(bSize, itemVal); caps->ReportCount = getValue(bSize, itemVal, FALSE);
break; break;
case TAG_GLOBAL_PUSH: case TAG_GLOBAL_PUSH:
{ {
@ -633,46 +633,46 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l
FIXME("More than %i individual usages defined\n",USAGE_MAX); FIXME("More than %i individual usages defined\n",USAGE_MAX);
else else
{ {
caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal); caps->u.NotRange.Usage[caps->usage_count++] = getValue(bSize, itemVal, FALSE);
caps->IsRange = FALSE; caps->IsRange = FALSE;
} }
break; break;
case TAG_LOCAL_USAGE_MINIMUM: case TAG_LOCAL_USAGE_MINIMUM:
caps->usage_count = 1; caps->usage_count = 1;
caps->u.Range.UsageMin = getValue(bSize, itemVal); caps->u.Range.UsageMin = getValue(bSize, itemVal, FALSE);
caps->IsRange = TRUE; caps->IsRange = TRUE;
break; break;
case TAG_LOCAL_USAGE_MAXIMUM: case TAG_LOCAL_USAGE_MAXIMUM:
caps->usage_count = 1; caps->usage_count = 1;
caps->u.Range.UsageMax = getValue(bSize, itemVal); caps->u.Range.UsageMax = getValue(bSize, itemVal, FALSE);
caps->IsRange = TRUE; caps->IsRange = TRUE;
break; break;
case TAG_LOCAL_DESIGNATOR_INDEX: case TAG_LOCAL_DESIGNATOR_INDEX:
caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal); caps->u.NotRange.DesignatorIndex = getValue(bSize, itemVal, FALSE);
caps->IsDesignatorRange = FALSE; caps->IsDesignatorRange = FALSE;
break; break;
case TAG_LOCAL_DESIGNATOR_MINIMUM: case TAG_LOCAL_DESIGNATOR_MINIMUM:
caps->u.Range.DesignatorMin = getValue(bSize, itemVal); caps->u.Range.DesignatorMin = getValue(bSize, itemVal, FALSE);
caps->IsDesignatorRange = TRUE; caps->IsDesignatorRange = TRUE;
break; break;
case TAG_LOCAL_DESIGNATOR_MAXIMUM: case TAG_LOCAL_DESIGNATOR_MAXIMUM:
caps->u.Range.DesignatorMax = getValue(bSize, itemVal); caps->u.Range.DesignatorMax = getValue(bSize, itemVal, FALSE);
caps->IsDesignatorRange = TRUE; caps->IsDesignatorRange = TRUE;
break; break;
case TAG_LOCAL_STRING_INDEX: case TAG_LOCAL_STRING_INDEX:
caps->u.NotRange.StringIndex = getValue(bSize, itemVal); caps->u.NotRange.StringIndex = getValue(bSize, itemVal, FALSE);
caps->IsStringRange = FALSE; caps->IsStringRange = FALSE;
break; break;
case TAG_LOCAL_STRING_MINIMUM: case TAG_LOCAL_STRING_MINIMUM:
caps->u.Range.StringMin = getValue(bSize, itemVal); caps->u.Range.StringMin = getValue(bSize, itemVal, FALSE);
caps->IsStringRange = TRUE; caps->IsStringRange = TRUE;
break; break;
case TAG_LOCAL_STRING_MAXIMUM: case TAG_LOCAL_STRING_MAXIMUM:
caps->u.Range.StringMax = getValue(bSize, itemVal); caps->u.Range.StringMax = getValue(bSize, itemVal, FALSE);
caps->IsStringRange = TRUE; caps->IsStringRange = TRUE;
break; break;
case TAG_LOCAL_DELIMITER: case TAG_LOCAL_DELIMITER:
caps->Delim = getValue(bSize, itemVal); caps->Delim = getValue(bSize, itemVal, FALSE);
break; break;
default: default:
ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType);