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

Huw Davies : nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx().
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 2bde6ccddb11cf09c3b353a98d5d7e8a578a9f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bde6ccddb11cf09c3b353a9… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 28 08:35:48 2021 +0100 nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 27 +++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 20 ++++++++++++++++++++ include/wine/nsi.h | 19 +++++++++++++++++++ 4 files changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 66054ffacd6..1ed0cfad916 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -43,8 +43,35 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size, DWORD *count ) { + struct nsi_enumerate_all_ex params; + DWORD err; + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.second_arg = unk2; + params.key_data = key_data; + params.key_size = key_size; + params.rw_data = rw_data; + params.rw_size = rw_size; + params.dynamic_data = dynamic_data; + params.dynamic_size = dynamic_size; + params.static_data = static_data; + params.static_size = static_size; + params.count = *count; + + err = NsiEnumerateObjectsAllParametersEx( &params ); + *count = params.count; + return err; +} + +DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index d4a29c38fe6..912a5e8d052 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -4,7 +4,7 @@ @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx @ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) -@ stub NsiEnumerateObjectsAllParametersEx +@ stdcall NsiEnumerateObjectsAllParametersEx(ptr) @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index b1befd548cd..5e2ea71646c 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -40,6 +40,7 @@ static void test_nsi_api( void ) struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -159,6 +160,25 @@ todo_wine ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); } + memset( &enum_params, 0, sizeof(enum_params) ); + enum_params.first_arg = 1; + enum_params.second_arg = 1; + enum_params.module = &NPI_MS_NDIS_MODULEID; + enum_params.table = NSI_NDIS_IFINFO_TABLE; + enum_params.key_data = enum_luid_tbl; + enum_params.key_size = sizeof(*enum_luid_tbl); + enum_params.rw_data = enum_rw_tbl; + enum_params.rw_size = rw_size; + enum_params.dynamic_data = enum_dyn_tbl; + enum_params.dynamic_size = sizeof(*enum_dyn_tbl); + enum_params.static_data = enum_stat_tbl; + enum_params.static_size = sizeof(*enum_stat_tbl); + enum_params.count = count; + + err = NsiEnumerateObjectsAllParametersEx( &enum_params ); + ok( !err, "got %d\n", err ); + ok( enum_params.count == count, "mismatch\n" ); + free( enum_luid_tbl ); free( enum_rw_tbl ); free( enum_dyn_tbl ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 648adac9931..999b8a57810 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -98,6 +98,24 @@ struct nsi_ndis_ifinfo_static #define NSI_PARAM_TYPE_DYNAMIC 1 #define NSI_PARAM_TYPE_STATIC 2 +struct nsi_enumerate_all_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD second_arg; + 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_PTR count; +}; + 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 ); @@ -105,6 +123,7 @@ DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_ 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 WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *params ); 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,

1 0

Huw Davies : nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters().
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 687650db1b6d0145112c025e38bc0a94b4248c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=687650db1b6d0145112c025e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 28 08:35:47 2021 +0100 nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 10 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++---- include/wine/nsi.h | 4 +++ 4 files changed, 82 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index bf52fe248c8..66054ffacd6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -38,6 +38,16 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR return ERROR_CALL_NOT_IMPLEMENTED; } +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, 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 ) +{ + FIXME( "%d %d %p %d %p %d %p %d %p %d %p %d %p: stub\n", unk, unk2, module, table, key_data, key_size, + rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count ); + return ERROR_CALL_NOT_IMPLEMENTED; +} + void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) { FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 46757988146..d4a29c38fe6 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -3,7 +3,7 @@ @ stub NsiCancelChangeNotification @ stub NsiDeregisterChangeNotification @ stub NsiDeregisterChangeNotificationEx -@ stub NsiEnumerateObjectsAllParameters +@ stdcall NsiEnumerateObjectsAllParameters(long long ptr long ptr long ptr long ptr long ptr long ptr) @ stub NsiEnumerateObjectsAllParametersEx @ stub NsiEnumerateObjectsAllPersistentParametersWithMask @ stub NsiFreePersistentDataWithMaskTable diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 72c9dcdccbd..b1befd548cd 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -37,11 +37,11 @@ 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; + struct nsi_ndis_ifinfo_rw *rw_tbl, *rw, get_rw, *enum_rw_tbl, *enum_rw; + struct nsi_ndis_ifinfo_dynamic *dyn_tbl, *dyn, get_dyn, *enum_dyn_tbl, *enum_dyn; + struct nsi_ndis_ifinfo_static *stat_tbl, *stat, get_stat, *enum_stat_tbl, *enum_stat; + DWORD err, count, i, rw_size, enum_count; + NET_LUID *luid_tbl, *enum_luid_tbl; /* Use the NDIS ifinfo table to test various api */ for (i = 0; i < ARRAY_SIZE(rw_sizes); i++) @@ -101,6 +101,68 @@ todo_wine winetest_pop_context(); } + enum_count = 0; + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + NULL, 0, NULL, 0, + NULL, 0, NULL, 0, &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + enum_luid_tbl = malloc( count * sizeof(*enum_luid_tbl) ); + enum_rw_tbl = malloc( count * rw_size ); + enum_dyn_tbl = malloc( count * sizeof(*enum_dyn_tbl) ); + enum_stat_tbl = malloc( count * sizeof(*enum_stat_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( !err, "got %d\n", err ); + ok( enum_count == count, "mismatch\n" ); + + for (i = 0; i < count; i++) + { + winetest_push_context( "%d", i ); + rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)rw_tbl + i * rw_size); + enum_rw = (struct nsi_ndis_ifinfo_rw *)((BYTE *)enum_rw_tbl + i * rw_size); + dyn = dyn_tbl + i; + enum_dyn = enum_dyn_tbl + i; + stat = stat_tbl + i; + enum_stat = enum_stat_tbl + i; + + /* test a selection of members */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "mismatch\n" ); + ok( IsEqualGUID( &enum_rw->network_guid, &rw->network_guid ), "mismatch\n" ); + ok( enum_rw->alias.Length == rw->alias.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->alias.String, rw->alias.String, rw->alias.Length ), "mismatch\n" ); + ok( enum_rw->phys_addr.Length == rw->phys_addr.Length, "mismatch\n" ); + ok( !memcmp( enum_rw->phys_addr.Address, rw->phys_addr.Address, IF_MAX_PHYS_ADDRESS_LENGTH ), "mismatch\n" ); + ok( enum_dyn->oper_status == dyn->oper_status, "mismatch\n" ); + ok( enum_stat->if_index == stat->if_index, "mismatch\n" ); + ok( IsEqualGUID( &enum_stat->if_guid, &stat->if_guid ), "mismatch\n" ); + winetest_pop_context(); + } + + if (count > 0) + { + enum_count--; + memset( enum_luid_tbl, 0xcc, count * sizeof(*enum_luid_tbl) ); + + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + enum_luid_tbl, sizeof(*enum_luid_tbl), enum_rw_tbl, rw_size, + enum_dyn_tbl, sizeof(*enum_dyn_tbl), enum_stat_tbl, sizeof(*enum_stat_tbl), + &enum_count ); + ok( err == ERROR_MORE_DATA, "got %d\n", err ); + ok( enum_count == count - 1, "mismatch\n" ); + + for (i = 0; i < enum_count; i++) /* for simplicity just check the luids */ + ok( enum_luid_tbl[i].Value == luid_tbl[i].Value, "%d: mismatch\n", i ); + } + + free( enum_luid_tbl ); + free( enum_rw_tbl ); + free( enum_dyn_tbl ); + free( enum_stat_tbl ); NsiFreeTable( luid_tbl, rw_tbl, dyn_tbl, stat_tbl ); } diff --git a/include/wine/nsi.h b/include/wine/nsi.h index e0370b00d41..648adac9931 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -101,6 +101,10 @@ struct nsi_ndis_ifinfo_static 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 ); +DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, 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 ); 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,

