wine-commits June 2021

wine-commits@winehq.org

1 participants
811 discussions

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

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 : 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

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: Handle WINED3D_LOCATION_DISCARDED in wined3d_buffer_get_memory().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 334a3bbe37d89ba8c11d14965946e09b939fa900 URL: https://source.winehq.org/git/wine.git/?a=commit;h=334a3bbe37d89ba8c11d1496… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:26 2021 -0500 wined3d: Handle WINED3D_LOCATION_DISCARDED in wined3d_buffer_get_memory(). This can't currently happen. However, we'd like to use wined3d_buffer_get_memory() in wined3d_cs_exec_update_sub_resource(). This would probably also help in implementing ID3D11DeviceContext1::DiscardResource(). 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 | 26 ++++++++++++++++++++------ dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 267a8a0bd9c..cbf33df5539 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -603,13 +603,26 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, + struct wined3d_bo_address *data) { unsigned int locations = buffer->locations; - TRACE("buffer %p, data %p, locations %s.\n", - buffer, data, wined3d_debug_location(locations)); + TRACE("buffer %p, context %p, data %p, locations %s.\n", + buffer, context, data, wined3d_debug_location(locations)); + if (locations & WINED3D_LOCATION_DISCARDED) + { + locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); + if (!wined3d_buffer_prepare_location(buffer, context, locations)) + { + data->buffer_object = 0; + data->addr = NULL; + return 0; + } + wined3d_buffer_validate_location(buffer, locations); + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_DISCARDED); + } if (locations & WINED3D_LOCATION_BUFFER) { data->buffer_object = buffer->buffer_object; @@ -1006,13 +1019,14 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off 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); - dst_location = wined3d_buffer_get_memory(dst_buffer, &dst); + 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, &src); + wined3d_buffer_get_memory(src_buffer, context, &src); src.addr += src_offset; - context = context_acquire(dst_buffer->resource.device, NULL, 0); wined3d_context_copy_bo_address(context, &dst, &src, size); context_release(context); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8b35b9da17f..a44e979d32c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,7 +304,7 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi else { wined3d_buffer_load(buffer, context, state); - wined3d_buffer_get_memory(buffer, &data); + wined3d_buffer_get_memory(buffer, context, &data); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 9baa0ae0cd3..67f4b03e9d3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1611,7 +1611,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return; - dst_location = wined3d_buffer_get_memory(buffer, &dst); + dst_location = wined3d_buffer_get_memory(buffer, context, &dst); dst.addr += offset; src.buffer_object = view->counter_bo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6ada1fa3642..400d20b94b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4899,7 +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; -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) 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; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Remove the now redundant "locations" parameter from wined3d_buffer_get_memory().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 9c1a80f433e436b854b470a0c5288d40a692da95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c1a80f433e436b854b470a0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:25 2021 -0500 wined3d: Remove the now redundant "locations" parameter from wined3d_buffer_get_memory(). 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 | 9 +++++---- dlls/wined3d/context.c | 2 +- dlls/wined3d/view.c | 2 +- dlls/wined3d/wined3d_private.h | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6cfeb4f510d..267a8a0bd9c 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -603,9 +603,10 @@ BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_c return buffer->resource.heap_memory; } -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, - struct wined3d_bo_address *data, DWORD locations) +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) { + unsigned int locations = buffer->locations; + TRACE("buffer %p, data %p, locations %s.\n", buffer, data, wined3d_debug_location(locations)); @@ -1005,10 +1006,10 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off 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); - dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + dst_location = wined3d_buffer_get_memory(dst_buffer, &dst); dst.addr += dst_offset; - wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); + wined3d_buffer_get_memory(src_buffer, &src); src.addr += src_offset; context = context_acquire(dst_buffer->resource.device, NULL, 0); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7f50126204b..8b35b9da17f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -304,7 +304,7 @@ void context_update_stream_info(struct wined3d_context *context, const struct wi else { wined3d_buffer_load(buffer, context, state); - wined3d_buffer_get_memory(buffer, &data, buffer->locations); + wined3d_buffer_get_memory(buffer, &data); element->data.buffer_object = data.buffer_object; element->data.addr += (ULONG_PTR)data.addr; } diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 7900df3c246..9baa0ae0cd3 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1611,7 +1611,7 @@ void wined3d_unordered_access_view_copy_counter(struct wined3d_unordered_access_ if (!view->counter_bo) return; - dst_location = wined3d_buffer_get_memory(buffer, &dst, buffer->locations); + dst_location = wined3d_buffer_get_memory(buffer, &dst); dst.addr += offset; src.buffer_object = view->counter_bo; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bbc2f4f4db7..6ada1fa3642 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4899,8 +4899,7 @@ 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; -DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, - struct wined3d_bo_address *data, DWORD locations) DECLSPEC_HIDDEN; +DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void wined3d_buffer_invalidate_location(struct wined3d_buffer *buffer, DWORD location) DECLSPEC_HIDDEN; void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data().
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: a48513f114ac048d963c2073d8f5515ea0211356 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a48513f114ac048d963c2073… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jun 18 11:13:24 2021 -0500 wined3d: Do not call wined3d_buffer_get_memory() in wined3d_buffer_init_data(). 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 12d038c0120..6cfeb4f510d 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1041,7 +1041,6 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_sub_resource_data *data) { struct wined3d_resource *resource = &buffer->resource; - struct wined3d_bo_address bo; struct wined3d_box box; if (buffer->flags & WINED3D_BUFFER_USE_BO) @@ -1052,8 +1051,7 @@ static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, } else { - wined3d_buffer_get_memory(buffer, &bo, WINED3D_LOCATION_SYSMEM); - memcpy(bo.addr, data->data, resource->size); + memcpy(buffer->resource.heap_memory, data->data, resource->size); wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_SYSMEM); }

