marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Use the thread pool for asynchronous hostname resolution. 

Signed-off-by: Hans Leidekker <hans@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Hans Leidekker 2018-11-23 11:35:28 +01:00 committed by Alexandre Julliard
parent c6251cbb12
commit 539f2f1530
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dlls/winhttp/net.c
View File

@ -651,42 +651,44 @@ static DWORD resolve_hostname( const WCHAR *name, INTERNET_PORT port, struct soc
return ERROR_SUCCESS;
}
struct resolve_args
struct async_resolve
{
const WCHAR *hostname;
INTERNET_PORT port;
struct sockaddr_storage *sa;
struct sockaddr_storage *addr;
DWORD result;
HANDLE done;
};
static DWORD CALLBACK resolve_proc( LPVOID arg )
static void CALLBACK resolve_proc( TP_CALLBACK_INSTANCE *instance, void *ctx )
{
struct resolve_args *ra = arg;
return resolve_hostname( ra->hostname, ra->port, ra->sa );
struct async_resolve *async = ctx;
async->result = resolve_hostname( async->hostname, async->port, async->addr );
SetEvent( async->done );
}
BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *sa, int timeout )
BOOL netconn_resolve( WCHAR *hostname, INTERNET_PORT port, struct sockaddr_storage *addr, int timeout )
{
DWORD ret;
if (timeout)
if (!timeout) ret = resolve_hostname( hostname, port, addr );
else
{
DWORD status;
HANDLE thread;
struct resolve_args ra;
struct async_resolve async;
ra.hostname = hostname;
ra.port = port;
ra.sa = sa;
thread = CreateThread( NULL, 0, resolve_proc, &ra, 0, NULL );
if (!thread) return FALSE;
status = WaitForSingleObject( thread, timeout );
if (status == WAIT_OBJECT_0) GetExitCodeThread( thread, &ret );
else ret = ERROR_WINHTTP_TIMEOUT;
CloseHandle( thread );
async.hostname = hostname;
async.port = port;
async.addr = addr;
if (!(async.done = CreateEventW( NULL, FALSE, FALSE, NULL ))) return FALSE;
if (!TrySubmitThreadpoolCallback( resolve_proc, &async, NULL ))
{
CloseHandle( async.done );
return FALSE;
}
if (WaitForSingleObject( async.done, timeout ) != WAIT_OBJECT_0) ret = ERROR_WINHTTP_TIMEOUT;
else ret = async.result;
CloseHandle( async.done );
}
else ret = resolve_hostname( hostname, port, sa );
if (ret)
{