July 2021 - Wine-Commits - list.winehq.org

Zhiyi Zhang : user32: Call SCROLL_DrawScrollBar() to draw moving thumb in SCROLL_HandleScrollEvent().
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: c3d8b39e9e531d50ca4fe5a88bba741eb2e98539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3d8b39e9e531d50ca4fe5a8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:21 2021 +0800 user32: Call SCROLL_DrawScrollBar() to draw moving thumb in SCROLL_HandleScrollEvent(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 01868bd4238..4abb13d5199 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -863,8 +863,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SCROLL_TrackingPos ); if (!SCROLL_MovingThumb) { - SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); SCROLL_MovingThumb = TRUE; + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); } } else if (msg == WM_LBUTTONUP) @@ -893,8 +893,8 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, MAKEWPARAM( SB_THUMBTRACK, SCROLL_TrackingVal), (LPARAM)hwndCtl ); - SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); SCROLL_MovingThumb = TRUE; + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); } } break;

1 0

Zhiyi Zhang : user32: Call SCROLL_DrawScrollBar() to draw tracks in SCROLL_HandleScrollEvent().
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: e04e857a1f1704f86a80def88a9e62a0dc8f2186 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e04e857a1f1704f86a80def8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:31 2021 +0800 user32: Call SCROLL_DrawScrollBar() to draw tracks in SCROLL_HandleScrollEvent(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 4abb13d5199..fdd657feda6 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -614,6 +614,13 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HITTEST hit SCROLL_DrawMovingThumb( hdc, &rect, vertical, arrowSize, thumbSize ); SCROLL_MovingThumb = FALSE; } + else if (vertical == SCROLL_trackVertical && GetCapture() == hwnd) + { + SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, + infoPtr->flags, vertical, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_TOP_RECT, + hit_test == SCROLL_trackHitTest && hit_test == SCROLL_BOTTOM_RECT ); + } else { SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, thumbPos, @@ -836,9 +843,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_TOP_RECT: - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - (hittest == SCROLL_trackHitTest), FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) @@ -869,9 +874,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) } else if (msg == WM_LBUTTONUP) { - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - FALSE, FALSE ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, SCROLL_NOWHERE, FALSE, TRUE ); } else /* WM_MOUSEMOVE */ { @@ -900,9 +903,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) break; case SCROLL_BOTTOM_RECT: - SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, - thumbPos, infoPtr->flags, vertical, - FALSE, (hittest == SCROLL_trackHitTest) ); + SCROLL_DrawScrollBar( hwnd, hdc, nBar, hittest, FALSE, TRUE ); if (hittest == SCROLL_trackHitTest) { if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER))

1 0

Zhiyi Zhang : user32: Pass a scroll bar tracking info parameter to SCROLL_DrawScrollBar().
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: b2184e7bff9c33f35ab46f7cb8a93968ceefa67f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2184e7bff9c33f35ab46f7c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:39 2021 +0800 user32: Pass a scroll bar tracking info parameter to SCROLL_DrawScrollBar(). Pack all scroll bar tracking information in a struct and pass that struct as a parameter to SCROLL_DrawScrollBar() instead of using global variables. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 14 +++++- dlls/user32/scroll.c | 121 +++++++++++++++++++++++-------------------------- 2 files changed, 70 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2184e7bff9c33f35ab4…

1 0

