ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iphlpapi: Only call res_init() once per process.

This commit is contained in:
Hans Leidekker 2007-04-18 20:39:33 +02:00 committed by Alexandre Julliard
parent dac19db358
commit dfebf1b91d
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/dnsapi/query.c
View File

@ -65,6 +65,17 @@ static CRITICAL_SECTION resolver_cs = { &resolver_cs_debug, -1, 0, 0, 0, 0 };
#define LOCK_RESOLVER() do { EnterCriticalSection( &resolver_cs ); } while (0)
#define UNLOCK_RESOLVER() do { LeaveCriticalSection( &resolver_cs ); } while (0)
static int resolver_initialised;
/* call res_init() just once because of a bug in Mac OSX 10.4 */
static void initialise_resolver( void )
{
if (!resolver_initialised)
{
res_init();
resolver_initialised = 1;
}
}
static const char *dns_section_to_str( ns_sect section )
{
@ -699,7 +710,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PIP4_ARRA
LOCK_RESOLVER();
res_init();
initialise_resolver();
_res.options |= dns_map_options( options );
if (servers && (ret = dns_set_serverlist( servers )))
@ -817,7 +828,7 @@ DNS_STATUS WINAPI DnsQueryConfig( DNS_CONFIG_TYPE config, DWORD flag, PWSTR adap
#ifdef HAVE_RESOLV
LOCK_RESOLVER();
res_init();
initialise_resolver();
ret = dns_get_serverlist( buffer, len );
UNLOCK_RESOLVER();

14
dlls/iphlpapi/iphlpapi_main.c
View File

@ -50,6 +50,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi);
#define INADDR_NONE ~0UL
#endif
static int resolver_initialised;
/* call res_init() just once because of a bug in Mac OSX 10.4 */
static void initialise_resolver(void)
{
if (!resolver_initialised)
{
res_init();
resolver_initialised = 1;
}
}
BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
{
switch (fdwReason) {
@ -1340,7 +1352,7 @@ DWORD WINAPI GetNetworkParams(PFIXED_INFO pFixedInfo, PULONG pOutBufLen)
if (!pOutBufLen)
return ERROR_INVALID_PARAMETER;
res_init();
initialise_resolver();
size = sizeof(FIXED_INFO) + (_res.nscount > 0 ? (_res.nscount - 1) *
sizeof(IP_ADDR_STRING) : 0);
if (!pFixedInfo || *pOutBufLen < size) {