wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

Huw Davies : nsi: Add a stub implementation of NsiGetParameter().
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 6b56599d47f6789c9f260f65e50f199b44eb5070 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b56599d47f6789c9f260f65… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 28 08:35:46 2021 +0100 nsi: Add a stub implementation of NsiGetParameter(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 8 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++++++++ include/wine/nsi.h | 7 +++++++ 4 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 3691dd5ad2b..bf52fe248c8 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -51,3 +51,11 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); return ERROR_CALL_NOT_IMPLEMENTED; } + +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ) +{ + FIXME( "%d %p %d %p %d %d %p %d %d: stub\n", unk, module, table, key, key_size, + param_type, data, data_size, data_offset ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 7db46c83e94..46757988146 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -12,7 +12,7 @@ @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity -@ stub NsiGetParameter +@ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) @ stub NsiGetParameterEx @ stub NsiRegisterChangeNotification @ stub NsiRegisterChangeNotificationEx diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index e0c0fcf168b..72c9dcdccbd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -75,6 +75,29 @@ todo_wine ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); ok( get_stat.if_index == stat->if_index, "mismatch\n" ); ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + + memset( &get_rw, 0xcc, sizeof(get_rw) ); + memset( &get_dyn, 0xcc, sizeof(get_dyn) ); + memset( &get_stat, 0xcc, sizeof(get_stat) ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_RW, &get_rw.alias, sizeof(get_rw.alias), + FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, alias) ); + ok( !err, "got %d\n", err ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_index, sizeof(get_stat.if_index), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_index) ); + ok( !err, "got %d\n", err ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + + err = NsiGetParameter( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + NSI_PARAM_TYPE_STATIC, &get_stat.if_guid, sizeof(get_stat.if_guid), + FIELD_OFFSET(struct nsi_ndis_ifinfo_static, if_guid) ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); winetest_pop_context(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 547ed91ce41..e0370b00d41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -93,6 +93,11 @@ struct nsi_ndis_ifinfo_static }; /* Undocumented Nsi api */ + +#define NSI_PARAM_TYPE_RW 0 +#define NSI_PARAM_TYPE_DYNAMIC 1 +#define NSI_PARAM_TYPE_STATIC 2 + DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWORD table, void **key_data, DWORD key_size, void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); @@ -100,5 +105,7 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ); +DWORD WINAPI NsiGetParameter( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + DWORD param_type, void *data, DWORD data_size, DWORD data_offset ); #endif /* __WINE_NSI_H */

1 0

Huw Davies : nsi: Add a stub implementation of NsiGetAllParameters().
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: d4db504adcbc7f9f18f939ba1c61d31585bfde10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4db504adcbc7f9f18f939ba… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 28 08:35:45 2021 +0100 nsi: Add a stub implementation of NsiGetAllParameters(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 9 +++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/wine/nsi.h | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index d55445a3dd7..3691dd5ad2b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -42,3 +42,12 @@ void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, voi { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); } + +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ) +{ + FIXME( "%d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size ); + return ERROR_CALL_NOT_IMPLEMENTED; +} diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index fc2db9e35c1..7db46c83e94 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -8,7 +8,7 @@ @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) -@ stub NsiGetAllParameters +@ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) @ stub NsiGetAllParametersEx @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 0cdb1993f1c..e0c0fcf168b 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -33,6 +33,54 @@ static int bounded( ULONG64 val, ULONG64 lo, ULONG64 hi ) return lo <= val && val <= hi; } +static void test_nsi_api( void ) +{ + DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), + sizeof(struct nsi_ndis_ifinfo_rw) }; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat; + DWORD err, count, i, rw_size; + NET_LUID *luid_tbl; + + /* Use the NDIS ifinfo table to test various api */ + for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) + { + err = NsiAllocateAndGetTable( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, (void **)&luid_tbl, sizeof(*luid_tbl), + (void **)&rw_tbl, rw_sizes[i], (void **)&dyn_tbl, sizeof(*dyn_tbl), + (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); + if (!err) break; + } +todo_wine + ok( !err, "got %d\n", err ); + if (err) return; + rw_size = rw_sizes[i]; + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + stat = stat_tbl + i; + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), + &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); + ok( !err, "got %d\n", err ); + /* test a selection of members */ + ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); + ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( get_rw.alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( get_rw.phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( get_rw.phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( get_dyn.oper_status == dyn->oper_status, "mismatch\n" ); + ok( get_stat.if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &get_stat.if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); +} + static void test_ndis_ifinfo( void ) { DWORD rw_sizes[] = { FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, name2), FIELD_OFFSET(struct nsi_ndis_ifinfo_rw, unk), @@ -145,5 +193,7 @@ todo_wine START_TEST( nsi ) { + test_nsi_api(); + test_ndis_ifinfo(); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 362eaed0c4e..547ed91ce41 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -97,5 +97,8 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ); void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ); +DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, + void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, + void *static_data, DWORD static_size ); #endif /* __WINE_NSI_H */

1 0

Rémi Bernon : hid: Always return node count in HidP_GetLinkCollectionNodes.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 7f0e91f5aa8a6b1d47a89aabad256f8f0a39efd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7f0e91f5aa8a6b1d47a89aab… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:22:01 2021 +0200 hid: Always return node count in HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 750dbce9f26..6a9fba6e425 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -731,8 +731,8 @@ NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, U if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; - if (capacity < preparsed->caps.NumberLinkCollectionNodes) return HIDP_STATUS_BUFFER_TOO_SMALL; count = *nodes_len = preparsed->caps.NumberLinkCollectionNodes; + if (capacity < count) return HIDP_STATUS_BUFFER_TOO_SMALL; for (i = 0; i < count; ++i) { diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index f9bb9e87cda..a3c2a303a59 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1852,7 +1852,6 @@ static void test_hidp(HANDLE file, int report_id) collection_count = 0; status = HidP_GetLinkCollectionNodes(collections, &collection_count, preparsed_data); ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_GetLinkCollectionNodes returned %#x\n", status); - todo_wine ok(collection_count == caps.NumberLinkCollectionNodes, "got %d collection nodes, expected %d\n", collection_count, caps.NumberLinkCollectionNodes); collection_count = ARRAY_SIZE(collections);

1 0

Rémi Bernon : hid: Build link collection nodes in HidP_GetLinkCollectionNodes.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 37009031bba80cea2b159ca8f75a2543edebd601 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37009031bba80cea2b159ca8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:22:00 2021 +0200 hid: Build link collection nodes in HidP_GetLinkCollectionNodes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 44 +++++++++++++++++++++++------------------- dlls/hidclass.sys/descriptor.c | 29 +++++----------------------- include/wine/hid.h | 14 +------------- 3 files changed, 30 insertions(+), 57 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 94dc4212067..750dbce9f26 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -721,33 +721,37 @@ NTSTATUS WINAPI HidP_GetData( HIDP_REPORT_TYPE report_type, HIDP_DATA *data, ULO return HIDP_STATUS_SUCCESS; } -NTSTATUS WINAPI HidP_GetLinkCollectionNodes(HIDP_LINK_COLLECTION_NODE *LinkCollectionNode, - ULONG *LinkCollectionNodeLength, PHIDP_PREPARSED_DATA PreparsedData) +NTSTATUS WINAPI HidP_GetLinkCollectionNodes( HIDP_LINK_COLLECTION_NODE *nodes, ULONG *nodes_len, PHIDP_PREPARSED_DATA preparsed_data ) { - WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA*)PreparsedData; - WINE_HID_LINK_COLLECTION_NODE *nodes = HID_NODES(data); - ULONG i; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct hid_value_caps *caps = HID_COLLECTION_VALUE_CAPS( preparsed ); + ULONG i, count, capacity = *nodes_len; - TRACE("(%p, %p, %p)\n", LinkCollectionNode, LinkCollectionNodeLength, PreparsedData); + TRACE( "nodes %p, nodes_len %p, preparsed_data %p.\n", nodes, nodes_len, preparsed_data ); - if (data->magic != HID_MAGIC) - return HIDP_STATUS_INVALID_PREPARSED_DATA; + if (preparsed->magic != HID_MAGIC) return HIDP_STATUS_INVALID_PREPARSED_DATA; - if (*LinkCollectionNodeLength < data->caps.NumberLinkCollectionNodes) - return HIDP_STATUS_BUFFER_TOO_SMALL; + if (capacity < preparsed->caps.NumberLinkCollectionNodes) return HIDP_STATUS_BUFFER_TOO_SMALL; + count = *nodes_len = preparsed->caps.NumberLinkCollectionNodes; - for (i = 0; i < data->caps.NumberLinkCollectionNodes; ++i) + for (i = 0; i < count; ++i) { - LinkCollectionNode[i].LinkUsage = nodes[i].LinkUsage; - LinkCollectionNode[i].LinkUsagePage = nodes[i].LinkUsagePage; - LinkCollectionNode[i].Parent = nodes[i].Parent; - LinkCollectionNode[i].NumberOfChildren = nodes[i].NumberOfChildren; - LinkCollectionNode[i].NextSibling = nodes[i].NextSibling; - LinkCollectionNode[i].FirstChild = nodes[i].FirstChild; - LinkCollectionNode[i].CollectionType = nodes[i].CollectionType; - LinkCollectionNode[i].IsAlias = nodes[i].IsAlias; + 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].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++; + } } - *LinkCollectionNodeLength = data->caps.NumberLinkCollectionNodes; return HIDP_STATUS_SUCCESS; } diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 3b4455a0b88..986912990a7 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -834,7 +834,6 @@ static void preparse_collection(const struct collection *root, const struct coll 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; struct hid_value_caps *caps; unsigned int report_count; @@ -843,7 +842,6 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c struct preparse_ctx ctx; unsigned int element_off; - unsigned int nodes_offset; memset(&ctx, 0, sizeof(ctx)); create_preparse_ctx(base_collection, &ctx); @@ -853,10 +851,8 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c element_off = FIELD_OFFSET(WINE_HIDP_PREPARSED_DATA, reports[report_count]); size = element_off + (ctx.elem_count * sizeof(WINE_HID_ELEMENT)); - nodes_offset = size; - size += state->caps.NumberLinkCollectionNodes * sizeof(WINE_HID_LINK_COLLECTION_NODE); - - caps_len = state->caps.NumberInputValueCaps + state->caps.NumberOutputValueCaps + state->caps.NumberFeatureValueCaps; + caps_len = state->caps.NumberInputValueCaps + state->caps.NumberOutputValueCaps + + state->caps.NumberFeatureValueCaps + state->caps.NumberLinkCollectionNodes; caps_off = size; size += caps_len * sizeof(*caps); @@ -866,7 +862,6 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c data->caps = state->caps; data->new_caps = state->caps; data->elementOffset = element_off; - data->nodesOffset = nodes_offset; data->value_caps_offset = caps_off; data->value_caps_count[HidP_Input] = state->caps.NumberInputValueCaps; @@ -878,23 +873,6 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c data->caps.NumberFeatureValueCaps = data->caps.NumberFeatureButtonCaps = data->caps.NumberFeatureDataIndices = 0; 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++; - } - } - /* fixup value vs button vs filler counts */ caps = HID_INPUT_VALUE_CAPS( data ); @@ -929,6 +907,9 @@ static WINE_HIDP_PREPARSED_DATA *build_preparsed_data( struct collection *base_c data->new_caps.NumberFeatureButtonCaps = button; data->new_caps.NumberFeatureValueCaps -= filler + button; + caps = HID_COLLECTION_VALUE_CAPS( data ); + memcpy( caps, state->collections, data->new_caps.NumberLinkCollectionNodes * sizeof(*caps) ); + return data; } diff --git a/include/wine/hid.h b/include/wine/hid.h index 8d1d6d4d104..b15b26474a0 100644 --- a/include/wine/hid.h +++ b/include/wine/hid.h @@ -81,17 +81,6 @@ typedef struct __WINE_HID_REPORT DWORD elementIdx; } WINE_HID_REPORT; -typedef struct __WINE_HID_LINK_COLLECTION_NODE { - USAGE LinkUsage; - USAGE LinkUsagePage; - USHORT Parent; - USHORT NumberOfChildren; - USHORT NextSibling; - USHORT FirstChild; - BYTE CollectionType; - BYTE IsAlias; -} WINE_HID_LINK_COLLECTION_NODE; - typedef struct __WINE_HIDP_PREPARSED_DATA { DWORD magic; @@ -100,7 +89,6 @@ typedef struct __WINE_HIDP_PREPARSED_DATA HIDP_CAPS new_caps; DWORD elementOffset; - DWORD nodesOffset; DWORD reportCount[3]; BYTE reportIdx[3][256]; @@ -113,10 +101,10 @@ typedef struct __WINE_HIDP_PREPARSED_DATA #define HID_OUTPUT_REPORTS(d) ((d)->reports + (d)->reportCount[0]) #define HID_FEATURE_REPORTS(d) ((d)->reports + (d)->reportCount[0] + (d)->reportCount[1]) #define HID_ELEMS(d) ((WINE_HID_ELEMENT*)((BYTE*)(d) + (d)->elementOffset)) -#define HID_NODES(d) ((WINE_HID_LINK_COLLECTION_NODE*)((BYTE*)(d) + (d)->nodesOffset)) #define HID_INPUT_VALUE_CAPS(d) ((struct hid_value_caps*)((char *)(d) + (d)->value_caps_offset)) #define HID_OUTPUT_VALUE_CAPS(d) (HID_INPUT_VALUE_CAPS(d) + (d)->value_caps_count[0]) #define HID_FEATURE_VALUE_CAPS(d) (HID_OUTPUT_VALUE_CAPS(d) + (d)->value_caps_count[1]) +#define HID_COLLECTION_VALUE_CAPS(d) (HID_FEATURE_VALUE_CAPS(d) + (d)->value_caps_count[2]) #endif /* __WINE_PARSE_H */

1 0

Rémi Bernon : hid: Rewrite HidP_GetData using enum_value_caps.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: b860281d3228daf0d2291804c1664e78206c7b57 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b860281d3228daf0d2291804… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:21:59 2021 +0200 hid: Rewrite HidP_GetData using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 157 ++++++++++++------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 41 +++++----- 2 files changed, 73 insertions(+), 125 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b860281d3228daf0d229…

1 0

Rémi Bernon : hid: Rewrite HidP_MaxDataListLength using enum_value_caps.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 1c4e7a00a309641ec1c8d6efce751f488b224c67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c4e7a00a309641ec1c8d6ef… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:21:58 2021 +0200 hid: Rewrite HidP_MaxDataListLength using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 32 ++++++++++++++++---------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 6261c3c2f68..afd69281f0d 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -679,24 +679,24 @@ NTSTATUS WINAPI HidP_GetUsagesEx( HIDP_REPORT_TYPE report_type, USHORT collectio return status; } -ULONG WINAPI HidP_MaxDataListLength(HIDP_REPORT_TYPE ReportType, PHIDP_PREPARSED_DATA PreparsedData) +static NTSTATUS count_data( const struct hid_value_caps *caps, void *user ) { - WINE_HIDP_PREPARSED_DATA *data = (WINE_HIDP_PREPARSED_DATA *)PreparsedData; - TRACE("(%i, %p)\n", ReportType, PreparsedData); - if (data->magic != HID_MAGIC) - return 0; + if (caps->is_range || HID_VALUE_CAPS_IS_BUTTON( caps )) *(ULONG *)user += caps->report_count; + else *(ULONG *)user += 1; + return HIDP_STATUS_SUCCESS; +} - switch(ReportType) - { - case HidP_Input: - return data->caps.NumberInputDataIndices; - case HidP_Output: - return data->caps.NumberOutputDataIndices; - case HidP_Feature: - return data->caps.NumberFeatureDataIndices; - default: - return 0; - } +ULONG WINAPI HidP_MaxDataListLength( HIDP_REPORT_TYPE report_type, PHIDP_PREPARSED_DATA preparsed_data ) +{ + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {}; + USHORT limit = -1; + ULONG count = 0; + + TRACE( "report_type %d, preparsed_data %p.\n", report_type, preparsed_data ); + + enum_value_caps( preparsed, report_type, 0, &filter, count_data, &count, &limit ); + return count; } NTSTATUS WINAPI HidP_GetData(HIDP_REPORT_TYPE ReportType, HIDP_DATA *DataList, ULONG *DataLength, diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 753957a8ac6..101366bf50b 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2229,7 +2229,6 @@ static void test_hidp(HANDLE file, int report_id) value = HidP_MaxDataListLength(HidP_Feature + 1, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Feature + 1) returned %d, expected %d\n", value, 0); value = HidP_MaxDataListLength(HidP_Input, preparsed_data); - todo_wine ok(value == 50, "HidP_MaxDataListLength(HidP_Input) returned %d, expected %d\n", value, 50); value = HidP_MaxDataListLength(HidP_Output, preparsed_data); ok(value == 0, "HidP_MaxDataListLength(HidP_Output) returned %d, expected %d\n", value, 0);

1 0

Rémi Bernon : hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 28bbaf670749fe058a6770982a4d0a3100032fa9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bbaf670749fe058a677098… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 28 09:21:57 2021 +0200 hid: Return HIDP_STATUS_INCOMPATIBLE_REPORT_ID when id mismatches. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 5 +++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 59f18276b38..6261c3c2f68 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -96,13 +96,14 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { const struct hid_value_caps *caps, *caps_end; NTSTATUS status; + BOOL incompatible = FALSE; LONG remaining = *count; for (status = get_value_caps_range( preparsed, report_type, report_len, &caps, &caps_end ); status == HIDP_STATUS_SUCCESS && caps != caps_end; caps++) { if (!match_value_caps( caps, filter )) continue; - if (filter->report_id && caps->report_id != filter->report_id) continue; + if (filter->report_id && caps->report_id != filter->report_id) incompatible = TRUE; else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -111,7 +112,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR if (status != HIDP_STATUS_SUCCESS) return status; *count -= remaining; - if (*count == 0) return HIDP_STATUS_USAGE_NOT_FOUND; + if (*count == 0) return incompatible ? HIDP_STATUS_INCOMPATIBLE_REPORT_ID : HIDP_STATUS_USAGE_NOT_FOUND; if (remaining < 0) return HIDP_STATUS_BUFFER_TOO_SMALL; return HIDP_STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 432bc168259..753957a8ac6 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2292,14 +2292,12 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_SetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_SetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_SetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, HID_USAGE_HAPTICS_WAVEFORM_RUMBLE, @@ -2330,13 +2328,11 @@ static void test_hidp(HANDLE file, int report_id) report[0] = 1 - report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine_if(!report_id) ok(status == (report_id ? HIDP_STATUS_SUCCESS : HIDP_STATUS_INCOMPATIBLE_REPORT_ID), "HidP_GetUsageValue returned %#x\n", status); report[0] = 2; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, waveform_list, 3, &value, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_INCOMPATIBLE_REPORT_ID, "HidP_GetUsageValue returned %#x\n", status); report[0] = report_id; status = HidP_GetUsageValue(HidP_Feature, HID_USAGE_PAGE_ORDINAL, 0xdead, 3, &value,

1 0

Zhiyi Zhang : light.msstyles: Add Tooltip parts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 0d915de46d7d4bdcc172d62ebb95dcb29c5cab10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d915de46d7d4bdcc172d62e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:29 2021 +0800 light.msstyles: Add Tooltip parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 1 + dlls/light.msstyles/blue_tooltip_close.bmp | Bin 0 -> 3402 bytes dlls/light.msstyles/blue_tooltip_close.svg | 17 +++++++++++++++++ dlls/light.msstyles/light.rc | 12 ++++++++++++ 4 files changed, 30 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8f9143d62f9..3205d1b28f9 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -56,6 +56,7 @@ SVG_SRCS = \ blue_toolbar_buttons_split_dropdown_glyph.svg \ blue_toolbar_separator_horizontal.svg \ blue_toolbar_separator_vertical.svg \ + blue_tooltip_close.svg \ blue_trackbar_slider_track.svg \ blue_trackbar_thumb_down_11px.svg \ blue_trackbar_thumb_down_15px.svg \ diff --git a/dlls/light.msstyles/blue_tooltip_close.bmp b/dlls/light.msstyles/blue_tooltip_close.bmp new file mode 100644 index 00000000000..82adf7e5cc1 Binary files /dev/null and b/dlls/light.msstyles/blue_tooltip_close.bmp differ diff --git a/dlls/light.msstyles/blue_tooltip_close.svg b/dlls/light.msstyles/blue_tooltip_close.svg new file mode 100644 index 00000000000..4a0e66448bc --- /dev/null +++ b/dlls/light.msstyles/blue_tooltip_close.svg @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:17-32" width="17" height="48" version="1.1" viewBox="0 0 4.4979 12.7" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <g stroke-width=".26458"> + <path d="m4.4979 0.42636-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#aeaeae"/> + <path d="m4.4979 4.6597-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#ff1744"/> + <path d="m4.4979 8.893-0.453-0.42636-1.796 1.6903-1.796-1.6903-0.453 0.42636 1.796 1.6903-1.796 1.6903 0.453 0.42636 1.796-1.6903 1.796 1.6903 0.453-0.42636-1.796-1.6903z" fill="#d50000"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c8c3f22ddb1..bddf183132c 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -879,6 +879,14 @@ BLUE_INI TEXTFILE "[TrackBar.TicsVert]\r\n" "Color = 174 174 174\r\n" +"\r\n; Tooltip\r\n" +"[Tooltip.Close]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_tooltip_close.bmp\r\n" +"ImageCount = 3\r\n" +"SizingType = TrueSize\r\n" +"ImageLayout = Vertical\r\n" + "\r\n; TreeView\r\n" "[TreeView]\r\n" "BgType = BorderFill\r\n" @@ -1070,6 +1078,10 @@ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_BMP BITMAP "blue_toolbar_buttons_split_dropd /* @makedep: blue_toolbar_buttons_split_dropdown_glyph.bmp */ BLUE_TOOLBAR_BUTTONS_SPLIT_DROPDOWN_GLYPH_BMP BITMAP "blue_toolbar_buttons_split_dropdown_glyph.bmp" +/* Tooltip */ +/* @makedep: blue_tooltip_close.bmp */ +BLUE_TOOLTIP_CLOSE_BMP BITMAP "blue_tooltip_close.bmp" + /* TrackBar */ /* @makedep: blue_trackbar_thumb_horizontal.bmp */ BLUE_TRACKBAR_THUMB_HORIZONTAL_BMP BITMAP "blue_trackbar_thumb_horizontal.bmp"

1 0

Zhiyi Zhang : light.msstyles: Add TrackBar parts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: 3e4c5afeb23c724d9efa3d8a746be02312eb5f3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e4c5afeb23c724d9efa3d8a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:20 2021 +0800 light.msstyles: Add TrackBar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 15 +++ dlls/light.msstyles/blue_trackbar_slider_track.bmp | Bin 0 -> 378 bytes dlls/light.msstyles/blue_trackbar_slider_track.svg | 13 ++ .../blue_trackbar_thumb_down_11px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_down_11px.svg | 21 +++ .../blue_trackbar_thumb_down_15px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_down_15px.svg | 21 +++ .../blue_trackbar_thumb_down_21px.bmp | Bin 0 -> 18618 bytes .../blue_trackbar_thumb_down_21px.svg | 21 +++ .../blue_trackbar_thumb_horizontal.bmp | Bin 0 -> 2418 bytes .../blue_trackbar_thumb_horizontal.svg | 19 +++ .../blue_trackbar_thumb_left_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_left_19px.svg | 21 +++ .../blue_trackbar_thumb_left_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_left_25px.svg | 21 +++ .../blue_trackbar_thumb_left_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_left_44px.svg | 21 +++ .../blue_trackbar_thumb_right_19px.bmp | Bin 0 -> 4318 bytes .../blue_trackbar_thumb_right_19px.svg | 21 +++ .../blue_trackbar_thumb_right_25px.bmp | Bin 0 -> 7638 bytes .../blue_trackbar_thumb_right_25px.svg | 21 +++ .../blue_trackbar_thumb_right_44px.bmp | Bin 0 -> 17738 bytes .../blue_trackbar_thumb_right_44px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_11px.bmp | Bin 0 -> 4318 bytes .../light.msstyles/blue_trackbar_thumb_up_11px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_15px.bmp | Bin 0 -> 7638 bytes .../light.msstyles/blue_trackbar_thumb_up_15px.svg | 21 +++ .../light.msstyles/blue_trackbar_thumb_up_21px.bmp | Bin 0 -> 18618 bytes .../light.msstyles/blue_trackbar_thumb_up_21px.svg | 21 +++ .../blue_trackbar_thumb_vertical.bmp | Bin 0 -> 4758 bytes .../blue_trackbar_thumb_vertical.svg | 19 +++ dlls/light.msstyles/light.rc | 150 +++++++++++++++++++++ 32 files changed, 468 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3e4c5afeb23c724d9efa…

1 0

Zhiyi Zhang : light.msstyles: Add Tab parts.
by Alexandre Julliard 28 Jun '21

28 Jun '21

Module: wine Branch: master Commit: ace01c30f87399c30dcbe27bb6a46533d57f8176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ace01c30f87399c30dcbe27b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:30:06 2021 +0800 light.msstyles: Add Tab parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 5 ++ dlls/light.msstyles/blue_tab_background.bmp | Bin 0 -> 19338 bytes dlls/light.msstyles/blue_tab_background.svg | 13 ++++ dlls/light.msstyles/blue_tab_item.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item.svg | 108 +++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_left.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_left.svg | 111 ++++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_item_right.bmp | Bin 0 -> 1658 bytes dlls/light.msstyles/blue_tab_item_right.svg | 109 +++++++++++++++++++++++++++ dlls/light.msstyles/blue_tab_pane_edge.bmp | Bin 0 -> 9354 bytes dlls/light.msstyles/blue_tab_pane_edge.svg | 16 ++++ dlls/light.msstyles/light.rc | 104 ++++++++++++++++++++++++++ 12 files changed, 466 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ace01c30f87399c30dcb…

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021