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

Hugh McMaster : reg/tests: Move 'delete' syntax tests into a separate function.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 7c9f372480511cba8abd90ed04480911d96036de URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c9f372480511cba8abd90ed… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 18 22:31:58 2021 +1000 reg/tests: Move 'delete' syntax tests into a separate function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/delete.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index 22c5e867461..251a15f3371 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -19,11 +19,9 @@ #include "reg_test.h" -static void test_delete(void) +static void test_command_syntax(void) { - HKEY hkey; DWORD r; - const DWORD deadbeef = 0xdeadbeef; delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); @@ -68,6 +66,16 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /f /v", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); +} + +static void test_delete(void) +{ + HKEY hkey; + DWORD r; + const DWORD deadbeef = 0xdeadbeef; + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE, 0); /* Create a test key */ add_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); @@ -142,5 +150,6 @@ START_TEST(delete) return; } + test_command_syntax(); test_delete(); }

1 0

Alexandre Julliard : Release 6.11.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 1de583a4dac7d704b2d4291ada4a1885cd8cd1c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1de583a4dac7d704b2d4291a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 21:44:17 2021 +0200 Release 6.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 829 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +- 4 files changed, 420 insertions(+), 434 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1de583a4dac7d704b2d4…

1 0

Paul Gofman : mshtml/tests: Add a test for JS functions scope.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 9c818c96e457632c54de463c458145710649717e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c818c96e457632c54de463c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:21 2021 +0300 mshtml/tests: Add a test for JS functions scope. Based on a patch by Jacek Caban. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 83 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index dd6ea76c77a..03663917177 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1341,3 +1341,86 @@ sync_test("let scope instances", function() { ok(f() == 2, "f() = " + f()); }); + +sync_test("functions scope", function() { + function f(){ return 1; } + function f(){ return 2; } + + var f0 = f, f1, f2, f3, i, o, a = []; + ok(f0() === 2, "f0() = " + f0()); + + { + f1 = f; + function f() { return 3; } + ok(f1 === f, "f1 != f"); + ok(f0 != f1, "f0 == f1"); + } + ok(f === f1, "f != f1"); + + for(i = 0; i < 3; i++) { + a[i] = f; + function f() {} + ok(f === a[i], "f != a[i]"); + } + ok(a[0] != a[1], "a[0] == a[1]"); + ok(a[1] != a[2], "a[1] == a[2]"); + ok(f === a[2], "f != a[2]"); + + { + f2 = f; + ok(f() === 4, "f() = " + f()); + function f() { return 4; } + + { + f3 = f; + ok(f() === 5, "f() = " + f()); + function f() { return 5;} + } + ok(f() === 4, "f() = " + f()); + ok(f === f2, "f != f2"); + } + ok(f === f3, "f != f3"); + + with(o = {f: 1}) { + ok(f === 1, "f != 1"); + { + ok(f() === 6, "f() = " + f()); + function f() { return 6; } + } + ok(f === 1, "f != 1"); + delete o.f; + ok(f() === 6, "f() = " + f()); + } + + if(false) { + function f() { throw "unexpected call"; } + } + ok(f() === 6, "f() = " + f()); + + /* 'with' has no effect for function defined in a single statement context. */ + let w = 8; + with({w:10, value:11}) + function with_function() + { + var except + + ok(w == 8, "w != 8"); + except = false; + try + { + ok(value === undefined, "value is defined"); + } + catch(e) + { + except = true; + } + ok(except, "with_function: expected exception"); + + let ret = w; + w = 9; + return ret; + } + val = with_function(); + ok(val == 8, "val != 8"); + ok(w == 9, "w != 9"); +});

1 0

Paul Gofman : mshtml/tests: Add test for multiple JS scope instances.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: bb12dbb892ee7a616038d77ac670ddb044133195 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb12dbb892ee7a616038d77a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:20 2021 +0300 mshtml/tests: Add test for multiple JS scope instances. Based on a patch by Jacek Caban. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/es5.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 2fb115556e5..dd6ea76c77a 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -1319,3 +1319,25 @@ sync_test("declaration_let", function() { ok(a == 3, "a != 3"); }); + +sync_test("let scope instances", function() { + var a = [], i; + for(i = 0; i < 3; i++) { + a[i] = function() { return v; }; + let v = i; + } + for(i = 0; i < 3; i++) + ok(a[i]() == i, "a[" + i + "]() = " + a[i]()); + + ok(typeof f == 'undefined', "f is defined"); + + for(i = 0; i < 3; i++) { + function f() { return v; } + a[i] = f; + let v = i; + } + for(i = 0; i < 3; i++) + ok(a[i]() == i, "a[" + i + "]() = " + a[i]()); + + ok(f() == 2, "f() = " + f()); +});

