September 2021 - Wine-Commits

Rémi Bernon : hidparse.sys: Introduce new add_new_value_caps helper.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: d6c47adc32c4ba43065236a2d1788f4792887d4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c47adc32c4ba43065236a2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:08:33 2021 +0200 hidparse.sys: Introduce new add_new_value_caps helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/main.c | 46 ++++++++++++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 19c756d9002..ca102765f93 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -328,14 +328,29 @@ static BOOL parse_end_collection( struct hid_parser_state *state ) return TRUE; } +static void add_new_value_caps( struct hid_parser_state *state, struct hid_value_caps *values, + LONG i, ULONG start_bit ) +{ + DWORD count, usages_size = max( 1, state->usages_size ); + + state->items.start_byte = start_bit / 8; + state->items.start_bit = start_bit % 8; + state->items.usage_page = state->usages_page[usages_size - 1 - i]; + state->items.usage_min = state->usages_min[usages_size - 1 - i]; + state->items.usage_max = state->usages_max[usages_size - 1 - i]; + if (!state->items.usage_max && !state->items.usage_min) count = -1; + else count = state->items.usage_max - state->items.usage_min; + state->items.data_index_min = state->items.data_index_max + 1; + state->items.data_index_max = state->items.data_index_min + count; + values[i] = state->items; +} + static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TYPE type ) { - struct hid_value_caps *value; + struct hid_value_caps *values; USAGE usage_page = state->items.usage_page; - DWORD usages_size = max( 1, state->usages_size ); + DWORD i, usages_size = max( 1, state->usages_size ); USHORT *byte_length = &state->byte_length[type]; - USHORT *caps_count = &state->caps_count[type]; - USHORT *data_count = &state->data_count[type]; ULONG start_bit, *bit_size = &state->bit_size[type][state->items.report_id]; BOOL is_array; @@ -350,12 +365,13 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY return TRUE; } - if (!array_reserve( &state->values[type], &state->values_size[type], *caps_count + usages_size )) + if (!array_reserve( &state->values[type], &state->values_size[type], + state->caps_count[type] + usages_size )) { ERR( "HID parser values overflow!\n" ); return FALSE; } - value = state->values[type] + *caps_count; + values = state->values[type] + state->caps_count[type]; if (!(is_array = HID_VALUE_CAPS_IS_ARRAY( &state->items ))) state->items.report_count -= usages_size - 1; else start_bit -= state->items.report_count * state->items.bit_size; @@ -364,23 +380,17 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY if (state->items.bit_field & INPUT_DATA_CONST) state->items.flags |= HID_VALUE_CAPS_IS_CONSTANT; if (state->items.bit_size == 1 || is_array) state->items.flags |= HID_VALUE_CAPS_IS_BUTTON; - while (usages_size--) + state->items.data_index_max = state->data_count[type] - 1; + for (i = 0; i < usages_size; ++i) { if (!is_array) start_bit -= state->items.report_count * state->items.bit_size; - else if (usages_size) state->items.flags |= HID_VALUE_CAPS_ARRAY_HAS_MORE; + else if (i < usages_size - 1) state->items.flags |= HID_VALUE_CAPS_ARRAY_HAS_MORE; else state->items.flags &= ~HID_VALUE_CAPS_ARRAY_HAS_MORE; - state->items.start_byte = start_bit / 8; - state->items.start_bit = start_bit % 8; - state->items.usage_page = state->usages_page[usages_size]; - state->items.usage_min = state->usages_min[usages_size]; - state->items.usage_max = state->usages_max[usages_size]; - state->items.data_index_min = *data_count; - state->items.data_index_max = *data_count + state->items.usage_max - state->items.usage_min; - if (state->items.usage_max || state->items.usage_min) *data_count = state->items.data_index_max + 1; - *value++ = state->items; - *caps_count += 1; + add_new_value_caps( state, values, i, start_bit ); if (!is_array) state->items.report_count = 1; } + state->caps_count[type] += usages_size; + state->data_count[type] = state->items.data_index_max + 1; state->items.usage_page = usage_page; reset_local_items( state );

