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

Nikolay Sivov : comctl32/listview: Fix focus rectangle for LVS_EX_FULLROWSELECT case.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 782253f18dea8134e83124336c16eb6988a94b5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=782253f18dea8134e83124336… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 10:20:28 2015 +0300 comctl32/listview: Fix focus rectangle for LVS_EX_FULLROWSELECT case. --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 8c5af7b..3ac84a9 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4601,11 +4601,11 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N if ((leftmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0))) { - INT Originx = pos->x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; - INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + INT Originx = pos->x - LISTVIEW_GetColumnInfo(infoPtr, leftmost)->rcHeader.left; + INT rightmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); - rcBox.right = LISTVIEW_GetColumnInfo(infoPtr, index)->rcHeader.right + Originx; + rcBox.right = LISTVIEW_GetColumnInfo(infoPtr, rightmost)->rcHeader.right + Originx; rcSelect.left = LISTVIEW_GetColumnInfo(infoPtr, leftmost)->rcHeader.left + Originx; } }

1 0

Bruno Jesus : ws2_32: Convert send/recv flags to native system.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: dcc0bae95df6e2d94ed54cc48b0eb80e882440bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcc0bae95df6e2d94ed54cc48… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 29 00:53:30 2015 -0300 ws2_32: Convert send/recv flags to native system. --- dlls/ws2_32/socket.c | 59 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1bcb63c..cda9641 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -462,6 +462,14 @@ static void WS_AddCompletion( SOCKET sock, ULONG_PTR CompletionValue, NTSTATUS C #define MAP_OPTION(opt) { WS_##opt, opt } +static const int ws_flags_map[][2] = +{ + MAP_OPTION( MSG_OOB ), + MAP_OPTION( MSG_PEEK ), + MAP_OPTION( MSG_DONTROUTE ), + MAP_OPTION( MSG_WAITALL ), +}; + static const int ws_sock_map[][2] = { MAP_OPTION( SO_DEBUG ), @@ -1014,6 +1022,33 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) } /*********************************************************************** + * convert_flags() + * + * Converts send/recv flags from Windows format. + * Return the converted flag bits, unsupported flags remain unchanged. + */ +static int convert_flags(int flags) +{ + int i, out; + if (!flags) return 0; + + for (out = i = 0; flags && i < sizeof(ws_flags_map) / sizeof(ws_flags_map[0]); i++) + { + if (ws_flags_map[i][0] & flags) + { + out |= ws_flags_map[i][1]; + flags &= ~ws_flags_map[i][0]; + } + } + if (flags) + { + FIXME("Unknown send/recv flags 0x%x, using anyway...\n", flags); + out |= flags; + } + return out; +} + +/*********************************************************************** * convert_sockopt() * * Converts socket flags from Windows format. @@ -1940,7 +1975,7 @@ static void WINAPI ws2_async_apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserv * * Workhorse for both synchronous and asynchronous recv() operations. */ -static int WS2_recv( int fd, struct ws2_async *wsa ) +static int WS2_recv( int fd, struct ws2_async *wsa, int flags ) { #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS char pktbuf[512]; @@ -1970,7 +2005,7 @@ static int WS2_recv( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - while ((n = recvmsg(fd, &hdr, wsa->flags)) == -1) + while ((n = recvmsg(fd, &hdr, flags)) == -1) { if (errno != EINTR) return -1; @@ -2025,7 +2060,7 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, if ((status = wine_server_handle_to_fd( wsa->hSocket, FILE_READ_DATA, &fd, NULL ) )) break; - result = WS2_recv( fd, wsa ); + result = WS2_recv( fd, wsa, convert_flags(wsa->flags) ); wine_server_release_fd( wsa->hSocket, fd ); if (result >= 0) { @@ -2173,7 +2208,7 @@ finish: * * Workhorse for both synchronous and asynchronous send() operations. */ -static int WS2_send( int fd, struct ws2_async *wsa ) +static int WS2_send( int fd, struct ws2_async *wsa, int flags ) { struct msghdr hdr; union generic_unix_sockaddr unix_addr; @@ -2221,7 +2256,7 @@ static int WS2_send( int fd, struct ws2_async *wsa ) hdr.msg_flags = 0; #endif - while ((ret = sendmsg(fd, &hdr, wsa->flags)) == -1) + while ((ret = sendmsg(fd, &hdr, flags)) == -1) { if (errno != EINTR) return -1; @@ -2262,7 +2297,7 @@ static NTSTATUS WS2_async_send( void *user, IO_STATUS_BLOCK *iosb, break; /* check to see if the data is ready (non-blocking) */ - result = WS2_send( fd, wsa ); + result = WS2_send( fd, wsa, convert_flags(wsa->flags) ); wine_server_release_fd( wsa->hSocket, fd ); if (result >= 0) @@ -4673,7 +4708,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { unsigned int i, options; - int n, fd, err, overlapped; + int n, fd, err, overlapped, flags; struct ws2_async *wsa = NULL, localwsa; int totalLength = 0; DWORD bytes_sent; @@ -4722,7 +4757,8 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, totalLength += lpBuffers[i].len; } - n = WS2_send( fd, wsa ); + flags = convert_flags(dwFlags); + n = WS2_send( fd, wsa, flags ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -4814,7 +4850,7 @@ static int WS2_sendto( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, goto error; /* msdn says a timeout in send is fatal */ } - n = WS2_send( fd, wsa ); + n = WS2_send( fd, wsa, flags ); if (n == -1 && errno != EAGAIN) { err = wsaErrno(); @@ -6712,7 +6748,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPWSABUF lpControlBuffer ) { unsigned int i, options; - int n, fd, err, overlapped; + int n, fd, err, overlapped, flags; struct ws2_async *wsa = NULL, localwsa; BOOL is_blocking; DWORD timeout_start = GetTickCount(); @@ -6773,9 +6809,10 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, wsa->iovec[i].iov_len = lpBuffers[i].len; } + flags = convert_flags(wsa->flags); for (;;) { - n = WS2_recv( fd, wsa ); + n = WS2_recv( fd, wsa, flags ); if (n == -1) { if (errno != EAGAIN)

1 0

Bruno Jesus : ws2_32: Do not poll unbound descriptors.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 10f7265270f1ad4e4e1bfec6fb5f06e494d5f579 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f7265270f1ad4e4e1bfec6f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 29 00:53:48 2015 -0300 ws2_32: Do not poll unbound descriptors. --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++++++------ dlls/ws2_32/tests/sock.c | 5 ----- 2 files changed, 33 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 26ac305..717a394 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4479,24 +4479,51 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set { fds[j].fd = get_sock_fd( readfds->fd_array[i], FILE_READ_DATA, NULL ); if (fds[j].fd == -1) goto failed; - fds[j].events = POLLIN; fds[j].revents = 0; + if (is_fd_bound(fds[j].fd, NULL, NULL) == 1) + { + fds[j].events = POLLIN; + } + else + { + release_sock_fd( readfds->fd_array[i], fds[j].fd ); + fds[j].fd = -1; + fds[j].events = 0; + } } if (writefds) for (i = 0; i < writefds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( writefds->fd_array[i], FILE_WRITE_DATA, NULL ); if (fds[j].fd == -1) goto failed; - fds[j].events = POLLOUT; fds[j].revents = 0; + if (is_fd_bound(fds[j].fd, NULL, NULL) == 1) + { + fds[j].events = POLLOUT; + } + else + { + release_sock_fd( readfds->fd_array[i], fds[j].fd ); + fds[j].fd = -1; + fds[j].events = 0; + } } if (exceptfds) for (i = 0; i < exceptfds->fd_count; i++, j++) { fds[j].fd = get_sock_fd( exceptfds->fd_array[i], 0, NULL ); if (fds[j].fd == -1) goto failed; - fds[j].events = POLLHUP; fds[j].revents = 0; + if (is_fd_bound(fds[j].fd, NULL, NULL) == 1) + { + fds[j].events = POLLHUP; + } + else + { + release_sock_fd( readfds->fd_array[i], fds[j].fd ); + fds[j].fd = -1; + fds[j].events = 0; + } } return fds; @@ -4505,13 +4532,13 @@ failed: j = 0; if (readfds) for (i = 0; i < readfds->fd_count && j < count; i++, j++) - release_sock_fd( readfds->fd_array[i], fds[j].fd ); + if (fds[j].fd != -1) release_sock_fd( readfds->fd_array[i], fds[j].fd ); if (writefds) for (i = 0; i < writefds->fd_count && j < count; i++, j++) - release_sock_fd( writefds->fd_array[i], fds[j].fd ); + if (fds[j].fd != -1) release_sock_fd( writefds->fd_array[i], fds[j].fd ); if (exceptfds) for (i = 0; i < exceptfds->fd_count && j < count; i++, j++) - release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); + if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); HeapFree( GetProcessHeap(), 0, fds ); return NULL; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87511aa..1f30fda 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3430,17 +3430,12 @@ static void test_select(void) if (fdWrite > maxfd) maxfd = fdWrite; - todo_wine { ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); ok ( (ret == 0), "select should not return any socket handles\n"); ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); - } ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); - - todo_wine { ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); - } ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); ret = closesocket(fdWrite);