1 0

Rémi Bernon : hidclass.sys: Create link collection caps during parsing.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: f266b2b5d4920050bb23877efd1eee4f0770156d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f266b2b5d4920050bb23877e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 18 09:39:35 2021 +0200 hidclass.sys: Create link collection caps during parsing. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 67 +++++++++++++++++++++++--------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 25 ++++++++------ 2 files changed, 56 insertions(+), 36 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 86b68863308..f7fcccf55d4 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -306,6 +306,9 @@ struct hid_parser_state DWORD stack_size; DWORD global_idx; DWORD collection_idx; + + struct hid_value_caps *collections; + DWORD collections_size; }; static BOOL array_reserve( struct hid_value_caps **array, DWORD *array_size, DWORD index ) @@ -390,12 +393,24 @@ static BOOL parse_new_collection( struct hid_parser_state *state ) return FALSE; } + if (!array_reserve( &state->collections, &state->collections_size, state->caps.NumberLinkCollectionNodes )) + { + ERR( "HID parser collections overflow!\n" ); + return FALSE; + } + copy_collection_items( state->stack + state->collection_idx, &state->items ); state->collection_idx++; + state->collections[state->caps.NumberLinkCollectionNodes] = state->items; state->items.link_collection = state->caps.NumberLinkCollectionNodes; state->items.link_usage_page = state->items.usage_page; state->items.link_usage = state->items.usage_min; + if (!state->caps.NumberLinkCollectionNodes) + { + state->caps.UsagePage = state->items.usage_page; + state->caps.Usage = state->items.usage_min; + } state->caps.NumberLinkCollectionNodes++; reset_local_items( state ); @@ -421,6 +436,7 @@ static void free_parser_state( struct hid_parser_state *state ) if (state->global_idx) ERR( "%u unpopped device caps on the stack\n", state->global_idx ); if (state->collection_idx) ERR( "%u unpopped device collection on the stack\n", state->collection_idx ); free( state->stack ); + free( state->collections ); free( state ); } @@ -727,10 +743,8 @@ static void preparse_collection(const struct collection *root, const struct coll WINE_HIDP_PREPARSED_DATA *data, struct preparse_ctx *ctx) { WINE_HID_ELEMENT *elem = HID_ELEMS(data); - WINE_HID_LINK_COLLECTION_NODE *nodes = HID_NODES(data); struct feature *f; struct collection *c; - struct list *entry; LIST_FOR_EACH_ENTRY(f, &base->features, struct feature, entry) { @@ -775,33 +789,18 @@ static void preparse_collection(const struct collection *root, const struct coll } } - if (root != base) - { - nodes[base->index].LinkUsagePage = base->caps.UsagePage; - nodes[base->index].LinkUsage = base->caps.NotRange.Usage; - nodes[base->index].Parent = base->parent == root ? 0 : base->parent->index; - nodes[base->index].CollectionType = base->type; - nodes[base->index].IsAlias = 0; - - if ((entry = list_head(&base->collections))) - nodes[base->index].FirstChild = LIST_ENTRY(entry, struct collection, entry)->index; - } - LIST_FOR_EACH_ENTRY(c, &base->collections, struct collection, entry) - { preparse_collection(root, c, data, ctx); - - if ((entry = list_next(&base->collections, &c->entry))) - nodes[c->index].NextSibling = LIST_ENTRY(entry, struct collection, entry)->index; - if (root != base) nodes[base->index].NumberOfChildren++; - } } -static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_collection, unsigned int node_count) +static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_collection, + struct hid_parser_state *state ) { + WINE_HID_LINK_COLLECTION_NODE *nodes; WINE_HIDP_PREPARSED_DATA *data; unsigned int report_count; unsigned int size; + DWORD i; struct preparse_ctx ctx; unsigned int element_off; @@ -816,18 +815,34 @@ static WINE_HIDP_PREPARSED_DATA* build_PreparseData(struct collection *base_coll size = element_off + (ctx.elem_count * sizeof(WINE_HID_ELEMENT)); nodes_offset = size; - size += node_count * sizeof(WINE_HID_LINK_COLLECTION_NODE); + size += state->caps.NumberLinkCollectionNodes * sizeof(WINE_HID_LINK_COLLECTION_NODE); if (!(data = calloc(1, size))) return NULL; data->magic = HID_MAGIC; data->dwSize = size; - data->caps.Usage = base_collection->caps.NotRange.Usage; - data->caps.UsagePage = base_collection->caps.UsagePage; - data->caps.NumberLinkCollectionNodes = node_count; + data->caps = state->caps; data->elementOffset = element_off; data->nodesOffset = nodes_offset; preparse_collection(base_collection, base_collection, data, &ctx); + + nodes = HID_NODES( data ); + for (i = 0; i < data->caps.NumberLinkCollectionNodes; ++i) + { + nodes[i].LinkUsagePage = state->collections[i].usage_page; + nodes[i].LinkUsage = state->collections[i].usage_min; + nodes[i].Parent = state->collections[i].link_collection; + nodes[i].CollectionType = state->collections[i].bit_field; + nodes[i].IsAlias = 0; + + if (i > 0) + { + nodes[i].NextSibling = nodes[nodes[i].Parent].FirstChild; + nodes[nodes[i].Parent].FirstChild = i; + nodes[nodes[i].Parent].NumberOfChildren++; + } + } + return data; } @@ -889,7 +904,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) debug_collection(base); - if ((data = build_PreparseData(base, cidx))) + if ((data = build_preparsed_data( base, state ))) debug_print_preparsed(data); free_collection(base); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 5453af8ff1c..19099a5a19c 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1500,6 +1500,20 @@ static void test_pnp_driver(struct testsign_context *ctx) (val).member, (exp).member) #define check_member(val, exp, fmt, member) check_member_(__FILE__, __LINE__, val, exp, fmt, member) +#define check_hidp_link_collection_node(a, b) check_hidp_link_collection_node_(__LINE__, a, b) +static inline void check_hidp_link_collection_node_(int line, HIDP_LINK_COLLECTION_NODE *node, + const HIDP_LINK_COLLECTION_NODE *exp) +{ + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsage); + check_member_(__FILE__, line, *node, *exp, "%04x", LinkUsagePage); + check_member_(__FILE__, line, *node, *exp, "%d", Parent); + check_member_(__FILE__, line, *node, *exp, "%d", NumberOfChildren); + check_member_(__FILE__, line, *node, *exp, "%d", NextSibling); + check_member_(__FILE__, line, *node, *exp, "%d", FirstChild); + check_member_(__FILE__, line, *node, *exp, "%d", CollectionType); + check_member_(__FILE__, line, *node, *exp, "%d", IsAlias); +} + #define check_hidp_button_caps(a, b) check_hidp_button_caps_(__LINE__, a, b) static inline void check_hidp_button_caps_(int line, HIDP_BUTTON_CAPS *caps, const HIDP_BUTTON_CAPS *exp) { @@ -1850,16 +1864,7 @@ static void test_hidp(HANDLE file, int report_id) for (i = 0; i < ARRAY_SIZE(expect_collections); ++i) { winetest_push_context("collections[%d]", i); - check_member(collections[i], expect_collections[i], "%04x", LinkUsage); - check_member(collections[i], expect_collections[i], "%04x", LinkUsagePage); - check_member(collections[i], expect_collections[i], "%d", Parent); - check_member(collections[i], expect_collections[i], "%d", NumberOfChildren); - todo_wine_if(i == 1) - check_member(collections[i], expect_collections[i], "%d", NextSibling); - todo_wine_if(i == 0) - check_member(collections[i], expect_collections[i], "%d", FirstChild); - check_member(collections[i], expect_collections[i], "%d", CollectionType); - check_member(collections[i], expect_collections[i], "%d", IsAlias); + check_hidp_link_collection_node(&collections[i], &expect_collections[i]); winetest_pop_context(); }

