wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Huw Davies : dsound: Merge two identical allocation blocks.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: b47487af999f48ba2700b4dd5ff6cd47891d4787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47487af999f48ba2700b4dd5… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Feb 26 17:42:22 2017 +0000 dsound: Merge two identical allocation blocks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ed41a5c..b10ba02 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -238,19 +238,9 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, mixfloat = TRUE; /* reallocate emulated primary buffer */ - if (forcewave) { - if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen); - else - newbuf = HeapAlloc(GetProcessHeap(), 0, new_buflen); - - if (!newbuf) { - ERR("failed to allocate primary buffer\n"); - return DSERR_OUTOFMEMORY; - } - FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); - } else if (!mixfloat) { - new_buflen = frames * sizeof(float); + if (forcewave || !mixfloat) { + if (!forcewave) + new_buflen = frames * sizeof(float); if (device->buffer) newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen);

1 0

Huw Davies : dsound: Correctly update buflen.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 3076192e7de3c988e140da7003bd60c937c6ac8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3076192e7de3c988e140da700… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Feb 26 17:42:21 2017 +0000 dsound: Correctly update buflen. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index f5a1020..ed41a5c 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -250,18 +250,18 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, } FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); } else if (!mixfloat) { - DWORD alloc_len = frames * sizeof(float); + new_buflen = frames * sizeof(float); if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, alloc_len); + newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen); else - newbuf = HeapAlloc(GetProcessHeap(), 0, alloc_len); + newbuf = HeapAlloc(GetProcessHeap(), 0, new_buflen); if (!newbuf) { ERR("failed to allocate primary buffer\n"); return DSERR_OUTOFMEMORY; } - FillMemory(newbuf, alloc_len, (wfx->wBitsPerSample == 8) ? 128 : 0); + FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); } else { HeapFree(GetProcessHeap(), 0, device->buffer); newbuf = NULL;

1 0

Nikolay Sivov : gdiplus/tests: Fix region leak (Valgrind).
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 371c43550ca9724e241fa4dc5f12a3b4e7ce9873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371c43550ca9724e241fa4dc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 16:55:28 2017 +0300 gdiplus/tests: Fix region leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/region.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index e0ad48e..d4d8772 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -147,6 +147,8 @@ static void test_region_data(DWORD *data, UINT size, INT line) /* some Windows versions fail to properly clear the aligned DWORD */ ok_(__FILE__, line)(data[size - 1] == buf[size - 1] || broken(data[size - 1] != buf[size - 1]), "off %u: %#x != %#x\n", size - 1, data[size - 1], buf[size - 1]); + + GdipDeleteRegion(region); } static void test_getregiondata(void)

1 0

