wine-commits August 2017

wine-commits@winehq.org

2 participants
351 discussions

Jacek Caban : netprofm: Added semi-stub Advise and Unadvise implementation.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: d53b711f27f15cdeb9700e86526dab13ddf8d731 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53b711f27f15cdeb9700e865… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 20:47:16 2017 +0200 netprofm: Added semi-stub Advise and Unadvise implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netprofm/list.c | 54 ++++++++++++++++++++++++++++++---- dlls/netprofm/tests/list.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+), 5 deletions(-) diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index d82ae36..d59ee0c 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -91,6 +91,15 @@ struct connection_point IConnectionPointContainer *container; LONG refs; IID iid; + struct list sinks; + DWORD cookie; +}; + +struct sink_entry +{ + struct list entry; + DWORD cookie; + IUnknown *unk; }; static inline struct list_manager *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) @@ -189,12 +198,33 @@ static HRESULT WINAPI connection_point_Advise( DWORD *cookie ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %p, %p - stub\n", cp, sink, cookie ); + struct sink_entry *sink_entry; + IUnknown *unk; + HRESULT hr; + + FIXME( "%p, %p, %p - semi-stub\n", cp, sink, cookie ); if (!sink || !cookie) return E_POINTER; - return CONNECT_E_CANNOTCONNECT; + hr = IUnknown_QueryInterface( sink, &cp->iid, (void**)&unk ); + if (FAILED(hr)) + { + WARN( "iface %s not implemented by sink\n", debugstr_guid(&cp->iid) ); + return CO_E_FAILEDTOOPENTHREADTOKEN; + } + + sink_entry = heap_alloc( sizeof(*sink_entry) ); + if (!sink_entry) + { + IUnknown_Release( unk ); + return E_OUTOFMEMORY; + } + + sink_entry->unk = unk; + *cookie = sink_entry->cookie = ++cp->cookie; + list_add_tail( &cp->sinks, &sink_entry->entry ); + return S_OK; } static HRESULT WINAPI connection_point_Unadvise( @@ -202,9 +232,21 @@ static HRESULT WINAPI connection_point_Unadvise( DWORD cookie ) { struct connection_point *cp = impl_from_IConnectionPoint( iface ); - FIXME( "%p, %d - stub\n", cp, cookie ); + struct sink_entry *iter; + + TRACE( "%p, %d\n", cp, cookie ); + + LIST_FOR_EACH_ENTRY( iter, &cp->sinks, struct sink_entry, entry ) + { + if (iter->cookie != cookie) continue; + list_remove( &iter->entry ); + IUnknown_Release( iter->unk ); + heap_free( iter ); + return S_OK; + } - return E_POINTER; + WARN( "invalid cookie\n" ); + return OLE_E_NOCONNECTION; } static HRESULT WINAPI connection_point_EnumConnections( @@ -241,8 +283,10 @@ static HRESULT connection_point_create( cp->IConnectionPoint_iface.lpVtbl = &connection_point_vtbl; cp->container = container; cp->refs = 1; + cp->cookie = 0; + cp->iid = *riid; + list_init( &cp->sinks ); - memcpy( &cp->iid, riid, sizeof(*riid) ); IConnectionPointContainer_AddRef( container ); *obj = &cp->IConnectionPoint_iface; diff --git a/dlls/netprofm/tests/list.c b/dlls/netprofm/tests/list.c index eb8477c..3937b2f 100644 --- a/dlls/netprofm/tests/list.c +++ b/dlls/netprofm/tests/list.c @@ -157,6 +157,64 @@ static void test_INetworkConnection( INetworkConnection *conn ) } } +static HRESULT WINAPI Unknown_QueryInterface(INetworkListManagerEvents *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static HRESULT WINAPI NetworkListManagerEvents_QueryInterface(INetworkListManagerEvents *iface, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_INetworkListManagerEvents)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI NetworkListManagerEvents_AddRef(INetworkListManagerEvents *iface) +{ + return 2; +} + +static ULONG WINAPI NetworkListManagerEvents_Release(INetworkListManagerEvents *iface) +{ + return 1; +} + +static HRESULT WINAPI NetworkListManagerEvents_ConnectivityChanged(INetworkListManagerEvents *iface, + NLM_CONNECTIVITY newConnectivity) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const INetworkListManagerEventsVtbl mgr_sink_vtbl = { + NetworkListManagerEvents_QueryInterface, + NetworkListManagerEvents_AddRef, + NetworkListManagerEvents_Release, + NetworkListManagerEvents_ConnectivityChanged +}; + +static INetworkListManagerEvents mgr_sink = { &mgr_sink_vtbl }; + +static const INetworkListManagerEventsVtbl mgr_sink_unk_vtbl = { + Unknown_QueryInterface, + NetworkListManagerEvents_AddRef, + NetworkListManagerEvents_Release, + NetworkListManagerEvents_ConnectivityChanged +}; + +static INetworkListManagerEvents mgr_sink_unk = { &mgr_sink_unk_vtbl }; + static void test_INetworkListManager( void ) { IConnectionPointContainer *cpc, *cpc2; @@ -169,6 +227,7 @@ static void test_INetworkListManager( void ) INetwork *network; IEnumNetworkConnections *conn_iter; INetworkConnection *conn; + DWORD cookie; HRESULT hr; ULONG ref1, ref2; IID iid; @@ -247,6 +306,19 @@ static void test_INetworkListManager( void ) ok( hr == S_OK, "got %08x\n", hr ); ok( !memcmp( &iid, &IID_INetworkListManagerEvents, sizeof(iid) ), "Expected iid to be IID_INetworkListManagerEvents\n" ); + + hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink_unk, &cookie); + ok( hr == CO_E_FAILEDTOOPENTHREADTOKEN, "Advise failed: %08x\n", hr ); + + hr = IConnectionPoint_Advise( pt, (IUnknown*)&mgr_sink, &cookie); + ok( hr == S_OK, "Advise failed: %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( pt, 0xdeadbeef ); + ok( hr == OLE_E_NOCONNECTION || hr == CO_E_FAILEDTOIMPERSONATE, "Unadvise failed: %08x\n", hr ); + + hr = IConnectionPoint_Unadvise( pt, cookie ); + ok( hr == S_OK, "Unadvise failed: %08x\n", hr ); + IConnectionPoint_Release( pt ); hr = IConnectionPointContainer_FindConnectionPoint( cpc, &IID_INetworkCostManagerEvents, &pt );

1 0

Aric Stewart : usp10: Fall back to 'dflt' language if shaping language tag isn't found.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 9d32c2d31aa036f9e7e49e26ccc800ac848639e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d32c2d31aa036f9e7e49e26c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Aug 16 07:03:14 2017 -0500 usp10: Fall back to 'dflt' language if shaping language tag isn't found. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/shape.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 2f47f89..b75be60 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -638,8 +638,12 @@ static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache } while(attempt && !feature); /* try in the default (latin) table */ - if (!feature && !script) - OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); + if (!feature) + { + if (!script) + script = MS_MAKE_TAG('l','a','t','n'); + OpenType_GetFontFeatureTags(psc, script, MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); + } } TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature);

