June 2015 - Wine-Commits - list.winehq.org

Alistair Leslie-Hughes : scrrun: Implement ITextStream Close.
by Alexandre Julliard June 19, 2015

June 19, 2015

Module: wine Branch: master Commit: 0a19048795f8084c448bab6d87c2d8170b8b0ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a19048795f8084c448bab6d8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 16 15:38:08 2015 +1000 scrrun: Implement ITextStream Close. --- dlls/scrrun/filesystem.c | 12 ++++++++++-- dlls/scrrun/tests/filesystem.c | 12 ++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d490d93..3de38d2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -633,8 +633,16 @@ static HRESULT WINAPI textstream_SkipLine(ITextStream *iface) static HRESULT WINAPI textstream_Close(ITextStream *iface) { struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p): stub\n", This); - return E_NOTIMPL; + HRESULT hr = S_OK; + + TRACE("(%p)\n", This); + + if(!CloseHandle(This->file)) + hr = S_FALSE; + + This->file = NULL; + + return hr; } static const ITextStreamVtbl textstreamvtbl = { diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index b22e006..28242ce 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -35,6 +35,9 @@ static IFileSystem3 *fs3; +/* w2k and 2k3 error code. */ +#define E_VAR_NOT_SET 0x800a005b + static inline ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -1378,6 +1381,15 @@ static void test_CreateTextFile(void) hr = ITextStream_Read(stream, 1, &str); ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + hr = ITextStream_Close(stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ITextStream_Read(stream, 1, &str); + ok(hr == CTL_E_BADFILEMODE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + + hr = ITextStream_Close(stream); + ok(hr == S_FALSE || hr == E_VAR_NOT_SET, "got 0x%08x\n", hr); + ITextStream_Release(stream); /* check it's created */

1 0

Nikolay Sivov : kernel32: Export RtlCopyMemory().
by Alexandre Julliard June 19, 2015

June 19, 2015

Module: wine Branch: master Commit: 08247714232408f0a48bf95da141a7b906450af3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08247714232408f0a48bf95da… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 19 04:00:26 2015 +0300 kernel32: Export RtlCopyMemory(). --- dlls/kernel32/kernel32.spec | 2 +- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/rtl.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8e97cdb..f9a0770 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1284,7 +1284,7 @@ @ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace @ stdcall -arch=x86_64 RtlCompareMemory(ptr ptr long) ntdll.RtlCompareMemory -# @ stub -arch=x86_64 RtlCopyMemory +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) ntdll.RtlCopyMemory @ cdecl -arch=arm,x86_64 RtlDeleteFunctionTable(ptr) ntdll.RtlDeleteFunctionTable @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory @ cdecl -arch=x86_64 RtlInstallFunctionTableCallback(long long long ptr ptr ptr) ntdll.RtlInstallFunctionTableCallback diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 191115b..270d7ff 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -474,6 +474,7 @@ # @ stub RtlConvertVariantToProperty @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) +@ stdcall -arch=x86_64 RtlCopyMemory(ptr ptr long) # @ stub RtlCopyMemoryStreamTo # @ stub RtlCopyOutOfProcessMemoryStreamTo # @ stub RtlCopyRangeList diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 8f6f386..855bdb9 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -534,6 +534,15 @@ SIZE_T WINAPI RtlCompareMemoryUlong(const ULONG *Source1, SIZE_T Length, ULONG d } /****************************************************************************** + * RtlCopyMemory [NTDLL.@] + */ +#undef RtlCopyMemory +void WINAPI RtlCopyMemory(void *dest, const void *src, SIZE_T len) +{ + memcpy(dest, src, len); +} + +/****************************************************************************** * RtlAssert [NTDLL.@] * * Fail a debug assertion.

1 0

Bruno Jesus : ws2_32: UDP sockets can write data even when unbound.
by Alexandre Julliard June 19, 2015

June 19, 2015

Module: wine Branch: master Commit: 45677e173d6efb64e6ab29689df118f2b15628fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=45677e173d6efb64e6ab29689… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jun 18 11:03:10 2015 -0300 ws2_32: UDP sockets can write data even when unbound. --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 63c965e..4fe3a0b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4708,7 +4708,8 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set fds[j].fd = get_sock_fd( writefds->fd_array[i], FILE_WRITE_DATA, NULL ); if (fds[j].fd == -1) goto failed; fds[j].revents = 0; - if (is_fd_bound(fds[j].fd, NULL, NULL) == 1) + if (is_fd_bound(fds[j].fd, NULL, NULL) == 1 || + _get_fd_type(fds[j].fd) == SOCK_DGRAM) { fds[j].events = POLLOUT; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7335faa..2d14496 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3877,9 +3877,7 @@ todo_wine FD_ZERO_ALL(); FD_SET_ALL(fdWrite); ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); -todo_wine ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); closesocket(fdWrite); }

