July 2021 - Wine-devel - list.winehq.org

[PATCH 5/5] wined3d: Use wined3d_mask_from_size() in shader_glsl_get_sample_function().
by Henri Verbeet 08 Jul '21

08 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index eb805f43a9f..5ae90148dc8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3463,8 +3463,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (shadow) ++coord_size; sample_function->offset_size = offset ? deriv_size : 0; - sample_function->coord_mask = (1u << coord_size) - 1; - sample_function->deriv_mask = (1u << deriv_size) - 1; + sample_function->coord_mask = wined3d_mask_from_size(coord_size); + sample_function->deriv_mask = wined3d_mask_from_size(deriv_size); sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); } -- 2.20.1

1 0

[PATCH 4/5] wined3d: Use wined3d_mask_from_size() in shader_glsl_atomic().
by Henri Verbeet 08 Jul '21

08 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b62f3f79e2e..eb805f43a9f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5354,7 +5354,7 @@ static void shader_glsl_atomic(const struct wined3d_shader_instruction *ins) } resource = "image"; data_type = reg_maps->uav_resource_info[resource_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + coord_mask = wined3d_mask_from_size(resource_type_info[resource_type].coord_size); stride = reg_maps->uav_resource_info[resource_idx].stride; } -- 2.20.1

1 0

[PATCH 3/5] wined3d: Use wined3d_mask_from_size() in shader_glsl_ld_uav().
by Henri Verbeet 08 Jul '21

08 Jul '21

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d0e7b13bd4..b62f3f79e2e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5532,7 +5532,7 @@ static void shader_glsl_ld_uav(const struct wined3d_shader_instruction *ins) resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } data_type = reg_maps->uav_resource_info[uav_idx].data_type; - coord_mask = (1u << resource_type_info[resource_type].coord_size) - 1; + coord_mask = wined3d_mask_from_size(resource_type_info[resource_type].coord_size); write_mask = shader_glsl_append_dst_ext(ins->ctx->buffer, ins, &ins->dst[0], 0, data_type); shader_glsl_get_swizzle(&ins->src[1], FALSE, write_mask, dst_swizzle); -- 2.20.1

1 0

[PATCH 2/5] winex11: Request VK_KHR_display in get_gpu_properties_from_vulkan().
by Henri Verbeet 08 Jul '21

08 Jul '21

Required by VK_EXT_direct_mode_display. VK_KHR_display in turn requires VK_KHR_surface. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index a8eab06a544..e7adcec0f2e 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -625,6 +625,8 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, "VK_EXT_acquire_xlib_display", "VK_EXT_direct_mode_display", + "VK_KHR_display", + VK_KHR_SURFACE_EXTENSION_NAME, }; const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); VkResult (*pvkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); -- 2.20.1

1 0

[PATCH 1/5] winex11: Request VK_KHR_external_memory_capabilities in get_gpu_properties_from_vulkan().
by Henri Verbeet 08 Jul '21

08 Jul '21