Zebediah Figura : ws2_32/tests: Fix some connection timeout tests.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 65dee2d28c0198cedafae9a79aa07e07f94945ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=65dee2d28c0198cedafae9a7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 5 19:14:15 2021 -0500 ws2_32/tests: Fix some connection timeout tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 6 ++++-- dlls/ws2_32/tests/sock.c | 30 ++++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 8f7f4acf4f2..2637630ce8d 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -448,7 +448,8 @@ static void test_poll(void) addr.sin_port = 255; ret = connect(client, (struct sockaddr *)&addr, sizeof(addr)); - ok(!ret || WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); ret = WaitForSingleObject(event, 10000); ok(!ret, "got %#x\n", ret); @@ -474,6 +475,7 @@ static void test_poll(void) server = accept(listener, NULL, NULL); ok(server != -1, "got error %u\n", WSAGetLastError()); + in_params->timeout = -1000 * 10000; in_params->count = 2; in_params->sockets[0].socket = client; in_params->sockets[0].flags = AFD_POLL_READ; @@ -1310,7 +1312,7 @@ static void test_get_events(void) ok(ret == -1, "expected failure\n"); ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); - ret = WaitForSingleObject(event, 2000); + ret = WaitForSingleObject(event, 10000); ok(!ret, "got %#x\n", ret); memset(&params, 0xcc, sizeof(params)); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8617a6fb7e3..1fd75dc40d8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3252,17 +3252,20 @@ static void test_select(void) FD_SET(fdWrite, &exceptfds); select_timeout.tv_sec = 10; ret = select(0, &readfds, &writefds, &exceptfds, &select_timeout); - ok(ret == 1, "expected 1, got %d\n", ret); + todo_wine ok(ret == 1, "expected 1, got %d\n", ret); len = sizeof(id); id = 0xdeadbeef; ret = getsockopt(fdWrite, SOL_SOCKET, SO_ERROR, (char*)&id, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(id == WSAECONNREFUSED, "expected 10061, got %d\n", id); - ok(FD_ISSET(fdWrite, &exceptfds), "fdWrite socket is not in the set\n"); + todo_wine ok(id == WSAECONNREFUSED, "got error %u\n", id); + 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); } + select_timeout.tv_sec = 1; + select_timeout.tv_usec = 250000; + /* Try select() on a closed socket after connection */ tcp_socketpair(&fdRead, &fdWrite); closesocket(fdRead); @@ -6372,22 +6375,33 @@ static void test_WSAPoll(void) * so make the test interactive-only. */ if (winetest_interactive) { - const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; + const struct sockaddr_in invalid_addr = + { + .sin_family = AF_INET, + .sin_addr.s_addr = htonl(INADDR_LOOPBACK), + .sin_port = 255, + }; + SOCKET client; - client = setup_connector_socket(&invalid_addr, sizeof(invalid_addr), TRUE); + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + set_blocking(client, FALSE); + + ret = connect(client, (const struct sockaddr *)&invalid_addr, sizeof(invalid_addr)); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAEWOULDBLOCK, "got error %u\n", WSAGetLastError()); fds[0].fd = client; fds[0].events = POLLRDNORM | POLLRDBAND | POLLWRNORM; fds[0].revents = 0xdead; ret = pWSAPoll(fds, 1, 10000); - ok(ret == 1, "got %d\n", ret); - ok(fds[0].revents == POLLERR, "got events %#x\n", fds[0].revents); + todo_wine ok(ret == 1, "got %d\n", ret); + todo_wine ok(fds[0].revents == (POLLWRNORM | POLLHUP | POLLERR), "got events %#x\n", fds[0].revents); len = sizeof(err); err = 0xdeadbeef; ret = getsockopt(client, SOL_SOCKET, SO_ERROR, (char *)&err, &len); ok(!ret, "getsockopt failed with %d\n", WSAGetLastError()); - ok(err == WSAECONNREFUSED, "expected 10061, got %d\n", err); + todo_wine ok(err == WSAECONNREFUSED, "got error %u\n", err); closesocket(client); }

1 0