1 0

Nikolay Sivov : dwrite/tests: Initial test for GetBaseline().
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: 5df702af9e52939827b60d074be739daf8c30b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5df702af9e52939827b60d074… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 18:56:03 2015 +0300 dwrite/tests: Initial test for GetBaseline(). --- dlls/dwrite/tests/analyzer.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index c514bec..a3eaa38 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -1819,6 +1819,65 @@ static void test_GetGlyphOrientationTransform(void) IDWriteTextAnalyzer2_Release(analyzer2); } +static void test_GetBaseline(void) +{ + DWRITE_SCRIPT_ANALYSIS sa = { 0 }; + IDWriteTextAnalyzer1 *analyzer1; + IDWriteTextAnalyzer *analyzer; + IDWriteFontFace *fontface; + INT32 baseline; + BOOL exists; + HRESULT hr; + + hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextAnalyzer_QueryInterface(analyzer, &IID_IDWriteTextAnalyzer1, (void**)&analyzer1); + IDWriteTextAnalyzer_Release(analyzer); + if (hr != S_OK) { + win_skip("GetBaseline() is not supported.\n"); + return; + } + + fontface = create_fontface(); + + /* Tahoma doesn't have BASE table, it doesn't work even with simulation enabled */ + exists = TRUE; + baseline = 456; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, + fontface, + DWRITE_BASELINE_DEFAULT, + FALSE, + TRUE, + sa, + NULL, + &baseline, + &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(baseline == 0, "got %d\n", baseline); + ok(exists == FALSE, "got %d\n", exists); +} + exists = TRUE; + baseline = 456; + hr = IDWriteTextAnalyzer1_GetBaseline(analyzer1, + fontface, + DWRITE_BASELINE_ROMAN, + FALSE, + TRUE, + sa, + NULL, + &baseline, + &exists); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(baseline == 0, "got %d\n", baseline); + ok(exists == FALSE, "got %d\n", exists); +} + IDWriteFontFace_Release(fontface); + IDWriteTextAnalyzer1_Release(analyzer1); +} + START_TEST(analyzer) { HRESULT hr; @@ -1844,6 +1903,7 @@ START_TEST(analyzer) test_GetGlyphPlacements(); test_ApplyCharacterSpacing(); test_GetGlyphOrientationTransform(); + test_GetBaseline(); IDWriteFactory_Release(factory); }

1 0

Jacek Caban : mshtml: Use test.winehq.org over http in img_onload tests.
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: e250e545305a3bf01648f88670d63face7e24103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e250e545305a3bf01648f8867… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 18 13:11:07 2015 +0200 mshtml: Use test.winehq.org over http in img_onload tests. --- dlls/mshtml/tests/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 07549e3..69f21df 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1854,7 +1854,7 @@ static void test_imgload(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&img_onerror_obj, "V_DISPATCH(onerror) != onerrorFunc\n"); VariantClear(&v); - str = a2bstr("https://www.winehq.org/images/winehq_logo_text.png"); + str = a2bstr("http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.p…"); hres = IHTMLImgElement_put_src(img, str); ok(hres == S_OK, "put_src failed: %08x\n", hres); SysFreeString(str);

1 0

Nikolay Sivov : riched20: Improve tracing for unimplemented selection methods.
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: 060cffc1b330f4087bd2a7f08d415aebaa5c0ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=060cffc1b330f4087bd2a7f08… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 16 22:00:25 2015 +0300 riched20: Improve tracing for unimplemented selection methods. --- dlls/riched20/richole.c | 308 +++++++++++++++++++++++++++++++----------------- 1 file changed, 202 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=060cffc1b330f4087bd2a…

1 0

