November 2018 - Wine-devel - list.winehq.org

[PATCH 4/4] server: Fix pipe server listen queue initialization.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/4] server: Remove no longer needed pipe_client struct.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 52 +++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 30 deletions(-)

1 0

[PATCH 2/4] server: Store message mode flag only in named_pipe object.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)

1 0

[PATCH 1/4] server: Properly handle disconnected pipe in set_named_pipe_info request.
by Jacek Caban 23 Nov '18

23 Nov '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 15 ++++++++++++++- server/named_pipe.c | 6 +++++- 2 files changed, 19 insertions(+), 2 deletions(-)

1 0

[PATCH 2/2] msvcp90: Add time_get<wchar> implementation.
by Piotr Caban 23 Nov '18

23 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- It's a copy of time_get<char> implementation with simple char->wchar changes. The only function that was changed manually is time_get_wchar__Init. dlls/msvcp100/msvcp100.spec | 88 +-- dlls/msvcp110/msvcp110.spec | 168 ++--- dlls/msvcp120/msvcp120.spec | 168 ++--- dlls/msvcp120_app/msvcp120_app.spec | 168 ++--- dlls/msvcp140/msvcp140.spec | 172 ++--- dlls/msvcp70/msvcp70.spec | 76 +-- dlls/msvcp71/msvcp71.spec | 80 +-- dlls/msvcp80/msvcp80.spec | 84 +-- dlls/msvcp90/locale.c | 944 +++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 88 +-- 10 files changed, 1489 insertions(+), 547 deletions(-)

1 0

[PATCH 1/2] msvcp90: Add '_char' suffix to time_get<char> helper functions.
by Piotr Caban 23 Nov '18

23 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/locale.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)

1 0

[PATCH 3/6] winhttp: Use the thread pool for asynchronous hostname resolution.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/net.c | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index af1d19d212..a1ad0461d4 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -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; - - ra.hostname = hostname; - ra.port = port; - ra.sa = sa; - - thread = CreateThread( NULL, 0, resolve_proc, &ra, 0, NULL ); - if (!thread) return FALSE; + struct async_resolve async; - 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) { -- 2.11.0

2 1

[PATCH 6/6] winhttp: Use the thread pool for COM object requests.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 52 ++++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 766eddabee..8a958979ee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3067,9 +3067,10 @@ struct winhttp_request HINTERNET hrequest; VARIANT data; WCHAR *verb; - HANDLE thread; + HANDLE done; HANDLE wait; HANDLE cancel; + BOOL proc_running; char *buffer; DWORD offset; DWORD bytes_available; @@ -3103,15 +3104,16 @@ static void cancel_request( struct winhttp_request *request ) { if (request->state <= REQUEST_STATE_CANCELLED) return; - SetEvent( request->cancel ); - LeaveCriticalSection( &request->cs ); - WaitForSingleObject( request->thread, INFINITE ); - EnterCriticalSection( &request->cs ); + if (request->proc_running) + { + SetEvent( request->cancel ); + LeaveCriticalSection( &request->cs ); - request->state = REQUEST_STATE_CANCELLED; + WaitForSingleObject( request->done, INFINITE ); - CloseHandle( request->thread ); - request->thread = NULL; + EnterCriticalSection( &request->cs ); + } + request->state = REQUEST_STATE_CANCELLED; } /* critical section must be held */ @@ -3121,7 +3123,7 @@ static void free_request( struct winhttp_request *request ) WinHttpCloseHandle( request->hrequest ); WinHttpCloseHandle( request->hconnect ); WinHttpCloseHandle( request->hsession ); - CloseHandle( request->thread ); + CloseHandle( request->done ); CloseHandle( request->wait ); CloseHandle( request->cancel ); heap_free( request->proxy.lpszProxy ); @@ -3450,6 +3452,7 @@ static void initialize_request( struct winhttp_request *request ) { request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->done = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3747,19 +3750,22 @@ static void wait_set_status_callback( struct winhttp_request *request, DWORD sta static DWORD wait_for_completion( struct winhttp_request *request ) { HANDLE handles[2] = { request->wait, request->cancel }; + DWORD ret; switch (WaitForMultipleObjects( 2, handles, FALSE, INFINITE )) { case WAIT_OBJECT_0: + ret = request->error; break; case WAIT_OBJECT_0 + 1: - request->error = ERROR_CANCELLED; + ret = request->error = ERROR_CANCELLED; + SetEvent( request->done ); break; default: - request->error = GetLastError(); + ret = request->error = GetLastError(); break; } - return request->error; + return ret; } static HRESULT request_receive( struct winhttp_request *request ) @@ -3917,27 +3923,21 @@ error: return HRESULT_FROM_WIN32( err ); } -static HRESULT request_send_and_receive( struct winhttp_request *request ) -{ - HRESULT hr = request_send( request ); - if (hr == S_OK) hr = request_receive( request ); - return hr; -} - -static DWORD CALLBACK send_and_receive_proc( void *arg ) +static void CALLBACK send_and_receive_proc( TP_CALLBACK_INSTANCE *instance, void *ctx ) { - struct winhttp_request *request = (struct winhttp_request *)arg; - return request_send_and_receive( request ); + struct winhttp_request *request = (struct winhttp_request *)ctx; + if (request_send( request ) == S_OK) request_receive( request ); + SetEvent( request->done ); } /* critical section must be held */ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) { - HANDLE thread = request->thread; + HANDLE done = request->done; DWORD err, ret; LeaveCriticalSection( &request->cs ); - while ((err = MsgWaitForMultipleObjects( 1, &thread, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) + while ((err = MsgWaitForMultipleObjects( 1, &done, FALSE, timeout, QS_ALLINPUT )) == WAIT_OBJECT_0 + 1) { MSG msg; while (PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE )) @@ -3960,6 +3960,7 @@ static DWORD request_wait( struct winhttp_request *request, DWORD timeout ) break; } EnterCriticalSection( &request->cs ); + if (!ret) request->proc_running = FALSE; return ret; } @@ -3989,11 +3990,12 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return hr; } - if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) + if (!TrySubmitThreadpoolCallback( send_and_receive_proc, request, NULL )) { LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } + request->proc_running = TRUE; if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); -- 2.11.0

