wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

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

Hwang YunSong : taskkill: Update Korean resource.
by Alexandre Julliard 12 Oct '10

12 Oct '10

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

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

12 Oct '10

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

Austin Lund : riched32/tests: Correct error messages in EM_POSFROMCHAR tests.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 12c964be68e69696876b659b1e139227bcd93dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=12c964be68e69696876b659b1… Author: Austin Lund <austin.lund(a)gmail.com> Date: Tue Oct 12 10:25:46 2010 +1000 riched32/tests: Correct error messages in EM_POSFROMCHAR tests. --- dlls/riched32/tests/editor.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 6b1f721..f11e3b5 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -776,13 +776,13 @@ static void test_EM_POSFROMCHAR(void) else if (i == 1) { ok(pl.y > 0, "EM_POSFROMCHAR reports y=%d, expected > 0\n", pl.y); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); height = pl.y; } else { ok(pl.y == i * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, i * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); } } @@ -790,13 +790,13 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 50 * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, 50 * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing that vertical scrolling does, in fact, have an effect on EM_POSFROMCHAR */ @@ -809,20 +809,20 @@ static void test_EM_POSFROMCHAR(void) ok(pl.y == (i - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (i - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); } /* Testing position at end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 50 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing position way past end of text */ result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 55 * 16); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == (50 - 1) * height, "EM_POSFROMCHAR reports y=%d, expected %d\n", pl.y, (50 - 1) * height); - ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); + ok(pl.x == xpos, "EM_POSFROMCHAR reports x=%d, expected %d\n", pl.x, xpos); /* Testing that horizontal scrolling does, in fact, have an effect on EM_POSFROMCHAR */ SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) text);

1 0

Frédéric Delanoy : taskkill: Update French translation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 7acdc0a8ea41e53ab834aba18050d4f8bd52c72f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7acdc0a8ea41e53ab834aba18… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Oct 12 00:37:16 2010 +0200 taskkill: Update French translation. --- programs/taskkill/Fr.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Fr.rc b/programs/taskkill/Fr.rc index 51bfe85..89c031d 100644 --- a/programs/taskkill/Fr.rc +++ b/programs/taskkill/Fr.rc @@ -41,4 +41,5 @@ STRINGTABLE STRING_SEARCH_FAILED, "Erreur : processus \"%s\" introuvable.\n" STRING_ENUM_FAILED, "Erreur : impossible d'énumérer la liste de processus.\n" STRING_TERMINATE_FAILED, "Erreur : impossible de terminer le processus \"%s\".\n" + STRING_SELF_TERMINATION, "Erreur : un processus ne peut pas s'auto-terminer.\n" }

1 0

Andrew Talbot : gdi32: Constify some variables.
by Alexandre Julliard 12 Oct '10

12 Oct '10

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

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