1 0

Jacek Caban : wininet/tests: Added more persistent connection tests.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: e09155723b916f33f4bd386138e1c209f41b321a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09155723b916f33f4bd38613… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:10:10 2017 +0200 wininet/tests: Added more persistent connection tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 204 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 169 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e09155723b916f33f4bd3…

1 0

Jacek Caban : wininet: Drain content before reusing connection in open_http_connection.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 085ce269b13978f081b5dd7b70cd898a9e87fe0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=085ce269b13978f081b5dd7b7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:59 2017 +0200 wininet: Drain content before reusing connection in open_http_connection. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d6fdedd..dc106d8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4745,22 +4745,22 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) netconn_t *netconn = NULL; DWORD res; - reset_data_stream(request); - if (request->netconn) { - if (is_valid_netconn(request->netconn) && NETCON_is_alive(request->netconn)) + if (NETCON_is_alive(request->netconn) && drain_content(request, TRUE) == ERROR_SUCCESS) { + reset_data_stream(request); *reusing = TRUE; return ERROR_SUCCESS; } - else - { - free_netconn(request->netconn); - request->netconn = NULL; - } + + TRACE("freeing netconn\n"); + free_netconn(request->netconn); + request->netconn = NULL; } + reset_data_stream(request); + res = HTTP_ResolveName(request); if(res != ERROR_SUCCESS) return res;

1 0

