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

Zebediah Figura : wined3d: Factor out wined3d_buffer_copy_bo_address().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 783c850d96ac9f6912d1a0a68626abb038b4e9fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=783c850d96ac9f6912d1a0a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:27 2021 -0500 wined3d: Factor out wined3d_buffer_copy_bo_address(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 24 ++++++++++++++++-------- dlls/wined3d/view.c | 10 ++-------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index cbf33df5539..7b8c8904961 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1009,28 +1009,36 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou return WINED3D_OK; } +void wined3d_buffer_copy_bo_address(struct wined3d_buffer *dst_buffer, struct wined3d_context *context, + unsigned int dst_offset, const struct wined3d_const_bo_address *src_addr, unsigned int size) +{ + struct wined3d_bo_address dst_addr; + DWORD dst_location; + + dst_location = wined3d_buffer_get_memory(dst_buffer, context, &dst_addr); + dst_addr.addr += dst_offset; + + wined3d_context_copy_bo_address(context, &dst_addr, (const struct wined3d_bo_address *)src_addr, size); + wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); +} + void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) { - struct wined3d_bo_address dst, src; struct wined3d_context *context; - DWORD dst_location; + struct wined3d_bo_address src; TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", dst_buffer, dst_offset, src_buffer, src_offset, size); context = context_acquire(dst_buffer->resource.device, NULL, 0); - dst_location = wined3d_buffer_get_memory(dst_buffer, context, &dst); - dst.addr += dst_offset; - wined3d_buffer_get_memory(src_buffer, context, &src); src.addr += src_offset; - wined3d_context_copy_bo_address(context, &dst, &src, size); - context_release(context); + wined3d_buffer_copy_bo_address(dst_buffer, context, dst_offset, wined3d_const_bo_address(&src), size); - wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); + context_release(context); } void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 67f4b03e9d3..e8c91ec6413 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1605,21 +1605,15 @@ void wined3d_unordered_access_view_set_counter(struct wined3d_unordered_access_v void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_view *view, struct wined3d_buffer *buffer, unsigned int offset, struct wined3d_context *context) { - struct wined3d_bo_address dst, src; - DWORD dst_location; + struct wined3d_const_bo_address src; if (!view->counter_bo) return; - dst_location = wined3d_buffer_get_memory(buffer, context, &dst); - dst.addr += offset; - src.buffer_object = view->counter_bo; src.addr = NULL; - wined3d_context_copy_bo_address(context, &dst, &src, sizeof(uint32_t)); - - wined3d_buffer_invalidate_location(buffer, ~dst_location); + wined3d_buffer_copy_bo_address(buffer, context, offset, &src, sizeof(uint32_t)); } void wined3d_unordered_access_view_gl_update(struct wined3d_unordered_access_view_gl *uav_gl, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 400d20b94b4..da1cf638606 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4899,6 +4899,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void wined3d_buffer_cleanup(struct wined3d_buffer *buffer) DECLSPEC_HIDDEN; void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; +void wined3d_buffer_copy_bo_address(struct wined3d_buffer *dst_buffer, struct wined3d_context *context, + unsigned int dst_offset, const struct wined3d_const_bo_address *src_addr, unsigned int size) DECLSPEC_HIDDEN; DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Do not use a staging buffer if discarding a mappable buffer in adapter_vk_copy_bo_address().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: f226540ee254ff1da61705a2eea320b7ef01d639 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f226540ee254ff1da61705a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:28 2021 -0500 wined3d: Do not use a staging buffer if discarding a mappable buffer in adapter_vk_copy_bo_address(). As in wined3d_buffer_vk_upload_ranges(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9f36ee39080..850e2a6dfdb 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -1007,6 +1007,7 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, struct wined3d_bo_vk staging_bo, *src_bo, *dst_bo; VkAccessFlags src_access_mask, dst_access_mask; VkBufferMemoryBarrier vk_barrier[2]; + DWORD map_flags = WINED3D_MAP_WRITE; struct wined3d_bo_address staging; VkCommandBuffer vk_command_buffer; struct wined3d_range range; @@ -1016,6 +1017,9 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, src_bo = (struct wined3d_bo_vk *)src->buffer_object; dst_bo = (struct wined3d_bo_vk *)dst->buffer_object; + if (dst_bo && !dst->addr && size == dst_bo->size) + map_flags |= WINED3D_MAP_DISCARD; + if (src_bo && dst_bo) { if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) @@ -1092,8 +1096,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, return; } - if (dst_bo && (dst_bo->command_buffer_id > context_vk->completed_command_buffer_id - || !(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT))) + if (dst_bo && (!(dst_bo->memory_type & VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT) || (!(map_flags & WINED3D_MAP_DISCARD) + && dst_bo->command_buffer_id > context_vk->completed_command_buffer_id))) { if (!(wined3d_context_vk_create_bo(context_vk, size, VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, &staging_bo))) @@ -1113,7 +1117,7 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, } src_ptr = adapter_vk_map_bo_address(context, src, size, WINED3D_MAP_READ); - dst_ptr = adapter_vk_map_bo_address(context, dst, size, WINED3D_MAP_WRITE); + dst_ptr = adapter_vk_map_bo_address(context, dst, size, map_flags); memcpy(dst_ptr, src_ptr, size);

1 0

Damjan Jovanovic : msxml3: Return S_FALSE from IXMLDOMNamedNodeMap::nextNode() when there are no attributes.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 06cd8d3d2eb09ffb19f26e95360c3ddcc4caf46d URL: https://source.winehq.org/git/wine.git/?a=commit;h=06cd8d3d2eb09ffb19f26e95… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jun 20 18:08:02 2021 +0200 msxml3: Return S_FALSE from IXMLDOMNamedNodeMap::nextNode() when there are no attributes. Currently Wine return S_FALSE when IXMLDOMNamedNodeMap::nextNode() has run out of attributes to return, but when an XML node has no attributes at all, it returns S_OK despite setting the nextNode output parameter to NULL, causing the caller to crash when it accesses this pointer. Return S_FALSE in this case instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50603 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/element.c | 2 ++ dlls/msxml3/tests/domdoc.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5891653a76f..1a523798328 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -1890,6 +1890,8 @@ static HRESULT domelem_next_node(const xmlNodePtr node, LONG *iter, IXMLDOMNode *nextNode = NULL; curr = node->properties; + if (curr == NULL) + return S_FALSE; for (i = 0; i < *iter; i++) { if (curr->next == NULL) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b1f172e3faa..df30104a156 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2205,6 +2205,8 @@ static void test_domnode( void ) if (element) { + IXMLDOMNamedNodeMap *attributes; + owner = NULL; r = IXMLDOMElement_get_ownerDocument( element, &owner ); ok( r == S_OK, "get_ownerDocument return code\n"); @@ -2283,6 +2285,29 @@ static void test_domnode( void ) ok( map != NULL, "should be attributes\n"); EXPECT_CHILDREN(element); + + r = IXMLDOMElement_get_childNodes( element, &list ); + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + r = IXMLDOMNodeList_nextNode( list, &node ); /* <bs> */ + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + IXMLDOMNode_Release( node ); + r = IXMLDOMNodeList_nextNode( list, &node ); /* <pr> */ + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + IXMLDOMNode_Release( node ); + r = IXMLDOMNodeList_nextNode( list, &node ); /* <empty> */ + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + r = IXMLDOMNode_get_attributes( node, &attributes ); + ok( r == S_OK, "Expected S_OK, ret %08x\n", r ); + next = (IXMLDOMNode*)0xdeadbeef; + r = IXMLDOMNamedNodeMap_nextNode( attributes, &next ); + ok( r == S_FALSE, "Expected S_FALSE, ret %08x\n", r ); + ok( next == NULL, "Expected NULL, ret %p\n", next ); + IXMLDOMNamedNodeMap_Release( attributes ); + IXMLDOMNode_Release( node ); + node = NULL; + next = NULL; + IXMLDOMNodeList_Release( list ); + list = NULL; } else ok( FALSE, "no element\n");

1 0

Zebediah Figura : ws2_32: Use Win32 getsockname() and getpeername() in SO_BSP_STATE.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 2fb11821bf02b4af2c4a83f7d85aff0402f61bdf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fb11821bf02b4af2c4a83f7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 22 10:24:11 2021 -0500 ws2_32: Use Win32 getsockname() and getpeername() in SO_BSP_STATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 98 ++++++++++++++++++++-------------------------------- 1 file changed, 37 insertions(+), 61 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 44c0690d535..71537e6a2d8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2118,75 +2118,51 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return ret; case WS_SO_BSP_STATE: { - int req_size, addr_size; + CSADDR_INFO *csinfo = (CSADDR_INFO *)optval; WSAPROTOCOL_INFOW infow; - CSADDR_INFO *csinfo; + int addr_size; - ret = ws_protocol_info(s, TRUE, &infow, &addr_size); - if (ret) - { - if (infow.iAddressFamily == WS_AF_INET) - addr_size = sizeof(struct sockaddr_in); - else if (infow.iAddressFamily == WS_AF_INET6) - addr_size = sizeof(struct sockaddr_in6); - else - { - FIXME("Family %d is unsupported for SO_BSP_STATE\n", infow.iAddressFamily); - SetLastError(WSAEAFNOSUPPORT); - return SOCKET_ERROR; - } - - req_size = sizeof(CSADDR_INFO) + addr_size * 2; - if (*optlen < req_size) - { - ret = 0; - SetLastError(WSAEFAULT); - } - else - { - union generic_unix_sockaddr uaddr; - socklen_t uaddrlen; + if (!ws_protocol_info( s, TRUE, &infow, &addr_size )) + return -1; - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; + if (infow.iAddressFamily == WS_AF_INET) + addr_size = sizeof(struct sockaddr_in); + else if (infow.iAddressFamily == WS_AF_INET6) + addr_size = sizeof(struct sockaddr_in6); + else + { + FIXME( "family %d is unsupported for SO_BSP_STATE\n", infow.iAddressFamily ); + SetLastError( WSAEAFNOSUPPORT ); + return -1; + } - csinfo = (CSADDR_INFO*) optval; + if (*optlen < sizeof(CSADDR_INFO) + addr_size * 2) + { + ret = 0; + SetLastError( WSAEFAULT ); + return -1; + } - /* Check if the sock is bound */ - if (is_fd_bound(fd, &uaddr, &uaddrlen) == 1) - { - csinfo->LocalAddr.lpSockaddr = - (LPSOCKADDR) (optval + sizeof(CSADDR_INFO)); - ws_sockaddr_u2ws(&uaddr.addr, csinfo->LocalAddr.lpSockaddr, &addr_size); - csinfo->LocalAddr.iSockaddrLength = addr_size; - } - else - { - csinfo->LocalAddr.lpSockaddr = NULL; - csinfo->LocalAddr.iSockaddrLength = 0; - } + csinfo->LocalAddr.lpSockaddr = (struct WS_sockaddr *)(csinfo + 1); + csinfo->RemoteAddr.lpSockaddr = (struct WS_sockaddr *)((char *)(csinfo + 1) + addr_size); - /* Check if the sock is connected */ - if (!getpeername(fd, &uaddr.addr, &uaddrlen) && - is_sockaddr_bound(&uaddr.addr, uaddrlen)) - { - csinfo->RemoteAddr.lpSockaddr = - (LPSOCKADDR) (optval + sizeof(CSADDR_INFO) + addr_size); - ws_sockaddr_u2ws(&uaddr.addr, csinfo->RemoteAddr.lpSockaddr, &addr_size); - csinfo->RemoteAddr.iSockaddrLength = addr_size; - } - else - { - csinfo->RemoteAddr.lpSockaddr = NULL; - csinfo->RemoteAddr.iSockaddrLength = 0; - } + csinfo->LocalAddr.iSockaddrLength = addr_size; + if (WS_getsockname( s, csinfo->LocalAddr.lpSockaddr, &csinfo->LocalAddr.iSockaddrLength ) < 0) + { + csinfo->LocalAddr.lpSockaddr = NULL; + csinfo->LocalAddr.iSockaddrLength = 0; + } - csinfo->iSocketType = infow.iSocketType; - csinfo->iProtocol = infow.iProtocol; - release_sock_fd( s, fd ); - } + csinfo->RemoteAddr.iSockaddrLength = addr_size; + if (WS_getpeername( s, csinfo->RemoteAddr.lpSockaddr, &csinfo->RemoteAddr.iSockaddrLength ) < 0) + { + csinfo->RemoteAddr.lpSockaddr = NULL; + csinfo->RemoteAddr.iSockaddrLength = 0; } - return ret ? 0 : SOCKET_ERROR; + + csinfo->iSocketType = infow.iSocketType; + csinfo->iProtocol = infow.iProtocol; + return 0; } case WS_SO_DONTLINGER: {

1 0

Zebediah Figura : ws2_32/tests: Test setting SO_ACCEPTCONN.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 2f0e8c084ec919d737dcd622481fc44b8f2f4220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f0e8c084ec919d737dcd622… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 22 10:24:12 2021 -0500 ws2_32/tests: Test setting SO_ACCEPTCONN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 01c14382e84..e7b91aab5bd 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2856,6 +2856,18 @@ static void test_listen(void) ok (!ret, "getsockopt failed\n"); ok (acceptc == 0, "SO_ACCEPTCONN should be 0, received %d\n", acceptc); + acceptc = 1; + WSASetLastError(0xdeadbeef); + ret = setsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char *)&acceptc, sizeof(acceptc)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + + acceptc = 0; + WSASetLastError(0xdeadbeef); + ret = setsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char *)&acceptc, sizeof(acceptc)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + ok (!listen(fdA, 0), "listen failed\n"); ok (!listen(fdA, SOMAXCONN), "double listen failed\n"); @@ -2864,6 +2876,18 @@ static void test_listen(void) ok (!ret, "getsockopt failed\n"); ok (acceptc == 1, "SO_ACCEPTCONN should be 1, received %d\n", acceptc); + acceptc = 1; + WSASetLastError(0xdeadbeef); + ret = setsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char *)&acceptc, sizeof(acceptc)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + + acceptc = 0; + WSASetLastError(0xdeadbeef); + ret = setsockopt(fdA, SOL_SOCKET, SO_ACCEPTCONN, (char *)&acceptc, sizeof(acceptc)); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + SetLastError(0xdeadbeef); ok ((listen(fdB, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); ret = WSAGetLastError();

1 0

Zebediah Figura : ws2_32: Explicitly forbid setting SO_ACCEPTCONN.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: c5487167df0fb0e444d82d2ac229369991b12ebe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5487167df0fb0e444d82d2a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 22 10:24:13 2021 -0500 ws2_32: Explicitly forbid setting SO_ACCEPTCONN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 71537e6a2d8..a0f704eba20 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3617,7 +3617,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* The options listed here don't need any special handling. Thanks to * the conversion happening above, options from there will fall through * to this, too.*/ - case WS_SO_ACCEPTCONN: case WS_SO_BROADCAST: case WS_SO_ERROR: case WS_SO_KEEPALIVE: @@ -3714,6 +3713,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); + /* fall through */ + + case WS_SO_ACCEPTCONN: SetLastError(WSAENOPROTOOPT); return SOCKET_ERROR; }

1 0

Zebediah Figura : ws2_32/tests: Test setting SO_TYPE.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 5d11333593f1c9800104001e5a36f91cc32e9d11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d11333593f1c9800104001e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 22 10:24:14 2021 -0500 ws2_32/tests: Test setting SO_TYPE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e7b91aab5bd..c12ff45b921 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2294,23 +2294,51 @@ static void test_WSASocket(void) sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); + size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", SOCK_DGRAM, socktype); + + socktype = SOCK_STREAM; + WSASetLastError(0xdeadbeef); + err = setsockopt(sock, SOL_SOCKET, SO_TYPE, (char *)&socktype, sizeof(socktype)); + ok(err == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + + socktype = SOCK_DGRAM; + WSASetLastError(0xdeadbeef); + err = setsockopt(sock, SOL_SOCKET, SO_TYPE, (char *)&socktype, sizeof(socktype)); + ok(err == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + closesocket(sock); sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); + size = sizeof(socktype); socktype = 0xdead; err = getsockopt(sock, SOL_SOCKET, SO_TYPE, (char *) &socktype, &size); ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); ok(socktype == SOCK_STREAM, "Wrong socket type, expected %d received %d\n", SOCK_STREAM, socktype); + + socktype = SOCK_STREAM; + WSASetLastError(0xdeadbeef); + err = setsockopt(sock, SOL_SOCKET, SO_TYPE, (char *)&socktype, sizeof(socktype)); + ok(err == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + + socktype = SOCK_DGRAM; + WSASetLastError(0xdeadbeef); + err = setsockopt(sock, SOL_SOCKET, SO_TYPE, (char *)&socktype, sizeof(socktype)); + ok(err == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAENOPROTOOPT, "got error %u\n", WSAGetLastError()); + closesocket(sock); HeapFree(GetProcessHeap(), 0, pi);

1 0

Zebediah Figura : ws2_32: Explicitly forbid setting SO_TYPE.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: fd7954974b9d94b4abe5b2ee8918f8ca063b51db URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd7954974b9d94b4abe5b2ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 22 10:24:15 2021 -0500 ws2_32: Explicitly forbid setting SO_TYPE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a0f704eba20..cb576bad5f2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3625,7 +3625,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * however, using it the BSD way fixes bug 8513 and seems to be what * most programmers assume, anyway */ case WS_SO_REUSEADDR: - case WS_SO_TYPE: convert_sockopt(&level, &optname); break; @@ -3716,6 +3715,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* fall through */ case WS_SO_ACCEPTCONN: + case WS_SO_TYPE: SetLastError(WSAENOPROTOOPT); return SOCKET_ERROR; }