1 0

Huw Davies : nsi: Add a stub implementation of NsiGetParameter().
by Alexandre Julliard June 28, 2021

June 28, 2021

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 June 28, 2021

June 28, 2021

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: Build link collection nodes in HidP_GetLinkCollectionNodes.
by Alexandre Julliard June 28, 2021

June 28, 2021

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 June 28, 2021

June 28, 2021

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 June 28, 2021

June 28, 2021

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

Zhiyi Zhang : light.msstyles: Add Tooltip parts.
by Alexandre Julliard June 28, 2021

June 28, 2021

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 Progress parts.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: 3dab0775c7ed3ef65034ca1904eb2ac7f6a204ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dab0775c7ed3ef65034ca19… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:29:58 2021 +0800 light.msstyles: Add Progress parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 4 ++ .../blue_progress_chunk_horizontal.bmp | Bin 0 -> 2358 bytes .../blue_progress_chunk_horizontal.svg | 13 ++++++ .../blue_progress_chunk_vertical.bmp | Bin 0 -> 2490 bytes .../blue_progress_chunk_vertical.svg | 13 ++++++ .../blue_progress_track_horizontal.bmp | Bin 0 -> 2698 bytes .../blue_progress_track_horizontal.svg | 13 ++++++ .../blue_progress_track_vertical.bmp | Bin 0 -> 886 bytes .../blue_progress_track_vertical.svg | 13 ++++++ dlls/light.msstyles/light.rc | 48 +++++++++++++++++++++ 10 files changed, 104 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index f5bbb77df04..c3c5643236a 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -15,6 +15,10 @@ SVG_SRCS = \ blue_groupbox.svg \ blue_header.svg \ blue_header_item.svg \ + blue_progress_chunk_horizontal.svg \ + blue_progress_chunk_vertical.svg \ + blue_progress_track_horizontal.svg \ + blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp new file mode 100644 index 00000000000..60debfe4049 Binary files /dev/null and b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg new file mode 100644 index 00000000000..629b667f585 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:49-24" width="49" height="15" version="1.1" viewBox="0 0 12.965 3.9688" 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> + <rect width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp new file mode 100644 index 00000000000..f9816b09dcf Binary files /dev/null and b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.svg b/dlls/light.msstyles/blue_progress_chunk_vertical.svg new file mode 100644 index 00000000000..4f43374dce5 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_chunk_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:15-24" width="15" height="49" version="1.1" viewBox="0 0 3.9687 12.965" 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> + <rect transform="rotate(90)" y="-3.9688" width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.bmp b/dlls/light.msstyles/blue_progress_track_horizontal.bmp new file mode 100644 index 00000000000..43d5eaa441a Binary files /dev/null and b/dlls/light.msstyles/blue_progress_track_horizontal.bmp differ diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.svg b/dlls/light.msstyles/blue_progress_track_horizontal.svg new file mode 100644 index 00000000000..af25bbbcd51 --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_horizontal.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:53-24" width="53" height="16" version="1.1" viewBox="0 0 14.023 4.2333" 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> + <rect x=".13229" y=".13229" width="13.758" height="3.9688" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/blue_progress_track_vertical.bmp b/dlls/light.msstyles/blue_progress_track_vertical.bmp new file mode 100644 index 00000000000..5dddee9c32e Binary files /dev/null and b/dlls/light.msstyles/blue_progress_track_vertical.bmp differ diff --git a/dlls/light.msstyles/blue_progress_track_vertical.svg b/dlls/light.msstyles/blue_progress_track_vertical.svg new file mode 100644 index 00000000000..2f0f638bd8a --- /dev/null +++ b/dlls/light.msstyles/blue_progress_track_vertical.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:14-24" width="14" height="17" version="1.1" viewBox="0 0 3.7042 4.4979" 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> + <rect x=".13229" y=".13229" width="3.4396" height="4.2333" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 19e3192201f..199ddcbfa77 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -365,6 +365,41 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; Progress\r\n" +"[Progress]\r\n" +"ProgressChunkSize = 1\r\n" +"ProgressSpaceSize = 0\r\n" +"BgType = BorderFill\r\n" +"FillType = Solid\r\n" +"FillColor = 255 255 255\r\n" +"BorderSize = 1\r\n" +"BorderColor = 174 174 174\r\n" + +"[Progress.Bar]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_horizontal.bmp\r\n" +"MinSize = 10, 10\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.BarVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_track_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.Chunk]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_horizontal.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + +"[Progress.ChunkVert]\r\n" +"BgType = ImageFile\r\n" +"ImageFile = blue_progress_chunk_vertical.bmp\r\n" +"SizingMargins = 1, 1, 1, 1\r\n" +"SizingType = Stretch\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n" @@ -722,6 +757,19 @@ BLUE_HEADER_BMP BITMAP "blue_header.bmp" /* @makedep: blue_header_item.bmp */ BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" +/* Progress */ +/* @makedep: blue_progress_chunk_horizontal.bmp */ +BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" + +/* @makedep: blue_progress_chunk_vertical.bmp */ +BLUE_PROGRESS_CHUNK_VERTICAL_BMP BITMAP "blue_progress_chunk_vertical.bmp" + +/* @makedep: blue_progress_track_horizontal.bmp */ +BLUE_PROGRESS_TRACK_HORIZONTAL_BMP BITMAP "blue_progress_track_horizontal.bmp" + +/* @makedep: blue_progress_track_vertical.bmp */ +BLUE_PROGRESS_TRACK_VERTICAL_BMP BITMAP "blue_progress_track_vertical.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp"