Nikolay Sivov : dwrite/tests: Initial test for GetLineMetrics().
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: 0b84556f8d8dd14b843901619be88be55ad69acb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b84556f8d8dd14b843901619… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 17:14:56 2015 +0300 dwrite/tests: Initial test for GetLineMetrics(). --- dlls/dwrite/tests/layout.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index ee7cfcb..3e654ae 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2662,6 +2662,99 @@ static void test_SetDrawingEffect(void) IDWriteFactory_Release(factory); } +static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) +{ + IDWriteFontCollection *collection; + IDWriteFontFamily *family; + IDWriteFontFace *fontface; + IDWriteFont *font; + WCHAR nameW[255]; + UINT32 index; + BOOL exists; + HRESULT hr; + + hr = IDWriteTextFormat_GetFontCollection(format, &collection); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteTextFormat_GetFontFamilyName(format, nameW, sizeof(nameW)/sizeof(WCHAR)); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_FindFamilyName(collection, nameW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontCollection_Release(collection); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, + IDWriteTextFormat_GetFontWeight(format), + IDWriteTextFormat_GetFontStretch(format), + IDWriteTextFormat_GetFontStyle(format), + &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); + + return fontface; +} + +static void test_GetLineMetrics(void) +{ + static const WCHAR strW[] = {'a','b','c','d',' ',0}; + DWRITE_FONT_METRICS fontmetrics; + DWRITE_LINE_METRICS metrics; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + UINT32 count; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 2048.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 5, format, 30000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 0, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + ok(count == 1, "got count %u\n", count); + + memset(&metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 1, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(metrics.length == 5, "got %u\n", metrics.length); + ok(metrics.trailingWhitespaceLength == 1, "got %u\n", metrics.trailingWhitespaceLength); +} + ok(metrics.newlineLength == 0, "got %u\n", metrics.newlineLength); + ok(metrics.isTrimmed == FALSE, "got %d\n", metrics.isTrimmed); + + /* Tahoma doesn't provide BASE table, so baseline is calculated from font metrics */ + fontface = get_fontface_from_format(format); + ok(fontface != NULL, "got %p\n", fontface); + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + +todo_wine { + ok(metrics.baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics.baseline, + fontmetrics.ascent); + ok(metrics.height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", + metrics.height, fontmetrics.ascent + fontmetrics.descent); +} + IDWriteFontFace_Release(fontface); + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2701,6 +2794,7 @@ START_TEST(layout) test_GetMetrics(); test_SetFlowDirection(); test_SetDrawingEffect(); + test_GetLineMetrics(); IDWriteFactory_Release(factory); }

1 0

Bernhard Übelacker : comctl32/tests: Free memory used by property sheet page (Valgrind).
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: ccf2ea61798979ae92e682e7396ecdd27fc80d61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf2ea61798979ae92e682e73… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Jun 18 00:43:25 2015 +0200 comctl32/tests: Free memory used by property sheet page (Valgrind). --- dlls/comctl32/tests/propsheet.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 815b8ad..9a422f1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -874,6 +874,7 @@ if (0) r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); + DestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg); }

1 0

Alex Henrie : riched20: Fix link notification conditions and add tests.
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: af19e6401770a0e9e5b81e5b03005fd702f9078a URL: http://source.winehq.org/git/wine.git/?a=commit;h=af19e6401770a0e9e5b81e5b0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Jun 17 23:08:34 2015 -0600 riched20: Fix link notification conditions and add tests. --- dlls/riched20/editor.c | 13 +++- dlls/riched20/tests/editor.c | 178 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 172 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af19e6401770a0e9e5b81…

1 0

Jacek Caban : wininet: Get rid of unneeded MSG_WAITALL support in NETCON_recv.
by Alexandre Julliard June 18, 2015

June 18, 2015

