mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-30 05:08:30 +00:00
iphlpapi: Fix the GAA_FLAG_INCLUDE_GATEWAYS constant name.
This commit is contained in:
parent
9909631f23
commit
8d2146934c
|
@ -1018,7 +1018,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG
|
||||||
luid = (family == AF_INET) ? &key4->luid : &key6->luid;
|
luid = (family == AF_INET) ? &key4->luid : &key6->luid;
|
||||||
if (luid->Value != aa->Luid.Value) continue;
|
if (luid->Value != aa->Luid.Value) continue;
|
||||||
|
|
||||||
if (flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS)
|
if (flags & GAA_FLAG_INCLUDE_GATEWAYS)
|
||||||
{
|
{
|
||||||
memset( &sockaddr, 0, sizeof(sockaddr) );
|
memset( &sockaddr, 0, sizeof(sockaddr) );
|
||||||
if (family == AF_INET)
|
if (family == AF_INET)
|
||||||
|
@ -1268,7 +1268,7 @@ static DWORD adapters_addresses_alloc( ULONG family, ULONG flags, IP_ADAPTER_ADD
|
||||||
if (err) goto err;
|
if (err) goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags & (GAA_FLAG_INCLUDE_ALL_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX))
|
if (flags & (GAA_FLAG_INCLUDE_GATEWAYS | GAA_FLAG_INCLUDE_PREFIX))
|
||||||
{
|
{
|
||||||
err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags );
|
err = call_families( gateway_and_prefix_addresses_alloc, aa, family, flags );
|
||||||
if (err) goto err;
|
if (err) goto err;
|
||||||
|
|
|
@ -1747,7 +1747,7 @@ static void init_networks( struct list_manager *mgr )
|
||||||
IP_ADAPTER_ADDRESSES *buf, *aa;
|
IP_ADAPTER_ADDRESSES *buf, *aa;
|
||||||
GUID id;
|
GUID id;
|
||||||
ULONG ret, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST |
|
ULONG ret, flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST |
|
||||||
GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_ALL_GATEWAYS;
|
GAA_FLAG_SKIP_DNS_SERVER | GAA_FLAG_INCLUDE_GATEWAYS;
|
||||||
|
|
||||||
list_init( &mgr->networks );
|
list_init( &mgr->networks );
|
||||||
list_init( &mgr->connections );
|
list_init( &mgr->connections );
|
||||||
|
|
|
@ -3086,11 +3086,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st
|
||||||
DWORD size = 0, ret;
|
DWORD size = 0, ret;
|
||||||
enum fill_status status = FILL_STATUS_UNFILTERED;
|
enum fill_status status = FILL_STATUS_UNFILTERED;
|
||||||
|
|
||||||
ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size );
|
ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &size );
|
||||||
if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
|
if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
|
||||||
|
|
||||||
if (!(buffer = malloc( size ))) return FILL_STATUS_FAILED;
|
if (!(buffer = malloc( size ))) return FILL_STATUS_FAILED;
|
||||||
if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size ))
|
if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, buffer, &size ))
|
||||||
{
|
{
|
||||||
free( buffer );
|
free( buffer );
|
||||||
return FILL_STATUS_FAILED;
|
return FILL_STATUS_FAILED;
|
||||||
|
|
|
@ -1221,7 +1221,7 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti
|
||||||
for (;;)
|
for (;;)
|
||||||
{
|
{
|
||||||
ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER |
|
ULONG flags = GAA_FLAG_SKIP_ANYCAST | GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER |
|
||||||
GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_INCLUDE_ALL_GATEWAYS;
|
GAA_FLAG_SKIP_FRIENDLY_NAME | GAA_FLAG_INCLUDE_GATEWAYS;
|
||||||
ULONG errcode = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, buf, &size);
|
ULONG errcode = GetAdaptersAddresses(AF_UNSPEC, flags, NULL, buf, &size);
|
||||||
|
|
||||||
if (errcode == ERROR_SUCCESS)
|
if (errcode == ERROR_SUCCESS)
|
||||||
|
|
|
@ -325,7 +325,7 @@ typedef IP_ADAPTER_ADDRESSES_LH *PIP_ADAPTER_ADDRESSES;
|
||||||
#define GAA_FLAG_INCLUDE_PREFIX 0x00000010
|
#define GAA_FLAG_INCLUDE_PREFIX 0x00000010
|
||||||
#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020
|
#define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020
|
||||||
#define GAA_FLAG_INCLUDE_WINS_INFO 0x00000040
|
#define GAA_FLAG_INCLUDE_WINS_INFO 0x00000040
|
||||||
#define GAA_FLAG_INCLUDE_ALL_GATEWAYS 0x00000080
|
#define GAA_FLAG_INCLUDE_GATEWAYS 0x00000080
|
||||||
#define GAA_FLAG_INCLUDE_ALL_INTERFACES 0x00000100
|
#define GAA_FLAG_INCLUDE_ALL_INTERFACES 0x00000100
|
||||||
#define GAA_FLAG_INCLUDE_ALL_COMPARTMENTS 0x00000200
|
#define GAA_FLAG_INCLUDE_ALL_COMPARTMENTS 0x00000200
|
||||||
#define GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER 0x00000400
|
#define GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER 0x00000400
|
||||||
|
|
|
@ -145,14 +145,14 @@ static void print_basic_information(void)
|
||||||
IP_ADAPTER_ADDRESSES *adapters;
|
IP_ADAPTER_ADDRESSES *adapters;
|
||||||
ULONG out = 0;
|
ULONG out = 0;
|
||||||
|
|
||||||
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS,
|
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS,
|
||||||
NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW)
|
NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW)
|
||||||
{
|
{
|
||||||
adapters = HeapAlloc(GetProcessHeap(), 0, out);
|
adapters = HeapAlloc(GetProcessHeap(), 0, out);
|
||||||
if (!adapters)
|
if (!adapters)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS,
|
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS,
|
||||||
NULL, adapters, &out) == ERROR_SUCCESS)
|
NULL, adapters, &out) == ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
IP_ADAPTER_ADDRESSES *p;
|
IP_ADAPTER_ADDRESSES *p;
|
||||||
|
@ -293,14 +293,14 @@ static void print_full_information(void)
|
||||||
HeapFree(GetProcessHeap(), 0, info);
|
HeapFree(GetProcessHeap(), 0, info);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS,
|
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS,
|
||||||
NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW)
|
NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW)
|
||||||
{
|
{
|
||||||
adapters = HeapAlloc(GetProcessHeap(), 0, out);
|
adapters = HeapAlloc(GetProcessHeap(), 0, out);
|
||||||
if (!adapters)
|
if (!adapters)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS,
|
if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS,
|
||||||
NULL, adapters, &out) == ERROR_SUCCESS)
|
NULL, adapters, &out) == ERROR_SUCCESS)
|
||||||
{
|
{
|
||||||
IP_ADAPTER_ADDRESSES *p;
|
IP_ADAPTER_ADDRESSES *p;
|
||||||
|
|
Loading…
Reference in a new issue