Jacek Caban : wininet: Never do blocking reads in chunked_read if zero chunk size is aready read.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 59395d8845931c76dce482fc0c59158138865c1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=59395d8845931c76dce482fc0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:52 2017 +0200 wininet: Never do blocking reads in chunked_read if zero chunk size is aready read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c5ada87..d6fdedd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2706,17 +2706,23 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, /* Ensure that we have data in the buffer for states that need it. */ if(!chunked_stream->buf_size) { + BOOL blocking_read = allow_blocking; + switch(chunked_stream->state) { - case CHUNKED_STREAM_STATE_READING_CHUNK_SIZE: + case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_SIZE: + /* never allow blocking after 0 chunk size */ + if(!chunked_stream->chunk_size) + blocking_read = FALSE; + /* fall through */ + case CHUNKED_STREAM_STATE_READING_CHUNK_SIZE: case CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA: - case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: chunked_stream->buf_pos = 0; - res = NETCON_recv(req->netconn, chunked_stream->buf, sizeof(chunked_stream->buf), allow_blocking, &read_bytes); + res = NETCON_recv(req->netconn, chunked_stream->buf, sizeof(chunked_stream->buf), blocking_read, &read_bytes); if(res == ERROR_SUCCESS && read_bytes) { chunked_stream->buf_size += read_bytes; }else if(res == WSAEWOULDBLOCK) { - if(ret_read) + if(ret_read || allow_blocking) res = ERROR_SUCCESS; continue_read = FALSE; continue;

1 0

Jacek Caban : wininet: Release connection in HTTPREQ_Read only if remaining control data may be drainad without blocking.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 4f40039cd785c916cd25e5e9b4a0c75dab53a50a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f40039cd785c916cd25e5e9b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:45 2017 +0200 wininet: Release connection in HTTPREQ_Read only if remaining control data may be drainad without blocking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 40bf96a..c5ada87 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -206,7 +206,7 @@ static BOOL HTTP_DeleteCustomHeader(http_request_t *req, DWORD index); static LPWSTR HTTP_build_req( LPCWSTR *list, int len ); static DWORD HTTP_HttpQueryInfoW(http_request_t*, DWORD, LPVOID, LPDWORD, LPDWORD); static UINT HTTP_DecodeBase64(LPCWSTR base64, LPSTR bin); -static BOOL drain_content(http_request_t*,BOOL); +static DWORD drain_content(http_request_t*,BOOL); static CRITICAL_SECTION connection_pool_cs; static CRITICAL_SECTION_DEBUG connection_pool_debug = @@ -2008,7 +2008,7 @@ static void HTTPREQ_CloseConnection(object_header_t *hdr) { http_request_t *req = (http_request_t*)hdr; - http_release_netconn(req, drain_content(req, FALSE)); + http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS); } static DWORD str_to_buffer(const WCHAR *str, void *buffer, DWORD *size, BOOL unicode) @@ -2998,28 +2998,34 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * LeaveCriticalSection( &req->read_section ); *read = ret_read; - TRACE( "retrieved %u bytes (%u)\n", ret_read, req->contentLength ); + TRACE( "retrieved %u bytes (res %u)\n", ret_read, res ); - if(res != WSAEWOULDBLOCK && (!ret_read || res != ERROR_SUCCESS)) - http_release_netconn(req, res == ERROR_SUCCESS); + if(res != WSAEWOULDBLOCK) { + if(res != ERROR_SUCCESS) + http_release_netconn(req, FALSE); + else if(!ret_read && drain_content(req, FALSE) == ERROR_SUCCESS) + http_release_netconn(req, TRUE); + } return res; } -static BOOL drain_content(http_request_t *req, BOOL blocking) +static DWORD drain_content(http_request_t *req, BOOL blocking) { DWORD res; - if(!is_valid_netconn(req->netconn) || req->contentLength == -1) - return FALSE; + TRACE("%p\n", req->netconn); + + if(!is_valid_netconn(req->netconn)) + return ERROR_NO_DATA; if(!strcmpW(req->verb, szHEAD)) - return TRUE; + return ERROR_SUCCESS; EnterCriticalSection( &req->read_section ); res = req->data_stream->vtbl->drain_content(req->data_stream, req, blocking); LeaveCriticalSection( &req->read_section ); - return res == ERROR_SUCCESS; + return res; } typedef struct { @@ -3054,7 +3060,7 @@ static void async_read_file_proc(task_header_t *hdr) if(task->ret_read) complete_arg = read; /* QueryDataAvailable reports read bytes in request complete notification */ if(res != ERROR_SUCCESS || !read) - http_release_netconn(req, drain_content(req, FALSE)); + http_release_netconn(req, drain_content(req, FALSE) == ERROR_SUCCESS); } TRACE("res %u read %u\n", res, read); @@ -5053,7 +5059,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, heap_free(request->verb); request->verb = heap_strdupW(szGET); } - http_release_netconn(request, drain_content(request, FALSE)); + http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS) { @@ -5079,7 +5085,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->session->password, host)) { heap_free(requestString); - if(!drain_content(request, TRUE)) { + if(!drain_content(request, TRUE) == ERROR_SUCCESS) { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5107,7 +5113,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, NULL)) { heap_free(requestString); - if(!drain_content(request, TRUE)) { + if(!drain_content(request, TRUE) == ERROR_SUCCESS) { FIXME("Could not drain content\n"); http_release_netconn(request, FALSE); } @@ -5249,7 +5255,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ heap_free(request->verb); request->verb = heap_strdupW(szGET); } - http_release_netconn(request, drain_content(request, FALSE)); + http_release_netconn(request, drain_content(request, FALSE) == ERROR_SUCCESS); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS)

1 0

Jacek Caban : wininet: Store error state separately from end of stream in chunked stream.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 8090d169ab4bc3c3bee6adb5536d6cea350e00f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8090d169ab4bc3c3bee6adb55… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:37 2017 +0200 wininet: Store error state separately from end of stream in chunked stream. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 6a7b6db..40bf96a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -401,7 +401,8 @@ typedef struct { CHUNKED_STREAM_STATE_READING_CHUNK, CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA, CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END, - CHUNKED_STREAM_STATE_END_OF_STREAM + CHUNKED_STREAM_STATE_END_OF_STREAM, + CHUNKED_STREAM_STATE_ERROR } state; } chunked_stream_t; @@ -2681,7 +2682,14 @@ static char next_chunked_data_char(chunked_stream_t *stream) static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - return chunked_stream->state == CHUNKED_STREAM_STATE_END_OF_STREAM; + switch(chunked_stream->state) { + case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END: + case CHUNKED_STREAM_STATE_END_OF_STREAM: + case CHUNKED_STREAM_STATE_ERROR: + return TRUE; + default: + return FALSE; + } } static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, @@ -2713,7 +2721,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, continue_read = FALSE; continue; }else { - chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM; + chunked_stream->state = CHUNKED_STREAM_STATE_ERROR; } break; default: @@ -2775,7 +2783,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, } if(!read_bytes) { - chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM; + chunked_stream->state = CHUNKED_STREAM_STATE_ERROR; continue; } } @@ -2805,6 +2813,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, break; case CHUNKED_STREAM_STATE_END_OF_STREAM: + case CHUNKED_STREAM_STATE_ERROR: continue_read = FALSE; break; } @@ -2826,7 +2835,8 @@ static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req, B BYTE buf[1024]; DWORD size, res; - while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) { + while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM + && chunked_stream->state != CHUNKED_STREAM_STATE_ERROR) { res = chunked_read(stream, req, buf, sizeof(buf), &size, allow_blocking); if(res != ERROR_SUCCESS) return res;

1 0

Jacek Caban : wininet: Always use drain_content specific to stream type.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 752d078a426d64c7717b0bbbf4983bfca9ceb412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752d078a426d64c7717b0bbbf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:31 2017 +0200 wininet: Always use drain_content specific to stream type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index eae2d4d..6a7b6db 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -383,7 +383,7 @@ static WCHAR *get_host_header( http_request_t *req ) struct data_stream_vtbl_t { BOOL (*end_of_data)(data_stream_t*,http_request_t*); DWORD (*read)(data_stream_t*,http_request_t*,BYTE*,DWORD,DWORD*,BOOL); - DWORD (*drain_content)(data_stream_t*,http_request_t*); + DWORD (*drain_content)(data_stream_t*,http_request_t*,BOOL); void (*destroy)(data_stream_t*); }; @@ -509,10 +509,10 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW return res; } -static DWORD gzip_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD gzip_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { gzip_stream_t *gzip_stream = (gzip_stream_t*)stream; - return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req); + return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req, allow_blocking); } static void gzip_destroy(data_stream_t *stream) @@ -2635,7 +2635,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return res; } -static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; @@ -2647,7 +2647,7 @@ static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req) while(netconn_stream->content_read < netconn_stream->content_length) { size = min(sizeof(buf), netconn_stream->content_length-netconn_stream->content_read); - res = NETCON_recv(req->netconn, buf, size, FALSE, &len); + res = NETCON_recv(req->netconn, buf, size, allow_blocking, &len); if(res) return res; if(!len) @@ -2820,14 +2820,14 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return ERROR_SUCCESS; } -static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req, BOOL allow_blocking) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; BYTE buf[1024]; DWORD size, res; while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) { - res = chunked_read(stream, req, buf, sizeof(buf), &size, FALSE); + res = chunked_read(stream, req, buf, sizeof(buf), &size, allow_blocking); if(res != ERROR_SUCCESS) return res; } @@ -3006,22 +3006,10 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) if(!strcmpW(req->verb, szHEAD)) return TRUE; - if(!blocking) - return req->data_stream->vtbl->drain_content(req->data_stream, req) == ERROR_SUCCESS; - EnterCriticalSection( &req->read_section ); - - while(1) { - DWORD bytes_read; - BYTE buf[4096]; - - res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); - if(res != ERROR_SUCCESS || !bytes_read) - break; - } - + res = req->data_stream->vtbl->drain_content(req->data_stream, req, blocking); LeaveCriticalSection( &req->read_section ); - return res; + return res == ERROR_SUCCESS; } typedef struct {

1 0

Jacek Caban : wininet: Try to read reamaining data in chunked_drain_content.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 90b936f0b2ddd8c5b98cc5072b2c1cd7310ef378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90b936f0b2ddd8c5b98cc5072… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:21 2017 +0200 wininet: Try to read reamaining data in chunked_drain_content. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f1d64f5..eae2d4d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2823,6 +2823,15 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; + BYTE buf[1024]; + DWORD size, res; + + while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) { + res = chunked_read(stream, req, buf, sizeof(buf), &size, FALSE); + if(res != ERROR_SUCCESS) + return res; + } + if(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) return ERROR_NO_DATA; return ERROR_SUCCESS;