Module: wine Branch: master Commit: 6fe55462107b4dcc31f919296a6e5870dcc881a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe55462107b4dcc31f919296… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 18 13:28:24 2015 +0200 wininet: Get rid of unneeded MSG_WAITALL support in NETCON_recv. --- dlls/wininet/http.c | 11 +++++------ dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 33 +++++++++------------------------ 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f4f67cb..42654a2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2513,7 +2513,7 @@ static DWORD read_more_data( http_request_t *req, int maxlen ) if (maxlen == -1) maxlen = sizeof(req->read_buf); res = NETCON_recv( req->netconn, req->read_buf + req->read_size, - maxlen - req->read_size, BLOCKING_ALLOW, &len ); + maxlen - req->read_size, TRUE, &len ); if(res == ERROR_SUCCESS) req->read_size += len; @@ -2664,8 +2664,7 @@ static DWORD netconn_read(data_stream_t *stream, http_request_t *req, BYTE *buf, size = min(size, netconn_stream->content_length-netconn_stream->content_read); if(size && is_valid_netconn(req->netconn)) { - while((res = NETCON_recv(req->netconn, buf+ret, size-ret, - blocking_mode == BLOCKING_WAITALL ? BLOCKING_ALLOW : blocking_mode, &len)) == ERROR_SUCCESS) { + while((res = NETCON_recv(req->netconn, buf+ret, size-ret, blocking_mode != BLOCKING_DISALLOW, &len)) == ERROR_SUCCESS) { if(!len) { netconn_stream->content_length = netconn_stream->content_read; break; @@ -2695,7 +2694,7 @@ static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) return TRUE; do { - if(NETCON_recv(req->netconn, buf, sizeof(buf), BLOCKING_DISALLOW, &len) != ERROR_SUCCESS) + if(NETCON_recv(req->netconn, buf, sizeof(buf), FALSE, &len) != ERROR_SUCCESS) return FALSE; netconn_stream->content_read += len; @@ -2735,7 +2734,7 @@ static DWORD read_more_chunked_data(chunked_stream_t *stream, http_request_t *re if (maxlen == -1) maxlen = sizeof(stream->buf); res = NETCON_recv( req->netconn, stream->buf + stream->buf_size, - maxlen - stream->buf_size, BLOCKING_ALLOW, &len ); + maxlen - stream->buf_size, TRUE, &len ); if(res == ERROR_SUCCESS) stream->buf_size += len; @@ -2871,7 +2870,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, break; } - res = NETCON_recv(req->netconn, (char *)buf+ret_read, read_bytes, BLOCKING_ALLOW, (int*)&read_bytes); + res = NETCON_recv(req->netconn, (char *)buf+ret_read, read_bytes, TRUE, (int*)&read_bytes); if(res != ERROR_SUCCESS) break; } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 40951b6..955c7c5 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -427,7 +427,7 @@ void NETCON_unload(void) DECLSPEC_HIDDEN; DWORD NETCON_secure_connect(netconn_t*,server_t*) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; -DWORD NETCON_recv(netconn_t*,void*,size_t,blocking_mode_t,int*) DECLSPEC_HIDDEN; +DWORD NETCON_recv(netconn_t*,void*,size_t,BOOL,int*) DECLSPEC_HIDDEN; BOOL NETCON_query_data_available(netconn_t *connection, DWORD *available) DECLSPEC_HIDDEN; BOOL NETCON_is_alive(netconn_t*) DECLSPEC_HIDDEN; LPCVOID NETCON_GetCert(netconn_t *connection) DECLSPEC_HIDDEN; diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 9f64cb9..e82dd30 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -731,6 +731,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking *ret_size = buf_len; if(!buf_len) { + TRACE("EOF\n"); *eof = TRUE; return ERROR_SUCCESS; } @@ -817,7 +818,7 @@ static BOOL read_ssl_chunk(netconn_t *conn, void *buf, SIZE_T buf_size, blocking * Basically calls 'recv()' unless we should use SSL * number of chars received is put in *recvd */ -DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t mode, int *recvd) +DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, BOOL blocking, int *recvd) { *recvd = 0; if (!len) @@ -825,18 +826,13 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t if (!connection->secure) { - int flags = 0; - - if(mode == BLOCKING_WAITALL) - flags = MSG_WAITALL; - - set_socket_blocking(connection->socket, mode); - *recvd = sock_recv(connection->socket, buf, len, flags); + set_socket_blocking(connection->socket, blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW); + *recvd = sock_recv(connection->socket, buf, len, 0); return *recvd == -1 ? WSAGetLastError() : ERROR_SUCCESS; } else { - SIZE_T size = 0, cread; + SIZE_T size = 0; BOOL eof; DWORD res; @@ -850,17 +846,13 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t heap_free(connection->peek_msg_mem); connection->peek_msg_mem = connection->peek_msg = NULL; } - /* check if we have enough data from the peek buffer */ - if(mode != BLOCKING_WAITALL || size == len) { - *recvd = size; - return ERROR_SUCCESS; - } - mode = BLOCKING_DISALLOW; + *recvd = size; + return ERROR_SUCCESS; } do { - res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, mode, &cread, &eof); + res = read_ssl_chunk(connection, (BYTE*)buf+size, len-size, blocking ? BLOCKING_ALLOW : BLOCKING_DISALLOW, &size, &eof); if(res != ERROR_SUCCESS) { if(res == WSAEWOULDBLOCK) { if(size) @@ -870,14 +862,7 @@ DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, blocking_mode_t } break; } - - if(eof) { - TRACE("EOF\n"); - break; - } - - size += cread; - }while(!size || (mode == BLOCKING_WAITALL && size < len)); + }while(!size && !eof); TRACE("received %ld bytes\n", size); *recvd = size;

1 0