Piotr Caban : msvcr100: Add _ReentrantBlockingLock tests.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 0e7fa9006807fb95b28bf3ac9088614371463a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7fa9006807fb95b28bf3ac9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:16:17 2017 +0100 msvcr100: Add _ReentrantBlockingLock tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 045d698..cdac1b9 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -134,6 +134,10 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct { + CRITICAL_SECTION cs; +} _ReentrantBlockingLock; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -163,6 +167,17 @@ static void (__thiscall *preader_writer_lock_unlock)(void*); static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock)(void*); static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock_read)(void*); +static _ReentrantBlockingLock* (__thiscall *p_ReentrantBlockingLock_ctor)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock_dtor)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock__Acquire)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock__Release)(_ReentrantBlockingLock*); +static MSVCRT_bool (__thiscall *p_ReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); +static _ReentrantBlockingLock* (__thiscall *p_NonReentrantBlockingLock_ctor)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock_dtor)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock__Acquire)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock__Release)(_ReentrantBlockingLock*); +static MSVCRT_bool (__thiscall *p_NonReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -211,6 +226,17 @@ static BOOL init(void) SET(preader_writer_lock_unlock, "?unlock@reader_writer_lock@Concurrency@@QEAAXXZ"); SET(preader_writer_lock_try_lock, "?try_lock@reader_writer_lock@Concurrency@@QEAA_NXZ"); SET(preader_writer_lock_try_lock_read, "?try_lock_read@reader_writer_lock@Concurrency@@QEAA_NXZ"); + + SET(p_ReentrantBlockingLock_ctor, "??0_ReentrantBlockingLock@details@Concurrency@@QEAA@XZ"); + SET(p_ReentrantBlockingLock_dtor, "??1_ReentrantBlockingLock@details@Concurrency@@QEAA@XZ"); + SET(p_ReentrantBlockingLock__Acquire, "?_Acquire@_ReentrantBlockingLock@details@Concurrency@@QEAAXXZ"); + SET(p_ReentrantBlockingLock__Release, "?_Release@_ReentrantBlockingLock@details@Concurrency@@QEAAXXZ"); + SET(p_ReentrantBlockingLock__TryAcquire, "?_TryAcquire@_ReentrantBlockingLock@details@Concurrency@@QEAA_NXZ"); + SET(p_NonReentrantBlockingLock_ctor, "??0_NonReentrantBlockingLock@details@Concurrency@@QEAA@XZ"); + SET(p_NonReentrantBlockingLock_dtor, "??1_NonReentrantBlockingLock@details@Concurrency@@QEAA@XZ"); + SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire@_NonReentrantBlockingLock@details@Concurrency@@QEAAXXZ"); + SET(p_NonReentrantBlockingLock__Release, "?_Release@_NonReentrantBlockingLock@details@Concurrency@@QEAAXXZ"); + SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire@_NonReentrantBlockingLock@details@Concurrency@@QEAA_NXZ"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00@details@Concurrency@@QAE@P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00@details@Concurrency@@QAEXXZ"); @@ -227,6 +253,17 @@ static BOOL init(void) SET(preader_writer_lock_unlock, "?unlock@reader_writer_lock@Concurrency@@QAEXXZ"); SET(preader_writer_lock_try_lock, "?try_lock@reader_writer_lock@Concurrency@@QAE_NXZ"); SET(preader_writer_lock_try_lock_read, "?try_lock_read@reader_writer_lock@Concurrency@@QAE_NXZ"); + + SET(p_ReentrantBlockingLock_ctor, "??0_ReentrantBlockingLock@details@Concurrency@@QAE@XZ"); + SET(p_ReentrantBlockingLock_dtor, "??1_ReentrantBlockingLock@details@Concurrency@@QAE@XZ"); + SET(p_ReentrantBlockingLock__Acquire, "?_Acquire@_ReentrantBlockingLock@details@Concurrency@@QAEXXZ"); + SET(p_ReentrantBlockingLock__Release, "?_Release@_ReentrantBlockingLock@details@Concurrency@@QAEXXZ"); + SET(p_ReentrantBlockingLock__TryAcquire, "?_TryAcquire@_ReentrantBlockingLock@details@Concurrency@@QAE_NXZ"); + SET(p_NonReentrantBlockingLock_ctor, "??0_NonReentrantBlockingLock@details@Concurrency@@QAE@XZ"); + SET(p_NonReentrantBlockingLock_dtor, "??1_NonReentrantBlockingLock@details@Concurrency@@QAE@XZ"); + SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire@_NonReentrantBlockingLock@details@Concurrency@@QAEXXZ"); + SET(p_NonReentrantBlockingLock__Release, "?_Release@_NonReentrantBlockingLock@details@Concurrency@@QAEXXZ"); + SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire@_NonReentrantBlockingLock@details@Concurrency@@QAE_NXZ"); } init_thiscall_thunk(); @@ -640,6 +677,34 @@ static void test_reader_writer_lock(void) call_func1(preader_writer_lock_dtor, rw_lock); } +static void test__ReentrantBlockingLock(void) +{ + _ReentrantBlockingLock rbl; + MSVCRT_bool ret; + + call_func1(p_ReentrantBlockingLock_ctor, &rbl); + ret = call_func1(p_ReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_ReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_ReentrantBlockingLock__Acquire, &rbl); + ret = call_func1(p_ReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_ReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock_dtor, &rbl); + + call_func1(p_NonReentrantBlockingLock_ctor, &rbl); + ret = call_func1(p_NonReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_NonReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_NonReentrantBlockingLock__Acquire, &rbl); + ret = call_func1(p_NonReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_NonReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock_dtor, &rbl); +} + START_TEST(msvcr100) { if (!init()) @@ -652,4 +717,5 @@ START_TEST(msvcr100) test_atoi(); test__SpinWait(); test_reader_writer_lock(); + test__ReentrantBlockingLock(); }

1 0

Piotr Caban : msvcr100: Add _NonReentrantBlockingLock class implementation.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 3d6ec3ea1948f8f1489683e1605aabfdd8e665c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ec3ea1948f8f1489683e16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:16:07 2017 +0100 msvcr100: Add _NonReentrantBlockingLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 ++++++++++---------- dlls/msvcr100/msvcr100.spec | 20 ++++++++++---------- dlls/msvcr110/msvcr110.spec | 30 +++++++++++++++--------------- dlls/msvcr120/msvcr120.spec | 30 +++++++++++++++--------------- dlls/msvcr120_app/msvcr120_app.spec | 30 +++++++++++++++--------------- 5 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6ec3ea1948f8f148968…

1 0

Piotr Caban : msvcr100: Add _ReentrantBlockingLock class implementation.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 2682f9e67c78172039de4abc690b33b3a20742f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2682f9e67c78172039de4abc6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:15:56 2017 +0100 msvcr100: Add _ReentrantBlockingLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 +++++++------- dlls/msvcr100/msvcr100.spec | 20 +++++++------- dlls/msvcr110/msvcr110.spec | 30 ++++++++++----------- dlls/msvcr120/msvcr120.spec | 30 ++++++++++----------- dlls/msvcr120_app/msvcr120_app.spec | 30 ++++++++++----------- dlls/msvcrt/lock.c | 54 +++++++++++++++++++++++++++++++++++++ 6 files changed, 119 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2682f9e67c78172039de4…

1 0