1 0

Alexandre Julliard : wrc: Remove no longer used cmdline copy.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: 77221688233247cae9b4dad7a05eb8a1d251934a URL: https://source.winehq.org/git/wine.git/?a=commit;h=77221688233247cae9b4dad7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 22 21:47:32 2021 +0200 wrc: Remove no longer used cmdline copy. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/wrc/wrc.c | 17 ----------------- tools/wrc/wrc.h | 1 - 2 files changed, 18 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index fec05148adc..c95819a793e 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -162,8 +162,6 @@ const char *nlsdirs[3] = { NULL, NLSDIR, NULL }; int line_number = 1; /* The current line */ int char_number = 1; /* The current char pos within the line */ -char *cmdline; /* The entire commandline */ - int parser_debug, yy_flex_debug; resource_t *resource_top; /* The top of the parsed resources */ @@ -367,7 +365,6 @@ int main(int argc,char *argv[]) int lose = 0; int nb_files = 0; int i; - int cmdlen; int po_mode = 0; char *po_dir = NULL; const char *sysroot = ""; @@ -387,20 +384,6 @@ int main(int argc,char *argv[]) /* Microsoft RC always searches current directory */ wpp_add_include_path("."); - /* First rebuild the commandline to put in destination */ - /* Could be done through env[], but not all OS-es support it */ - cmdlen = 4; /* for "wrc " */ - for(i = 1; i < argc; i++) - cmdlen += strlen(argv[i]) + 1; - cmdline = xmalloc(cmdlen); - strcpy(cmdline, "wrc "); - for(i = 1; i < argc; i++) - { - strcat(cmdline, argv[i]); - if(i < argc-1) - strcat(cmdline, " "); - } - while((optc = getopt_long(argc, argv, short_options, long_options, &opti)) != EOF) { switch(optc) diff --git a/tools/wrc/wrc.h b/tools/wrc/wrc.h index 24b0e28904f..d39284fbe96 100644 --- a/tools/wrc/wrc.h +++ b/tools/wrc/wrc.h @@ -43,7 +43,6 @@ extern int utf8_input; extern int check_utf8; extern char *input_name; -extern char *cmdline; extern const char *nlsdirs[];

1 0

