August 2017 - Wine-commits - list.winehq.org

Andrew Eikum : gdiplus: Implement transform matrix for line gradient brushes.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: aac33dab2a7a3ff7e7ffd1bcbe432b8d4507d73b URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac33dab2a7a3ff7e7ffd1bcb… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 16 13:28:59 2017 -0500 gdiplus: Implement transform matrix for line gradient brushes. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/brush.c | 127 ++++++++---- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 22 +- dlls/gdiplus/tests/brush.c | 443 +++++++++++++++++++++++++++++++++-------- include/gdiplusflat.h | 1 + 5 files changed, 450 insertions(+), 144 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aac33dab2a7a3ff7e7ffd…

1 0

Andrew Eikum : gdiplus: GdipCreateMetafileFromWmfFile will also load EMFs.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: a4ab858a960800f3bc7c1ff7571c78d93196f8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ab858a960800f3bc7c1ff75… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Aug 16 14:32:00 2017 -0500 gdiplus: GdipCreateMetafileFromWmfFile will also load EMFs. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 13 ++++++++++--- dlls/gdiplus/tests/metafile.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 41355bc..0bd3033 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2361,13 +2361,20 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, GpStatus WINGDIPAPI GdipCreateMetafileFromWmfFile(GDIPCONST WCHAR *file, GDIPCONST WmfPlaceableFileHeader * placeable, GpMetafile **metafile) { - HMETAFILE hmf = GetMetaFileW(file); + HMETAFILE hmf; + HENHMETAFILE emf; TRACE("(%s, %p, %p)\n", debugstr_w(file), placeable, metafile); - if(!hmf) return InvalidParameter; + hmf = GetMetaFileW(file); + if(hmf) + return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); - return GdipCreateMetafileFromWmf(hmf, TRUE, placeable, metafile); + emf = GetEnhMetaFileW(file); + if(emf) + return GdipCreateMetafileFromEmf(emf, TRUE, metafile); + + return GenericError; } GpStatus WINGDIPAPI GdipCreateMetafileFromFile(GDIPCONST WCHAR *file, diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 1d36d9e..9770a8f 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -2702,6 +2702,7 @@ static void test_fillpath(void) { static const WCHAR description[] = {'w','i','n','e','t','e','s','t',0}; static const GpRectF frame = {0.0, 0.0, 100.0, 100.0}; + static const WCHAR winetestemfW[] = {'w','i','n','e','t','e','s','t','.','e','m','f',0}; GpMetafile *metafile; GpGraphics *graphics; @@ -2745,10 +2746,26 @@ static void test_fillpath(void) expect(Ok, stat); check_emfplus(hemf, fill_path_records, "fill path"); + + /* write to disk */ + DeleteEnhMetaFile(CopyEnhMetaFileW(hemf, winetestemfW)); + DeleteEnhMetaFile(hemf); stat = GdipDisposeImage((GpImage*)metafile); expect(Ok, stat); + + /* should succeed when given path to an EMF */ + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(Ok, stat); + + stat = GdipDisposeImage((GpImage*)metafile); + expect(Ok, stat); + + DeleteFileW(winetestemfW); + + stat = GdipCreateMetafileFromWmfFile(winetestemfW, NULL, &metafile); + expect(GenericError, stat); } START_TEST(metafile)

1 0

Hans Leidekker : include: Add BCRYPT_KEY_LENGTHS_STRUCT declaration.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: ab575f3d2bddd52affbe083b9e543fb66af61ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab575f3d2bddd52affbe083b9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Aug 17 13:36:38 2017 +0200 include: Add BCRYPT_KEY_LENGTHS_STRUCT declaration. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/bcrypt.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h index 9e193da..c71b1e8 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -82,6 +82,13 @@ typedef struct _BCRYPT_ALGORITHM_IDENTIFIER ULONG dwFlags; } BCRYPT_ALGORITHM_IDENTIFIER; +typedef struct __BCRYPT_KEY_LENGTHS_STRUCT +{ + ULONG dwMinLength; + ULONG dwMaxLength; + ULONG dwIncrement; +} BCRYPT_KEY_LENGTHS_STRUCT; + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE;