1 0

[PATCH 5/6] winhttp: Make sure the COM request object is properly initialized.
by Hans Leidekker 23 Nov '18

23 Nov '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 47 ++++++++++++++--------------------------------- 1 file changed, 14 insertions(+), 33 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 0f9580734d..766eddabee 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3049,7 +3049,6 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, LPCVOID buffer, DWORD to_write enum request_state { - REQUEST_STATE_UNINITIALIZED, REQUEST_STATE_INITIALIZED, REQUEST_STATE_CANCELLED, REQUEST_STATE_OPEN, @@ -3113,10 +3112,6 @@ static void cancel_request( struct winhttp_request *request ) CloseHandle( request->thread ); request->thread = NULL; - CloseHandle( request->wait ); - request->wait = NULL; - CloseHandle( request->cancel ); - request->cancel = NULL; } /* critical section must be held */ @@ -3453,25 +3448,8 @@ done: static void initialize_request( struct winhttp_request *request ) { - request->hrequest = NULL; - request->hconnect = NULL; - request->hsession = NULL; - request->thread = NULL; - request->wait = NULL; - request->cancel = NULL; - request->buffer = NULL; - request->verb = NULL; - request->offset = 0; - request->bytes_available = 0; - request->bytes_read = 0; - request->error = ERROR_SUCCESS; - request->async = FALSE; - request->logon_policy = WINHTTP_AUTOLOGON_SECURITY_LEVEL_MEDIUM; - request->disable_feature = 0; - request->proxy.dwAccessType = WINHTTP_ACCESS_TYPE_DEFAULT_PROXY; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->resolve_timeout = 0; + request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); + request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); request->connect_timeout = 60000; request->send_timeout = 30000; request->receive_timeout = 30000; @@ -3495,8 +3473,17 @@ static void reset_request( struct winhttp_request *request ) request->bytes_available = 0; request->bytes_read = 0; request->error = ERROR_SUCCESS; + request->logon_policy = 0; + request->disable_feature = 0; request->async = FALSE; + request->connect_timeout = 60000; + request->send_timeout = 30000; + request->receive_timeout = 30000; request->url_codepage = CP_UTF8; + heap_free( request->proxy.lpszProxy ); + request->proxy.lpszProxy = NULL; + heap_free( request->proxy.lpszProxyBypass ); + request->proxy.lpszProxyBypass = NULL; VariantClear( &request->data ); request->state = REQUEST_STATE_INITIALIZED; } @@ -3533,8 +3520,7 @@ static HRESULT WINAPI winhttp_request_Open( if (!WinHttpCrackUrl( url, 0, 0, &uc )) return HRESULT_FROM_WIN32( GetLastError() ); EnterCriticalSection( &request->cs ); - if (request->state < REQUEST_STATE_INITIALIZED) initialize_request( request ); - else reset_request( request ); + reset_request( request ); if (!(hostname = heap_alloc( (uc.dwHostNameLength + 1) * sizeof(WCHAR) ))) goto error; memcpy( hostname, uc.lpszHostName, uc.dwHostNameLength * sizeof(WCHAR) ); @@ -4008,8 +3994,6 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return HRESULT_FROM_WIN32( GetLastError() ); } - request->wait = CreateEventW( NULL, FALSE, FALSE, NULL ); - request->cancel = CreateEventW( NULL, FALSE, FALSE, NULL ); if (!request->async) { hr = HRESULT_FROM_WIN32( request_wait( request, INFINITE ) ); @@ -4613,15 +4597,12 @@ HRESULT WinHttpRequest_create( void **obj ) TRACE("%p\n", obj); - if (!(request = heap_alloc( sizeof(*request) ))) return E_OUTOFMEMORY; + if (!(request = heap_alloc_zero( sizeof(*request) ))) return E_OUTOFMEMORY; request->IWinHttpRequest_iface.lpVtbl = &winhttp_request_vtbl; request->refs = 1; - request->state = REQUEST_STATE_UNINITIALIZED; - request->proxy.lpszProxy = NULL; - request->proxy.lpszProxyBypass = NULL; - request->url_codepage = CP_UTF8; InitializeCriticalSection( &request->cs ); request->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": winhttp_request.cs"); + initialize_request( request ); *obj = &request->IWinHttpRequest_iface; TRACE("returning iface %p\n", *obj); -- 2.11.0