Zhiyi Zhang : uxtheme: Disallow EnableTheming() to enable theming.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: 50005fee22ce8b7dd86623679d5172b7073bf8f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=50005fee22ce8b7dd8662367… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 22 10:24:10 2021 +0800 uxtheme: Disallow EnableTheming() to enable theming. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 12 ++++-------- dlls/uxtheme/tests/system.c | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 8ced977c267..193e8f80538 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -571,20 +571,16 @@ BOOL WINAPI IsCompositionActive(void) HRESULT WINAPI EnableTheming(BOOL fEnable) { HKEY hKey; - WCHAR szEnabled[] = L"0"; TRACE("(%d)\n", fEnable); - if(fEnable != bThemeActive) { - if(fEnable) - UXTHEME_BackupSystemMetrics(); - else - UXTHEME_RestoreSystemMetrics(); + if (bThemeActive && !fEnable) + { + UXTHEME_RestoreSystemMetrics(); UXTHEME_SaveSystemMetrics (); bThemeActive = fEnable; - if(bThemeActive) szEnabled[0] = '1'; if(!RegOpenKeyW(HKEY_CURRENT_USER, szThemeManager, &hKey)) { - RegSetValueExW(hKey, L"ThemeActive", 0, REG_SZ, (BYTE*)szEnabled, sizeof(WCHAR)); + RegSetValueExW(hKey, L"ThemeActive", 0, REG_SZ, (BYTE *)L"0", 2 * sizeof(WCHAR)); RegCloseKey(hKey); } UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index a4ace2adfd3..3d85bffeaf7 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1260,7 +1260,6 @@ static void test_EnableTheming(void) hr = EnableTheming(TRUE); ok(hr == S_OK, "EnableTheming failed, hr %#x.\n", hr); - todo_wine ok(!IsThemeActive(), "Expected theming inactive.\n"); hr = EnableTheming(FALSE);

1 0

Zhiyi Zhang : uxtheme: Initialize system metrics in 96 DPI.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: cd99d08a74736f9267c53c63e7a5399ea133147b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd99d08a74736f9267c53c63… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Sep 22 10:23:38 2021 +0800 uxtheme: Initialize system metrics in 96 DPI. Similar to 7290db3. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 7356f6ea354..f129d998d65 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -733,12 +733,18 @@ struct PARSENONCLIENTSTATE static inline void parse_init_nonclient (struct PARSENONCLIENTSTATE* state) { + DPI_AWARENESS_CONTEXT old_context; + + old_context = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE); + memset (state, 0, sizeof (*state)); state->metrics.cbSize = sizeof (NONCLIENTMETRICSW); SystemParametersInfoW (SPI_GETNONCLIENTMETRICS, sizeof (NONCLIENTMETRICSW), &state->metrics, 0); SystemParametersInfoW (SPI_GETICONTITLELOGFONT, sizeof (LOGFONTW), &state->iconTitleFont, 0); + + SetThreadDpiAwarenessContext(old_context); } static BOOL parse_handle_nonclient_font (struct PARSENONCLIENTSTATE* state,

1 0

Connor McAdams : user32/tests: Add missing winevents to test_accelerators() message sequences.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: 18d2df2bdf5381c1b2529795805876fe791f81f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18d2df2bdf5381c1b2529795… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 21 19:50:40 2021 -0400 user32/tests: Add missing winevents to test_accelerators() message sequences. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c79d8838a18..7b75b65193b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -9493,12 +9493,18 @@ static const struct message WmShiftF10Seq[] = { { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, { HCBT_SYSCOMMAND, hook }, { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_INITMENU, sent|defwinproc }, + { EVENT_SYSTEM_MENUSTART, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_SYSMENU, 0 }, { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE), 0, MAKEWPARAM(0,MF_RIGHTJUSTIFY) }, + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_SYSMENU, 1 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xd0000001 }, /* XP */ { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0x10000001 }, /* XP */ + { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_SYSMENU, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_CAPTURECHANGED, sent|defwinproc|wparam|lparam, 0, 0 }, { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { EVENT_SYSTEM_MENUEND, winevent_hook|wparam|lparam|winevent_hook_todo, OBJID_SYSMENU, 0 }, { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0xc0000001 }, /* XP */ { WM_KEYUP, wparam|lparam, VK_ESCAPE, 0xc0000001 }, @@ -18533,6 +18539,15 @@ START_TEST(msg) test_paint_messages(); test_interthread_messages(); test_message_conversion(); + test_accelerators(); + test_timers(); + test_timers_no_wnd(); + test_timers_exceptions(); + if (hCBT_hook) + { + test_set_hook(); + test_recursive_hook(); + } /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18543,15 +18558,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_accelerators(); - test_timers(); - test_timers_no_wnd(); - test_timers_exceptions(); - if (hCBT_hook) - { - test_set_hook(); - test_recursive_hook(); - } test_DestroyWindow(); test_DispatchMessage(); test_SendMessageTimeout();

1 0

Connor McAdams : user32/tests: Fix test_paint_messages() message sequences to support WinEvents.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: e4bc8227ff827a2d89fa8f53690d95125f0d98cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4bc8227ff827a2d89fa8f53… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 21 19:50:38 2021 -0400 user32/tests: Fix test_paint_messages() message sequences to support WinEvents. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 52cb7aa8eb4..a8cd85a791c 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -414,7 +414,7 @@ static const struct message WmSWP_FrameChanged_clip[] = { { WM_NCPAINT, sent }, /* wparam != 1 */ { WM_ERASEBKGND, sent }, { WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_PAINT, sent }, { 0 } }; @@ -426,7 +426,7 @@ static const struct message WmSWP_FrameChangedDeferErase[] = { { WM_WINDOWPOSCHANGING, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_DEFERERASE|SWP_NOACTIVATE|SWP_FRAMECHANGED }, { WM_NCCALCSIZE, sent|wparam|parent, 1 }, { WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_DEFERERASE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_PAINT, sent|parent|optional }, { WM_NCPAINT, sent|beginpaint|parent|optional }, /* wparam != 1 */ { WM_GETTEXT, sent|beginpaint|parent|defwinproc|optional }, @@ -447,7 +447,7 @@ static const struct message WmSWP_FrameChanged_noclip[] = { { WM_GETTEXT, sent|parent|defwinproc|optional }, { WM_ERASEBKGND, sent|parent|optional }, { WM_WINDOWPOSCHANGED, sent|wparam|parent, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_FRAMECHANGED|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, - { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|winevent_hook_todo, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|beginpaint }, /* wparam != 1 */ { WM_ERASEBKGND, sent|beginpaint|optional }, @@ -18530,6 +18530,9 @@ START_TEST(msg) test_listbox_messages(); test_combobox_messages(); test_wmime_keydown_message(); + test_paint_messages(); + test_interthread_messages(); + test_message_conversion(); /* Fix message sequences before removing 4 lines below */ if (pUnhookWinEvent && hEvent_hook) @@ -18540,9 +18543,6 @@ START_TEST(msg) } hEvent_hook = 0; - test_paint_messages(); - test_interthread_messages(); - test_message_conversion(); test_accelerators(); test_timers(); test_timers_no_wnd();

1 0

Rémi Bernon : hidparse.sys: Precompute collection node list on the parser side.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: 75e74b3a734e7a5c9bf179f252fae22a82536c6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=75e74b3a734e7a5c9bf179f2… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:08:31 2021 +0200 hidparse.sys: Precompute collection node list on the parser side. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 23 ++++++++--------------- dlls/hidparse.sys/main.c | 44 +++++++++++++++++++++++++++++++++++++------- include/wine/hid.h | 15 ++++++++++++++- 3 files changed, 59 insertions(+), 23 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index acb02246523..4abc867fe0f 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -997,7 +997,7 @@ NTSTATUS WINAPI HidP_GetData( HIDP_REPORT_TYPE report_type, HIDP_DATA *data, ULO NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, ULONG *nodes_len, PHIDP_PREPARSED_DATA preparsed_data ) { struct hid_preparsed_data *preparsed = (struct hid_preparsed_data *)preparsed_data; - struct hid_value_caps *caps = HID_COLLECTION_VALUE_CAPS( preparsed ); + struct hid_collection_node *collections = HID_COLLECTION_NODES( preparsed ); ULONG i, count, capacity = *nodes_len; TRACE( "nodes %p, nodes_len %p, preparsed_data %p.\n", nodes, nodes_len, preparsed_data ); @@ -1009,21 +1009,14 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, U for (i = 0; i < count; ++i) { - nodes[i].LinkUsagePage = caps[i].usage_page; - nodes[i].LinkUsage = caps[i].usage_min; - nodes[i].Parent = caps[i].link_collection; - nodes[i].CollectionType = caps[i].bit_field; + nodes[i].LinkUsagePage = collections[i].usage_page; + nodes[i].LinkUsage = collections[i].usage; + nodes[i].Parent = collections[i].parent; + nodes[i].CollectionType = collections[i].collection_type; + nodes[i].FirstChild = collections[i].first_child; + nodes[i].NextSibling = collections[i].next_sibling; + nodes[i].NumberOfChildren = collections[i].number_of_children; nodes[i].IsAlias = 0; - nodes[i].FirstChild = 0; - nodes[i].NextSibling = 0; - nodes[i].NumberOfChildren = 0; - - if (i > 0) - { - nodes[i].NextSibling = nodes[nodes[i].Parent].FirstChild; - nodes[nodes[i].Parent].FirstChild = i; - nodes[nodes[i].Parent].NumberOfChildren++; - } } return HIDP_STATUS_SUCCESS; diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 8440d93e34e..02a1c2d58d0 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -110,6 +110,14 @@ static inline const char *debugstr_hid_value_caps( struct hid_value_caps *caps ) caps->units, caps->units_exp, caps->logical_min, caps->logical_max, caps->physical_min, caps->physical_max ); } +static inline const char *debugstr_hid_collection_node( struct hid_collection_node *node ) +{ + if (!node) return "(null)"; + return wine_dbg_sprintf( "Usg %02x:%02x, Parent %u, Next %u, NbChild %u, Child %u, Type %02x", + node->usage_page, node->usage, node->parent, node->next_sibling, + node->number_of_children, node->first_child, node->collection_type ); +} + static void debug_print_preparsed( struct hid_preparsed_data *data ) { unsigned int i, end; @@ -129,7 +137,7 @@ static void debug_print_preparsed( struct hid_preparsed_data *data ) end = data->feature_caps_count; for (i = 0; i < end; i++) TRACE( "feature %d: %s\n", i, debugstr_hid_value_caps( HID_FEATURE_VALUE_CAPS( data ) + i ) ); end = data->number_link_collection_nodes; - for (i = 0; i < end; i++) TRACE( "collection %d: %s\n", i, debugstr_hid_value_caps( HID_COLLECTION_VALUE_CAPS( data ) + i ) ); + for (i = 0; i < end; i++) TRACE( "collection %d: %s\n", i, debugstr_hid_collection_node( HID_COLLECTION_NODES( data ) + i ) ); } } @@ -393,16 +401,20 @@ static void free_parser_state( struct hid_parser_state *state ) static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state *state, POOL_TYPE pool_type ) { + struct hid_collection_node *nodes; struct hid_preparsed_data *data; struct hid_value_caps *caps; - DWORD caps_len, size; + DWORD i, size, caps_size; - caps_len = state->caps_count[HidP_Input] + state->caps_count[HidP_Output] + - state->caps_count[HidP_Feature] + state->number_link_collection_nodes; - size = FIELD_OFFSET( struct hid_preparsed_data, value_caps[caps_len] ); + caps_size = state->caps_count[HidP_Input] + state->caps_count[HidP_Output] + + state->caps_count[HidP_Feature]; + caps_size *= sizeof(struct hid_value_caps); + size = caps_size + FIELD_OFFSET(struct hid_preparsed_data, value_caps[0]) + + state->number_link_collection_nodes * sizeof(struct hid_collection_node); if (!(data = ExAllocatePool( pool_type, size ))) return NULL; memset( data, 0, size ); + data->magic = HID_MAGIC; data->size = size; data->usage = state->usage; @@ -419,6 +431,7 @@ static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state data->feature_caps_count = state->caps_count[HidP_Feature]; data->feature_caps_end = data->feature_caps_start + data->feature_caps_count; data->feature_report_byte_length = state->byte_length[HidP_Feature]; + data->caps_size = caps_size; data->number_link_collection_nodes = state->number_link_collection_nodes; caps = HID_INPUT_VALUE_CAPS( data ); @@ -427,8 +440,25 @@ static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state memcpy( caps, state->values[1], data->output_caps_count * sizeof(*caps) ); caps = HID_FEATURE_VALUE_CAPS( data ); memcpy( caps, state->values[2], data->feature_caps_count * sizeof(*caps) ); - caps = HID_COLLECTION_VALUE_CAPS( data ); - memcpy( caps, state->collections, data->number_link_collection_nodes * sizeof(*caps) ); + + nodes = HID_COLLECTION_NODES( data ); + for (i = 0; i < data->number_link_collection_nodes; ++i) + { + nodes[i].usage_page = state->collections[i].usage_page; + nodes[i].usage = state->collections[i].usage_min; + nodes[i].parent = state->collections[i].link_collection; + nodes[i].collection_type = state->collections[i].bit_field; + nodes[i].first_child = 0; + nodes[i].next_sibling = 0; + nodes[i].number_of_children = 0; + + if (i > 0) + { + nodes[i].next_sibling = nodes[nodes[i].parent].first_child; + nodes[nodes[i].parent].first_child = i; + nodes[nodes[i].parent].number_of_children++; + } + } return data; } diff --git a/include/wine/hid.h b/include/wine/hid.h index 10fccda07cc..a74b7eed02b 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -31,6 +31,17 @@ #define HID_MAGIC 0x8491759 +struct hid_collection_node +{ + USAGE usage; + USAGE usage_page; + USHORT parent; + USHORT number_of_children; + USHORT next_sibling; + USHORT first_child; + ULONG collection_type; +}; + struct hid_value_caps { USAGE usage_page; @@ -90,13 +101,15 @@ struct hid_preparsed_data USHORT feature_caps_count; USHORT feature_caps_end; USHORT feature_report_byte_length; + USHORT caps_size; USHORT number_link_collection_nodes; struct hid_value_caps value_caps[1]; + /* struct hid_collection_node nodes[1] */ }; #define HID_INPUT_VALUE_CAPS(d) ((d)->value_caps + (d)->input_caps_start) #define HID_OUTPUT_VALUE_CAPS(d) ((d)->value_caps + (d)->output_caps_start) #define HID_FEATURE_VALUE_CAPS(d) ((d)->value_caps + (d)->feature_caps_start) -#define HID_COLLECTION_VALUE_CAPS(d) ((d)->value_caps + (d)->feature_caps_end) +#define HID_COLLECTION_NODES(d) (struct hid_collection_node *)((char *)(d)->value_caps + (d)->caps_size) #endif /* __WINE_PARSE_H */

1 0

Rémi Bernon : hidparse.sys: Don't keep an HIDP_CAPS in the parser state.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: 2c677b1fea268b47692f3fee8fea1bc58c0d1834 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c677b1fea268b47692f3fee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:08:30 2021 +0200 hidparse.sys: Don't keep an HIDP_CAPS in the parser state. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidparse.sys/main.c | 90 +++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 51 deletions(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index d1191a20789..8440d93e34e 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -135,7 +135,12 @@ static void debug_print_preparsed( struct hid_preparsed_data *data ) struct hid_parser_state { - HIDP_CAPS caps; + USAGE usage; + USAGE usage_page; + USHORT input_report_byte_length; + USHORT output_report_byte_length; + USHORT feature_report_byte_length; + USHORT number_link_collection_nodes; USAGE usages_page[256]; USAGE usages_min[256]; @@ -155,10 +160,10 @@ struct hid_parser_state struct hid_value_caps *values[3]; ULONG values_size[3]; - ULONG bit_size[3][256]; - USHORT *byte_size[3]; /* pointers to caps */ - USHORT *value_idx[3]; /* pointers to caps */ - USHORT *data_idx[3]; /* pointers to caps */ + ULONG bit_size[3][256]; + USHORT byte_length[3]; + USHORT caps_count[3]; + USHORT data_count[3]; }; static BOOL array_reserve( struct hid_value_caps **array, DWORD *array_size, DWORD index ) @@ -274,7 +279,7 @@ static BOOL parse_new_collection( struct hid_parser_state *state ) return FALSE; } - if (!array_reserve( &state->collections, &state->collections_size, state->caps.NumberLinkCollectionNodes )) + if (!array_reserve( &state->collections, &state->collections_size, state->number_link_collection_nodes )) { ERR( "HID parser collections overflow!\n" ); return FALSE; @@ -286,16 +291,16 @@ static BOOL parse_new_collection( struct hid_parser_state *state ) state->items.usage_min = state->usages_min[0]; state->items.usage_max = state->usages_max[0]; - state->collections[state->caps.NumberLinkCollectionNodes] = state->items; - state->items.link_collection = state->caps.NumberLinkCollectionNodes; + state->collections[state->number_link_collection_nodes] = state->items; + state->items.link_collection = state->number_link_collection_nodes; state->items.link_usage_page = state->items.usage_page; state->items.link_usage = state->items.usage_min; - if (!state->caps.NumberLinkCollectionNodes) + if (!state->number_link_collection_nodes) { - state->caps.UsagePage = state->items.usage_page; - state->caps.Usage = state->items.usage_min; + state->usage_page = state->items.usage_page; + state->usage = state->items.usage_min; } - state->caps.NumberLinkCollectionNodes++; + state->number_link_collection_nodes++; reset_local_items( state ); return TRUE; @@ -320,15 +325,15 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY struct hid_value_caps *value; USAGE usage_page = state->items.usage_page; DWORD usages_size = max( 1, state->usages_size ); - USHORT *byte_size = state->byte_size[type]; - USHORT *value_idx = state->value_idx[type]; - USHORT *data_idx = state->data_idx[type]; + USHORT *byte_length = &state->byte_length[type]; + USHORT *caps_count = &state->caps_count[type]; + USHORT *data_count = &state->data_count[type]; ULONG start_bit, *bit_size = &state->bit_size[type][state->items.report_id]; BOOL is_array; if (!*bit_size) *bit_size = 8; *bit_size += state->items.bit_size * state->items.report_count; - *byte_size = max( *byte_size, (*bit_size + 7) / 8 ); + *byte_length = max( *byte_length, (*bit_size + 7) / 8 ); start_bit = *bit_size; if (!state->items.report_count) @@ -337,12 +342,12 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY return TRUE; } - if (!array_reserve( &state->values[type], &state->values_size[type], *value_idx + usages_size )) + if (!array_reserve( &state->values[type], &state->values_size[type], *caps_count + usages_size )) { ERR( "HID parser values overflow!\n" ); return FALSE; } - value = state->values[type] + *value_idx; + value = state->values[type] + *caps_count; if (!(is_array = HID_VALUE_CAPS_IS_ARRAY( &state->items ))) state->items.report_count -= usages_size - 1; else start_bit -= state->items.report_count * state->items.bit_size; @@ -361,11 +366,11 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY state->items.usage_page = state->usages_page[usages_size]; state->items.usage_min = state->usages_min[usages_size]; state->items.usage_max = state->usages_max[usages_size]; - state->items.data_index_min = *data_idx; - state->items.data_index_max = *data_idx + state->items.usage_max - state->items.usage_min; - if (state->items.usage_max || state->items.usage_min) *data_idx = state->items.data_index_max + 1; + state->items.data_index_min = *data_count; + state->items.data_index_max = *data_count + state->items.usage_max - state->items.usage_min; + if (state->items.usage_max || state->items.usage_min) *data_count = state->items.data_index_max + 1; *value++ = state->items; - *value_idx += 1; + *caps_count += 1; if (!is_array) state->items.report_count = 1; } @@ -374,22 +379,6 @@ static BOOL parse_new_value_caps( struct hid_parser_state *state, HIDP_REPORT_TY return TRUE; } -static void init_parser_state( struct hid_parser_state *state ) -{ - memset( state, 0, sizeof(*state) ); - state->byte_size[HidP_Input] = &state->caps.InputReportByteLength; - state->byte_size[HidP_Output] = &state->caps.OutputReportByteLength; - state->byte_size[HidP_Feature] = &state->caps.FeatureReportByteLength; - - state->value_idx[HidP_Input] = &state->caps.NumberInputValueCaps; - state->value_idx[HidP_Output] = &state->caps.NumberOutputValueCaps; - state->value_idx[HidP_Feature] = &state->caps.NumberFeatureValueCaps; - - state->data_idx[HidP_Input] = &state->caps.NumberInputDataIndices; - state->data_idx[HidP_Output] = &state->caps.NumberOutputDataIndices; - state->data_idx[HidP_Feature] = &state->caps.NumberFeatureDataIndices; -} - 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 ); @@ -408,29 +397,29 @@ static struct hid_preparsed_data *build_preparsed_data( struct hid_parser_state struct hid_value_caps *caps; DWORD caps_len, size; - caps_len = state->caps.NumberInputValueCaps + state->caps.NumberOutputValueCaps + - state->caps.NumberFeatureValueCaps + state->caps.NumberLinkCollectionNodes; + caps_len = state->caps_count[HidP_Input] + state->caps_count[HidP_Output] + + state->caps_count[HidP_Feature] + state->number_link_collection_nodes; size = FIELD_OFFSET( struct hid_preparsed_data, value_caps[caps_len] ); if (!(data = ExAllocatePool( pool_type, size ))) return NULL; memset( data, 0, size ); data->magic = HID_MAGIC; data->size = size; - data->usage = state->caps.Usage; - data->usage_page = state->caps.UsagePage; + data->usage = state->usage; + data->usage_page = state->usage_page; data->input_caps_start = 0; - data->input_caps_count = state->caps.NumberInputValueCaps; + data->input_caps_count = state->caps_count[HidP_Input]; data->input_caps_end = data->input_caps_start + data->input_caps_count; - data->input_report_byte_length = state->caps.InputReportByteLength; + data->input_report_byte_length = state->byte_length[HidP_Input]; data->output_caps_start = data->input_caps_end; - data->output_caps_count = state->caps.NumberOutputValueCaps; + data->output_caps_count = state->caps_count[HidP_Output]; data->output_caps_end = data->output_caps_start + data->output_caps_count; - data->output_report_byte_length = state->caps.OutputReportByteLength; + data->output_report_byte_length = state->byte_length[HidP_Output]; data->feature_caps_start = data->output_caps_end; - data->feature_caps_count = state->caps.NumberFeatureValueCaps; + data->feature_caps_count = state->caps_count[HidP_Feature]; data->feature_caps_end = data->feature_caps_start + data->feature_caps_count; - data->feature_report_byte_length = state->caps.FeatureReportByteLength; - data->number_link_collection_nodes = state->caps.NumberLinkCollectionNodes; + data->feature_report_byte_length = state->byte_length[HidP_Feature]; + data->number_link_collection_nodes = state->number_link_collection_nodes; caps = HID_INPUT_VALUE_CAPS( data ); memcpy( caps, state->values[0], data->input_caps_count * sizeof(*caps) ); @@ -464,8 +453,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng } } - if (!(state = malloc( sizeof(*state) ))) return NULL; - init_parser_state( state ); + if (!(state = calloc( 1, sizeof(*state) ))) return NULL; for (ptr = descriptor, end = descriptor + length; ptr != end; ptr += size + 1) {

1 0

Alexandre Julliard : configure: Remove some obsolete shared library checks.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: ae06f7482896ef95235d0a0e7b21f7bf184822c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae06f7482896ef95235d0a0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 22 10:25:10 2021 +0200 configure: Remove some obsolete shared library checks. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 164 +++++++++-------------------------------------------------- configure.ac | 81 +++++++++++------------------ 2 files changed, 54 insertions(+), 191 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae06f7482896ef95235d…

1 0

Rémi Bernon : hidparse.sys: Recompute HIDP_CAPS from the value caps in HidP_GetCaps.
by Alexandre Julliard Sept. 22, 2021

Sept. 22, 2021

Module: wine Branch: master Commit: 218e2718a75eb3d4c2d6089a6c1b1b156ae9960f URL: https://source.winehq.org/git/wine.git/?a=commit;h=218e2718a75eb3d4c2d6089a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 22 10:08:29 2021 +0200 hidparse.sys: Recompute HIDP_CAPS from the value caps in HidP_GetCaps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 60 ++++++++++++++++++++++--- dlls/hidparse.sys/main.c | 111 ++++++++++++++++++----------------------------- include/wine/hid.h | 25 ++++++++--- 3 files changed, 115 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=218e2718a75eb3d4c2d6…

1 0