October 2010 - Wine-commits

Henri Verbeet : ddraw: Use a linear filter in ddraw_surface7_Blt().
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 4d19daaa71b9db6990198d9feb2ea364b2b65558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d19daaa71b9db6990198d9fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 13:40:01 2010 +0200 ddraw: Use a linear filter in ddraw_surface7_Blt(). --- dlls/ddraw/surface.c | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index badd46b..8c8fb89 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -907,13 +907,8 @@ static HRESULT WINAPI ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *DestR * and replace the ddraw surfaces with the wined3d surfaces * So far no blitting operations using surfaces in the bltfx struct are supported anyway. */ - hr = IWineD3DSurface_Blt(This->WineD3DSurface, - DestRect, - Src ? Src->WineD3DSurface : NULL, - SrcRect, - Flags, - (WINEDDBLTFX *) DDBltFx, - WINED3DTEXF_POINT); + hr = IWineD3DSurface_Blt(This->WineD3DSurface, DestRect, Src ? Src->WineD3DSurface : NULL, + SrcRect, Flags, (WINEDDBLTFX *)DDBltFx, WINED3DTEXF_LINEAR); LeaveCriticalSection(&ddraw_cs); switch(hr)

1 0

Henri Verbeet : wined3d: Recognize the SM4 sampler register type.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 6cbf1dd4b5633fbdd0cd1dbbd474f7a394a85095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cbf1dd4b5633fbdd0cd1dbbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 13:40:02 2010 +0200 wined3d: Recognize the SM4 sampler register type. --- dlls/wined3d/shader_sm4.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 1b4dbd5..d7bd76f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -88,6 +88,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_OUTPUT = 0x2, WINED3D_SM4_RT_IMMCONST = 0x4, + WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_CONSTBUFFER = 0x8, WINED3D_SM4_RT_NULL = 0xd, }; @@ -164,7 +165,7 @@ static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = /* UNKNOWN */ 0, /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, /* UNKNOWN */ 0, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* UNKNOWN */ 0,

1 0

Henri Verbeet : wined3d: Recognize the SM4 resource register type.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 916167e93aea5c3cfcd8e7fdea07119721b76961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=916167e93aea5c3cfcd8e7fde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 13:40:03 2010 +0200 wined3d: Recognize the SM4 resource register type. --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f6546c8..1febf56 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1027,6 +1027,10 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, TRACE("null"); break; + case WINED3DSPR_RESOURCE: + TRACE("t"); + break; + default: TRACE("unhandled_rtype(%#x)", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d7bd76f..2bcd3d3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -166,7 +166,7 @@ static const WINED3DSHADER_PARAM_REGISTER_TYPE register_type_table[] = /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_RESOURCE */ WINED3DSPR_RESOURCE, /* WINED3D_SM4_RT_CONSTBUFFER */ WINED3DSPR_CONSTBUFFER, /* UNKNOWN */ 0, /* UNKNOWN */ 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b291d43..7959c8e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -309,6 +309,7 @@ typedef enum _WINED3DSHADER_PARAM_REGISTER_TYPE WINED3DSPR_IMMCONST, WINED3DSPR_CONSTBUFFER, WINED3DSPR_NULL, + WINED3DSPR_RESOURCE, } WINED3DSHADER_PARAM_REGISTER_TYPE; enum wined3d_immconst_type

1 0

Henri Verbeet : wined3d: Skip SM4 source register modifiers.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 0e4e19697908b0cc39d79310fb0fa2314984a303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e4e19697908b0cc39d79310f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 13:40:04 2010 +0200 wined3d: Skip SM4 source register modifiers. --- dlls/wined3d/shader_sm4.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 2bcd3d3..d893b05 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -28,6 +28,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); #define WINED3D_SM4_OPCODE_MASK 0xff +#define WINED3D_SM4_REGISTER_MODIFIER (1 << 31) + #define WINED3D_SM4_REGISTER_ORDER_SHIFT 20 #define WINED3D_SM4_REGISTER_ORDER_MASK (0x3 << WINED3D_SM4_REGISTER_ORDER_SHIFT) @@ -345,6 +347,12 @@ static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wine src_param->reg.type = register_type_table[register_type]; } + if (token & WINED3D_SM4_REGISTER_MODIFIER) + { + DWORD modifier = *(*ptr)++; + FIXME("Skipping modifier 0x%08x.\n", modifier); + } + order = (token & WINED3D_SM4_REGISTER_ORDER_MASK) >> WINED3D_SM4_REGISTER_ORDER_SHIFT; if (order < 1) src_param->reg.idx = ~0U;

1 0