Bruno Jesus : winegstreamer: Avoid a magic number for empty offset.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: a8fc94d526e716aa76fdbd75feef57a33bf821ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8fc94d526e716aa76fdbd75f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Feb 22 23:44:48 2017 -0300 winegstreamer: Avoid a magic number for empty offset. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 759a5db..3ef2324 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -700,7 +700,7 @@ static GstFlowReturn request_buffer_src(GstPad *pad, GstObject *parent, guint64 TRACE("%p %s %i %p\n", pad, wine_dbgstr_longlong(ofs), len, buf); *buf = NULL; - if (ofs == (guint64)-1) + if (ofs == GST_BUFFER_OFFSET_NONE) ofs = This->nextpullofs; if (ofs >= This->filesize) { WARN("Reading past eof: %s, %u\n", wine_dbgstr_longlong(ofs), len);

1 0

André Hentschel : iphlpapi/tests: Test ScopeID only for IPv6.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 38bf651bc4efdce9ef296326b7cf40d6ae117e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf651bc4efdce9ef296326b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 27 14:05:45 2017 +0100 iphlpapi/tests: Test ScopeID only for IPv6. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index e0701a3..953bbc9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2067,8 +2067,6 @@ static void test_GetUnicastIpAddressEntry(void) if (row.Address.si_family == AF_INET6) ok(row.ScopeId.Value == row.Address.Ipv6.sin6_scope_id, "Expected %d, got %d\n", row.Address.Ipv6.sin6_scope_id, row.ScopeId.Value); - else - ok(row.ScopeId.Value == 0, "Expected 0, got %d\n", row.ScopeId.Value); ok(row.CreationTimeStamp.QuadPart, "CreationTimeStamp is 0\n"); } ua = ua->Next;

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 42a62ad83920bcdeeddb67f8053eb0717cd63fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a62ad83920bcdeeddb67f80… Author: Kim Malmo <berencamlost(a)msn.com> Date: Mon Feb 27 15:31:52 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index da76ed9..3af4b72 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 16:00+0100\n" +"PO-Revision-Date: 2017-02-27 16:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -12220,17 +12220,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksporterer den valgte greinen av registeret til en tekstfil" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Bekreft sletting av verdi" +msgstr "Bekreft sletting av nøkkel" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Vil du virkelig slette registernøkkel \"%1\"?" +msgstr "Vil du virkelig slette registernøkkel \"%1\" og alle dens undernøkler?" #: regsvr32.rc:32 msgid ""

1 0

Jacek Caban : wininet: Improved netconn_drain_content.
by Alexandre Julliard 27 Feb '17

27 Feb '17

Module: wine Branch: master Commit: 7b42dc4931201a078029fb35d51cb1d0c75e2d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b42dc4931201a078029fb35d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 27 15:20:26 2017 +0100 wininet: Improved netconn_drain_content. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 15 ++++++++------ dlls/wininet/tests/http.c | 52 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 635b7d6..21b93dd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2682,17 +2682,20 @@ static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; - int len; + int len, res; + size_t size; - if(netconn_end_of_data(stream, req)) - return TRUE; + if(netconn_stream->content_length == ~0u) + return FALSE; - do { - if(NETCON_recv(req->netconn, buf, sizeof(buf), FALSE, &len) != ERROR_SUCCESS) + 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; netconn_stream->content_read += len; - }while(netconn_stream->content_read < netconn_stream->content_length); + } return TRUE; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fb64e3c..6df30fa 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4652,7 +4652,14 @@ static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, _readex_expect_sync_data_len(line, req, flags, buf, buf_size, exdata, strlen(exdata)); } -static void send_response_and_wait(const char *response, BOOL close_connection, INTERNET_BUFFERSW *buf) +static void close_connection(void) +{ + char c; + SetEvent(conn_wait_event); + recv(server_socket, &c, 1, 0); +} + +static void send_response_and_wait(const char *response, BOOL do_close_connection, INTERNET_BUFFERSW *buf) { DWORD orig_size = buf->dwBufferLength; @@ -4661,11 +4668,8 @@ static void send_response_and_wait(const char *response, BOOL close_connection, if(response) server_send_string(response); - if(close_connection) { - char c; - SetEvent(conn_wait_event); - recv(server_socket, &c, 1, 0); - } + if(do_close_connection) + close_connection(); WaitForSingleObject(hCompleteEvent, INFINITE); @@ -4821,6 +4825,41 @@ static void test_http_read(int port) CloseHandle(server_req_rec_event); } +static void test_connection_break(int port) +{ + INTERNET_BUFFERSW ib; + test_request_t req; + char buf[24000]; + + if(!is_ie7plus) + return; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + trace("Testing InternetReadFileExW on broken connection...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 10000\r\n" + "\r\n" + "xx"); + + /* close connection and make sure that it's closed on handle release. */ + close_connection(); + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, hCompleteEvent, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); +} + static void test_long_url(int port) { char long_path[INTERNET_MAX_PATH_LENGTH*2] = "/echo_request?"; @@ -4919,6 +4958,7 @@ static void test_http_connection(void) test_basic_auth_credentials_reuse(si.port); test_async_read(si.port); test_http_read(si.port); + test_connection_break(si.port); test_long_url(si.port); test_remove_dot_segments(si.port);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
84
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 February 2017