1 0

Bruno Jesus : ws2_32: Add a helper to check if a socket is bound or not.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 57e7a562bd196742043a209e8251bfa32222ff3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e7a562bd196742043a209e8… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 29 00:53:36 2015 -0300 ws2_32: Add a helper to check if a socket is bound or not. --- dlls/ws2_32/socket.c | 57 ++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cda9641..0b8e2cb 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1586,6 +1586,22 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) } } +/* Returns -1 if getsockname fails, 0 if not bound, 1 otherwise */ +static int is_fd_bound(int fd, union generic_unix_sockaddr *uaddr, socklen_t *uaddrlen) +{ + union generic_unix_sockaddr inaddr; + socklen_t inlen; + int res; + + if (!uaddr) uaddr = &inaddr; + if (!uaddrlen) uaddrlen = &inlen; + + *uaddrlen = sizeof(inaddr); + res = getsockname(fd, &uaddr->addr, uaddrlen); + if (!res) res = is_sockaddr_bound(&uaddr->addr, *uaddrlen); + return res; +} + /* Returns 0 if successful, -1 if the buffer is too small */ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* wsaddr, int* wsaddrlen) { @@ -2941,8 +2957,6 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n PVOID sendBuf, DWORD sendBufLen, LPDWORD sent, LPOVERLAPPED ov) { int fd, ret, status; - union generic_unix_sockaddr uaddr; - socklen_t uaddrlen = sizeof(uaddr); if (!ov) { @@ -2960,14 +2974,10 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n TRACE("socket %04lx, ptr %p %s, length %d, sendptr %p, len %d, ov %p\n", s, name, debugstr_sockaddr(name), namelen, sendBuf, sendBufLen, ov); - if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) - { - SetLastError(wsaErrno()); - return FALSE; - } - else if (!is_sockaddr_bound(&uaddr.addr, uaddrlen)) + ret = is_fd_bound(fd, NULL, NULL); + if (ret <= 0) { - SetLastError(WSAEINVAL); + SetLastError(ret == -1 ? wsaErrno() : WSAEINVAL); return FALSE; } @@ -3115,15 +3125,12 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) if (fd != -1) { union generic_unix_sockaddr uaddr; - socklen_t uaddrlen = sizeof(uaddr); + socklen_t uaddrlen; + int bound = is_fd_bound(fd, &uaddr, &uaddrlen); - if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) + if (bound <= 0) { - SetLastError(wsaErrno()); - } - else if (!is_sockaddr_bound(&uaddr.addr, uaddrlen)) - { - SetLastError(WSAEINVAL); + SetLastError(bound == -1 ? wsaErrno() : WSAEINVAL); } else if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) { @@ -3132,7 +3139,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) } else { - res=0; + res = 0; TRACE("=> %s\n", debugstr_sockaddr(name)); } release_sock_fd( s, fd ); @@ -3222,7 +3229,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, else { union generic_unix_sockaddr uaddr; - socklen_t uaddrlen = sizeof(uaddr); + socklen_t uaddrlen; if ( (fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; @@ -3230,8 +3237,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, csinfo = (CSADDR_INFO*) optval; /* Check if the sock is bound */ - if (!getsockname(fd, &uaddr.addr, &uaddrlen) && - is_sockaddr_bound(&uaddr.addr, uaddrlen)) + if (is_fd_bound(fd, &uaddr, &uaddrlen) == 1) { csinfo->LocalAddr.lpSockaddr = (LPSOCKADDR) (optval + sizeof(CSADDR_INFO)); @@ -4399,16 +4405,11 @@ int WINAPI WS_listen(SOCKET s, int backlog) TRACE("socket %04lx, backlog %d\n", s, backlog); if (fd != -1) { - union generic_unix_sockaddr uaddr; - socklen_t uaddrlen = sizeof(uaddr); + int bound = is_fd_bound(fd, NULL, NULL); - if (getsockname(fd, &uaddr.addr, &uaddrlen) != 0) - { - SetLastError(wsaErrno()); - } - else if (!is_sockaddr_bound(&uaddr.addr, uaddrlen)) + if (bound <= 0) { - SetLastError(WSAEINVAL); + SetLastError(bound == -1 ? wsaErrno() : WSAEINVAL); } else if (listen(fd, backlog) == 0) {

1 0

Nikolay Sivov : comctl32/listview: Fix item focus rectangle to use proper label/selection bounds.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 326af51ec239b870702b7ce2bdddf57f0cefcbce URL: http://source.winehq.org/git/wine.git/?a=commit;h=326af51ec239b870702b7ce2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 28 09:59:08 2015 +0300 comctl32/listview: Fix item focus rectangle to use proper label/selection bounds. --- dlls/comctl32/listview.c | 53 ++++++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2653155..8c5af7b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4550,6 +4550,7 @@ static inline BOOL LISTVIEW_FillBkgnd(const LISTVIEW_INFO *infoPtr, HDC hdc, con static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const NMLVCUSTOMDRAW *nmlvcd, const POINT *pos) { RECT rcSelect, rcLabel, rcBox, rcStateIcon, rcIcon; + const RECT *background; HIMAGELIST himl; UINT format; RECT *focus; @@ -4579,37 +4580,41 @@ static void LISTVIEW_DrawItemPart(LISTVIEW_INFO *infoPtr, LVITEMW *item, const N if ( infoPtr->uView == LV_VIEW_ICON || (infoPtr->uView == LV_VIEW_DETAILS && (!(item->state & LVIS_SELECTED) || (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)))) - rcSelect = rcLabel; + background = &rcLabel; + else + background = &rcSelect; if (nmlvcd->clrTextBk != CLR_NONE) - ExtTextOutW(nmlvcd->nmcd.hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + ExtTextOutW(nmlvcd->nmcd.hdc, background->left, background->top, ETO_OPAQUE, background, NULL, 0, NULL); if (item->state & LVIS_FOCUSED) { - if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - { - /* we have to update left focus bound too if item isn't in leftmost column - and reduce right box bound */ - if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) - { - INT leftmost; - - if ((leftmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0))) - { - INT Originx = pos->x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; - INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, - DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); - - rcBox.right = LISTVIEW_GetColumnInfo(infoPtr, index)->rcHeader.right + Originx; - rcSelect.left = LISTVIEW_GetColumnInfo(infoPtr, leftmost)->rcHeader.left + Originx; - } - } + if (infoPtr->uView == LV_VIEW_DETAILS) + { + if (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) + { + /* we have to update left focus bound too if item isn't in leftmost column + and reduce right box bound */ + if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) + { + INT leftmost; - rcSelect.right = rcBox.right; - } + if ((leftmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0))) + { + INT Originx = pos->x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; + INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); - /* store new focus rectangle */ - infoPtr->rcFocus = rcSelect; + rcBox.right = LISTVIEW_GetColumnInfo(infoPtr, index)->rcHeader.right + Originx; + rcSelect.left = LISTVIEW_GetColumnInfo(infoPtr, leftmost)->rcHeader.left + Originx; + } + } + rcSelect.right = rcBox.right; + } + infoPtr->rcFocus = rcSelect; + } + else + infoPtr->rcFocus = rcLabel; } /* state icons */

1 0

Bruno Jesus : ws2_32: Check for OOB data in select() calls when not OOB_INLINED.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: 10d51ce8554e3eda7cf4a99e4631f6d9b47a8a4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10d51ce8554e3eda7cf4a99e4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 29 00:53:58 2015 -0300 ws2_32: Check for OOB data in select() calls when not OOB_INLINED. --- dlls/ws2_32/socket.c | 8 ++++++++ dlls/ws2_32/tests/sock.c | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 717a394..4444011 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4516,7 +4516,15 @@ static struct pollfd *fd_sets_to_poll( const WS_fd_set *readfds, const WS_fd_set fds[j].revents = 0; if (is_fd_bound(fds[j].fd, NULL, NULL) == 1) { + int oob_inlined = 0; + socklen_t olen = sizeof(oob_inlined); + fds[j].events = POLLHUP; + + /* Check if we need to test for urgent data or not */ + getsockopt(fds[j].fd, SOL_SOCKET, SO_OOBINLINE, (char*) &oob_inlined, &olen); + if (!oob_inlined) + fds[j].events |= POLLPRI; } else { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1f30fda..b7bc006 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3626,9 +3626,7 @@ static void test_select(void) FD_SET(fdRead, &readfds); FD_SET(fdRead, &exceptfds); ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); -todo_wine ok(ret == 1, "expected 1, got %d\n", ret); -todo_wine ok(FD_ISSET(fdRead, &exceptfds), "fdRead socket is not in the set\n"); tmp_buf[0] = 0xAF; ret = recv(fdRead, tmp_buf, sizeof(tmp_buf), MSG_OOB);

1 0

Bruno Jesus : ws2_32: Don' t try to receive data in an OOB_INLINED socket with MSG_OOB.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: d73330e4d89d44f8ba558fe80efb2da700581f80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d73330e4d89d44f8ba558fe80… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 29 00:53:11 2015 -0300 ws2_32: Don't try to receive data in an OOB_INLINED socket with MSG_OOB. --- dlls/ws2_32/socket.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e7e3de5..1bcb63c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -6713,7 +6713,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { unsigned int i, options; int n, fd, err, overlapped; - struct ws2_async *wsa, localwsa; + struct ws2_async *wsa = NULL, localwsa; BOOL is_blocking; DWORD timeout_start = GetTickCount(); ULONG_PTR cvalue = (lpOverlapped && ((ULONG_PTR)lpOverlapped->hEvent & 1) == 0) ? (ULONG_PTR)lpOverlapped : 0; @@ -6728,6 +6728,18 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, if (fd == -1) return SOCKET_ERROR; + if (*lpFlags & WS_MSG_OOB) + { + /* It's invalid to receive OOB data from an OOBINLINED socket + * as OOB data is turned into normal data. */ + i = sizeof(n); + if (!getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, (char*) &n, &i) && n) + { + err = WSAEINVAL; + goto error; + } + } + overlapped = (lpOverlapped || lpCompletionRoutine) && !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); if (overlapped || dwBufferCount > 1)

1 0

Bruno Jesus : ws2_32: Ensure sockets in exceptfds get set when an error occurs.
by Alexandre Julliard March 30, 2015

March 30, 2015

Module: wine Branch: master Commit: b2556a2c34f36c0c82f028dbf24acb1ed77cce29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2556a2c34f36c0c82f028dbf… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 29 00:53:43 2015 -0300 ws2_32: Ensure sockets in exceptfds get set when an error occurs. --- dlls/ws2_32/socket.c | 16 +--------------- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0b8e2cb..26ac305 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1124,15 +1124,6 @@ static char *strdup_lower(const char *str) return ret; } -static inline int sock_error_p(int s) -{ - unsigned int optval; - socklen_t optlen = sizeof(optval); - getsockopt(s, SOL_SOCKET, SO_ERROR, (void *) &optval, &optlen); - if (optval) WARN("\t[%i] error: %d\n", s, optval); - return optval != 0; -} - /* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option * from an fd and return the value converted to milli seconds * or -1 if there is an infinite time out */ @@ -4545,12 +4536,7 @@ static void release_poll_fds( const WS_fd_set *readfds, const WS_fd_set *writefd if (exceptfds) { for (i = 0; i < exceptfds->fd_count; i++, j++) - if (fds[j].fd != -1) - { - /* make sure we have a real error before releasing the fd */ - if (!sock_error_p( fds[j].fd )) fds[j].revents = 0; - release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); - } + if (fds[j].fd != -1) release_sock_fd( exceptfds->fd_array[i], fds[j].fd ); } } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 638a767..87511aa 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3437,8 +3437,10 @@ static void test_select(void) } ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); + todo_wine { ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + } ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); ret = closesocket(fdWrite); @@ -3683,9 +3685,7 @@ todo_wine FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 2; /* requires more time to realize it will not connect */ 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, &exceptfds), "fdWrite socket is not in the set\n"); ok(select_timeout.tv_usec == 250000, "select timeout should not have changed\n"); closesocket(fdWrite);