12 Oct '10

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: Set DNS servers in the IP_PER_ADAPTER_INFO returned for non-loopback addresses .
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 112f878975659c2d3700efd377c5bbc00beb66d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112f878975659c2d3700efd37… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Mar 23 14:56:34 2010 -0700 iphlpapi: Set DNS servers in the IP_PER_ADAPTER_INFO returned for non-loopback addresses. --- dlls/iphlpapi/ifenum.c | 15 +++++++++++++++ dlls/iphlpapi/ifenum.h | 1 + dlls/iphlpapi/iphlpapi_main.c | 20 +++++++++++++++----- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index 4628b21..c998b93 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -158,6 +158,21 @@ DWORD getInterfaceIndexByName(const char *name, PDWORD index) return ret; } +BOOL isIfIndexLoopback(ULONG idx) +{ + BOOL ret = FALSE; + char name[IFNAMSIZ]; + int fd; + + getInterfaceNameByIndex(idx, name); + fd = socket(PF_INET, SOCK_DGRAM, 0); + if (fd != -1) { + ret = isLoopbackInterface(fd, name); + close(fd); + } + return ret; +} + DWORD getNumNonLoopbackInterfaces(void) { DWORD numInterfaces; diff --git a/dlls/iphlpapi/ifenum.h b/dlls/iphlpapi/ifenum.h index 79e484b..be5c9c1 100644 --- a/dlls/iphlpapi/ifenum.h +++ b/dlls/iphlpapi/ifenum.h @@ -46,6 +46,7 @@ DWORD getNumInterfaces(void); DWORD getNumNonLoopbackInterfaces(void); +BOOL isIfIndexLoopback(ULONG idx); /* A table of interface indexes, see get*InterfaceTable(). */ typedef struct _InterfaceIndexTable { diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 2869ce3..5cefd4a 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1688,18 +1688,21 @@ DWORD WINAPI GetNumberOfInterfaces(PDWORD pdwNumIf) * RETURNS * Success: NO_ERROR * Failure: error code from winerror.h - * - * FIXME - * Stub, returns empty IP_PER_ADAPTER_INFO in every case. */ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterInfo, PULONG pOutBufLen) { - ULONG bytesNeeded = sizeof(IP_PER_ADAPTER_INFO); + ULONG bytesNeeded = sizeof(IP_PER_ADAPTER_INFO), serverListSize = 0; + DWORD ret = NO_ERROR; TRACE("(IfIndex %d, pPerAdapterInfo %p, pOutBufLen %p)\n", IfIndex, pPerAdapterInfo, pOutBufLen); if (!pOutBufLen) return ERROR_INVALID_PARAMETER; + if (!isIfIndexLoopback(IfIndex)) { + get_dns_server_list(NULL, NULL, &serverListSize); + if (serverListSize > sizeof(IP_ADDR_STRING)) + bytesNeeded += serverListSize - sizeof(IP_ADDR_STRING); + } if (!pPerAdapterInfo || *pOutBufLen < bytesNeeded) { *pOutBufLen = bytesNeeded; @@ -1707,7 +1710,14 @@ DWORD WINAPI GetPerAdapterInfo(ULONG IfIndex, PIP_PER_ADAPTER_INFO pPerAdapterIn } memset(pPerAdapterInfo, 0, bytesNeeded); - return NO_ERROR; + if (!isIfIndexLoopback(IfIndex)) { + ret = get_dns_server_list(&pPerAdapterInfo->DnsServerList, + (PIP_ADDR_STRING)((PBYTE)pPerAdapterInfo + sizeof(IP_PER_ADAPTER_INFO)), + &serverListSize); + /* Assume the first DNS server in the list is the "current" DNS server: */ + pPerAdapterInfo->CurrentDnsServer = &pPerAdapterInfo->DnsServerList; + } + return ret; }

1 0

Juan Lang : iphlpapi: Use a helper function to get the DNS server list.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 189cd59079eafc5b373a38cb24b39dec0c8048cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=189cd59079eafc5b373a38cb2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 09:12:45 2010 -0700 iphlpapi: Use a helper function to get the DNS server list. --- dlls/iphlpapi/iphlpapi_main.c | 68 +++++++++++++++++++++++++++++------------ 1 files changed, 48 insertions(+), 20 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index ae2dd76..2869ce3 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1539,6 +1539,46 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr return ret; } +/* Gets the DNS server list into the list beginning at list. Assumes that + * a single server address may be placed at list if *len is at least + * sizeof(IP_ADDR_STRING) long. Otherwise, list->Next is set to firstDynamic, + * and assumes that all remaining DNS servers are contiguously located + * beginning at firstDynamic. On input, *len is assumed to be the total number + * of bytes available for all DNS servers, and is ignored if list is NULL. + * On return, *len is set to the total number of bytes required for all DNS + * servers. + * Returns ERROR_BUFFER_OVERFLOW if *len is insufficient, + * ERROR_SUCCESS otherwise. + */ +static DWORD get_dns_server_list(PIP_ADDR_STRING list, + PIP_ADDR_STRING firstDynamic, DWORD *len) +{ + DWORD size; + + initialise_resolver(); + size = _res.nscount * sizeof(IP_ADDR_STRING); + if (!list || *len < size) { + *len = size; + return ERROR_BUFFER_OVERFLOW; + } + *len = size; + if (_res.nscount > 0) { + PIP_ADDR_STRING ptr; + int i; + + for (i = 0, ptr = list; i < _res.nscount && ptr; i++, ptr = ptr->Next) { + toIPAddressString(_res.nsaddr_list[i].sin_addr.s_addr, + ptr->IpAddress.String); + if (i == _res.nscount - 1) + ptr->Next = NULL; + else if (i == 0) + ptr->Next = firstDynamic; + else + ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); + } + } + return ERROR_SUCCESS; +} /****************************************************************** * GetNetworkParams (IPHLPAPI.@) @@ -1560,7 +1600,7 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr */ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) { - DWORD ret, size; + DWORD ret, size, serverListSize; LONG regReturn; HKEY hKey; @@ -1568,9 +1608,8 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) if (!pOutBufLen) return ERROR_INVALID_PARAMETER; - initialise_resolver(); - size = sizeof(FIXED_INFO) + (_res.nscount > 0 ? (_res.nscount - 1) * - sizeof(IP_ADDR_STRING) : 0); + get_dns_server_list(NULL, NULL, &serverListSize); + size = sizeof(FIXED_INFO) + serverListSize - sizeof(IP_ADDR_STRING); if (!pFixedInfo || *pOutBufLen < size) { *pOutBufLen = size; return ERROR_BUFFER_OVERFLOW; @@ -1581,22 +1620,11 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen) GetComputerNameExA(ComputerNameDnsHostname, pFixedInfo->HostName, &size); size = sizeof(pFixedInfo->DomainName); GetComputerNameExA(ComputerNameDnsDomain, pFixedInfo->DomainName, &size); - if (_res.nscount > 0) { - PIP_ADDR_STRING ptr; - int i; - - for (i = 0, ptr = &pFixedInfo->DnsServerList; i < _res.nscount && ptr; - i++, ptr = ptr->Next) { - toIPAddressString(_res.nsaddr_list[i].sin_addr.s_addr, - ptr->IpAddress.String); - if (i == _res.nscount - 1) - ptr->Next = NULL; - else if (i == 0) - ptr->Next = (PIP_ADDR_STRING)((LPBYTE)pFixedInfo + sizeof(FIXED_INFO)); - else - ptr->Next = (PIP_ADDR_STRING)((PBYTE)ptr + sizeof(IP_ADDR_STRING)); - } - } + get_dns_server_list(&pFixedInfo->DnsServerList, + (PIP_ADDR_STRING)((BYTE *)pFixedInfo + sizeof(FIXED_INFO)), + &serverListSize); + /* Assume the first DNS server in the list is the "current" DNS server: */ + pFixedInfo->CurrentDnsServer = &pFixedInfo->DnsServerList; pFixedInfo->NodeType = HYBRID_NODETYPE; regReturn = RegOpenKeyExA(HKEY_LOCAL_MACHINE, "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &hKey);

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010