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

Francois Gouget : php: Fix the spelling of PHP comments.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: 69d0de55cab9df822716f1182d0c537c80d1c9aa URL: https://source.winehq.org/git/website.git/?a=commit;h=69d0de55cab9df822716f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:53:12 2021 +0200 php: Fix the spelling of PHP comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/incl.php | 4 ++-- include/utils.php | 2 +- include/wwn.php | 2 +- site.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/incl.php b/include/incl.php index 4a528614..443bde2c 100644 --- a/include/incl.php +++ b/include/incl.php @@ -84,7 +84,7 @@ else $avail = array_map("strtolower", $avail); foreach ($avail as $inLang) { - // check to see if langage is available + // check to see if language is available if (in_array($inLang, $GLOBALS['config']->languages)) { debug("global", "lang from browser: {$inLang}"); @@ -92,7 +92,7 @@ else break; } - // check to see if variation of langage is available + // check to see if variation of language is available if (strlen($inLang) > 2) { $inLangAlt = substr($inLang, 0, 2); diff --git a/include/utils.php b/include/utils.php index 4876bd89..7052f67e 100644 --- a/include/utils.php +++ b/include/utils.php @@ -357,7 +357,7 @@ function array_finder ($array, $filter) return $ret; } -// sort a multi-dimentional array by one of the keys +// sort a multi-dimensional array by one of the keys function array_qsort (&$array, $column=0, $order=SORT_ASC, $first=0, $last= -2) { // $array - the array to be sorted diff --git a/include/wwn.php b/include/wwn.php index d13957ec..9231be81 100644 --- a/include/wwn.php +++ b/include/wwn.php @@ -21,7 +21,7 @@ class wwn private $map_array; private $inquote = 0; - // constuctor + // constructor public function __construct () { $this->summary = array(); diff --git a/site.php b/site.php index e108f779..1c4be8ce 100644 --- a/site.php +++ b/site.php @@ -56,7 +56,7 @@ if (isset($_SERVER['PATH_INFO'])) $_SERVER['PHP_SELF'] = str_replace($page_params, '', $_SERVER['PHP_SELF']); $_SERVER['PHP_SELF'] = preg_replace('/\/\/$/', '/', $_SERVER['PHP_SELF']); - // don't contine the loop, this is the end page + // don't continue the loop, this is the end page unset($page_params); break; }

1 0

Francois Gouget : fr: Add a closing parenthesis.
by Alexandre Julliard 21 Jun '21

21 Jun '21

Module: website Branch: master Commit: eb248cdf07cc47ec5fe9649bf3e7d99bbb8252f3 URL: https://source.winehq.org/git/website.git/?a=commit;h=eb248cdf07cc47ec5fe96… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 19 18:54:05 2021 +0200 fr: Add a closing parenthesis. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/fr/home.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/fr/home.template b/templates/fr/home.template index 8a7ea907..243a7a36 100644 --- a/templates/fr/home.template +++ b/templates/fr/home.template @@ -43,7 +43,7 @@ <div class="clear"></div> </div> - <p>Wine (à l'origine un acronyme pour « Wine Is Not an Emulator » est une couche de compatibilité capable d'exécuter des applications Windows sur divers systèmes d'exploitation conformes à POSIX comme Linux, macOS et BSD. Plutôt que de simuler la logique interne de Windows comme une machine virtuelle ou un émulateur, Wine traduit les appels de l'API Windows en appels POSIX à la volée, éliminant les pénalités mémoire et de performance d'autre méthodes et vous permettant d'intégrer proprement les applications Windows à votre bureau.</p> + <p>Wine (à l'origine un acronyme pour « Wine Is Not an Emulator ») est une couche de compatibilité capable d'exécuter des applications Windows sur divers systèmes d'exploitation conformes à POSIX comme Linux, macOS et BSD. Plutôt que de simuler la logique interne de Windows comme une machine virtuelle ou un émulateur, Wine traduit les appels de l'API Windows en appels POSIX à la volée, éliminant les pénalités mémoire et de performance d'autre méthodes et vous permettant d'intégrer proprement les applications Windows à votre bureau.</p> </div>

1 0

Alexandre Julliard : Wine release 6.11
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: website Branch: master Commit: 7d55b019818004a08bfa701c03759bf0b108d73e URL: https://source.winehq.org/git/website.git/?a=commit;h=7d55b019818004a08bfa7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 21:46:06 2021 +0200 Wine release 6.11 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021061801.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021061801.xml b/news/en/2021061801.xml new file mode 100644 index 00000000..4f57421c --- /dev/null +++ b/news/en/2021061801.xml @@ -0,0 +1,17 @@ +<news> +<date>June 18, 2021</date> +<title>Wine 6.11 Released</title> +<body> +<p> The Wine development release 6.11 is now available.</p> +<p> <a href="{$root}/announce/6.11">What's new</a> in this release: +<ul> + <li>Theming support in all builtin programs.</li> + <li>All remaining CRT math functions imported from Musl.</li> + <li>MP3 support requires libmpg123 also on macOS.</li> + <li>Support for codepage 720 (Arabic).</li> + <li>Various bug fixes.</li> +</ul> +</p> +<p>The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.11.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</p></body></news>