Required for VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index e3fa7a6e1d6..a8eab06a544 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -622,6 +622,7 @@ static BOOL get_gpu_properties_from_vulkan( struct x11drv_gpu *gpu, const XRRPro static const char *extensions[] = { VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, "VK_EXT_acquire_xlib_display", "VK_EXT_direct_mode_display", }; -- 2.20.1

1 0

[PATCH 6/6] iphlpapi: Use ConvertGuidToStringA() where possible.
by Huw Davies 08 Jul '21

08 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 079acbf2a9e..5621a4485c4 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -747,10 +747,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) /* on Win98 this is left empty, but whatever */ ConvertInterfaceIndexToLuid(table->indexes[ndx], &luid); ConvertInterfaceLuidToGuid(&luid, &guid); - sprintf(ptr->AdapterName, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], - guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], - guid.Data4[6], guid.Data4[7]); + ConvertGuidToStringA( &guid, ptr->AdapterName, ARRAY_SIZE(ptr->AdapterName) ); getInterfaceNameByIndex(table->indexes[ndx], ptr->Description); ptr->AddressLength = sizeof(ptr->Address); getInterfacePhysicalByIndex(table->indexes[ndx], @@ -1057,10 +1054,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index ConvertInterfaceIndexToLuid(index, &luid); ConvertInterfaceLuidToGuid(&luid, &guid); - sprintf(ptr, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", - guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], - guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], - guid.Data4[6], guid.Data4[7]); + ConvertGuidToStringA( &guid, ptr, CHARS_IN_GUID ); aa->AdapterName = ptr; ptr += CHARS_IN_GUID; -- 2.23.0

1 0

[PATCH 5/6] iphlpapi: Implement ConvertStringToGuidW().
by Huw Davies 08 Jul '21

08 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 8 ++++++++ dlls/iphlpapi/tests/iphlpapi.c | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 480b26c9315..6c51548b6e3 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -32,7 +32,7 @@ #@ stub ConvertRemoteInterfaceLuidToGuid #@ stub ConvertRemoteInterfaceLuidToIndex #@ stub ConvertStringToGuidA -#@ stub ConvertStringToGuidW +@ stdcall ConvertStringToGuidW( ptr ptr ) #@ stub ConvertStringToInterfacePhysicalAddress #@ stub CPNatfwtCreateProviderInstance #@ stub CPNatfwtDeregisterProviderInstance diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ffd0028ff42..079acbf2a9e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -97,6 +97,14 @@ DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) return ERROR_SUCCESS; } +DWORD WINAPI ConvertStringToGuidW( const WCHAR *str, GUID *guid ) +{ + UNICODE_STRING ustr; + + RtlInitUnicodeString( &ustr, str ); + return RtlNtStatusToDosError( RtlGUIDFromString( &ustr, guid ) ); +} + /****************************************************************** * AddIPAddress (IPHLPAPI.@) * diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index daf3fec0a98..39aa7123668 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -69,6 +69,7 @@ static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); DWORD WINAPI ConvertGuidToStringA( const GUID *, char *, DWORD ); DWORD WINAPI ConvertGuidToStringW( const GUID *, WCHAR *, DWORD ); +DWORD WINAPI ConvertStringToGuidW( const WCHAR *, GUID * ); static void loadIPHlpApi(void) { @@ -2339,7 +2340,7 @@ static void test_ConvertGuidToString( void ) DWORD err; char bufA[39]; WCHAR bufW[39]; - GUID guid = { 0xa, 0xb, 0xc, { 0xd, 0, 0xe, 0xf } }; + GUID guid = { 0xa, 0xb, 0xc, { 0xd, 0, 0xe, 0xf } }, guid2; err = ConvertGuidToStringA( &guid, bufA, 38 ); ok( err, "got %d\n", err ); @@ -2352,6 +2353,13 @@ static void test_ConvertGuidToString( void ) err = ConvertGuidToStringW( &guid, bufW, 39 ); ok( !err, "got %d\n", err ); ok( !wcscmp( bufW, L"{0000000A-000B-000C-0D00-0E0F00000000}" ), "got %s\n", debugstr_w( bufW ) ); + + err = ConvertStringToGuidW( bufW, &guid2 ); + ok( !err, "got %d\n", err ); + ok( IsEqualGUID( &guid, &guid2 ), "guid mismatch\n" ); + + err = ConvertStringToGuidW( L"foo", &guid2 ); + ok( err == ERROR_INVALID_PARAMETER, "got %d\n", err ); } START_TEST(iphlpapi) -- 2.23.0

1 0

[PATCH 4/6] iphlpapi: Implement ConvertGuidToString[AW]().
by Huw Davies 08 Jul '21

08 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi.spec | 4 ++-- dlls/iphlpapi/iphlpapi_main.c | 28 ++++++++++++++++++++++++++-- dlls/iphlpapi/tests/iphlpapi.c | 24 ++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 4299af36660..480b26c9315 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -10,8 +10,8 @@ @ stdcall AllocateAndGetUdpTableFromStack( ptr long long long ) @ stdcall CancelIPChangeNotify( ptr ) @ stdcall CancelMibChangeNotify2( ptr ) -#@ stub ConvertGuidToStringA -#@ stub ConvertGuidToStringW +@ stdcall ConvertGuidToStringA( ptr ptr long ) +@ stdcall ConvertGuidToStringW( ptr ptr long ) @ stdcall ConvertInterfaceAliasToLuid( ptr ptr ) @ stdcall ConvertInterfaceGuidToLuid( ptr ptr ) @ stdcall ConvertInterfaceIndexToLuid( long ptr ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index d8696f62ab7..ffd0028ff42 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -73,6 +73,30 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); #define INADDR_NONE ~0UL #endif +#define CHARS_IN_GUID 39 + +DWORD WINAPI ConvertGuidToStringA( const GUID *guid, char *str, DWORD len ) +{ + if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; + sprintf( str, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + return ERROR_SUCCESS; +} + +DWORD WINAPI ConvertGuidToStringW( const GUID *guid, WCHAR *str, DWORD len ) +{ + static const WCHAR fmt[] = { '{','%','0','8','X','-','%','0','4','X','-','%','0','4','X','-', + '%','0','2','X','%','0','2','X','-','%','0','2','X','%','0','2','X', + '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X','}',0 }; + + if (len < CHARS_IN_GUID) return ERROR_INSUFFICIENT_BUFFER; + sprintfW( str, fmt, + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], guid->Data4[2], + guid->Data4[3], guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + return ERROR_SUCCESS; +} + /****************************************************************** * AddIPAddress (IPHLPAPI.@) * @@ -989,7 +1013,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index } total_size = sizeof(IP_ADAPTER_ADDRESSES); - total_size += 39; /* "{00000000-0000-0000-0000-000000000000}" */ + total_size += CHARS_IN_GUID; total_size += IF_NAMESIZE * sizeof(WCHAR); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) total_size += IF_NAMESIZE * sizeof(WCHAR); @@ -1030,7 +1054,7 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, IF_INDEX index guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]); aa->AdapterName = ptr; - ptr += 39; + ptr += CHARS_IN_GUID; getInterfaceNameByIndex(index, name); if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME)) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index bbd3ac2cc9e..daf3fec0a98 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -67,6 +67,9 @@ static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IP PVOID, BOOLEAN, HANDLE *); static DWORD (WINAPI *pCancelMibChangeNotify2)(HANDLE); +DWORD WINAPI ConvertGuidToStringA( const GUID *, char *, DWORD ); +DWORD WINAPI ConvertGuidToStringW( const GUID *, WCHAR *, DWORD ); + static void loadIPHlpApi(void) { hLibrary = LoadLibraryA("iphlpapi.dll"); @@ -2331,6 +2334,26 @@ static void test_NotifyUnicastIpAddressChange(void) ok(!CloseHandle(handle), "CloseHandle() succeeded.\n"); } +static void test_ConvertGuidToString( void ) +{ + DWORD err; + char bufA[39]; + WCHAR bufW[39]; + GUID guid = { 0xa, 0xb, 0xc, { 0xd, 0, 0xe, 0xf } }; + + err = ConvertGuidToStringA( &guid, bufA, 38 ); + ok( err, "got %d\n", err ); + err = ConvertGuidToStringA( &guid, bufA, 39 ); + ok( !err, "got %d\n", err ); + ok( !strcmp( bufA, "{0000000A-000B-000C-0D00-0E0F00000000}" ), "got %s\n", bufA ); + + err = ConvertGuidToStringW( &guid, bufW, 38 ); + ok( err, "got %d\n", err ); + err = ConvertGuidToStringW( &guid, bufW, 39 ); + ok( !err, "got %d\n", err ); + ok( !wcscmp( bufW, L"{0000000A-000B-000C-0D00-0E0F00000000}" ), "got %s\n", debugstr_w( bufW ) ); +} + START_TEST(iphlpapi) { @@ -2363,6 +2386,7 @@ START_TEST(iphlpapi) test_GetUdp6Table(); test_ParseNetworkString(); test_NotifyUnicastIpAddressChange(); + test_ConvertGuidToString(); freeIPHlpApi(); } } -- 2.23.0

1 0

[PATCH 3/6] iphlpapi: Implement GetNumberOfInterfaces() on top of nsi.
by Huw Davies 08 Jul '21

08 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 21 +++++++++------------ dlls/iphlpapi/tests/iphlpapi.c | 4 ---- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index b869570bac0..d8696f62ab7 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2376,21 +2376,18 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) * RETURNS * NO_ERROR on success, ERROR_INVALID_PARAMETER if pdwNumIf is NULL. */ -DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) +DWORD WINAPI GetNumberOfInterfaces( DWORD *count ) { - DWORD ret; + DWORD err, num; - TRACE("pdwNumIf %p\n", pdwNumIf); - if (!pdwNumIf) - ret = ERROR_INVALID_PARAMETER; - else { - *pdwNumIf = get_interface_indices( FALSE, NULL ); - ret = NO_ERROR; - } - TRACE("returning %d\n", ret); - return ret; -} + TRACE( "count %p\n", count ); + if (!count) return ERROR_INVALID_PARAMETER; + err = NsiEnumerateObjectsAllParameters( 1, 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, NULL, 0, + NULL, 0, NULL, 0, NULL, 0, &num ); + *count = err ? 0 : num; + return err; +} /****************************************************************** * GetPerAdapterInfo (IPHLPAPI.@) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 87aeb99d6d9..bbd3ac2cc9e 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -138,10 +138,6 @@ static void testGetNumberOfInterfaces(void) } apiReturn = GetNumberOfInterfaces(&numInterfaces); - if (apiReturn == ERROR_NOT_SUPPORTED) { - skip("GetNumberOfInterfaces is not supported\n"); - return; - } ok(apiReturn == NO_ERROR, "GetNumberOfInterfaces returned %d, expected 0\n", apiReturn); } -- 2.23.0

1 0

[PATCH 2/6] iphlpapi: Implement IfGetEntry2Ex() on top of nsi.
by Huw Davies 08 Jul '21

08 Jul '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi.spec | 1 + dlls/iphlpapi/iphlpapi_main.c | 92 ++++++++++++++-------------------- dlls/iphlpapi/tests/iphlpapi.c | 61 +++++++--------------- include/netioapi.h | 2 + 4 files changed, 58 insertions(+), 98 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index 604852a754d..4299af36660 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -89,6 +89,7 @@ @ stub GetIcmpStatsFromStack @ stdcall GetIfEntry( ptr ) @ stdcall GetIfEntry2( ptr ) +@ stdcall GetIfEntry2Ex( long ptr ) @ stub GetIfEntryFromStack #@ stub GetIfStackTable @ stdcall GetIfTable( ptr ptr long ) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index dd2b9d7035c..b869570bac0 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1778,61 +1778,6 @@ DWORD WINAPI GetIfEntry(PMIB_IFROW pIfRow) return ret; } -/****************************************************************** - * GetIfEntry2 (IPHLPAPI.@) - */ -DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row2 ) -{ - DWORD ret; - char buf[MAX_ADAPTER_NAME], *name; - MIB_IFROW row; - - TRACE("%p\n", row2); - - if (!row2 || (!(name = getInterfaceNameByIndex( row2->InterfaceIndex, buf )) && - !(name = getInterfaceNameByIndex( row2->InterfaceLuid.Info.NetLuidIndex, buf )))) - { - return ERROR_INVALID_PARAMETER; - } - if ((ret = getInterfaceEntryByName( name, &row ))) return ret; - if ((ret = getInterfaceStatsByName( name, &row ))) return ret; - - memset( row2, 0, sizeof(*row2) ); - row2->InterfaceIndex = row.dwIndex; - ConvertInterfaceIndexToLuid( row2->InterfaceIndex, &row2->InterfaceLuid ); - ConvertInterfaceLuidToGuid( &row2->InterfaceLuid, &row2->InterfaceGuid ); - row2->Type = row.dwType; - row2->Mtu = row.dwMtu; - MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Description, ARRAY_SIZE(row2->Description) ); - MultiByteToWideChar( CP_UNIXCP, 0, (const char *)row.bDescr, -1, row2->Alias, ARRAY_SIZE(row2->Alias) ); - row2->PhysicalAddressLength = row.dwPhysAddrLen; - memcpy( &row2->PhysicalAddress, &row.bPhysAddr, row.dwPhysAddrLen ); - memcpy( &row2->PermanentPhysicalAddress, &row.bPhysAddr, row.dwPhysAddrLen ); - row2->OperStatus = row.dwOperStatus == MIB_IF_OPER_STATUS_OPERATIONAL ? IfOperStatusUp : IfOperStatusDown; - row2->AdminStatus = NET_IF_ADMIN_STATUS_UP; - row2->MediaConnectState = MediaConnectStateConnected; - row2->ConnectionType = NET_IF_CONNECTION_DEDICATED; - row2->TransmitLinkSpeed = row2->ReceiveLinkSpeed = row.dwSpeed; - row2->AccessType = (row2->Type == MIB_IF_TYPE_LOOPBACK) ? NET_IF_ACCESS_LOOPBACK : NET_IF_ACCESS_BROADCAST; - row2->InterfaceAndOperStatusFlags.ConnectorPresent = row2->Type != MIB_IF_TYPE_LOOPBACK; - row2->InterfaceAndOperStatusFlags.HardwareInterface = row2->Type != MIB_IF_TYPE_LOOPBACK; - - /* stats */ - row2->InOctets = row.dwInOctets; - row2->InUcastPkts = row.dwInUcastPkts; - row2->InNUcastPkts = row.dwInNUcastPkts; - row2->InDiscards = row.dwInDiscards; - row2->InErrors = row.dwInErrors; - row2->InUnknownProtos = row.dwInUnknownProtos; - row2->OutOctets = row.dwOutOctets; - row2->OutUcastPkts = row.dwOutUcastPkts; - row2->OutNUcastPkts = row.dwOutNUcastPkts; - row2->OutDiscards = row.dwOutDiscards; - row2->OutErrors = row.dwOutErrors; - - return NO_ERROR; -} - static int IfTableSorter(const void *a, const void *b) { int ret; @@ -1982,6 +1927,43 @@ static void if_row2_fill( MIB_IF_ROW2 *row, struct nsi_ndis_ifinfo_rw *rw, struc row->OutQLen = 0; /* fixme */ } +/****************************************************************** + * GetIfEntry2Ex (IPHLPAPI.@) + */ +DWORD WINAPI GetIfEntry2Ex( MIB_IF_TABLE_LEVEL level, MIB_IF_ROW2 *row ) +{ + DWORD err; + struct nsi_ndis_ifinfo_rw rw; + struct nsi_ndis_ifinfo_dynamic dyn; + struct nsi_ndis_ifinfo_static stat; + + TRACE( "(%d, %p)\n", level, row ); + + if (level != MibIfTableNormal) FIXME( "level %u not fully supported\n", level ); + if (!row) return ERROR_INVALID_PARAMETER; + + if (!row->InterfaceLuid.Value) + { + if (!row->InterfaceIndex) return ERROR_INVALID_PARAMETER; + err = ConvertInterfaceIndexToLuid( row->InterfaceIndex, &row->InterfaceLuid ); + if (err) return err; + } + + err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, + &row->InterfaceLuid, sizeof(row->InterfaceLuid), + &rw, sizeof(rw), &dyn, sizeof(dyn), &stat, sizeof(stat) ); + if (!err) if_row2_fill( row, &rw, &dyn, &stat ); + return err; +} + +/****************************************************************** + * GetIfEntry2 (IPHLPAPI.@) + */ +DWORD WINAPI GetIfEntry2( MIB_IF_ROW2 *row ) +{ + return GetIfEntry2Ex( MibIfTableNormal, row ); +} + /****************************************************************** * GetIfTable2Ex (IPHLPAPI.@) */ diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 54c820e522c..87aeb99d6d9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -53,9 +53,6 @@ static HMODULE hLibrary = NULL; static DWORD (WINAPI *pAllocateAndGetTcpExTableFromStack)(void**,BOOL,HANDLE,DWORD,DWORD); -static DWORD (WINAPI *pGetIfEntry2)(PMIB_IF_ROW2); -static DWORD (WINAPI *pGetIfTable2)(PMIB_IF_TABLE2*); -static DWORD (WINAPI *pGetIfTable2Ex)(MIB_IF_TABLE_LEVEL,PMIB_IF_TABLE2*); static DWORD (WINAPI *pGetTcp6Table)(PMIB_TCP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUdp6Table)(PMIB_UDP6TABLE,PDWORD,BOOL); static DWORD (WINAPI *pGetUnicastIpAddressEntry)(MIB_UNICASTIPADDRESS_ROW*); @@ -64,7 +61,6 @@ static DWORD (WINAPI *pGetExtendedTcpTable)(PVOID,PDWORD,BOOL,ULONG,TCP_TABLE_CL static DWORD (WINAPI *pGetExtendedUdpTable)(PVOID,PDWORD,BOOL,ULONG,UDP_TABLE_CLASS,ULONG); static DWORD (WINAPI *pCreateSortedAddressPairs)(const PSOCKADDR_IN6,ULONG,const PSOCKADDR_IN6,ULONG,ULONG, PSOCKADDR_IN6_PAIR*,ULONG*); -static void (WINAPI *pFreeMibTable)(void*); static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*); static DWORD (WINAPI *pParseNetworkString)(const WCHAR*,DWORD,NET_ADDRESS_INFO*,USHORT*,BYTE*); static DWORD (WINAPI *pNotifyUnicastIpAddressChange)(ADDRESS_FAMILY, PUNICAST_IPADDRESS_CHANGE_CALLBACK, @@ -76,9 +72,6 @@ static void loadIPHlpApi(void) hLibrary = LoadLibraryA("iphlpapi.dll"); if (hLibrary) { pAllocateAndGetTcpExTableFromStack = (void *)GetProcAddress(hLibrary, "AllocateAndGetTcpExTableFromStack"); - pGetIfEntry2 = (void *)GetProcAddress(hLibrary, "GetIfEntry2"); - pGetIfTable2 = (void *)GetProcAddress(hLibrary, "GetIfTable2"); - pGetIfTable2Ex = (void *)GetProcAddress(hLibrary, "GetIfTable2Ex"); pGetTcp6Table = (void *)GetProcAddress(hLibrary, "GetTcp6Table"); pGetUdp6Table = (void *)GetProcAddress(hLibrary, "GetUdp6Table"); pGetUnicastIpAddressEntry = (void *)GetProcAddress(hLibrary, "GetUnicastIpAddressEntry"); @@ -86,7 +79,6 @@ static void loadIPHlpApi(void) pGetExtendedTcpTable = (void *)GetProcAddress(hLibrary, "GetExtendedTcpTable"); pGetExtendedUdpTable = (void *)GetProcAddress(hLibrary, "GetExtendedUdpTable"); pCreateSortedAddressPairs = (void *)GetProcAddress(hLibrary, "CreateSortedAddressPairs"); - pFreeMibTable = (void *)GetProcAddress(hLibrary, "FreeMibTable"); pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask"); pParseNetworkString = (void *)GetProcAddress(hLibrary, "ParseNetworkString"); pNotifyUnicastIpAddressChange = (void *)GetProcAddress(hLibrary, "NotifyUnicastIpAddressChange"); @@ -1576,7 +1568,7 @@ static void test_CreateSortedAddressPairs(void) ok( pair_count >= 1, "got %u\n", pair_count ); ok( pair[0].SourceAddress != NULL, "src address not set\n" ); ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); - pFreeMibTable( pair ); + FreeMibTable( pair ); dst[1].sin6_family = AF_INET6; dst[1].sin6_addr.u.Word[5] = 0xffff; @@ -1593,7 +1585,7 @@ static void test_CreateSortedAddressPairs(void) ok( pair[0].DestinationAddress != NULL, "dst address not set\n" ); ok( pair[1].SourceAddress != NULL, "src address not set\n" ); ok( pair[1].DestinationAddress != NULL, "dst address not set\n" ); - pFreeMibTable( pair ); + FreeMibTable( pair ); } static DWORD get_interface_index(void) @@ -1862,27 +1854,22 @@ static void test_GetIfEntry2(void) MIB_IF_ROW2 row; NET_IFINDEX index; - if (!pGetIfEntry2) - { - win_skip( "GetIfEntry2 not available\n" ); - return; - } if (!(index = get_interface_index())) { skip( "no suitable interface found\n" ); return; } - ret = pGetIfEntry2( NULL ); + ret = GetIfEntry2( NULL ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); memset( &row, 0, sizeof(row) ); - ret = pGetIfEntry2( &row ); + ret = GetIfEntry2( &row ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); memset( &row, 0, sizeof(row) ); row.InterfaceIndex = index; - ret = pGetIfEntry2( &row ); + ret = GetIfEntry2( &row ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( row.InterfaceIndex == index, "got %u\n", index ); } @@ -1892,17 +1879,11 @@ static void test_GetIfTable2(void) DWORD ret; MIB_IF_TABLE2 *table; - if (!pGetIfTable2) - { - win_skip( "GetIfTable2 not available\n" ); - return; - } - table = NULL; - ret = pGetIfTable2( &table ); + ret = GetIfTable2( &table ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( table != NULL, "table not set\n" ); - pFreeMibTable( table ); + FreeMibTable( table ); } static void test_GetIfTable2Ex(void) @@ -1910,35 +1891,29 @@ static void test_GetIfTable2Ex(void) DWORD ret; MIB_IF_TABLE2 *table; - if (!pGetIfTable2Ex) - { - win_skip( "GetIfTable2Ex not available\n" ); - return; - } - table = NULL; - ret = pGetIfTable2Ex( MibIfTableNormal, &table ); + ret = GetIfTable2Ex( MibIfTableNormal, &table ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( table != NULL, "table not set\n" ); - pFreeMibTable( table ); + FreeMibTable( table ); table = NULL; - ret = pGetIfTable2Ex( MibIfTableRaw, &table ); + ret = GetIfTable2Ex( MibIfTableRaw, &table ); ok( ret == NO_ERROR, "got %u\n", ret ); ok( table != NULL, "table not set\n" ); - pFreeMibTable( table ); + FreeMibTable( table ); table = NULL; - ret = pGetIfTable2Ex( MibIfTableNormalWithoutStatistics, &table ); + ret = GetIfTable2Ex( MibIfTableNormalWithoutStatistics, &table ); ok( ret == NO_ERROR || broken(ret == ERROR_INVALID_PARAMETER), "got %u\n", ret ); ok( table != NULL || broken(!table), "table not set\n" ); - pFreeMibTable( table ); + FreeMibTable( table ); table = NULL; - ret = pGetIfTable2Ex( 3, &table ); + ret = GetIfTable2Ex( 3, &table ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); ok( !table, "table should not be set\n" ); - pFreeMibTable( table ); + FreeMibTable( table ); } static void test_GetUnicastIpAddressEntry(void) @@ -2070,12 +2045,12 @@ static void test_GetUnicastIpAddressTable(void) ret = pGetUnicastIpAddressTable(AF_INET, &table); ok( ret == NO_ERROR, "got %u\n", ret ); trace("GetUnicastIpAddressTable(AF_INET): NumEntries %u\n", table->NumEntries); - pFreeMibTable(table); + FreeMibTable( table ); ret = pGetUnicastIpAddressTable(AF_INET6, &table); ok( ret == NO_ERROR, "got %u\n", ret ); trace("GetUnicastIpAddressTable(AF_INET6): NumEntries %u\n", table->NumEntries); - pFreeMibTable(table); + FreeMibTable( table ); ret = pGetUnicastIpAddressTable(AF_UNSPEC, &table); ok( ret == NO_ERROR, "got %u\n", ret ); @@ -2099,7 +2074,7 @@ static void test_GetUnicastIpAddressTable(void) trace("CreationTimeStamp: %08x%08x\n", table->Table[i].CreationTimeStamp.HighPart, table->Table[i].CreationTimeStamp.LowPart); } - pFreeMibTable(table); + FreeMibTable( table ); } static void test_ConvertLengthToIpv4Mask(void) diff --git a/include/netioapi.h b/include/netioapi.h index 055266d946e..bbd203fc9b3 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -251,7 +251,9 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*); DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*); void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); +DWORD WINAPI GetIfEntry2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); +DWORD WINAPI GetIfTable2Ex(MIB_IF_TABLE_LEVEL,MIB_IF_TABLE2**); DWORD WINAPI GetIpInterfaceTable(ADDRESS_FAMILY,MIB_IPINTERFACE_TABLE**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); -- 2.23.0

1 0