1 0

Georg Lehmann : winevulkan: Fix bit field struct members.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: afa49b18ca145830ffa31fa4a7c808833ab12b3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa49b18ca145830ffa31fa4… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Jun 22 12:15:41 2021 +0200 winevulkan: Fix bit field struct members. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 18 ++++++++++++++++-- include/wine/vulkan.h | 24 ++++++++++++------------ 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b7d57b8218d..e8534cbd5f5 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1078,7 +1078,7 @@ class VkHandle(object): class VkMember(object): def __init__(self, const=False, struct_fwd_decl=False,_type=None, pointer=None, name=None, array_len=None, - dyn_array_len=None, optional=False, values=None, object_type=None): + dyn_array_len=None, optional=False, values=None, object_type=None, bit_width=None): self.const = const self.struct_fwd_decl = struct_fwd_decl self.name = name @@ -1090,6 +1090,7 @@ class VkMember(object): self.optional = optional self.values = values self.object_type = object_type + self.bit_width = bit_width def __eq__(self, other): """ Compare member based on name against a string. @@ -1116,6 +1117,7 @@ class VkMember(object): member_type = None pointer = None array_len = None + bit_width = None values = member.get("values") @@ -1161,8 +1163,14 @@ class VkMember(object): object_type = member.get("objecttype", None) + # Some members are bit field values: + # <member><type>uint32_t</type> <name>mask</name>:8</member> + if name_elem.tail and name_elem.tail[0] == ':': + LOGGER.debug("Found bit field") + bit_width = int(name_elem.tail[1:]) + return VkMember(const=const, struct_fwd_decl=struct_fwd_decl, _type=member_type, pointer=pointer, name=name_elem.text, - array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type) + array_len=array_len, dyn_array_len=dyn_array_len, optional=optional, values=values, object_type=object_type, bit_width=bit_width) def copy(self, input, output, direction, conv): """ Helper method for use by conversion logic to generate a C-code statement to copy this member. @@ -1267,6 +1275,9 @@ class VkMember(object): if self.is_static_array(): text += "[{0}]".format(self.array_len) + if self.is_bit_field(): + text += ":{}".format(self.bit_width) + return text def get_conversions(self): @@ -1344,6 +1355,9 @@ class VkMember(object): return self.object_type != None and self.type == "uint64_t" + def is_bit_field(self): + return self.bit_width is not None + def needs_alignment(self): """ Check if this member needs alignment for 64-bit data. Various structures need alignment on 64-bit variables due diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index eb72a0cdf34..7a3ccab9758 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -5752,10 +5752,10 @@ typedef struct VkAccelerationStructureGeometryMotionTrianglesDataNV typedef struct VkAccelerationStructureInstanceKHR { VkTransformMatrixKHR transform; - uint32_t instanceCustomIndex; - uint32_t mask; - uint32_t instanceShaderBindingTableRecordOffset; - VkGeometryInstanceFlagsKHR flags; + uint32_t instanceCustomIndex:24; + uint32_t mask:8; + uint32_t instanceShaderBindingTableRecordOffset:24; + VkGeometryInstanceFlagsKHR flags:8; uint64_t WINE_VK_ALIGN(8) accelerationStructureReference; } VkAccelerationStructureInstanceKHR; typedef VkAccelerationStructureInstanceKHR VkAccelerationStructureInstanceNV; @@ -5772,10 +5772,10 @@ typedef struct VkAccelerationStructureSRTMotionInstanceNV { VkSRTDataNV transformT0; VkSRTDataNV transformT1; - uint32_t instanceCustomIndex; - uint32_t mask; - uint32_t instanceShaderBindingTableRecordOffset; - VkGeometryInstanceFlagsKHR flags; + uint32_t instanceCustomIndex:24; + uint32_t mask:8; + uint32_t instanceShaderBindingTableRecordOffset:24; + VkGeometryInstanceFlagsKHR flags:8; uint64_t WINE_VK_ALIGN(8) accelerationStructureReference; } VkAccelerationStructureSRTMotionInstanceNV; @@ -7033,10 +7033,10 @@ typedef struct VkAccelerationStructureMatrixMotionInstanceNV { VkTransformMatrixKHR transformT0; VkTransformMatrixKHR transformT1; - uint32_t instanceCustomIndex; - uint32_t mask; - uint32_t instanceShaderBindingTableRecordOffset; - VkGeometryInstanceFlagsKHR flags; + uint32_t instanceCustomIndex:24; + uint32_t mask:8; + uint32_t instanceShaderBindingTableRecordOffset:24; + VkGeometryInstanceFlagsKHR flags:8; uint64_t WINE_VK_ALIGN(8) accelerationStructureReference; } VkAccelerationStructureMatrixMotionInstanceNV;

1 0

Henri Verbeet : wined3d: Add decompression information for BC4_UNORM.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: 2aeab85c27a202d0ef7b1e01d7ccab32d9d53c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2aeab85c27a202d0ef7b1e01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 22 14:36:00 2021 +0200 wined3d: Add decompression information for BC4_UNORM. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 153 ++++++++++++++++++++++++++++++++++++++ dlls/d3d11/tests/d3d11.c | 155 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 81 +++++++++++++++++++- 3 files changed, 387 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2aeab85c27a202d0ef7b…

1 0

Giovanni Mascellani : mf/sar: Query for current padding before requesting sample buffer.
by Alexandre Julliard 22 Jun '21

22 Jun '21

Module: wine Branch: master Commit: da171b8f90d07fa80a4b1bb53b3b295a3e0f003a URL: https://source.winehq.org/git/wine.git/?a=commit;h=da171b8f90d07fa80a4b1bb5… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Jun 21 17:52:53 2021 +0200 mf/sar: Query for current padding before requesting sample buffer. According to both MSDN and our impementation, GetBufferSize returns the size of the buffer, but it doesn't guarantee that all of it is available. In order to know how much of it is available, the caller must also call GetCurrentPadding and subtract that number to the buffer size. Failing to do so might result in GetBuffer returning an error. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 77cbfcb21da..eba822ae0fe 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -1751,7 +1751,7 @@ static HRESULT WINAPI audio_renderer_render_callback_GetParameters(IMFAsyncCallb static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResult *result) { - unsigned int src_frames, dst_frames, max_frames, src_len; + unsigned int src_frames, dst_frames, max_frames, pad_frames, src_len; struct queued_object *obj, *obj2; BOOL keep_sample = FALSE; IMFMediaBuffer *buffer; @@ -1775,20 +1775,24 @@ static void audio_renderer_render(struct audio_renderer *renderer, IMFAsyncResul { if (SUCCEEDED(IAudioClient_GetBufferSize(renderer->audio_client, &max_frames))) { - src_frames -= obj->u.sample.frame_offset; - dst_frames = min(src_frames, max_frames); - - if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + if (SUCCEEDED(IAudioClient_GetCurrentPadding(renderer->audio_client, &pad_frames))) { - memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, - dst_frames * renderer->frame_size); + max_frames -= pad_frames; + src_frames -= obj->u.sample.frame_offset; + dst_frames = min(src_frames, max_frames); - IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); + if (SUCCEEDED(hr = IAudioRenderClient_GetBuffer(renderer->audio_render_client, dst_frames, &dst))) + { + memcpy(dst, src + obj->u.sample.frame_offset * renderer->frame_size, + dst_frames * renderer->frame_size); - obj->u.sample.frame_offset += dst_frames; - } + IAudioRenderClient_ReleaseBuffer(renderer->audio_render_client, dst_frames, 0); - keep_sample = FAILED(hr) || src_frames > max_frames; + obj->u.sample.frame_offset += dst_frames; + } + + keep_sample = FAILED(hr) || src_frames > max_frames; + } } } IMFMediaBuffer_Unlock(buffer);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
82
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2021