Henri Verbeet : wined3d: Skip SM4 instruction modifiers.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 5eb7a44a2e65891aa5b2a72d5869a02c13c313d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eb7a44a2e65891aa5b2a72d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 12 13:40:05 2010 +0200 wined3d: Skip SM4 instruction modifiers. --- dlls/wined3d/shader_sm4.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d893b05..e32178e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -23,6 +23,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); +#define WINED3D_SM4_INSTRUCTION_MODIFIER (1 << 31) + #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0xf << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) @@ -326,6 +328,12 @@ static void shader_sm4_read_opcode(void *data, const DWORD **ptr, struct wined3d ins->predicate = 0; ins->dst_count = opcode_info->dst_count; ins->src_count = opcode_info->src_count; + + if (token & WINED3D_SM4_INSTRUCTION_MODIFIER) + { + DWORD modifier = *(*ptr)++; + FIXME("Skipping modifier 0x%08x.\n", modifier); + } } static void shader_sm4_read_src_param(void *data, const DWORD **ptr, struct wined3d_shader_src_param *src_param,

1 0

Dmitry Timoshkov : oleaut32: Handle VT_DATE in serialize_param()/ deserialize_param().
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 72da0a2d49d4c0856faa085e4e326d0382425e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72da0a2d49d4c0856faa085e4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 12 21:18:43 2010 +0900 oleaut32: Handle VT_DATE in serialize_param()/deserialize_param(). --- dlls/oleaut32/tmarshal.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 26babdb..bfe17c8 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -615,6 +615,7 @@ serialize_param( vartype = VT_SAFEARRAY; switch (vartype) { + case VT_DATE: case VT_I8: case VT_UI8: case VT_R8: @@ -911,6 +912,7 @@ deserialize_param( } return S_OK; } + case VT_DATE: case VT_I8: case VT_UI8: case VT_R8:

1 0

Juan Lang : iphlpapi: Only return gateway addresses if GAA_FLAG_INCLUDE_ALL_GATEWAYS is specified .
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 60354102c054094565b094fc8f9e9c4ff75ceddd URL: http://source.winehq.org/git/wine.git/?a=commit;h=60354102c054094565b094fc8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 13:17:45 2010 -0700 iphlpapi: Only return gateway addresses if GAA_FLAG_INCLUDE_ALL_GATEWAYS is specified. --- dlls/iphlpapi/iphlpapi_main.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f14f337..fef5637 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -716,7 +716,8 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, return row; } -static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) +static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, + IP_ADAPTER_ADDRESSES *aa, ULONG *size) { ULONG ret, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; @@ -725,26 +726,29 @@ static ULONG adapterAddressesFromIndex(ULONG family, DWORD index, IP_ADAPTER_ADD if (family == WS_AF_INET) { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, - GetProcessHeap(), 0); - if (!ret) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); - num_v4_gateways = count_v4_gateways(index, routeTable); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); + if (!ret) + num_v4_gateways = count_v4_gateways(index, routeTable); } } else if (family == WS_AF_INET6) ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); else if (family == WS_AF_UNSPEC) { - ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, - GetProcessHeap(), 0); - if (!ret) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); - num_v4_gateways = count_v4_gateways(index, routeTable); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, + GetProcessHeap(), 0); if (!ret) + { + num_v4_gateways = count_v4_gateways(index, routeTable); ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + } } } else @@ -929,7 +933,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, for (i = 0; i < table->numIndexes; i++) { size = 0; - if ((ret = adapterAddressesFromIndex(family, table->indexes[i], NULL, &size))) + if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], NULL, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret; @@ -941,7 +945,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, ULONG bytes_left = size = total_size; for (i = 0; i < table->numIndexes; i++) { - if ((ret = adapterAddressesFromIndex(family, table->indexes[i], aa, &size))) + if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], aa, &size))) { HeapFree(GetProcessHeap(), 0, table); return ret;

1 0

Juan Lang : iphlpapi: Honor GAA_FLAG_SKIP_UNICAST.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: c44c16cf740e3b970cd7d23838a4742c0364adf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c44c16cf740e3b970cd7d2383… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 13:19:34 2010 -0700 iphlpapi: Honor GAA_FLAG_SKIP_UNICAST. --- dlls/iphlpapi/iphlpapi_main.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index fef5637..190c0ca 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -719,14 +719,15 @@ static PMIB_IPFORWARDROW findIPv4Gateway(DWORD index, static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, IP_ADAPTER_ADDRESSES *aa, ULONG *size) { - ULONG ret, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; + ULONG ret = ERROR_SUCCESS, i, num_v4addrs = 0, num_v4_gateways = 0, num_v6addrs = 0, total_size; DWORD *v4addrs = NULL; SOCKET_ADDRESS *v6addrs = NULL; PMIB_IPFORWARDTABLE routeTable = NULL; if (family == WS_AF_INET) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, @@ -736,10 +737,14 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, } } else if (family == WS_AF_INET6) - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + { + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + } else if (family == WS_AF_UNSPEC) { - ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v4addressesFromIndex(index, &v4addrs, &num_v4addrs); if (!ret && flags & GAA_FLAG_INCLUDE_ALL_GATEWAYS) { ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, @@ -747,7 +752,8 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, if (!ret) { num_v4_gateways = count_v4_gateways(index, routeTable); - ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); + if (!(flags & GAA_FLAG_SKIP_UNICAST)) + ret = v6addressesFromIndex(index, &v6addrs, &num_v6addrs); } } }