1 0

André Hentschel : Add WWN 388
by Jeremy Newman March 27, 2015

March 27, 2015

Module: website Branch: master Commit: a7b46ec28834574a2779b3f33c4ff29aabc4e124 URL: http://source.winehq.org/git/website.git/?a=commit;h=a7b46ec28834574a2779b3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Mar 27 17:26:34 2015 +0100 Add WWN 388 --- news/de/2015032701.xml | 10 + news/en/2015032701.xml | 10 + wwn/en/wn20150327_388.xml | 656 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 676 insertions(+) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=a7b46ec28834574a27…

1 0

Frédéric Delanoy : French translation for release 1.7.39
by Jeremy Newman March 27, 2015

March 27, 2015

Module: website Branch: master Commit: f7ad60c29c84946da437a33dc0e639168d758b3f URL: http://source.winehq.org/git/website.git/?a=commit;h=f7ad60c29c84946da437a3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Mar 27 13:20:11 2015 +0100 French translation for release 1.7.39 --- news/fr/2015032001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/fr/2015032001.xml b/news/fr/2015032001.xml new file mode 100644 index 0000000..265c304 --- /dev/null +++ b/news/fr/2015032001.xml @@ -0,0 +1,16 @@ +<news> +<date>20 mars 2015</date> +<title>Sortie de Wine 1.7.39</title> +<body> + La version de développement 1.7.39 de Wine est disponible. + <a href="{$root}/announce/1.7.39">Nouveautés</a> de cette version : +<ul> + <li>Prise en charge des joysticks dans WinMM sous Mac OS X.</li> + <li>Prise en charge du crénage dans DirectWrite.</li> + <li>Prise en charge des filtres DirectX Media Objects.</li> + <li>Meilleure prise en charge des GIF animés dans GdiPlus.</li> + <li>Meilleure prise en charge des dossiers spéciaux dans Shell32.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.39.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0