October 2010 - Wine-Commits

Krzysztof Nowicki : ntdll: Fix possible deadlock in vectored exception handling.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: eb0e82a75568db095df5f78be703987147f00f66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0e82a75568db095df5f78be… Author: Krzysztof Nowicki <krissn(a)op.pl> Date: Fri Oct 8 20:03:14 2010 +0200 ntdll: Fix possible deadlock in vectored exception handling. --- dlls/ntdll/exception.c | 29 ++++++++++++++++------------- dlls/ntdll/ntdll_misc.h | 1 + dlls/ntdll/thread.c | 1 + 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c index 63fd281..4d2f759 100644 --- a/dlls/ntdll/exception.c +++ b/dlls/ntdll/exception.c @@ -48,14 +48,17 @@ typedef struct static struct list vectored_handlers = LIST_INIT(vectored_handlers); -static RTL_CRITICAL_SECTION vectored_handlers_section; -static RTL_CRITICAL_SECTION_DEBUG critsect_debug = +static RTL_RWLOCK vectored_handlers_lock; + +/********************************************************************** + * exceptions_init + * + * Initialize read/write lock used by the vectored exception handling. + */ +void exceptions_init(void) { - 0, 0, &vectored_handlers_section, - { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": vectored_handlers_section") } -}; -static RTL_CRITICAL_SECTION vectored_handlers_section = { &critsect_debug, -1, 0, 0, 0, 0 }; + RtlInitializeResource(&vectored_handlers_lock); +} /********************************************************************** * wait_suspend @@ -162,7 +165,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) except_ptrs.ExceptionRecord = rec; except_ptrs.ContextRecord = context; - RtlEnterCriticalSection( &vectored_handlers_section ); + RtlAcquireResourceShared( &vectored_handlers_lock, TRUE ); LIST_FOR_EACH( ptr, &vectored_handlers ) { VECTORED_HANDLER *handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -172,7 +175,7 @@ LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) TRACE( "handler at %p returned %x\n", handler->func, ret ); if (ret == EXCEPTION_CONTINUE_EXECUTION) break; } - RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlReleaseResource( &vectored_handlers_lock ); return ret; } @@ -214,10 +217,10 @@ PVOID WINAPI RtlAddVectoredExceptionHandler( ULONG first, PVECTORED_EXCEPTION_HA if (handler) { handler->func = func; - RtlEnterCriticalSection( &vectored_handlers_section ); + RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE ); if (first) list_add_head( &vectored_handlers, &handler->entry ); else list_add_tail( &vectored_handlers, &handler->entry ); - RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlReleaseResource( &vectored_handlers_lock ); } return handler; } @@ -231,7 +234,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) struct list *ptr; ULONG ret = FALSE; - RtlEnterCriticalSection( &vectored_handlers_section ); + RtlAcquireResourceExclusive( &vectored_handlers_lock, TRUE ); LIST_FOR_EACH( ptr, &vectored_handlers ) { VECTORED_HANDLER *curr_handler = LIST_ENTRY( ptr, VECTORED_HANDLER, entry ); @@ -242,7 +245,7 @@ ULONG WINAPI RtlRemoveVectoredExceptionHandler( PVOID handler ) break; } } - RtlLeaveCriticalSection( &vectored_handlers_section ); + RtlReleaseResource( &vectored_handlers_lock ); if (ret) RtlFreeHeap( GetProcessHeap(), 0, handler ); return ret; } diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 212edf5..3c35251 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,6 +71,7 @@ extern void virtual_init(void); extern void virtual_init_threading(void); extern void fill_cpu_info(void); extern void heap_set_debug_flags( HANDLE handle ); +extern void exceptions_init(void); /* server support */ extern timeout_t server_start_time; diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index df6c3e2..bd24aa0 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -296,6 +296,7 @@ HANDLE thread_init(void) user_shared_data->TickCountMultiplier = 1 << 24; fill_cpu_info(); + exceptions_init(); return exe_file; }

1 0

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

Oct. 12, 2010

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: Skip SM4 source register modifiers.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

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

Hwang YunSong : taskkill: Update Korean resource.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: 80a06a92a9a4465c9cb3960de9c7b48d423d44b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a06a92a9a4465c9cb3960de… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Oct 12 11:25:50 2010 +0900 taskkill: Update Korean resource. --- programs/taskkill/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Ko.rc b/programs/taskkill/Ko.rc index 5e22785..02b1011 100644 --- a/programs/taskkill/Ko.rc +++ b/programs/taskkill/Ko.rc @@ -41,4 +41,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "에러: 프로세스 \"%s\"를 찾을 수 없습니다.\n" STRING_ENUM_FAILED, "에러: 프로세스 목록을 열거 할 수 업습니다.\n" STRING_TERMINATE_FAILED, "에러: \"%s\" 프로세스를 중단시킬 수 없습니다.\n" + STRING_SELF_TERMINATION, "에러: 프로세스 자가 종료는 허용되지 않습니다.\n" }

