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

[PATCH 2/5] nsi: Add a stub implementation of NsiGetParameter().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 8 ++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 23 +++++++++++++++++++++++ include/wine/nsi.h | 2 ++ 4 files changed, 34 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..8b276e76b82 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -100,5 +100,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 */ -- 2.23.0

2 2

[PATCH v2 5/5] nsi: Add a stub implementation of NsiGetAllParametersEx().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 23 +++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 1ed0cfad916..4e55721475b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -84,8 +84,31 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { + struct nsi_get_all_parameters_ex params; + 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 ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + 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; + + return NsiGetAllParametersEx( &params ); +} + +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 912a5e8d052..376d25438aa 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -9,7 +9,7 @@ @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) -@ stub NsiGetAllParametersEx +@ stdcall NsiGetAllParametersEx(ptr) @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 5e2ea71646c..7c2c57b9548 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_get_all_parameters_ex get_all_params; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -81,6 +82,35 @@ todo_wine memset( &get_dyn, 0xcc, sizeof(get_dyn) ); memset( &get_stat, 0xcc, sizeof(get_stat) ); + memset( &get_all_params, 0, sizeof(get_all_params) ); + get_all_params.first_arg = 1; + get_all_params.module = &NPI_MS_NDIS_MODULEID; + get_all_params.table = NSI_NDIS_IFINFO_TABLE; + get_all_params.key = luid_tbl + i; + get_all_params.key_size = sizeof(*luid_tbl); + get_all_params.rw_data = &get_rw; + get_all_params.rw_size = rw_size; + get_all_params.dynamic_data = &get_dyn; + get_all_params.dynamic_size = sizeof(get_dyn); + get_all_params.static_data = &get_stat; + get_all_params.static_size = sizeof(get_stat); + + err = NsiGetAllParametersEx( &get_all_params ); + 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" ); + + 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) ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 999b8a57810..81d221324e9 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -116,6 +116,23 @@ struct nsi_enumerate_all_ex DWORD_PTR count; }; +struct nsi_get_all_parameters_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + 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 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 ); @@ -128,6 +145,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 NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); 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 ); -- 2.23.0

1 0

[PATCH v2 4/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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, -- 2.23.0

1 0

[PATCH v2 3/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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, -- 2.23.0

1 0

[PATCH v2 2/5] nsi: Add a stub implementation of NsiGetParameter().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 */ -- 2.23.0

1 0

[PATCH v2 1/5] nsi: Add a stub implementation of NsiGetAllParameters().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 */ -- 2.23.0

1 0

[PATCH 3/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParameters().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 8b276e76b82..8fd16dd9d97 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -96,6 +96,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, -- 2.23.0

2 1

[PATCH 5/5] nsi: Add a stub implementation of NsiGetAllParametersEx().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 23 +++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 30 ++++++++++++++++++++++++++++++ include/wine/nsi.h | 18 ++++++++++++++++++ 4 files changed, 72 insertions(+), 1 deletion(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 1ed0cfad916..4e55721475b 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -84,8 +84,31 @@ DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD t void *rw_data, DWORD rw_size, void *dynamic_data, DWORD dynamic_size, void *static_data, DWORD static_size ) { + struct nsi_get_all_parameters_ex params; + 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 ); + + params.unknown[0] = 0; + params.unknown[1] = 0; + params.module = module; + params.table = table; + params.first_arg = unk; + params.unknown2 = 0; + params.key = key; + 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; + + return NsiGetAllParametersEx( &params ); +} + +DWORD WINAPI NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ) +{ return ERROR_CALL_NOT_IMPLEMENTED; } diff --git a/dlls/nsi/nsi.spec b/dlls/nsi/nsi.spec index 912a5e8d052..376d25438aa 100644 --- a/dlls/nsi/nsi.spec +++ b/dlls/nsi/nsi.spec @@ -9,7 +9,7 @@ @ stub NsiFreePersistentDataWithMaskTable @ stdcall NsiFreeTable(ptr ptr ptr ptr) @ stdcall NsiGetAllParameters(long ptr long ptr long ptr long ptr long ptr long) -@ stub NsiGetAllParametersEx +@ stdcall NsiGetAllParametersEx(ptr) @ stub NsiGetAllPersistentParametersWithMask @ stub NsiObjectSecurity @ stdcall NsiGetParameter(long ptr long ptr long long ptr long long) diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 5e2ea71646c..7c2c57b9548 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_get_all_parameters_ex get_all_params; struct nsi_enumerate_all_ex enum_params; DWORD err, count, i, rw_size, enum_count; NET_LUID *luid_tbl, *enum_luid_tbl; @@ -81,6 +82,35 @@ todo_wine memset( &get_dyn, 0xcc, sizeof(get_dyn) ); memset( &get_stat, 0xcc, sizeof(get_stat) ); + memset( &get_all_params, 0, sizeof(get_all_params) ); + get_all_params.first_arg = 1; + get_all_params.module = &NPI_MS_NDIS_MODULEID; + get_all_params.table = NSI_NDIS_IFINFO_TABLE; + get_all_params.key = luid_tbl + i; + get_all_params.key_size = sizeof(*luid_tbl); + get_all_params.rw_data = &get_rw; + get_all_params.rw_size = rw_size; + get_all_params.dynamic_data = &get_dyn; + get_all_params.dynamic_size = sizeof(get_dyn); + get_all_params.static_data = &get_stat; + get_all_params.static_size = sizeof(get_stat); + + err = NsiGetAllParametersEx( &get_all_params ); + 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" ); + + 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) ); diff --git a/include/wine/nsi.h b/include/wine/nsi.h index 999b8a57810..81d221324e9 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -116,6 +116,23 @@ struct nsi_enumerate_all_ex DWORD_PTR count; }; +struct nsi_get_all_parameters_ex +{ + void *unknown[2]; + const NPI_MODULEID *module; + DWORD_PTR table; + DWORD first_arg; + DWORD unknown2; + 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 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 ); @@ -128,6 +145,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 NsiGetAllParametersEx( struct nsi_get_all_parameters_ex *params ); 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 ); -- 2.23.0

1 0

[PATCH 4/5] nsi: Add a stub implementation of NsiEnumerateObjectsAllParametersEx().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/nsi/nsi.c | 27 +++++++++++++++++++++++++++ dlls/nsi/nsi.spec | 2 +- dlls/nsi/tests/nsi.c | 20 ++++++++++++++++++++ include/wine/nsi.h | 24 ++++++++++++++++++++++++ 4 files changed, 72 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 8fd16dd9d97..999b8a57810 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -93,6 +93,29 @@ 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 + +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 ); @@ -100,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, -- 2.23.0

1 0

[PATCH 1/5] nsi: Add a stub implementation of NsiGetAllParameters().
by Huw Davies June 28, 2021

June 28, 2021

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 */ -- 2.23.0

1 0