1 0

Zhiyi Zhang : light.msstyles: Add Header parts.
by Alexandre Julliard June 28, 2021

June 28, 2021

Module: wine Branch: master Commit: a0debf126f2faecb5b108f588316ef2845a7ebf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0debf126f2faecb5b108f58… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Jun 28 10:29:52 2021 +0800 light.msstyles: Add Header parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_header.bmp | Bin 0 -> 618 bytes dlls/light.msstyles/blue_header.svg | 21 +++++++++++++++++ dlls/light.msstyles/blue_header_item.bmp | Bin 0 -> 2538 bytes dlls/light.msstyles/blue_header_item.svg | 39 +++++++++++++++++++++++++++++++ dlls/light.msstyles/light.rc | 24 +++++++++++++++++++ 6 files changed, 86 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index c0b55dd966d..f5bbb77df04 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -13,6 +13,8 @@ SVG_SRCS = \ blue_commandlink_glyph_30px.svg \ blue_commandlink_glyph_45px.svg \ blue_groupbox.svg \ + blue_header.svg \ + blue_header_item.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_25px.svg \ diff --git a/dlls/light.msstyles/blue_header.bmp b/dlls/light.msstyles/blue_header.bmp new file mode 100644 index 00000000000..fb81a657aa9 Binary files /dev/null and b/dlls/light.msstyles/blue_header.bmp differ diff --git a/dlls/light.msstyles/blue_header.svg b/dlls/light.msstyles/blue_header.svg new file mode 100644 index 00000000000..46046e1e454 --- /dev/null +++ b/dlls/light.msstyles/blue_header.svg @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="24" version="1.1" viewBox="0 0 1.5875 6.35" 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="0"> + <rect width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect x="1.3229" y="3.1988e-7" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="5.8208" y="-1.3229" width=".26458" height="1.3229"/> + <rect x="-1.5895e-8" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="2.2252e-7" y="-1.3229" width=".26458" height="1.3229"/> + </g> + </g> +</svg> diff --git a/dlls/light.msstyles/blue_header_item.bmp b/dlls/light.msstyles/blue_header_item.bmp new file mode 100644 index 00000000000..3a381109f57 Binary files /dev/null and b/dlls/light.msstyles/blue_header_item.bmp differ diff --git a/dlls/light.msstyles/blue_header_item.svg b/dlls/light.msstyles/blue_header_item.svg new file mode 100644 index 00000000000..642db57b60f --- /dev/null +++ b/dlls/light.msstyles/blue_header_item.svg @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:6-24" width="6" height="120" version="1.1" viewBox="0 0 1.5875 31.75" 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 transform="translate(-159.47 -110.22)" stroke-width="0"> + <rect x="159.47" y="110.22" width="1.5875" height="6.35" fill="#fff"/> + <rect x="160.79" y="110.22" width=".26458" height="6.0854" fill="#aeaeae"/> + <rect transform="rotate(90)" x="116.04" y="-160.79" width=".26458" height="1.3229" fill="#aeaeae"/> + <rect x="159.47" y="116.57" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#3096fa"> + <rect x="160.79" y="116.57" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.39" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="116.57" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="122.92" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#2979ff"> + <rect x="160.79" y="122.92" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="122.92" y="-160.79" width=".26458" height="1.0583"/> + <rect x="159.47" y="122.92" width=".26458" height="6.0854"/> + </g> + <rect x="159.47" y="129.27" width="1.5875" height="6.35" fill="#fff"/> + <rect transform="rotate(90)" x="135.09" y="-161.06" width=".26458" height="1.5875" fill="#aeaeae"/> + <rect x="159.47" y="135.62" width="1.5875" height="6.35" fill="#fff"/> + <g fill="#aeaeae"> + <rect transform="rotate(90)" x="141.44" y="-161.06" width=".26458" height="1.5875"/> + <rect x="159.47" y="110.22" width=".26458" height="6.0854"/> + <rect transform="rotate(90)" x="110.22" y="-160.79" width=".26458" height="1.3229"/> + </g> + <rect transform="rotate(90)" x="116.57" y="-160.79" width=".26458" height="1.0583" fill="#3096fa"/> + <rect transform="rotate(90)" x="128.74" y="-160.79" width=".26458" height="1.0583" fill="#2979ff"/> + </g> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 5aea6c02610..19e3192201f 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -334,6 +334,23 @@ BLUE_INI TEXTFILE "FillColor = 245 245 245\r\n" "TextColor = 0 0 0\r\n" +"\r\n; Header\r\n" +"[Header]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ImageFile = blue_header.bmp\r\n" +"SizingType = Tile\r\n" + +"[Header.HeaderItem]\r\n" +"BgType = ImageFile\r\n" +"SizingMargins = 2, 2, 2, 4\r\n" +"ContentMargins = 3, 0, 0, 0\r\n" +"ImageFile = blue_header_item.bmp\r\n" +"ImageCount = 5\r\n" +"ImageLayout = Vertical\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + "\r\n; ListBox\r\n" "[ListBox]\r\n" "BgType = BorderFill\r\n" @@ -698,6 +715,13 @@ BLUE_COMBOBUTTON_BMP BITMAP "blue_combobutton.bmp" /* @makedep: blue_combobutton_glyph.bmp */ BLUE_COMBOBUTTON_GLYPH_BMP BITMAP "blue_combobutton_glyph.bmp" +/* Header */ +/* @makedep: blue_header.bmp */ +BLUE_HEADER_BMP BITMAP "blue_header.bmp" + +/* @makedep: blue_header_item.bmp */ +BLUE_HEADER_ITEM_BMP BITMAP "blue_header_item.bmp" + /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp"

1 0