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

Matteo Bruni : d3dcompiler: Parse ": register()" syntax.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: bd7e83f2920ece2c388ada1e2e5fb76256b956c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7e83f2920ece2c388ada1e2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jun 16 22:45:44 2015 +0200 d3dcompiler: Parse ": register()" syntax. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 17 ++++- dlls/d3dcompiler_43/hlsl.y | 107 ++++++++++++++++++++++++++---- dlls/d3dcompiler_43/utils.c | 1 + 3 files changed, 112 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd7e83f2920ece2c388ad…

1 0

Alistair Leslie-Hughes : scrrun: Implement ITextStream Close.
by Alexandre Julliard 19 Jun '15

19 Jun '15

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

Huw Davies : gdi32/tests: Japanese Win 7 uses MS Shell Dlg as its default GUI font.
by Alexandre Julliard 19 Jun '15

19 Jun '15

Module: wine Branch: master Commit: c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c81ff0f8cfc1a7b6fa7546d8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jun 19 09:24:23 2015 +0100 gdi32/tests: Japanese Win 7 uses MS Shell Dlg as its default GUI font. --- dlls/gdi32/tests/font.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index a590ce8..f26c227 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5705,7 +5705,7 @@ static void test_stock_fonts(void) int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; WORD lang_id; - } td[][11] = + } td[][12] = { { /* ANSI_FIXED_FONT */ { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, @@ -5737,6 +5737,7 @@ static void test_stock_fonts(void) { 0 } }, { /* DEFAULT_GUI_FONT */ + { SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, { SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" }, { SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" }, { HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" }, @@ -5772,7 +5773,8 @@ static void test_stock_fonts(void) for (j = 0; td[i][j].face_name[0] != 0; j++) { if ((lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) || - (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL)) + (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL) || + (td[i][j].face_name[0] != '?' && strcmp(lf.lfFaceName, td[i][j].face_name))) { continue; }

1 0

Nikolay Sivov : comctl32/monthcal: Fix title to use properly localized year/month format.
by Alexandre Julliard 18 Jun '15

18 Jun '15

Module: wine Branch: master Commit: 035d0a159431d9d6b9affff46ce7ff84d1d0e990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035d0a159431d9d6b9affff46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 17 11:57:21 2015 +0300 comctl32/monthcal: Fix title to use properly localized year/month format. --- dlls/comctl32/monthcal.c | 76 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a49fad7..5accbe6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -866,10 +866,16 @@ static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, enum nav_direc /* paint a title with buttons and month/year string */ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx) { - static const WCHAR fmt_monthW[] = { '%','s',' ','%','l','d',0 }; + static const WCHAR mmmmW[] = {'M','M','M','M',0}; + static const WCHAR mmmW[] = {'M','M','M',0}; + static const WCHAR mmW[] = {'M','M',0}; + static const WCHAR fmtyearW[] = {'%','l','d',0}; + static const WCHAR fmtmmW[] = {'%','0','2','d',0}; + static const WCHAR fmtmW[] = {'%','d',0}; RECT *title = &infoPtr->calendars[calIdx].title; const SYSTEMTIME *st = &infoPtr->calendars[calIdx].month; - WCHAR buf_month[80], buf_fmt[80]; + WCHAR monthW[80], strW[80], fmtW[80], yearW[6] /* valid year range is 1601-30827 */; + int yearoffset, monthoffset, shiftX; SIZE sz; /* fill header box */ @@ -880,21 +886,65 @@ static void MONTHCAL_PaintTitle(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRU SetTextColor(hdc, infoPtr->colors[MCSC_TITLETEXT]); SelectObject(hdc, infoPtr->hBoldFont); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1 + st->wMonth - 1, - buf_month, countof(buf_month)); + /* draw formatted date string */ + GetDateFormatW(LOCALE_USER_DEFAULT, DATE_YEARMONTH, st, NULL, strW, countof(strW)); + DrawTextW(hdc, strW, strlenW(strW), title, DT_CENTER | DT_VCENTER | DT_SINGLELINE); + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SYEARMONTH, fmtW, countof(fmtW)); + wsprintfW(yearW, fmtyearW, st->wYear); + + /* month is trickier as it's possible to have different format pictures, we'll + test for M, MM, MMM, and MMMM */ + if (strstrW(fmtW, mmmmW)) + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SMONTHNAME1+st->wMonth-1, monthW, countof(monthW)); + else if (strstrW(fmtW, mmmW)) + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_SABBREVMONTHNAME1+st->wMonth-1, monthW, countof(monthW)); + else if (strstrW(fmtW, mmW)) + wsprintfW(monthW, fmtmmW, st->wMonth); + else + wsprintfW(monthW, fmtmW, st->wMonth); - wsprintfW(buf_fmt, fmt_monthW, buf_month, st->wYear); - DrawTextW(hdc, buf_fmt, strlenW(buf_fmt), title, - DT_CENTER | DT_VCENTER | DT_SINGLELINE); + /* update hit boxes */ + yearoffset = 0; + while (strW[yearoffset]) + { + if (!strncmpW(&strW[yearoffset], yearW, strlenW(yearW))) + break; + yearoffset++; + } - /* update title rectangles with current month - used while testing hits */ - GetTextExtentPoint32W(hdc, buf_fmt, strlenW(buf_fmt), &sz); - infoPtr->calendars[calIdx].titlemonth.left = title->right / 2 + title->left / 2 - sz.cx / 2; - infoPtr->calendars[calIdx].titleyear.right = title->right / 2 + title->left / 2 + sz.cx / 2; + monthoffset = 0; + while (strW[monthoffset]) + { + if (!strncmpW(&strW[monthoffset], monthW, strlenW(monthW))) + break; + monthoffset++; + } + + /* for left limits use offsets */ + sz.cx = 0; + if (yearoffset) + GetTextExtentPoint32W(hdc, strW, yearoffset, &sz); + infoPtr->calendars[calIdx].titleyear.left = sz.cx; + + sz.cx = 0; + if (monthoffset) + GetTextExtentPoint32W(hdc, strW, monthoffset, &sz); + infoPtr->calendars[calIdx].titlemonth.left = sz.cx; - GetTextExtentPoint32W(hdc, buf_month, strlenW(buf_month), &sz); + /* for right limits use actual string parts lengths */ + GetTextExtentPoint32W(hdc, &strW[yearoffset], strlenW(yearW), &sz); + infoPtr->calendars[calIdx].titleyear.right = infoPtr->calendars[calIdx].titleyear.left + sz.cx; + + GetTextExtentPoint32W(hdc, monthW, strlenW(monthW), &sz); infoPtr->calendars[calIdx].titlemonth.right = infoPtr->calendars[calIdx].titlemonth.left + sz.cx; - infoPtr->calendars[calIdx].titleyear.left = infoPtr->calendars[calIdx].titlemonth.right; + + /* Finally translate rectangles to match center aligned string, + hit rectangles are relative to title rectangle before translation. */ + GetTextExtentPoint32W(hdc, strW, strlenW(strW), &sz); + shiftX = (title->right - title->left - sz.cx) / 2 + title->left; + OffsetRect(&infoPtr->calendars[calIdx].titleyear, shiftX, 0); + OffsetRect(&infoPtr->calendars[calIdx].titlemonth, shiftX, 0); } static void MONTHCAL_PaintWeeknumbers(const MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps, INT calIdx)

1 0

Huw Davies : gdi32/tests: Fix Courier test on Arabic locales.
by Alexandre Julliard 18 Jun '15

18 Jun '15

Module: wine Branch: master Commit: 002cf965e16c296f4c928f42c752ef0ad652b6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=002cf965e16c296f4c928f42c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jun 18 09:45:35 2015 +0100 gdi32/tests: Fix Courier test on Arabic locales. --- dlls/gdi32/tests/font.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 5388df1..a590ce8 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5704,9 +5704,11 @@ static void test_stock_fonts(void) { int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; + WORD lang_id; } td[][11] = { { /* ANSI_FIXED_FONT */ + { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 96, "Courier" }, { DEFAULT_CHARSET, FW_NORMAL, 12, 13, 120, "Courier" }, { 0 } @@ -5769,7 +5771,8 @@ static void test_stock_fonts(void) for (j = 0; td[i][j].face_name[0] != 0; j++) { - if (lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) + if ((lf.lfCharSet != td[i][j].charset && td[i][j].charset != DEFAULT_CHARSET) || + (system_lang_id != td[i][j].lang_id && td[i][j].lang_id != LANG_NEUTRAL)) { continue; }

1 0

Jacek Caban : secur32: Fixed compilation on very old gnutls versions.
by Alexandre Julliard 18 Jun '15

18 Jun '15

Module: wine Branch: master Commit: cae3f98c6938663aab248f6551e9cc7cfbc1ce09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cae3f98c6938663aab248f655… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 18 13:06:08 2015 +0200 secur32: Fixed compilation on very old gnutls versions. --- dlls/secur32/schannel_gnutls.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index c0b6f80..d2c64fc 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); WINE_DECLARE_DEBUG_CHANNEL(winediag); +/* Not present in gnutls version < 2.9.10. */ +extern int gnutls_cipher_get_block_size(gnutls_cipher_algorithm_t algorithm); + static void *libgnutls_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gnutls_alert_get); @@ -77,10 +80,34 @@ MAKE_FUNCPTR(gnutls_transport_set_push_function); #undef MAKE_FUNCPTR #if GNUTLS_VERSION_MAJOR < 3 +#define GNUTLS_CIPHER_AES_192_CBC 92 #define GNUTLS_CIPHER_AES_128_GCM 93 #define GNUTLS_CIPHER_AES_256_GCM 94 #endif +static int compat_cipher_get_block_size(gnutls_cipher_algorithm_t cipher) +{ + switch(cipher) { + case GNUTLS_CIPHER_3DES_CBC: + return 8; + case GNUTLS_CIPHER_AES_128_CBC: + case GNUTLS_CIPHER_AES_256_CBC: + return 16; + case GNUTLS_CIPHER_ARCFOUR_128: + case GNUTLS_CIPHER_ARCFOUR_40: + return 1; + case GNUTLS_CIPHER_DES_CBC: + return 8; + case GNUTLS_CIPHER_NULL: + return 1; + case GNUTLS_CIPHER_RC2_40_CBC: + return 8; + default: + FIXME("Unknown cipher %#x, returning 1\n", cipher); + return 1; + } +} + static ssize_t schan_pull_adapter(gnutls_transport_ptr_t transport, void *buff, size_t buff_len) { @@ -474,7 +501,6 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_certificate_free_credentials) LOAD_FUNCPTR(gnutls_certificate_get_peers) LOAD_FUNCPTR(gnutls_cipher_get) - LOAD_FUNCPTR(gnutls_cipher_get_block_size) LOAD_FUNCPTR(gnutls_cipher_get_key_size) LOAD_FUNCPTR(gnutls_credentials_set) LOAD_FUNCPTR(gnutls_deinit) @@ -501,6 +527,12 @@ BOOL schan_imp_init(void) LOAD_FUNCPTR(gnutls_transport_set_push_function) #undef LOAD_FUNCPTR + if (!(pgnutls_cipher_get_block_size = wine_dlsym(libgnutls_handle, "gnutls_cipher_get_block_size", NULL, 0))) + { + WARN("gnutls_cipher_get_block_size not found\n"); + pgnutls_cipher_get_block_size = compat_cipher_get_block_size; + } + ret = pgnutls_global_init(); if (ret != GNUTLS_E_SUCCESS) {

1 0

Jacek Caban : mshtml: Use test.winehq.org over http in img_onload tests.
by Alexandre Julliard 18 Jun '15

18 Jun '15

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

Jacek Caban : wininet: Get rid of unneeded MSG_WAITALL support in NETCON_recv.
by Alexandre Julliard 18 Jun '15

18 Jun '15

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

Alex Henrie : riched20: Fix link notification conditions and add tests.
by Alexandre Julliard 18 Jun '15

18 Jun '15

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

Bernhard Übelacker : comctl32/tests: Free memory used by property sheet page (Valgrind).
by Alexandre Julliard 18 Jun '15

18 Jun '15

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