Juan Lang : iphlpapi: Honor GAA_FLAG_SKIP_FRIENDLY_NAME.
Alexandre Julliard
julliard at winehq.org
Tue Oct 12 11:26:59 CDT 2010
Module: wine
Branch: master
Commit: 434cd6c609d72cb92578077343ffbce9b9f92d31
URL: http://source.winehq.org/git/wine.git/?a=commit;h=434cd6c609d72cb92578077343ffbce9b9f92d31
Author: Juan Lang <juan.lang at gmail.com>
Date: Mon Oct 11 08:50:00 2010 -0700
iphlpapi: Honor GAA_FLAG_SKIP_FRIENDLY_NAME.
---
dlls/iphlpapi/iphlpapi_main.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 190c0ca..52d1c58 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -770,7 +770,9 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index,
total_size = sizeof(IP_ADAPTER_ADDRESSES);
total_size += IF_NAMESIZE;
- total_size += 2 * IF_NAMESIZE * sizeof(WCHAR);
+ total_size += IF_NAMESIZE * sizeof(WCHAR);
+ if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME))
+ total_size += IF_NAMESIZE * sizeof(WCHAR);
total_size += sizeof(IP_ADAPTER_UNICAST_ADDRESS) * num_v4addrs;
total_size += sizeof(struct sockaddr_in) * num_v4addrs;
total_size += (sizeof(IP_ADAPTER_GATEWAY_ADDRESS) + sizeof(SOCKADDR_IN)) * num_v4_gateways;
@@ -793,11 +795,14 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index,
memcpy(ptr, name, IF_NAMESIZE);
aa->AdapterName = ptr;
ptr += IF_NAMESIZE;
- aa->FriendlyName = (WCHAR *)ptr;
- for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++)
- *dst = *src;
- *dst++ = 0;
- ptr = (char *)dst;
+ if (!(flags & GAA_FLAG_SKIP_FRIENDLY_NAME))
+ {
+ aa->FriendlyName = (WCHAR *)ptr;
+ for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++)
+ *dst = *src;
+ *dst++ = 0;
+ ptr = (char *)dst;
+ }
aa->Description = (WCHAR *)ptr;
for (src = name, dst = (WCHAR *)ptr; *src; src++, dst++)
*dst = *src;
More information about the wine-cvs
mailing list