1 0

Nikolay Sivov : bcrypt: Support BCRYPT_KEY_LENGTHS property for AES.
by Alexandre Julliard 17 Aug '17

17 Aug '17

Module: wine Branch: master Commit: a71062b95c856fbc1ebe3dc472faa54741afda37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71062b95c856fbc1ebe3dc47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 17 13:36:39 2017 +0200 bcrypt: Support BCRYPT_KEY_LENGTHS property for AES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 13 +++++++++++++ dlls/bcrypt/tests/bcrypt.c | 20 ++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 7a93515..b631128 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -474,6 +474,19 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, return STATUS_BUFFER_TOO_SMALL; } } + if (!strcmpW( prop, BCRYPT_KEY_LENGTHS )) + { + BCRYPT_KEY_LENGTHS_STRUCT *key_lengths = (void *)buf; + *ret_size = sizeof(*key_lengths); + if (key_lengths && size < *ret_size) return STATUS_BUFFER_TOO_SMALL; + if (key_lengths) + { + key_lengths->dwMinLength = 128; + key_lengths->dwMaxLength = 256; + key_lengths->dwIncrement = 64; + } + return STATUS_SUCCESS; + } break; default: diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 05d85d0..7ac0c11 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -700,6 +700,7 @@ static void test_rng(void) static void test_aes(void) { + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; BCRYPT_ALG_HANDLE alg; ULONG size, len; UCHAR mode[64]; @@ -733,6 +734,15 @@ static void test_aes(void) ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", mode); ok(size == 64, "got %u\n", size); + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = BCryptGetProperty(alg, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + test_alg_name(alg, "AES"); ret = pBCryptCloseAlgorithmProvider(alg, 0); @@ -962,6 +972,7 @@ static void test_BCryptDecrypt(void) {0xc6,0xa1,0x3b,0x37,0x87,0x8f,0x5b,0x82,0x6f,0x4f,0x81,0x62,0xa1,0xc8,0xd8,0x79, 0xb1,0xa2,0x92,0x73,0xbe,0x2c,0x42,0x07,0xa5,0xac,0xe3,0x93,0x39,0x8c,0xb6,0xfb, 0x87,0x5d,0xea,0xa3,0x7e,0x0f,0xde,0xfa,0xd9,0xec,0x6c,0x4e,0x3c,0x76,0x86,0xe4}; + BCRYPT_KEY_LENGTHS_STRUCT key_lengths; BCRYPT_ALG_HANDLE aes; BCRYPT_KEY_HANDLE key; UCHAR *buf, plaintext[48], ivbuf[16]; @@ -971,6 +982,15 @@ static void test_BCryptDecrypt(void) ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + size = 0; + memset(&key_lengths, 0, sizeof(key_lengths)); + ret = BCryptGetProperty(aes, BCRYPT_KEY_LENGTHS, (UCHAR*)&key_lengths, sizeof(key_lengths), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(key_lengths), "got %u\n", size); + ok(key_lengths.dwMinLength == 128, "Expected 128, got %d\n", key_lengths.dwMinLength); + ok(key_lengths.dwMaxLength == 256, "Expected 256, got %d\n", key_lengths.dwMaxLength); + ok(key_lengths.dwIncrement == 64, "Expected 64, got %d\n", key_lengths.dwIncrement); + len = 0xdeadbeef; size = sizeof(len); ret = pBCryptGetProperty(aes, BCRYPT_OBJECT_LENGTH, (UCHAR *)&len, sizeof(len), &size, 0);

1 0

Nikolay Sivov : kernel32/nls: Added LOCALE_SNAN entries.
by Alexandre Julliard 17 Aug '17

17 Aug '17

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

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: 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: 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: 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