1 0

[PATCH 2/6] winhttp: Propagate errors from refill_buffer.
by Hans Leidekker 23 Nov '18

23 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38228 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 49 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 9817287fe2..61af6ea977 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1949,6 +1949,7 @@ static BOOL end_of_read_data( struct request *request ) static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD *read, BOOL async ) { int count, bytes_read = 0; + BOOL ret = TRUE; if (end_of_read_data( request )) goto done; @@ -1956,7 +1957,7 @@ static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD { if (!(count = get_available_data( request ))) { - if (!refill_buffer( request, async )) goto done; + if (!(ret = refill_buffer( request, async ))) goto done; if (!(count = get_available_data( request ))) goto done; } count = min( count, size ); @@ -1968,15 +1969,25 @@ static BOOL read_data( struct request *request, void *buffer, DWORD size, DWORD request->content_read += count; if (end_of_read_data( request )) goto done; } - if (request->read_chunked && !request->read_chunked_size) refill_buffer( request, async ); + if (request->read_chunked && !request->read_chunked_size) ret = refill_buffer( request, async ); done: TRACE( "retrieved %u bytes (%u/%u)\n", bytes_read, request->content_read, request->content_length ); + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); + else + { + WINHTTP_ASYNC_RESULT result; + result.dwResult = API_READ_DATA; + result.dwError = GetLastError(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } - if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, buffer, bytes_read ); - if (read) *read = bytes_read; + if (ret && read) *read = bytes_read; if (end_of_read_data( request )) finished_reading( request ); - return TRUE; + return ret; } /* read any content returned by the server so that the connection can be reused */ @@ -2781,7 +2792,7 @@ static BOOL receive_response( struct request *request, BOOL async ) } netconn_set_timeout( request->netconn, FALSE, request->receive_timeout ); - if (request->content_length) refill_buffer( request, FALSE ); + if (request->content_length) ret = refill_buffer( request, FALSE ); if (async) { @@ -2847,25 +2858,35 @@ BOOL WINAPI WinHttpReceiveResponse( HINTERNET hrequest, LPVOID reserved ) static BOOL query_data_available( struct request *request, DWORD *available, BOOL async ) { DWORD count = 0; + BOOL ret = TRUE; if (end_of_read_data( request )) goto done; count = get_available_data( request ); - if (!request->read_chunked && request->netconn) - count += netconn_query_data_available( request->netconn ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); if (!count) { - refill_buffer( request, async ); + if (!(ret = refill_buffer( request, async ))) goto done; count = get_available_data( request ); - if (!request->read_chunked && request->netconn) - count += netconn_query_data_available( request->netconn ); + if (!request->read_chunked && request->netconn) count += netconn_query_data_available( request->netconn ); } done: - if (async) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); TRACE("%u bytes available\n", count); - if (available) *available = count; - return TRUE; + if (async) + { + if (ret) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE, &count, sizeof(count) ); + else + { + WINHTTP_ASYNC_RESULT result; + result.dwResult = API_QUERY_DATA_AVAILABLE; + result.dwError = GetLastError(); + send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } + } + + if (ret && available) *available = count; + return ret; } static void task_query_data_available( struct task_header *task ) -- 2.11.0

1 0