1 0

Alexandre Julliard : winecrt0: Use multiple load/store instructions in setjmp() on ARM.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 74776480347660f149d6ad3f21d4fb353fb61910 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74776480347660f149d6ad3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 21 17:31:29 2021 +0200 winecrt0: Use multiple load/store instructions in setjmp() on ARM. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecrt0/setjmp.c | 39 ++++++--------------------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/dlls/winecrt0/setjmp.c b/dlls/winecrt0/setjmp.c index 642e78e355e..d83df54b889 100644 --- a/dlls/winecrt0/setjmp.c +++ b/dlls/winecrt0/setjmp.c @@ -106,54 +106,27 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, #elif defined(__arm__) __ASM_GLOBAL_FUNC( __wine_setjmpex, - "str r1, [r0]\n\t" /* jmp_buf->Frame */ - "str r4, [r0, #0x4]\n\t" /* jmp_buf->R4 */ - "str r5, [r0, #0x8]\n\t" /* jmp_buf->R5 */ - "str r6, [r0, #0xc]\n\t" /* jmp_buf->R6 */ - "str r7, [r0, #0x10]\n\t" /* jmp_buf->R7 */ - "str r8, [r0, #0x14]\n\t" /* jmp_buf->R8 */ - "str r9, [r0, #0x18]\n\t" /* jmp_buf->R9 */ - "str r10, [r0, #0x1c]\n\t" /* jmp_buf->R10 */ - "str r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ + "stm r0, {r1,r4-r11}\n" /* jmp_buf->Frame,R4..R11 */ "str sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "str lr, [r0, #0x28]\n\t" /* jmp_buf->Pc */ #ifndef __SOFTFP__ "vmrs r2, fpscr\n\t" "str r2, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ - "vstr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ - "vstr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ - "vstr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ - "vstr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ - "vstr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ - "vstr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ - "vstr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ - "vstr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ + "add r0, r0, #0x30\n\t" + "vstm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ #endif "mov r0, #0\n\t" "bx lr" ) __ASM_GLOBAL_FUNC( __wine_longjmp, - "ldr r4, [r0, #0x4]\n\t" /* jmp_buf->R4 */ - "ldr r5, [r0, #0x8]\n\t" /* jmp_buf->R5 */ - "ldr r6, [r0, #0xc]\n\t" /* jmp_buf->R6 */ - "ldr r7, [r0, #0x10]\n\t" /* jmp_buf->R7 */ - "ldr r8, [r0, #0x14]\n\t" /* jmp_buf->R8 */ - "ldr r9, [r0, #0x18]\n\t" /* jmp_buf->R9 */ - "ldr r10, [r0, #0x1c]\n\t" /* jmp_buf->R10 */ - "ldr r11, [r0, #0x20]\n\t" /* jmp_buf->R11 */ + "ldm r0, {r3-r11}\n\t" /* jmp_buf->Frame,R4..R11 */ "ldr sp, [r0, #0x24]\n\t" /* jmp_buf->Sp */ "ldr r2, [r0, #0x28]\n\t" /* jmp_buf->Pc */ #ifndef __SOFTFP__ "ldr r3, [r0, #0x2c]\n\t" /* jmp_buf->Fpscr */ "vmsr fpscr, r3\n\t" - "vldr d8, [r0, #0x30]\n\t" /* jmp_buf->D[0] */ - "vldr d9, [r0, #0x38]\n\t" /* jmp_buf->D[1] */ - "vldr d10, [r0, #0x40]\n\t" /* jmp_buf->D[2] */ - "vldr d11, [r0, #0x48]\n\t" /* jmp_buf->D[3] */ - "vldr d12, [r0, #0x50]\n\t" /* jmp_buf->D[4] */ - "vldr d13, [r0, #0x58]\n\t" /* jmp_buf->D[5] */ - "vldr d14, [r0, #0x60]\n\t" /* jmp_buf->D[6] */ - "vldr d15, [r0, #0x68]\n\t" /* jmp_buf->D[7] */ + "add r0, r0, #0x30\n\t" + "vldm r0, {d8-d15}\n\t" /* jmp_buf->D[0..7] */ #endif "mov r0, r1\n\t" /* retval */ "bx r2" )

1 0

Alexandre Julliard : ntdll/tests: Add more tests for segment registers in 64-bit mode.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 03fe2b36cdcd6d5b431af2bc02aeeb67219c1a51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03fe2b36cdcd6d5b431af2bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 22 12:43:09 2021 +0200 ntdll/tests: Add more tests for segment registers in 64-bit mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 141 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 137 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03fe2b36cdcd6d5b431a…

1 0