1 0

Andrew Talbot : gdi32: Constify some variables.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: bbd355614654ccf49e0180797f565c103c19a1f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbd355614654ccf49e0180797… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Oct 11 22:25:15 2010 +0100 gdi32: Constify some variables. --- dlls/gdi32/bidi.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/bidi.c b/dlls/gdi32/bidi.c index 4ef0e99..297ce86 100644 --- a/dlls/gdi32/bidi.c +++ b/dlls/gdi32/bidi.c @@ -198,9 +198,9 @@ static int resolveParagraphs(WORD *types, int cch) Breaks a paragraph into lines - Input: Character count + Input: Array of line break flags + Character count In/Out: Array of characters - Array of line break flags Returns the count of characters on the first line @@ -209,7 +209,7 @@ static int resolveParagraphs(WORD *types, int cch) occurs after the character in pszInput[n]. Breaks before the first character are not allowed. ------------------------------------------------------------------------*/ -static int resolveLines(LPCWSTR pszInput, BOOL * pbrk, int cch) +static int resolveLines(LPCWSTR pszInput, const BOOL * pbrk, int cch) { /* skip characters not of type LS */ int ich = 0; @@ -289,14 +289,14 @@ static void resolveWhitespace(int baselevel, const WORD *pcls, BYTE *plevel, int Implements the Line-by-Line phases of the Unicode Bidi Algorithm Input: Count of characters + Array of character directions Inp/Out: Input text - Array of character directions Array of levels ------------------------------------------------------------------------*/ -static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, WORD * pclsLine, - BYTE * plevelLine, int cchPara, BOOL * pbrk) +static void BidiLines(int baselevel, LPWSTR pszOutLine, LPCWSTR pszLine, const WORD * pclsLine, + BYTE * plevelLine, int cchPara, const BOOL * pbrk) { int cchLine = 0; int done = 0;

1 0

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

Oct. 12, 2010

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

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

Oct. 12, 2010

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

Vincent Povirk : aclocal: Detect the mingw variant named amd64-mingw32msvc.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

Module: wine Branch: master Commit: d21037519f0ff35e08894a690345d6e7305dc634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21037519f0ff35e08894a690… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Oct 11 15:55:40 2010 -0500 aclocal: Detect the mingw variant named amd64-mingw32msvc. --- aclocal.m4 | 3 ++- configure | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 021159d..485f8d6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -128,7 +128,8 @@ AC_DEFUN([WINE_CHECK_MINGW_PROG], ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, mingw32msvc, mingw32], m4_foreach([ac_wine_cpu],[i686,i586,i486,i386],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; x86_64) - ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32,w64-mingw32],[x86_64-ac_wine_prefix-$2 ])" ;; + ac_prefix_list="m4_foreach([ac_wine_prefix],[pc-mingw32, w64-mingw32, mingw32msvc], + m4_foreach([ac_wine_cpu],[x86_64,amd64],[ac_wine_cpu-ac_wine_prefix-$2 ]))" ;; *) ac_prefix_list="" ;; esac diff --git a/configure b/configure index 24deb97..e2b7257 100755 --- a/configure +++ b/configure @@ -7018,7 +7018,7 @@ then i[3456789]86*) ac_prefix_list="i686-pc-mingw32-gcc i586-pc-mingw32-gcc i486-pc-mingw32-gcc i386-pc-mingw32-gcc i686-mingw32msvc-gcc i586-mingw32msvc-gcc i486-mingw32msvc-gcc i386-mingw32msvc-gcc i686-mingw32-gcc i586-mingw32-gcc i486-mingw32-gcc i386-mingw32-gcc " ;; x86_64) - ac_prefix_list="x86_64-pc-mingw32-gcc x86_64-w64-mingw32-gcc " ;; + ac_prefix_list="x86_64-pc-mingw32-gcc amd64-pc-mingw32-gcc x86_64-w64-mingw32-gcc amd64-w64-mingw32-gcc x86_64-mingw32msvc-gcc amd64-mingw32msvc-gcc " ;; *) ac_prefix_list="" ;; esac

1 0

Juan Lang : iphlpapi: Honor GAA_FLAG_SKIP_UNICAST.
by Alexandre Julliard Oct. 12, 2010

Oct. 12, 2010

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 Oct. 12, 2010

Oct. 12, 2010

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