1 0

Alexandre Julliard : ntdll/tests: Adapt some of the i386 tests to run on x86-64 as well.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 15b18f483002ea06daa50a0fa1c208a8fbde77ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=15b18f483002ea06daa50a0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 16:22:09 2021 +0200 ntdll/tests: Adapt some of the i386 tests to run on x86-64 as well. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 487 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 431 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15b18f483002ea06daa5…

1 0

Paul Gofman : jscript: Support block scope variables.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 308c8468b4326d989fe4a064740143af140336a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=308c8468b4326d989fe4a064… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 18 15:50:18 2021 +0300 jscript: Support block scope variables. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/compile.c | 104 ++++++++++++++++---------- dlls/jscript/engine.c | 182 ++++++++++++++++++++++++++++++++++++++------- dlls/jscript/engine.h | 6 +- dlls/jscript/tests/lang.js | 16 ++++ dlls/mshtml/tests/es5.js | 48 +++++++++++- 5 files changed, 285 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=308c8468b4326d989fe4…

1 0

Rémi Bernon : hidclass.sys: Remove unused struct feature members.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 28c37bbdba40fe7d678116a5fed5763869361b54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28c37bbdba40fe7d678116a5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 18 09:39:36 2021 +0200 hidclass.sys: Remove unused struct feature members. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 54 ++++-------------------------------------- 1 file changed, 5 insertions(+), 49 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index f7fcccf55d4..f1232137b83 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -95,17 +95,6 @@ struct feature { HIDP_REPORT_TYPE type; BOOLEAN isData; - BOOLEAN isArray; - BOOLEAN IsAbsolute; - BOOLEAN Wrap; - BOOLEAN Linear; - BOOLEAN prefState; - BOOLEAN HasNull; - BOOLEAN Volatile; - BOOLEAN BitField; - - unsigned int index; - struct collection *collection; }; static const char* const collection_string[] = { @@ -186,18 +175,7 @@ static void debug_feature(struct feature *feature) { if (!feature) return; - TRACE("[Feature type %s [%i]; %s; %s; %s; %s; %s; %s; %s; %s; %s]\n", - feature_string[feature->type], - feature->index, - (feature->isData)?"Data":"Const", - (feature->isArray)?"Array":"Var", - (feature->IsAbsolute)?"Abs":"Rel", - (feature->Wrap)?"Wrap":"NoWrap", - (feature->Linear)?"Linear":"NonLinear", - (feature->prefState)?"PrefStat":"NoPrefState", - (feature->HasNull)?"HasNull":"NoNull", - (feature->Volatile)?"Volatile":"NonVolatile", - (feature->BitField)?"BitField":"Buffered"); + TRACE( "[Feature type %s %s]\n", feature_string[feature->type], (feature->isData) ? "Data" : "Const" ); TRACE("Feature %s\n", debugstr_hidp_value_caps(&feature->caps)); } @@ -441,7 +419,6 @@ static void free_parser_state( struct hid_parser_state *state ) } static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, - unsigned int *feature_index, struct feature *feature) { if (bSize == 0) @@ -451,23 +428,6 @@ static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, else { feature->isData = ((itemVal & INPUT_DATA_CONST) == 0); - feature->isArray = ((itemVal & INPUT_ARRAY_VAR) == 0); - feature->IsAbsolute = ((itemVal & INPUT_ABS_REL) == 0); - feature->Wrap = ((itemVal & INPUT_WRAP) != 0); - feature->Linear = ((itemVal & INPUT_LINEAR) == 0); - feature->prefState = ((itemVal & INPUT_PREFSTATE) == 0); - feature->HasNull = ((itemVal & INPUT_NULL) != 0); - - if (bTag != TAG_MAIN_INPUT) - { - feature->Volatile = ((itemVal & INPUT_VOLATILE) != 0); - } - if (bSize > 1) - { - feature->BitField = ((itemVal & INPUT_BITFIELD) == 0); - } - feature->index = *feature_index; - *feature_index = *feature_index + 1; } } @@ -487,8 +447,7 @@ static void parse_collection(unsigned int bSize, int itemVal, } } -static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int length, - unsigned int *feature_index, unsigned int *collection_index, +static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int length, unsigned int *collection_index, struct collection *collection, struct hid_parser_state *state ) { int i, j; @@ -538,11 +497,10 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int feature->type = HidP_Output; else feature->type = HidP_Feature; - parse_io_feature(size, value, tag, feature_index, feature); + parse_io_feature( size, value, tag, feature ); if (j < state->usages_size) state->items.usage_min = state->usages[j]; copy_hidp_value_caps( &feature->caps, &state->items ); feature->caps.ReportCount = 1; - feature->collection = collection; if (j + 1 >= state->usages_size) { feature->caps.ReportCount += state->items.report_count - (j + 1); @@ -569,8 +527,7 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int parse_collection(size, value, subcollection); if (!parse_new_collection( state )) return -1; - if ((i = parse_descriptor( descriptor, i, length, feature_index, collection_index, - subcollection, state )) < 0) + if ((i = parse_descriptor( descriptor, i, length, collection_index, subcollection, state )) < 0) return i; continue; } @@ -870,7 +827,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) struct collection *base; int i; - unsigned int feature_count = 0; unsigned int cidx; if (TRACE_ON(hid)) @@ -895,7 +851,7 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) list_init(&base->collections); cidx = 0; - if (parse_descriptor( descriptor, 0, length, &feature_count, &cidx, base, state ) < 0) + if (parse_descriptor( descriptor, 0, length, &cidx, base, state ) < 0) { free_collection(base); free_parser_state( state );

1 0

Rémi Bernon : hidclass.sys: Remove unused struct collection members.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: 54936bba46b8caabc6f3a3360fc3fd35066a8a99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54936bba46b8caabc6f3a336… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 18 09:39:37 2021 +0200 hidclass.sys: Remove unused struct collection members. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index f1232137b83..f10ec40abec 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -109,8 +109,6 @@ static const char* const collection_string[] = { struct collection { struct list entry; - HIDP_VALUE_CAPS caps; - unsigned int index; unsigned int type; struct collection *parent; struct list features; @@ -186,15 +184,14 @@ static void debug_collection(struct collection *collection) struct collection *centry; if (TRACE_ON(hid)) { - 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)); - TRACE("Collection %s\n", debugstr_hidp_value_caps(&collection->caps)); + TRACE( "START Collection <<< %s, parent: %p, %i features, %i collections\n", + collection_string[collection->type], collection->parent, + list_count( &collection->features ), list_count( &collection->collections ) ); LIST_FOR_EACH_ENTRY(fentry, &collection->features, struct feature, entry) debug_feature(fentry); LIST_FOR_EACH_ENTRY(centry, &collection->collections, struct collection, entry) debug_collection(centry); - TRACE(">>> END Collection %i\n", collection->index); + TRACE( ">>> END Collection\n" ); } } @@ -447,7 +444,7 @@ static void parse_collection(unsigned int bSize, int itemVal, } } -static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int length, unsigned int *collection_index, +static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int length, struct collection *collection, struct hid_parser_state *state ) { int i, j; @@ -518,17 +515,12 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int /* Only set our collection once... We do not properly handle composite devices yet. */ if (state->usages_size) state->items.usage_min = state->usages[state->usages_size - 1]; - if (*collection_index == 0) copy_hidp_value_caps( &collection->caps, &state->items ); - copy_hidp_value_caps( &subcollection->caps, &state->items ); - subcollection->index = *collection_index; - *collection_index = *collection_index + 1; list_init(&subcollection->features); list_init(&subcollection->collections); parse_collection(size, value, subcollection); if (!parse_new_collection( state )) return -1; - if ((i = parse_descriptor( descriptor, i, length, collection_index, subcollection, state )) < 0) - return i; + if ((i = parse_descriptor( descriptor, i, length, subcollection, state )) < 0) return i; continue; } case SHORT_ITEM(TAG_MAIN_END_COLLECTION, TAG_TYPE_MAIN): @@ -827,8 +819,6 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) struct collection *base; int i; - unsigned int cidx; - if (TRACE_ON(hid)) { TRACE("descriptor %p, length %u:\n", descriptor, length); @@ -846,12 +836,10 @@ WINE_HIDP_PREPARSED_DATA* ParseDescriptor(BYTE *descriptor, unsigned int length) free( state ); return NULL; } - base->index = 1; list_init(&base->features); list_init(&base->collections); - cidx = 0; - if (parse_descriptor( descriptor, 0, length, &cidx, base, state ) < 0) + if (parse_descriptor( descriptor, 0, length, base, state ) < 0) { free_collection(base); free_parser_state( state );

1 0

Rémi Bernon : hidclass.sys: Split feature parsing to separate helper.
by Alexandre Julliard June 18, 2021

June 18, 2021

Module: wine Branch: master Commit: ef1247d77aef8a237630abaef51abc44f39293a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef1247d77aef8a237630abae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 18 09:39:38 2021 +0200 hidclass.sys: Split feature parsing to separate helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 68 +++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 37 deletions(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index f10ec40abec..930dcd52715 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -406,6 +406,31 @@ static BOOL parse_end_collection( struct hid_parser_state *state ) return TRUE; } +static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TYPE type, struct collection *collection ) +{ + struct feature *feature; + int j; + + for (j = 0; j < state->items.report_count; j++) + { + if (!(feature = calloc( 1, sizeof(*feature) ))) return -1; + list_add_tail( &collection->features, &feature->entry ); + feature->type = type; + feature->isData = ((state->items.bit_field & INPUT_DATA_CONST) == 0); + if (j < state->usages_size) state->items.usage_min = state->usages[j]; + copy_hidp_value_caps( &feature->caps, &state->items ); + feature->caps.ReportCount = 1; + if (j + 1 >= state->usages_size) + { + feature->caps.ReportCount += state->items.report_count - (j + 1); + break; + } + } + + reset_local_items( state ); + return TRUE; +} + static void free_parser_state( struct hid_parser_state *state ) { if (state->global_idx) ERR( "%u unpopped device caps on the stack\n", state->global_idx ); @@ -415,19 +440,6 @@ static void free_parser_state( struct hid_parser_state *state ) free( state ); } -static void parse_io_feature(unsigned int bSize, int itemVal, int bTag, - struct feature *feature) -{ - if (bSize == 0) - { - return; - } - else - { - feature->isData = ((itemVal & INPUT_DATA_CONST) == 0); - } -} - static void parse_collection(unsigned int bSize, int itemVal, struct collection *collection) { @@ -447,15 +459,13 @@ static void parse_collection(unsigned int bSize, int itemVal, static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int length, struct collection *collection, struct hid_parser_state *state ) { - int i, j; + int i; UINT32 value; INT32 signed_value; - struct feature *feature; for (i = index; i < length;) { BYTE item = descriptor[i++]; - BYTE tag = item >> 4; int size = item & 0x03; if (size == 3) size = 4; @@ -482,29 +492,13 @@ static int parse_descriptor( BYTE *descriptor, unsigned int index, unsigned int switch (item & SHORT_ITEM(0xf,0x3)) { case SHORT_ITEM(TAG_MAIN_INPUT, TAG_TYPE_MAIN): + if (!parse_new_value_caps( state, HidP_Input, collection )) return -1; + break; case SHORT_ITEM(TAG_MAIN_OUTPUT, TAG_TYPE_MAIN): + if (!parse_new_value_caps( state, HidP_Output, collection )) return -1; + break; case SHORT_ITEM(TAG_MAIN_FEATURE, TAG_TYPE_MAIN): - for (j = 0; j < state->items.report_count; j++) - { - if (!(feature = calloc(1, sizeof(*feature)))) return -1; - list_add_tail(&collection->features, &feature->entry); - if (tag == TAG_MAIN_INPUT) - feature->type = HidP_Input; - else if (tag == TAG_MAIN_OUTPUT) - feature->type = HidP_Output; - else - feature->type = HidP_Feature; - parse_io_feature( size, value, tag, feature ); - if (j < state->usages_size) state->items.usage_min = state->usages[j]; - copy_hidp_value_caps( &feature->caps, &state->items ); - feature->caps.ReportCount = 1; - if (j + 1 >= state->usages_size) - { - feature->caps.ReportCount += state->items.report_count - (j + 1); - break; - } - } - reset_local_items( state ); + if (!parse_new_value_caps( state, HidP_Feature, collection )) return -1; break; case SHORT_ITEM(TAG_MAIN_COLLECTION, TAG_TYPE_MAIN): {

1 0