Zhiyi Zhang : user32: Separate scroll bar window checks from actual drawing.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: wine Branch: master Commit: 09f43e0491fc3ca3286f779fc415c64cc9aae143 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09f43e0491fc3ca3286f779f… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jul 6 15:07:55 2021 +0800 user32: Separate scroll bar window checks from actual drawing. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index 6e9f899496f..d7a4f412785 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -562,15 +562,10 @@ static void SCROLL_DoDrawScrollBar( HWND hwnd, HDC hdc, INT nBar, enum SCROLL_HI BOOL interior, RECT *rect, INT arrowSize, INT thumbPos, INT thumbSize, BOOL vertical ) { - SCROLLBAR_INFO *infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ); - DWORD style = GetWindowLongW( hwnd, GWL_STYLE ); - - if (!(hwnd = WIN_GetFullHandle( hwnd ))) return; + SCROLLBAR_INFO *infoPtr; - if (!infoPtr || - ((nBar == SB_VERT) && !(style & WS_VSCROLL)) || - ((nBar == SB_HORZ) && !(style & WS_HSCROLL))) return; - if (!WIN_IsWindowDrawable( hwnd, FALSE )) return; + if (!(infoPtr = SCROLL_GetInternalInfo( hwnd, nBar, TRUE ))) + return; /* Draw the arrows */ @@ -625,8 +620,19 @@ void SCROLL_DrawScrollBar( HWND hwnd, HDC hdc, INT bar, enum SCROLL_HITTEST hit_ { INT arrow_size, thumb_size, thumb_pos; BOOL vertical; + DWORD style; RECT rect; + if (!(hwnd = WIN_GetFullHandle( hwnd ))) + return; + + style = GetWindowLongW( hwnd, GWL_STYLE ); + if ((bar == SB_VERT && !(style & WS_VSCROLL)) || (bar == SB_HORZ && !(style & WS_HSCROLL))) + return; + + if (!WIN_IsWindowDrawable( hwnd, FALSE )) + return; + SCROLL_GetScrollBarDrawInfo( hwnd, bar, tracking_info, &rect, &arrow_size, &thumb_size, &thumb_pos, &vertical ); /* do not draw if the scrollbar rectangle is empty */

1 0

Conor McCarthy : vkd3d: Pad resource allocation size to allow texture placement at a 64kb alignment.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: vkd3d Branch: master Commit: cea28ec77eeb29e92b52d50e7d62fe253836ce89 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cea28ec77eeb29e92b52d50… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 6 13:25:56 2021 +1000 vkd3d: Pad resource allocation size to allow texture placement at a 64kb alignment. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 15 ++++++++++++--- libs/vkd3d/resource.c | 6 ++++++ tests/d3d12.c | 1 - 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index a63fc92..159bc47 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3221,7 +3221,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) { - info->SizeInBytes = desc->Width; + info->SizeInBytes = align(desc->Width, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT); info->Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; } else @@ -3235,9 +3235,18 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour requested_alignment = desc->Alignment ? desc->Alignment : D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; info->Alignment = max(info->Alignment, requested_alignment); - } - info->SizeInBytes = align(info->SizeInBytes, info->Alignment); + info->SizeInBytes = align(info->SizeInBytes, info->Alignment); + + /* Pad by the maximum heap offset increase which may be needed to align to a higher + * Vulkan requirement an offset supplied by the calling application. This allows + * us to return the standard D3D12 alignment and adjust resource placement later. */ + if (info->Alignment > requested_alignment) + { + info->SizeInBytes += info->Alignment - requested_alignment; + info->Alignment = requested_alignment; + } + } TRACE("Size %#"PRIx64", alignment %#"PRIx64".\n", info->SizeInBytes, info->Alignment); diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 3a66bb1..3faa679 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1901,9 +1901,15 @@ static HRESULT vkd3d_bind_heap_memory(struct d3d12_device *device, VkResult vr; if (d3d12_resource_is_buffer(resource)) + { VK_CALL(vkGetBufferMemoryRequirements(vk_device, resource->u.vk_buffer, &requirements)); + } else + { VK_CALL(vkGetImageMemoryRequirements(vk_device, resource->u.vk_image, &requirements)); + /* Padding in d3d12_device_GetResourceAllocationInfo() leaves room to align the offset. */ + heap_offset = align(heap_offset, requirements.alignment); + } if (heap_offset % requirements.alignment) { diff --git a/tests/d3d12.c b/tests/d3d12.c index 4144637..b3dee1d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29863,7 +29863,6 @@ static void test_64kb_texture_alignment(void) /* If the heap could not be used, the texture is not aliased. */ reset_command_list(command_list, context.allocator); get_texture_readback_with_command_list(textures[1], 0, &rb, queue, command_list); - todo_if(info.Alignment > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) check_readback_data_uint(&rb, &box, 0xdeadbeef, 0); release_resource_readback(&rb);

1 0

Conor McCarthy : tests: Add test for texture placement with a 64kb alignment.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: vkd3d Branch: master Commit: fdad6a9bdee90debb53718c982009d584eca502b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fdad6a9bdee90debb53718c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 6 13:25:55 2021 +1000 tests: Add test for texture placement with a 64kb alignment. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ce6d6b3..4144637 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -29766,6 +29766,114 @@ static void test_resource_allocation_info(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_64kb_texture_alignment(void) +{ + ID3D12GraphicsCommandList *command_list; + D3D12_RESOURCE_ALLOCATION_INFO info; + D3D12_SUBRESOURCE_DATA texture_data; + D3D12_RESOURCE_DESC resource_desc; + struct test_context context; + struct resource_readback rb; + ID3D12Resource *textures[2]; + D3D12_HEAP_DESC heap_desc; + ID3D12CommandQueue *queue; + uint32_t *upload_buffer; + ID3D12Device *device; + ID3D12Heap *heap; + unsigned int i; + D3D12_BOX box; + HRESULT hr; + + if (!init_test_context(&context, NULL)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + /* This results in an alignment of 0x20000 with RX580/RADV, but + * only with D3D12_TEXTURE_LAYOUT_UNKNOWN. Other cards/drivers may + * specify smaller alignments compatible with the 64kb D3D12 default. */ + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_desc.Alignment = 0; + resource_desc.Width = 1024; + resource_desc.Height = 1024; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_desc.Flags = 0; + + info = ID3D12Device_GetResourceAllocationInfo(device, 0, 1, &resource_desc); + + heap_desc.SizeInBytes = info.SizeInBytes * 2 + D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_DENY_BUFFERS | D3D12_HEAP_FLAG_DENY_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + + /* Padding of info.SizeInBytes is (vulkan_alignment - d3d12_alignment), so this heap_offset calculation + * always results in a Vulkan-aligned offset which won't be adjusted upwards. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT + info.SizeInBytes, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, (void **)&textures[1]); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + /* Some apps, e.g. WoW, ignore the alignment returned by GetResourceAllocationInfo() and use + * D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT. D3D12 requires support for this alignment. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + &resource_desc, D3D12_RESOURCE_STATE_COPY_DEST, NULL, &IID_ID3D12Resource, (void **)&textures[0]); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + upload_buffer = malloc(info.SizeInBytes); + ok(upload_buffer, "Failed to allocate memory.\n"); + + for (i = 0; i < resource_desc.Width * resource_desc.Height; ++i) + upload_buffer[i] = 0xcafef00d; + texture_data.pData = upload_buffer; + texture_data.RowPitch = resource_desc.Width * sizeof(uint32_t); + texture_data.SlicePitch = texture_data.RowPitch * resource_desc.Height; + upload_texture_data(textures[1], &texture_data, 1, queue, command_list); + + for (i = 0; i < resource_desc.Width * resource_desc.Height; ++i) + upload_buffer[i] = 0xdeadbeef; + texture_data.SlicePitch = texture_data.RowPitch * resource_desc.Height; + reset_command_list(command_list, context.allocator); + /* Write data to the first texture to check if the second is overwritten. + * Resource overlap may still go undetected depending on the actual layout + * used by the driver. */ + upload_texture_data(textures[0], &texture_data, 1, queue, command_list); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, textures[1], + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(textures[1], 0, &rb, queue, command_list); + set_box(&box, 0, 0, 0, resource_desc.Width, resource_desc.Height, 1); + check_readback_data_uint(&rb, &box, 0xcafef00d, 0); + release_resource_readback(&rb); + + ID3D12Resource_Release(textures[1]); + /* Create an aliased texture. */ + hr = ID3D12Device_CreatePlacedResource(device, heap, D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT, + &resource_desc, D3D12_RESOURCE_STATE_COPY_SOURCE, NULL, &IID_ID3D12Resource, (void **)&textures[1]); + ok(hr == S_OK, "Failed to create placed resource, hr %#x.\n", hr); + + /* If the heap could not be used, the texture is not aliased. */ + reset_command_list(command_list, context.allocator); + get_texture_readback_with_command_list(textures[1], 0, &rb, queue, command_list); + todo_if(info.Alignment > D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT) + check_readback_data_uint(&rb, &box, 0xdeadbeef, 0); + release_resource_readback(&rb); + + free(upload_buffer); + ID3D12Resource_Release(textures[0]); + ID3D12Resource_Release(textures[1]); + ID3D12Heap_Release(heap); + destroy_test_context(&context); +} + static void test_suballocate_small_textures(void) { D3D12_GPU_VIRTUAL_ADDRESS gpu_address; @@ -33982,6 +34090,7 @@ START_TEST(d3d12) run_test(test_clip_distance); run_test(test_combined_clip_and_cull_distances); run_test(test_resource_allocation_info); + run_test(test_64kb_texture_alignment); run_test(test_suballocate_small_textures); run_test(test_command_list_initial_pipeline_state); run_test(test_blend_factor);

1 0

Francois Gouget : wwn/en: Tweak the wording of the AppDB disclaimer.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: website Branch: master Commit: 6fb6e298a1b9719982790003636787eb690fce66 URL: https://source.winehq.org/git/website.git/?a=commit;h=6fb6e298a1b9719982790… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 6 10:53:31 2021 +0200 wwn/en: Tweak the wording of the AppDB disclaimer. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wwn/en/wn20071210_334.xml | 10 +++++----- wwn/en/wn20071217_335.xml | 13 ++++++------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/wwn/en/wn20071210_334.xml b/wwn/en/wn20071210_334.xml index 1919feb7..2c19f405 100644 --- a/wwn/en/wn20071210_334.xml +++ b/wwn/en/wn20071210_334.xml @@ -530,12 +530,12 @@ situation left where shaders recompile all over. posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by +*Disclaimer: This list of changes is automatically generated from information entered into the AppDB. These results are subject to the opinions -of the users submitting application reviews. The WINE community does not -guarantee that even though an application may be upgraded to 'Gold' or -'Platinum' in this list that you will have the same experience and would -provide a similar rating +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3"> diff --git a/wwn/en/wn20071217_335.xml b/wwn/en/wn20071217_335.xml index 9a550817..0cdc1079 100644 --- a/wwn/en/wn20071217_335.xml +++ b/wwn/en/wn20071217_335.xml @@ -379,13 +379,12 @@ Alexander N. Sornes posts="0" > <topic>AppDB</topic> -*Disclaimer: This list of changes is automatically generated by -information entered into the AppDB. -These results are subject to the opinions of the users submitting application -reviews. -The WINE community does not guarantee that even though an application may be -upgraded to 'Gold' or 'Platinum' in this list that you -will have the same experience and would provide a similar rating +*Disclaimer: This list of changes is automatically generated from +information entered into the AppDB. These results are subject to the opinions +of the users submitting application reviews. Even if an application is +upgraded to 'Gold' or 'Platinum' in this list, the Wine community cannot +guarantee that you will have the same experience and would +provide a similar rating. <div align="center"> Updates by App Maintainers <table width="80%" border="1" bordercolor="#222222" cellspacing="0" cellpadding="3">

1 0

Francois Gouget : wwn/en: Fix some case and spelling issues, add some missing words.
by Alexandre Julliard July 6, 2021

July 6, 2021

Module: website Branch: master Commit: 64edd5ecce3cf3760f3d828e1cea9060c8277e4f URL: https://source.winehq.org/git/website.git/?a=commit;h=64edd5ecce3cf3760f3d8… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jul 6 10:54:26 2021 +0200 wwn/en: Fix some case and spelling issues, add some missing words. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- wwn/en/wn19990829_6.xml | 2 +- wwn/en/wn20010611_97.xml | 6 +++--- wwn/en/wn20010802_101.xml | 10 +++++----- wwn/en/wn20041015_244.xml | 4 ++-- wwn/en/wn20070410_328.xml | 2 +- wwn/en/wn20080106_338.xml | 4 ++-- wwn/en/wn20080922_352.xml | 2 +- wwn/en/wn20140303_364.xml | 12 ++++++------ wwn/en/wn20140314_365.xml | 8 ++++---- wwn/en/wn20140328_366.xml | 8 ++++---- wwn/en/wn20140509_369.xml | 4 ++-- 11 files changed, 31 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=64edd5ecce3cf3760…

1 0

Rémi Bernon : ntoskrnl.exe/tests: Add some HidD_GetInputReport tests.
by Alexandre Julliard July 5, 2021

July 5, 2021

Module: wine Branch: master Commit: 8d63ccd1994ff1db60e1de939c2dbd0beec9bb51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d63ccd1994ff1db60e1de93… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jul 5 10:44:53 2021 +0200 ntoskrnl.exe/tests: Add some HidD_GetInputReport tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver_hid.c | 21 ++++++++++++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 63 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver_hid.c b/dlls/ntoskrnl.exe/tests/driver_hid.c index acb51d99816..793b25f3189 100644 --- a/dlls/ntoskrnl.exe/tests/driver_hid.c +++ b/dlls/ntoskrnl.exe/tests/driver_hid.c @@ -382,6 +382,27 @@ static NTSTATUS WINAPI driver_internal_ioctl(DEVICE_OBJECT *device, IRP *irp) break; } + case IOCTL_HID_GET_INPUT_REPORT: + { + HID_XFER_PACKET *packet = irp->UserBuffer; + ULONG expected_size = 23; + ok(!in_size, "got input size %u\n", in_size); + ok(out_size == sizeof(*packet), "got output size %u\n", out_size); + + todo_wine_if(packet->reportId == 0x5a) + ok(packet->reportId == report_id, "got packet report id %u\n", packet->reportId); + todo_wine_if(packet->reportBufferLen == 21 || packet->reportBufferLen == 22) + ok(packet->reportBufferLen >= expected_size, "got packet buffer len %u, expected %d or more\n", + packet->reportBufferLen, expected_size); + ok(!!packet->reportBuffer, "got packet buffer %p\n", packet->reportBuffer); + + memset(packet->reportBuffer, 0xa5, 3); + if (report_id) ((char *)packet->reportBuffer)[0] = report_id; + irp->IoStatus.Information = 3; + ret = STATUS_SUCCESS; + break; + } + case IOCTL_HID_GET_STRING: ok(!in_size, "got input size %u\n", in_size); ok(out_size == 128, "got output size %u\n", out_size); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index a34c467ecb7..875aa62e6a1 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1661,6 +1661,21 @@ static inline void check_hidp_value_caps_(int line, HIDP_VALUE_CAPS *caps, const } } +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD *ret_len) +{ + OVERLAPPED ovl = {0}; + DWORD out_len = ret_len ? *ret_len : 0; + BOOL ret; + + ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, &out_len, &ovl); + if (!ret && GetLastError() == ERROR_IO_PENDING) ret = GetOverlappedResult(file, &ovl, &out_len, TRUE); + CloseHandle(ovl.hEvent); + + if (ret_len) *ret_len = out_len; + return ret; +} + static void test_hidp(HANDLE file, int report_id) { const HIDP_CAPS expect_hidp_caps[] = @@ -2419,6 +2434,54 @@ static void test_hidp(HANDLE file, int report_id) memset(buffer + 16, 0xff, 8); ok(!memcmp(buffer, buffer + 16, 16), "unexpected report value\n"); + + memset(report, 0xcd, sizeof(report)); + status = HidP_InitializeReportForID(HidP_Input, report_id, preparsed_data, report, caps.InputReportByteLength); + ok(status == HIDP_STATUS_SUCCESS, "HidP_InitializeReportForID returned %#x\n", status); + + SetLastError(0xdeadbeef); + ret = HidD_GetInputReport(file, report, 0); + ok(!ret, "HidD_GetInputReport succeeded\n"); + todo_wine ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "HidD_GetInputReport returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = HidD_GetInputReport(file, report, caps.InputReportByteLength - 1); + todo_wine + ok(!ret, "HidD_GetInputReport succeeded\n"); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), + "HidD_GetInputReport returned error %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(buffer, 0x5a, sizeof(buffer)); + ret = HidD_GetInputReport(file, buffer, caps.InputReportByteLength); + if (report_id || broken(!ret) /* w7u */) + { + todo_wine + ok(!ret, "HidD_GetInputReport succeeded, last error %u\n", GetLastError()); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_CRC), + "HidD_GetInputReport returned error %u\n", GetLastError()); + } + else + { + ok(ret, "HidD_GetInputReport failed, last error %u\n", GetLastError()); + todo_wine ok(buffer[0] == 0x5a, "got buffer[0] %x, expected 0x5a\n", (BYTE)buffer[0]); + } + + SetLastError(0xdeadbeef); + ret = HidD_GetInputReport(file, report, caps.InputReportByteLength); + ok(ret, "HidD_GetInputReport failed, last error %u\n", GetLastError()); + ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); + + SetLastError(0xdeadbeef); + value = caps.InputReportByteLength * 2; + ret = sync_ioctl(file, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, report, &value); + ok(ret, "IOCTL_HID_GET_INPUT_REPORT failed, last error %u\n", GetLastError()); + todo_wine ok(value == 3, "got length %u, expected 3\n", value); + ok(report[0] == report_id, "got report[0] %02x, expected %02x\n", report[0], report_id); + + HidD_FreePreparsedData(preparsed_data); CloseHandle(file); }

1 0