ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iphlpapi: Add support for ConvertLengthToIpv4Mask(). 

Signed-off-by: Dagfinn Reiakvam <dagfinn@reiakvam.no>
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Dagfinn Reiakvam 2018-03-20 18:27:04 +01:00 committed by Alexandre Julliard
parent f57d316cd3
commit 1d82495ba1
4 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/iphlpapi/iphlpapi.spec
View File

@ -23,7 +23,7 @@
@ stdcall ConvertInterfaceNameToLuidW( wstr ptr )
#@ stub ConvertInterfacePhysicalAddressToLuid
#@ stub ConvertIpv4MaskToLength
#@ stub ConvertLengthToIpv4Mask
@ stdcall ConvertLengthToIpv4Mask( long ptr )
#@ stub ConvertRemoteInterfaceAliasToLuid
#@ stub ConvertRemoteInterfaceGuidToLuid
#@ stub ConvertRemoteInterfaceIndexToLuid

19
dlls/iphlpapi/iphlpapi_main.c
View File

@ -3222,6 +3222,25 @@ DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR *name, NET_LUID *luid)
return NO_ERROR;
}
/******************************************************************
* ConvertLengthToIpv4Mask (IPHLPAPI.@)
*/
DWORD WINAPI ConvertLengthToIpv4Mask(ULONG mask_len, ULONG *mask)
{
if (mask_len > 32)
{
*mask = INADDR_NONE;
return ERROR_INVALID_PARAMETER;
}
if (mask_len == 0)
*mask = 0;
else
*mask = htonl(~0u << (32 - mask_len));
return NO_ERROR;
}
/******************************************************************
* if_nametoindex (IPHLPAPI.@)
*/

36
dlls/iphlpapi/tests/iphlpapi.c
View File

@ -96,6 +96,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameW)(const NET_LUID*,WCHAR*,SIZE_
static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T);
static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*);
static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*);
static DWORD (WINAPI *pConvertLengthToIpv4Mask)(ULONG,ULONG*);
static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR);
static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*);
@ -149,6 +150,7 @@ static void loadIPHlpApi(void)
pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW");
pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA");
pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW");
pConvertLengthToIpv4Mask = (void *)GetProcAddress(hLibrary, "ConvertLengthToIpv4Mask");
pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname");
pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex");
}
@ -2174,6 +2176,39 @@ static void test_GetUnicastIpAddressTable(void)
pFreeMibTable(table);
}
static void test_ConvertLengthToIpv4Mask(void)
{
DWORD ret;
DWORD n;
ULONG mask;
ULONG expected;
if (!pConvertLengthToIpv4Mask)
{
win_skip( "ConvertLengthToIpv4Mask not available\n" );
return;
}
for (n = 0; n <= 32; n++)
{
mask = 0xdeadbeef;
if (n > 0)
expected = htonl( ~0u << (32 - n) );
else
expected = 0;
ret = pConvertLengthToIpv4Mask( n, &mask );
ok( ret == NO_ERROR, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, NO_ERROR );
ok( mask == expected, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, expected );
}
/* Testing for out of range. In this case both mask and return are changed to indicate error. */
mask = 0xdeadbeef;
ret = pConvertLengthToIpv4Mask( 33, &mask );
ok( ret == ERROR_INVALID_PARAMETER, "ConvertLengthToIpv4Mask returned 0x%08x, expected 0x%08x\n", ret, ERROR_INVALID_PARAMETER );
ok( mask == INADDR_NONE, "ConvertLengthToIpv4Mask mask value 0x%08x, expected 0x%08x\n", mask, INADDR_NONE );
}
START_TEST(iphlpapi)
{
@ -2201,6 +2236,7 @@ START_TEST(iphlpapi)
test_GetIfTable2Ex();
test_GetUnicastIpAddressEntry();
test_GetUnicastIpAddressTable();
test_ConvertLengthToIpv4Mask();
freeIPHlpApi();
}
}

1
include/netioapi.h
View File

@ -170,6 +170,7 @@ DWORD WINAPI ConvertInterfaceLuidToNameA(const NET_LUID*,char*,SIZE_T);
DWORD WINAPI ConvertInterfaceLuidToNameW(const NET_LUID*,WCHAR*,SIZE_T);
DWORD WINAPI ConvertInterfaceNameToLuidA(const char*,NET_LUID*);
DWORD WINAPI ConvertInterfaceNameToLuidW(const WCHAR*,NET_LUID*);
DWORD WINAPI ConvertLengthToIpv4Mask(ULONG,ULONG*);
void WINAPI FreeMibTable(void*);
DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*);
DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**);