[PATCH 0/1] MR2611: iphlpapi: Fix the GAA_FLAG_INCLUDE_GATEWAYS constant name.
From: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi_main.c | 4 ++-- dlls/netprofm/list.c | 2 +- dlls/wbemprox/builtin.c | 4 ++-- dlls/wininet/internet.c | 2 +- include/iptypes.h | 2 +- programs/ipconfig/ipconfig.c | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 4afe3470630..d22209ff719 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1018,7 +1018,7 @@ static DWORD gateway_and_prefix_addresses_alloc( IP_ADAPTER_ADDRESSES *aa, ULONG luid = (family == AF_INET) ? &key4->luid : &key6->luid; 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) ); 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 (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 ); if (err) goto err; diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 3f10bcb8005..40e03cb94f7 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -1747,7 +1747,7 @@ static void init_networks( struct list_manager *mgr ) IP_ADAPTER_ADDRESSES *buf, *aa; GUID id; 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->connections ); diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 9cae1750b73..7c4e530a6d0 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3086,11 +3086,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st DWORD size = 0, ret; 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 (!(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 ); return FILL_STATUS_FAILED; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 6dabb0fc5e3..6155d60938a 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1221,7 +1221,7 @@ BOOL WINAPI InternetGetConnectedStateExW(LPDWORD lpdwStatus, LPWSTR lpszConnecti for (;;) { 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); if (errcode == ERROR_SUCCESS) diff --git a/include/iptypes.h b/include/iptypes.h index c1ee7322b01..d8609654748 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -325,7 +325,7 @@ typedef IP_ADAPTER_ADDRESSES_LH *PIP_ADAPTER_ADDRESSES; #define GAA_FLAG_INCLUDE_PREFIX 0x00000010 #define GAA_FLAG_SKIP_FRIENDLY_NAME 0x00000020 #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_COMPARTMENTS 0x00000200 #define GAA_FLAG_INCLUDE_TUNNEL_BINDINGORDER 0x00000400 diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index b787947885d..40324a0a493 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -145,14 +145,14 @@ static void print_basic_information(void) IP_ADAPTER_ADDRESSES *adapters; 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) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p; @@ -293,14 +293,14 @@ static void print_full_information(void) 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) { adapters = HeapAlloc(GetProcessHeap(), 0, out); if (!adapters) exit(1); - if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, + if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, adapters, &out) == ERROR_SUCCESS) { IP_ADAPTER_ADDRESSES *p; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/2611
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2611
This merge request was approved by Hans Leidekker. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/2611
participants (4)
-
Francois Gouget -
Francois Gouget (＠fgouget)
-
Hans Leidekker (＠hans)
-
Huw Davies (＠huw)