June 2021 - Wine-commits - list.winehq.org

Rémi Bernon : hidclass.sys: Handle failures when parsing descriptor.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 4c6c8c54566493013722f11c36d5a844a54d6f35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c6c8c54566493013722f11c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:06:57 2021 +0200 hidclass.sys: Handle failures when parsing descriptor. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 9c52dee5fe1..0e0d6a6bf54 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -464,7 +464,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l { int usages_top = 0; USAGE usages[256]; - unsigned int i; + int i; for (i = index; i < length;) { @@ -479,6 +479,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l { /* Long data items: Should be unused */ ERR("Long Data Item, should be unused\n"); + return -1; } else { @@ -506,7 +507,7 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l case TAG_MAIN_FEATURE: for (j = 0; j < caps->ReportCount; j++) { - feature = calloc(1, sizeof(*feature)); + if (!(feature = calloc(1, sizeof(*feature)))) return -1; list_add_tail(&collection->features, &feature->entry); if (bTag == TAG_MAIN_INPUT) feature->type = HidP_Input; @@ -531,7 +532,8 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_MAIN_COLLECTION: { - struct collection *subcollection = calloc(1, sizeof(struct collection)); + struct collection *subcollection; + if (!(subcollection = calloc(1, sizeof(struct collection)))) return -1; list_add_tail(&collection->collections, &subcollection->entry); subcollection->parent = collection; /* Only set our collection once... @@ -552,13 +554,14 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l parse_collection(bSize, itemVal, subcollection); - i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, stack); + if ((i = parse_descriptor(descriptor, i+1, length, feature_index, collection_index, subcollection, caps, stack)) < 0) return i; continue; } case TAG_MAIN_END_COLLECTION: return i; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); + return -1; } } else if (bType == TAG_TYPE_GLOBAL) @@ -597,7 +600,8 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; case TAG_GLOBAL_PUSH: { - struct caps_stack *saved = malloc(sizeof(*saved)); + struct caps_stack *saved; + if (!(saved = malloc(sizeof(*saved)))) return -1; saved->caps = *caps; TRACE("Push\n"); list_add_tail(stack, &saved->entry); @@ -617,11 +621,15 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l free(saved); } else + { ERR("Pop but no stack!\n"); + return -1; + } break; } default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); + return -1; } } else if (bType == TAG_TYPE_LOCAL) @@ -630,7 +638,10 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l { case TAG_LOCAL_USAGE: if (usages_top == sizeof(usages)) + { ERR("More than 256 individual usages defined\n"); + return -1; + } else { usages[usages_top++] = getValue(bSize, itemVal, FALSE); @@ -674,10 +685,14 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l break; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); + return -1; } } else + { ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); + return -1; + } i += bSize; } @@ -927,7 +942,7 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_coll nodes_offset = size; size += node_count * sizeof(WINE_HID_LINK_COLLECTION_NODE); - data = calloc(1, size); + if (!(data = calloc(1, size))) return NULL; data->magic = HID_MAGIC; data->dwSize = size; data->caps.Usage = base_collection->caps.NotRange.Usage; @@ -982,14 +997,18 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) list_init(&caps_stack); - base = calloc(1, sizeof(*base)); + if (!(base = calloc(1, sizeof(*base)))) return NULL; base->index = 1; list_init(&base->features); list_init(&base->collections); memset(&caps, 0, sizeof(caps)); cidx = 0; - parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &caps_stack); + if (parse_descriptor(descriptor, 0, length, &feature_count, &cidx, base, &caps, &caps_stack) < 0) + { + free_collection(base); + return NULL; + } debug_collection(base); @@ -1004,8 +1023,8 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) } } - data = build_PreparseData(base, cidx); - debug_print_preparsed(data); + if ((data = build_PreparseData(base, cidx))) + debug_print_preparsed(data); free_collection(base); return data;

1 0

Rémi Bernon : hidclass.sys: Remove Delim member from struct caps.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 1f0b48abf23741c3c7b23931dce7acb351937701 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f0b48abf23741c3c7b23931… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:06:58 2021 +0200 hidclass.sys: Remove Delim member from struct caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 0e0d6a6bf54..ec559f67f5f 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -122,8 +122,6 @@ struct caps { USHORT Reserved3; } NotRange; } DUMMYUNIONNAME; - - int Delim; }; struct feature { @@ -200,7 +198,7 @@ static void debugstr_caps(const char* type, struct caps *caps) return; TRACE("(%s Caps: UsagePage 0x%x; LogicalMin %i; LogicalMax %i; PhysicalMin %i; " "PhysicalMax %i; UnitsExp %i; Units %i; BitSize %i; ReportID %i; ReportCount %i; " - "Usage %s; StringIndex %s; DesignatorIndex %s; Delim %i;)\n", + "Usage %s; StringIndex %s; DesignatorIndex %s;)\n", type, caps->UsagePage, caps->LogicalMin, @@ -214,8 +212,7 @@ static void debugstr_caps(const char* type, struct caps *caps) caps->ReportCount, debugstr_usages(caps), debugstr_stringindex(caps), - debugstr_designatorindex(caps), - caps->Delim); + debugstr_designatorindex(caps)); } static void debug_feature(struct feature *feature) @@ -681,8 +678,8 @@ static int parse_descriptor(BYTE *descriptor, unsigned int index, unsigned int l caps->IsStringRange = TRUE; break; case TAG_LOCAL_DELIMITER: - caps->Delim = getValue(bSize, itemVal, FALSE); - break; + FIXME("delimiter %d not implemented!\n", itemVal); + return -1; default: ERR("Unknown (bTag: 0x%x, bType: 0x%x)\n", bTag, bType); return -1;

1 0

Rémi Bernon : hidclass.sys: Use HIDP_VALUE_CAPS instead of struct caps.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: ca9bb8a23dd66521b3d780721d38a36f8f1163da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca9bb8a23dd66521b3d78072… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:06:59 2021 +0200 hidclass.sys: Use HIDP_VALUE_CAPS instead of struct caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 160 ++++++++--------------------------------- 1 file changed, 31 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca9bb8a23dd66521b3d7…

1 0

Rémi Bernon : hidclass.sys: Factor all HIDP_VALUE_CAPS debug helpers.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: c3d8a9803c9f6263ed56c1ebe1921ea194807bb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d8a9803c9f6263ed56c1eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:07:00 2021 +0200 hidclass.sys: Factor all HIDP_VALUE_CAPS debug helpers. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 113 +++++------------------------------------ 1 file changed, 14 insertions(+), 99 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 869d1dc1a85..2585ea2a40e 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -133,51 +133,16 @@ struct caps_stack { HIDP_VALUE_CAPS caps; }; -static const char* debugstr_usages(HIDP_VALUE_CAPS *caps) +static inline const char *debugstr_hidp_value_caps( HIDP_VALUE_CAPS *caps ) { - if (!caps->IsRange) - return wine_dbg_sprintf("[0x%x]", caps->NotRange.Usage); - else - return wine_dbg_sprintf("[0x%x - 0x%x]", caps->Range.UsageMin, caps->Range.UsageMax); -} - -static const char* debugstr_stringindex(HIDP_VALUE_CAPS *caps) -{ - if (!caps->IsStringRange) - return wine_dbg_sprintf("%i", caps->NotRange.StringIndex); - else - return wine_dbg_sprintf("[%i - %i]", caps->Range.StringMin, caps->Range.StringMax); -} - -static const char* debugstr_designatorindex(HIDP_VALUE_CAPS *caps) -{ - if (!caps->IsDesignatorRange) - return wine_dbg_sprintf("%i", caps->NotRange.DesignatorIndex); - else - return wine_dbg_sprintf("[%i - %i]", caps->Range.DesignatorMin, caps->Range.DesignatorMax); -} - -static void debugstr_caps(const char* type, HIDP_VALUE_CAPS *caps) -{ - if (!caps) - return; - TRACE("(%s Caps: UsagePage 0x%x; LogicalMin %i; LogicalMax %i; PhysicalMin %i; " - "PhysicalMax %i; UnitsExp %i; Units %i; BitSize %i; ReportID %i; ReportCount %i; " - "Usage %s; StringIndex %s; DesignatorIndex %s;)\n", - type, - caps->UsagePage, - caps->LogicalMin, - caps->LogicalMax, - caps->PhysicalMin, - caps->PhysicalMax, - caps->UnitsExp, - caps->Units, - caps->BitSize, - caps->ReportID, - caps->ReportCount, - debugstr_usages(caps), - debugstr_stringindex(caps), - debugstr_designatorindex(caps)); + if (!caps) return "(null)"; + return wine_dbg_sprintf( "RId %d, Usg %02x:%02x-%02x Dat %02x-%02x (%d), Str %d-%d (%d), Des %d-%d (%d), " + "Bits %02x, Als %d, Abs %d, Nul %d, LCol %d LUsg %02x:%02x, BitSz %d, RCnt %d, " + "Unit %x E%+d, Log %+d-%+d, Phy %+d-%+d", + caps->ReportID, caps->UsagePage, caps->Range.UsageMin, caps->Range.UsageMax, caps->Range.DataIndexMin, caps->Range.DataIndexMax, caps->IsRange, + caps->Range.StringMin, caps->Range.StringMax, caps->IsStringRange, caps->Range.DesignatorMin, caps->Range.DesignatorMax, caps->IsDesignatorRange, + caps->BitField, caps->IsAlias, caps->IsAbsolute, caps->HasNull, caps->LinkCollection, caps->LinkUsagePage, caps->LinkUsage, caps->BitSize, caps->ReportCount, + caps->Units, caps->UnitsExp, caps->LogicalMin, caps->LogicalMax, caps->PhysicalMin, caps->PhysicalMax ); } static void debug_feature(struct feature *feature) @@ -197,7 +162,7 @@ static void debug_feature(struct feature *feature) (feature->Volatile)?"Volatile":"NonVolatile", (feature->BitField)?"BitField":"Buffered"); - debugstr_caps("Feature", &feature->caps); + TRACE("Feature %s\n", debugstr_hidp_value_caps(&feature->caps)); } static void debug_collection(struct collection *collection) @@ -209,7 +174,7 @@ static void debug_collection(struct collection *collection) TRACE("START Collection %i <<< %s, parent: %p, %i features, %i collections\n", collection->index, collection_string[collection->type], collection->parent, list_count(&collection->features), list_count(&collection->collections)); - debugstr_caps("Collection", &collection->caps); + TRACE("Collection %s\n", debugstr_hidp_value_caps(&collection->caps)); LIST_FOR_EACH_ENTRY(fentry, &collection->features, struct feature, entry) debug_feature(fentry); LIST_FOR_EACH_ENTRY(centry, &collection->collections, struct collection, entry) @@ -218,61 +183,10 @@ static void debug_collection(struct collection *collection) } } -static void debug_print_button_cap(const CHAR * type, WINE_HID_ELEMENT *wine_element) -{ - if (!wine_element->caps.IsRange) - TRACE("%s Button: 0x%x/0x%04x: ReportId %i, startBit %i/1\n" , type, - wine_element->caps.UsagePage, - wine_element->caps.NotRange.Usage, - wine_element->caps.ReportID, - wine_element->valueStartBit); - else - TRACE("%s Button: 0x%x/[0x%04x-0x%04x]: ReportId %i, startBit %i/%i\n" ,type, - wine_element->caps.UsagePage, - wine_element->caps.Range.UsageMin, - wine_element->caps.Range.UsageMax, - wine_element->caps.ReportID, - wine_element->valueStartBit, - wine_element->bitCount); -} - -static void debug_print_value_cap(const CHAR * type, WINE_HID_ELEMENT *wine_element) -{ - TRACE("%s Value: 0x%x/0x%x: ReportId %i, IsAbsolute %i, HasNull %i, " - "Bit Size %i, ReportCount %i, UnitsExp %i, Units %i, " - "LogicalMin %i, Logical Max %i, PhysicalMin %i, " - "PhysicalMax %i -- StartBit %i/%i\n", type, - wine_element->caps.UsagePage, - wine_element->caps.NotRange.Usage, - wine_element->caps.ReportID, - wine_element->caps.IsAbsolute, - wine_element->caps.HasNull, - wine_element->caps.BitSize, - wine_element->caps.ReportCount, - wine_element->caps.UnitsExp, - wine_element->caps.Units, - wine_element->caps.LogicalMin, - wine_element->caps.LogicalMax, - wine_element->caps.PhysicalMin, - wine_element->caps.PhysicalMax, - wine_element->valueStartBit, - wine_element->bitCount); -} - -static void debug_print_element(const CHAR* type, WINE_HID_ELEMENT *wine_element) -{ - if (wine_element->ElementType == ButtonElement) - debug_print_button_cap(type, wine_element); - else if (wine_element->ElementType == ValueElement) - debug_print_value_cap(type, wine_element); - else - TRACE("%s: UNKNOWN\n", type); -} - static void debug_print_report(const char* type, WINE_HIDP_PREPARSED_DATA *data, WINE_HID_REPORT *report) { - WINE_HID_ELEMENT *elem = HID_ELEMS(data); + WINE_HID_ELEMENT *elems = HID_ELEMS(data); unsigned int i; TRACE("START Report %i <<< %s report : bitSize: %i elementCount: %i\n", report->reportID, @@ -281,7 +195,8 @@ static void debug_print_report(const char* type, WINE_HIDP_PREPARSED_DATA *data, report->elementCount); for (i = 0; i < report->elementCount; i++) { - debug_print_element(type, &elem[report->elementIdx + i]); + WINE_HID_ELEMENT *elem = elems + report->elementIdx + i; + TRACE("%s: %s, StartBit %d, BitCount %d\n", type, debugstr_hidp_value_caps(&elem->caps), elem->valueStartBit, elem->bitCount); } TRACE(">>> END Report %i\n",report->reportID); }

1 0

Rémi Bernon : hid: Use caps.BitSize to differenciate buttons from values.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 45958834b80accad262a811d7eb519158232e479 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45958834b80accad262a811d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:07:01 2021 +0200 hid: Use caps.BitSize to differenciate buttons from values. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 36 ++++++++++++++++++------------------ dlls/hidclass.sys/descriptor.c | 2 -- include/wine/hid.h | 7 ------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 92c1442d048..a7003717a21 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -203,7 +203,7 @@ NTSTATUS WINAPI HidP_GetButtonCaps(HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAP { for (i = 0; i < report[j].elementCount && u < b_count; i++) { - if (elems[report[j].elementIdx + i].ElementType == ButtonElement) + if (elems[report[j].elementIdx + i].caps.BitSize == 1) ButtonCaps[u++] = *(HIDP_BUTTON_CAPS *)&elems[report[j].elementIdx + i].caps; } } @@ -230,7 +230,7 @@ NTSTATUS WINAPI HidP_GetCaps(PHIDP_PREPARSED_DATA PreparsedData, static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, - WINE_ELEMENT_TYPE ElementType, WINE_HID_ELEMENT *element) + USHORT bit_size, WINE_HID_ELEMENT *element) { PWINE_HIDP_PREPARSED_DATA data = (PWINE_HIDP_PREPARSED_DATA)PreparsedData; WINE_HID_ELEMENT *elems = HID_ELEMS(data); @@ -270,7 +270,7 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT { HIDP_VALUE_CAPS *value = &elems[report->elementIdx + i].caps; - if (elems[report->elementIdx + i].ElementType != ElementType || + if ((elems[report->elementIdx + i].caps.BitSize == 1) != (bit_size == 1) || value->UsagePage != UsagePage) continue; @@ -278,13 +278,13 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT { *element = elems[report->elementIdx + i]; element->valueStartBit += value->BitSize * (Usage - value->Range.UsageMin); - element->bitCount = elems[report->elementIdx + i].ElementType == ValueElement ? value->BitSize: 1; + 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].ElementType == ValueElement ? value->BitSize : 1; + element->bitCount = elems[report->elementIdx + i].caps.BitSize; return HIDP_STATUS_SUCCESS; } } @@ -297,7 +297,7 @@ static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) UINT bit_count = element->bitCount; if ((value & (1 << (bit_count - 1))) - && element->ElementType == ValueElement + && element->caps.BitSize != 1 && element->caps.LogicalMin < 0) { value -= (1 << bit_count); @@ -326,7 +326,7 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -352,7 +352,7 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, TRACE("(%i, %x, %i, %i, %p, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -374,7 +374,7 @@ NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE Usage 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, ValueElement, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -435,7 +435,7 @@ NTSTATUS WINAPI HidP_GetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH uCount = 0; for (i = 0; i < report->elementCount && uCount < *UsageLength; i++) { - if (elems[report->elementIdx + i].ElementType == ButtonElement && + if (elems[report->elementIdx + i].caps.BitSize == 1 && elems[report->elementIdx + i].caps.UsagePage == UsagePage) { int k; @@ -514,7 +514,7 @@ NTSTATUS WINAPI HidP_GetValueCaps(HIDP_REPORT_TYPE ReportType, PHIDP_VALUE_CAPS { for (i = 0; i < report[j].elementCount && u < v_count; i++) { - if (elems[report[j].elementIdx + i].ElementType == ValueElement) + if (elems[report[j].elementIdx + i].caps.BitSize != 1) ValueCaps[u++] = elems[report[j].elementIdx + i].caps; } } @@ -607,7 +607,7 @@ ULONG WINAPI HidP_MaxUsageListLength(HIDP_REPORT_TYPE ReportType, USAGE UsagePag int j; for (j = 0; j < report[i].elementCount; j++) { - if (elems[report[i].elementIdx + j].ElementType == ButtonElement && + if (elems[report[i].elementIdx + j].caps.BitSize == 1 && (UsagePage == 0 || elems[report[i].elementIdx + j].caps.UsagePage == UsagePage)) { if (elems[report[i].elementIdx + j].caps.IsRange) @@ -631,7 +631,7 @@ NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, TRACE("(%i, %x, %i, %i, %i, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, PreparsedData, Report, ReportLength); - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, ValueElement, &element); + rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); if (rc == HIDP_STATUS_SUCCESS) { @@ -657,7 +657,7 @@ NTSTATUS WINAPI HidP_SetUsages(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USH for (i = 0; i < *UsageLength; i++) { rc = find_usage(ReportType, UsagePage, LinkCollection, - UsageList[i], PreparsedData, Report, ButtonElement, &element); + UsageList[i], PreparsedData, Report, 1, &element); if (rc == HIDP_STATUS_SUCCESS) { rc = set_report_data((BYTE*)Report, ReportLength, @@ -734,7 +734,7 @@ NTSTATUS WINAPI HidP_GetSpecificButtonCaps(HIDP_REPORT_TYPE ReportType, { for (i = 0; i < report[j].elementCount && u < b_count; i++) { - if (elems[report[j].elementIdx + i].ElementType == ButtonElement && + if (elems[report[j].elementIdx + i].caps.BitSize == 1 && (UsagePage == 0 || UsagePage == elems[report[j].elementIdx + i].caps.UsagePage) && (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.LinkCollection) && (Usage == 0 || ( @@ -804,7 +804,7 @@ NTSTATUS WINAPI HidP_GetSpecificValueCaps(HIDP_REPORT_TYPE ReportType, { for (i = 0; i < report[j].elementCount && u < v_count; i++) { - if (elems[report[j].elementIdx + i].ElementType == ValueElement && + if (elems[report[j].elementIdx + i].caps.BitSize != 1 && (UsagePage == 0 || UsagePage == elems[report[j].elementIdx + i].caps.UsagePage) && (LinkCollection == 0 || LinkCollection == elems[report[j].elementIdx + i].caps.LinkCollection) && (Usage == 0 || Usage == elems[report[j].elementIdx + i].caps.NotRange.Usage)) @@ -861,7 +861,7 @@ NTSTATUS WINAPI HidP_GetUsagesEx(HIDP_REPORT_TYPE ReportType, USHORT LinkCollect for (i = 0; i < report->elementCount; i++) { - if (elems[report->elementIdx + i].ElementType == ButtonElement) + if (elems[report->elementIdx + i].caps.BitSize == 1) { int k; WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; @@ -945,7 +945,7 @@ NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, U for (i = 0; i < report->elementCount; i++) { WINE_HID_ELEMENT *element = &elems[report->elementIdx + i]; - if (element->ElementType == ButtonElement) + if (element->caps.BitSize == 1) { int k; for (k=0; k < element->bitCount; k++) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 2585ea2a40e..9364400275a 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -617,8 +617,6 @@ static void build_elements(WINE_HID_REPORT *wine_report, WINE_HID_ELEMENT *elems *data_index = *data_index + 1; } - if (feature->caps.BitSize == 1) wine_element->ElementType = ButtonElement; - else wine_element->ElementType = ValueElement; wine_report->elementCount++; } diff --git a/include/wine/hid.h b/include/wine/hid.h index 38d84bc96af..cfb4f389eb9 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -31,15 +31,8 @@ #define HID_MAGIC 0x8491759 -typedef enum __WINE_ELEMENT_TYPE { - UnknownElement = 0, - ButtonElement, - ValueElement, -} WINE_ELEMENT_TYPE; - typedef struct __WINE_ELEMENT { - WINE_ELEMENT_TYPE ElementType; UINT valueStartBit; UINT bitCount; HIDP_VALUE_CAPS caps;

1 0

Rémi Bernon : include: Add HID haptics usage page.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 40b418bd1fe9c9cad0e206d1b57f2809fc3a37c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40b418bd1fe9c9cad0e206d1… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:10:22 2021 +0200 include: Add HID haptics usage page. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/hidusage.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/hidusage.h b/include/hidusage.h index fc77dff2c6b..002040bddc0 100644 --- a/include/hidusage.h +++ b/include/hidusage.h @@ -196,6 +196,7 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_PAGE_TELEPHONY ((USAGE) 0x0B) #define HID_USAGE_PAGE_CONSUMER ((USAGE) 0x0C) #define HID_USAGE_PAGE_DIGITIZER ((USAGE) 0x0D) +#define HID_USAGE_PAGE_HAPTICS ((USAGE) 0x0E) #define HID_USAGE_PAGE_UNICODE ((USAGE) 0x10) #define HID_USAGE_PAGE_ALPHANUMERIC ((USAGE) 0x14) #define HID_USAGE_PAGE_VENDOR_DEFINED_BEGIN ((USAGE) 0xff00) @@ -224,6 +225,33 @@ typedef USHORT USAGE, *PUSAGE; #define HID_USAGE_TELEPHONY_KEYPAD_D ((USAGE) 0xBF) #define HID_USAGE_TELEPHONY_HOST_AVAILABLE ((USAGE) 0xF1) +#define HID_USAGE_HAPTICS_SIMPLE_CONTROLLER ((USAGE) 0x01) +#define HID_USAGE_HAPTICS_WAVEFORM_LIST ((USAGE) 0x10) +#define HID_USAGE_HAPTICS_DURATION_LIST ((USAGE) 0x11) +#define HID_USAGE_HAPTICS_AUTO_TRIGGER ((USAGE) 0x20) +#define HID_USAGE_HAPTICS_MANUAL_TRIGGER ((USAGE) 0x21) +#define HID_USAGE_HAPTICS_AUTO_ASSOCIATED_CONTROL ((USAGE) 0x22) +#define HID_USAGE_HAPTICS_INTENSITY ((USAGE) 0x23) +#define HID_USAGE_HAPTICS_REPEAT_COUNT ((USAGE) 0x24) +#define HID_USAGE_HAPTICS_RETRIGGER_PERIOD ((USAGE) 0x25) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_PAGE ((USAGE) 0x26) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_ID ((USAGE) 0x27) +#define HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME ((USAGE) 0x28) +#define HID_USAGE_HAPTICS_WAVEFORM_BEGIN ((USAGE) 0x1000) +/* Differs from https://usb.org/sites/default/files/hut1_22.pdf */ +/* Waveform None */ +#define HID_USAGE_HAPTICS_WAVEFORM_STOP ((USAGE) 0x1001) +/* Waveform Stop */ +#define HID_USAGE_HAPTICS_WAVEFORM_NULL ((USAGE) 0x1002) +#define HID_USAGE_HAPTICS_WAVEFORM_CLICK ((USAGE) 0x1003) +#define HID_USAGE_HAPTICS_WAVEFORM_BUZZ ((USAGE) 0x1004) +#define HID_USAGE_HAPTICS_WAVEFORM_RUMBLE ((USAGE) 0x1005) +#define HID_USAGE_HAPTICS_WAVEFORM_PRESS ((USAGE) 0x1006) +#define HID_USAGE_HAPTICS_WAVEFORM_RELEASE ((USAGE) 0x1007) +#define HID_USAGE_HAPTICS_WAVEFORM_END ((USAGE) 0x1FFF) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_BEGIN ((USAGE) 0x2000) +#define HID_USAGE_HAPTICS_WAVEFORM_VENDOR_END ((USAGE) 0x2FFF) + #define HID_USAGE_MS_BTH_HF_DIALNUMBER ((USAGE) 0x21) #define HID_USAGE_MS_BTH_HF_DIALMEMORY ((USAGE) 0x22)

1 0

Rémi Bernon : hidclass.sys: Don't crash when no buffer was provided.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: f43c01fa82ce76273162bb940363809386ad1d80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f43c01fa82ce76273162bb94… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 7 11:11:37 2021 +0200 hidclass.sys: Don't crash when no buffer was provided. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 73ea6610ab8..82366ad1888 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -345,6 +345,12 @@ static NTSTATUS HID_get_feature(BASE_DEVICE_EXTENSION *ext, IRP *irp) out_buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); TRACE_(hid_report)("Device %p Buffer length %i Buffer %p\n", ext, irpsp->Parameters.DeviceIoControl.OutputBufferLength, out_buffer); + if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !out_buffer) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + return rc; + } + len = sizeof(*packet) + irpsp->Parameters.DeviceIoControl.OutputBufferLength; packet = malloc(len); packet->reportBufferLen = irpsp->Parameters.DeviceIoControl.OutputBufferLength; @@ -495,6 +501,12 @@ NTSTATUS WINAPI pdo_ioctl(DEVICE_OBJECT *device, IRP *irp) BYTE *buffer = MmGetSystemAddressForMdlSafe(irp->MdlAddress, NormalPagePriority); ULONG out_length; + if (!irpsp->Parameters.DeviceIoControl.OutputBufferLength || !buffer) + { + irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; + break; + } + packet = malloc(packet_size); if (ext->u.pdo.preparsed_data->reports[0].reportID)

1 0

Haidong Yu : shell32: Fix a memory leak.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 479b6594630c32b345aeb1cfd3c4c9cd8e214f95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=479b6594630c32b345aeb1cf… Author: Haidong Yu <yuhaidong(a)uniontech.com> Date: Mon Jun 7 17:47:33 2021 +0800 shell32: Fix a memory leak. Signed-off-by: Haidong Yu <yuhaidong(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelllink.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 69d610f2503..2353ac3e56e 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -2158,7 +2158,10 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile if (*pszFile == '\0') *buffer = '\0'; else if (!GetFullPathNameW(pszFile, MAX_PATH, buffer, &fname)) - return E_FAIL; + { + heap_free(unquoted); + return E_FAIL; + } else if(!PathFileExistsW(buffer) && !SearchPathW(NULL, pszFile, NULL, MAX_PATH, buffer, NULL)) hr = S_FALSE;

1 0

Henri Verbeet : d3d11/tests: Add a test for image UAV clears.
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: 736c4803d78800bd2df1d26a1e4f907a29efe898 URL: https://source.winehq.org/git/wine.git/?a=commit;h=736c4803d78800bd2df1d26a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:07 2021 +0200 d3d11/tests: Add a test for image UAV clears. Ported from the similar Direct3D 12 test in vkd3d. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 329 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 329 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=736c4803d78800bd2df1…

1 0

Henri Verbeet : wined3d: Introduce wined3d_mask_from_size().
by Alexandre Julliard 07 Jun '21

07 Jun '21

Module: wine Branch: master Commit: cc31ca8885a9a6977db35ba8e0f65408c3b063cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc31ca8885a9a6977db35ba8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 7 16:55:08 2021 +0200 wined3d: Introduce wined3d_mask_from_size(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 ++++---- dlls/wined3d/utils.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c5d7a7d9d55..8a4ca4f5781 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,11 +36,11 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER; /* Works correctly only for <= 4 bpp formats. */ -static void get_color_masks(const struct wined3d_format *format, DWORD *masks) +static void get_color_masks(const struct wined3d_format *format, uint32_t *masks) { - masks[0] = ((1u << format->red_size) - 1) << format->red_offset; - masks[1] = ((1u << format->green_size) - 1) << format->green_offset; - masks[2] = ((1u << format->blue_size) - 1) << format->blue_offset; + masks[0] = wined3d_mask_from_size(format->red_size) << format->red_offset; + masks[1] = wined3d_mask_from_size(format->green_size) << format->green_offset; + masks[2] = wined3d_mask_from_size(format->blue_size) << format->blue_offset; } /* See also float_16_to_32() in wined3d_private.h */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index b39fb46cadc..8eacc52ee2c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5902,7 +5902,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con static float color_to_float(DWORD color, DWORD size, DWORD offset) { - DWORD mask = size < 32 ? (1u << size) - 1 : ~0u; + uint32_t mask = wined3d_mask_from_size(size); if (!size) return 1.0f; @@ -5938,10 +5938,10 @@ void wined3d_format_get_float_color_key(const struct wined3d_format *format, case WINED3DFMT_R8G8B8X8_UNORM: case WINED3DFMT_R16G16_UNORM: case WINED3DFMT_B10G10R10A2_UNORM: - slop.r = 0.5f / ((1u << format->red_size) - 1); - slop.g = 0.5f / ((1u << format->green_size) - 1); - slop.b = 0.5f / ((1u << format->blue_size) - 1); - slop.a = 0.5f / ((1u << format->alpha_size) - 1); + slop.r = 0.5f / wined3d_mask_from_size(format->red_size); + slop.g = 0.5f / wined3d_mask_from_size(format->green_size); + slop.b = 0.5f / wined3d_mask_from_size(format->blue_size); + slop.a = 0.5f / wined3d_mask_from_size(format->alpha_size); float_colors[0].r = color_to_float(key->color_space_low_value, format->red_size, format->red_offset) - slop.r; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0f8ea1bf93..6d41f02e842 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5959,6 +5959,11 @@ static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geomet && geometry_shader->u.gs.so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; } +static inline uint32_t wined3d_mask_from_size(unsigned int size) +{ + return size < 32 ? (1u << size) - 1 : ~0u; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) {

1 0