1 0

Jacek Caban : wininet: Return error codes from HTTP streams.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: 2ecdac8846bf3ad0b1973d6849f33fe5a250c9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ecdac8846bf3ad0b1973d684… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 17 19:09:13 2017 +0200 wininet: Return error codes from HTTP streams. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3a8f2b8..f1d64f5 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -383,7 +383,7 @@ static WCHAR *get_host_header( http_request_t *req ) struct data_stream_vtbl_t { BOOL (*end_of_data)(data_stream_t*,http_request_t*); DWORD (*read)(data_stream_t*,http_request_t*,BYTE*,DWORD,DWORD*,BOOL); - BOOL (*drain_content)(data_stream_t*,http_request_t*); + DWORD (*drain_content)(data_stream_t*,http_request_t*); void (*destroy)(data_stream_t*); }; @@ -509,7 +509,7 @@ static DWORD gzip_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DW return res; } -static BOOL gzip_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD gzip_drain_content(data_stream_t *stream, http_request_t *req) { gzip_stream_t *gzip_stream = (gzip_stream_t*)stream; return gzip_stream->parent_stream->vtbl->drain_content(gzip_stream->parent_stream, req); @@ -2635,7 +2635,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return res; } -static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD netconn_drain_content(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; @@ -2643,18 +2643,20 @@ static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) size_t size; if(netconn_stream->content_length == ~0u) - return FALSE; + return WSAEISCONN; while(netconn_stream->content_read < netconn_stream->content_length) { size = min(sizeof(buf), netconn_stream->content_length-netconn_stream->content_read); res = NETCON_recv(req->netconn, buf, size, FALSE, &len); - if(res || !len) - return FALSE; + if(res) + return res; + if(!len) + return WSAECONNABORTED; netconn_stream->content_read += len; } - return TRUE; + return ERROR_SUCCESS; } static void netconn_destroy(data_stream_t *stream) @@ -2818,10 +2820,12 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, return ERROR_SUCCESS; } -static BOOL chunked_drain_content(data_stream_t *stream, http_request_t *req) +static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req) { chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; - return chunked_stream->state == CHUNKED_STREAM_STATE_END_OF_STREAM; + if(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) + return ERROR_NO_DATA; + return ERROR_SUCCESS; } static void chunked_destroy(data_stream_t *stream) @@ -2985,7 +2989,7 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * static BOOL drain_content(http_request_t *req, BOOL blocking) { - BOOL ret; + DWORD res; if(!is_valid_netconn(req->netconn) || req->contentLength == -1) return FALSE; @@ -2994,27 +2998,21 @@ static BOOL drain_content(http_request_t *req, BOOL blocking) return TRUE; if(!blocking) - return req->data_stream->vtbl->drain_content(req->data_stream, req); + return req->data_stream->vtbl->drain_content(req->data_stream, req) == ERROR_SUCCESS; EnterCriticalSection( &req->read_section ); while(1) { - DWORD bytes_read, res; + DWORD bytes_read; BYTE buf[4096]; res = HTTPREQ_Read(req, buf, sizeof(buf), &bytes_read, TRUE); - if(res != ERROR_SUCCESS) { - ret = FALSE; - break; - } - if(!bytes_read) { - ret = TRUE; + if(res != ERROR_SUCCESS || !bytes_read) break; - } } LeaveCriticalSection( &req->read_section ); - return ret; + return res; } typedef struct {

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
36
Older →

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 August 2017