1 0

Juan Lang : iphlpapi: Honor GAA_FLAG_SKIP_FRIENDLY_NAME.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 434cd6c609d72cb92578077343ffbce9b9f92d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=434cd6c609d72cb9257807734… Author: Juan Lang <juan.lang(a)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;

1 0

Juan Lang : iphlpapi: Set DNS servers in GetAdaptersAddresses when GAA_FLAG_SKIP_DNS_SERVER isn' t specified.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 873034c72d46d079bcabd4648599a9aa3561e66c URL: http://source.winehq.org/git/wine.git/?a=commit;h=873034c72d46d079bcabd4648… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 09:05:06 2010 -0700 iphlpapi: Set DNS servers in GetAdaptersAddresses when GAA_FLAG_SKIP_DNS_SERVER isn't specified. --- dlls/iphlpapi/iphlpapi_main.c | 67 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 66 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 52d1c58..ae2dd76 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -924,11 +924,55 @@ static ULONG adapterAddressesFromIndex(ULONG family, ULONG flags, DWORD index, return ERROR_SUCCESS; } +static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, ULONG *len) +{ + DWORD size; + + initialise_resolver(); + /* FIXME: no support for IPv6 DNS server addresses. Doing so requires + * sizeof SOCKADDR_STORAGE instead, and using _res._u._ext.nsaddrs when + * available. + */ + size = _res.nscount * (sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR)); + if (!address || *len < size) + { + *len = size; + return ERROR_BUFFER_OVERFLOW; + } + *len = size; + if (_res.nscount > 0) + { + PIP_ADAPTER_DNS_SERVER_ADDRESS addr; + int i; + + for (i = 0, addr = address; i < _res.nscount && addr; + i++, addr = addr->Next) + { + SOCKADDR_IN *sin; + + addr->Address.iSockaddrLength = sizeof(SOCKADDR); + addr->Address.lpSockaddr = + (LPSOCKADDR)((PBYTE)addr + sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS)); + sin = (SOCKADDR_IN *)addr->Address.lpSockaddr; + sin->sin_family = WS_AF_INET; + sin->sin_port = _res.nsaddr_list[i].sin_port; + memcpy(&sin->sin_addr, &_res.nsaddr_list[i].sin_addr, sizeof(sin->sin_addr)); + if (i == _res.nscount - 1) + addr->Next = NULL; + else + addr->Next = + (PIP_ADAPTER_DNS_SERVER_ADDRESS)((PBYTE)addr + + sizeof(IP_ADAPTER_DNS_SERVER_ADDRESS) + sizeof(SOCKADDR)); + } + } + return ERROR_SUCCESS; +} + ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, PIP_ADAPTER_ADDRESSES aa, PULONG buflen) { InterfaceIndexTable *table; - ULONG i, size, total_size, ret = ERROR_NO_DATA; + ULONG i, size, dns_server_size, total_size, ret = ERROR_NO_DATA; TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); @@ -951,9 +995,20 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, } total_size += size; } + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + { + /* Since DNS servers aren't really per adapter, get enough space for a + * single copy of them. + */ + get_dns_server_addresses(NULL, &dns_server_size); + total_size += dns_server_size; + } if (aa && *buflen >= total_size) { ULONG bytes_left = size = total_size; + PIP_ADAPTER_ADDRESSES first_aa = aa; + PIP_ADAPTER_DNS_SERVER_ADDRESS firstDns; + for (i = 0; i < table->numIndexes; i++) { if ((ret = adapterAddressesFromIndex(family, flags, table->indexes[i], aa, &size))) @@ -968,6 +1023,16 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, size = bytes_left -= size; } } + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + { + firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)aa + total_size - dns_server_size); + get_dns_server_addresses(firstDns, &dns_server_size); + for (aa = first_aa; aa; aa = aa->Next) + { + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) + aa->FirstDnsServerAddress = firstDns; + } + } ret = ERROR_SUCCESS; } if (*buflen < total_size) ret = ERROR_BUFFER_OVERFLOW;

1 0