1 0

Rémi Bernon : hidclass.sys: Create link collection caps during parsing.
by Alexandre Julliard 18 Jun '21

18 Jun '21

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

Rémi Bernon : hidclass.sys: Remove unused struct feature members.
by Alexandre Julliard 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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 18 Jun '21

18 Jun '21

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

Alexandre Julliard : ntdll: Ignore faults caused by alignment check on x86-64.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: c0012ecdd79a698f2ddca9bdcd5e6bbf5a0fcf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0012ecdd79a698f2ddca9bd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 18 13:49:03 2021 +0200 ntdll: Ignore faults caused by alignment check on x86-64. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index c36699589d9..2cd133a1087 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2280,6 +2280,11 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) if (!rec.ExceptionCode) return; break; case TRAP_x86_ALIGNFLT: /* Alignment check exception */ + if (EFL_sig(ucontext) & 0x00040000) + { + EFL_sig(ucontext) &= ~0x00040000; /* reset AC flag */ + return; + } rec.ExceptionCode = EXCEPTION_DATATYPE_MISALIGNMENT; break; default:

1 0

Alexandre Julliard : ntdll/tests: Adapt some of the i386 tests to run on x86-64 as well.
by Alexandre Julliard 18 Jun '21

18 Jun '21

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

Hugh McMaster : reg: Support the use of registry views during the 'add' operation.
by Alexandre Julliard 18 Jun '21

18 Jun '21

Module: wine Branch: master Commit: 304b80a9b5a6ed128dd8a89e22f05b99142310cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=304b80a9b5a6ed128dd8a89e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Jun 18 22:31:57 2021 +1000 reg: Support the use of registry views during the 'add' operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 22 ++++++++++++++++++---- programs/reg/tests/add.c | 32 ++++++++++++++++---------------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index fb0ee2a03fd..269fa30e5e1 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -158,7 +158,7 @@ static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, return TRUE; } -static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, +static int run_add(HKEY root, WCHAR *path, REGSAM sam, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { HKEY hkey; @@ -167,7 +167,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, LONG rc; if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, - KEY_READ|KEY_WRITE, NULL, &hkey, &dispos)) + KEY_READ|KEY_WRITE|sam, NULL, &hkey, &dispos)) { output_message(STRING_ACCESS_DENIED); return 1; @@ -229,6 +229,7 @@ int reg_add(int argc, WCHAR *argvW[]) HKEY root; WCHAR *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; BOOL value_empty = FALSE, force = FALSE; + REGSAM sam = 0; int i; if (!parse_registry_key(argvW[2], &root, &path)) @@ -249,8 +250,18 @@ int reg_add(int argc, WCHAR *argvW[]) value_empty = TRUE; continue; } - else if (!lstrcmpiW(str, L"reg:32") || !lstrcmpiW(str, L"reg:64")) + else if (!lstrcmpiW(str, L"reg:32")) + { + if (sam & KEY_WOW64_32KEY) goto invalid; + sam |= KEY_WOW64_32KEY; + continue; + } + else if (!lstrcmpiW(str, L"reg:64")) + { + if (sam & KEY_WOW64_64KEY) goto invalid; + sam |= KEY_WOW64_64KEY; continue; + } else if (!str[0] || str[1]) goto invalid; @@ -286,7 +297,10 @@ int reg_add(int argc, WCHAR *argvW[]) if (value_name && value_empty) goto invalid; - return run_add(root, path, value_name, value_empty, type, separator, data, force); + if (sam == (KEY_WOW64_32KEY|KEY_WOW64_64KEY)) + goto invalid; + + return run_add(root, path, sam, value_name, value_empty, type, separator, data, force); invalid: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 264693ab349..3b4a895d0c5 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -277,13 +277,13 @@ static void test_command_syntax(void) /* Test registry view */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:32", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:32 /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v abc /d 123 /f /reg:64 /reg:64", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } static void test_key_formats(void) @@ -914,12 +914,12 @@ static void test_registry_view_win64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine32 /d Test /f /reg:32", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); - todo_wine verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); - todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY, &hkey); + verify_reg(hkey, "Wine32", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); /* Try adding to the 64-bit registry view (64-bit Windows) */ run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); @@ -958,16 +958,16 @@ static void test_registry_view_wow64(void) run_reg_exe("reg add HKLM\\" KEY_BASE " /v Wine64 /d Test /f /reg:64", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); - todo_wine open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); - todo_wine verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); - todo_wine close_key(hkey); - todo_wine delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); + open_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY, &hkey); + verify_reg(hkey, "Wine64", REG_SZ, "Test", 5, 0); + close_key(hkey); + delete_key(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_64KEY); - todo_wine verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); + verify_key_nonexist(HKEY_LOCAL_MACHINE, KEY_BASE, KEY_WOW64_32KEY); } START_TEST(add)

1 0