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

Józef Kucia : vkd3d: Do not crash on NULL views in IASetIndexBuffers().
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: vkd3d Branch: master Commit: d0f8443ac52c9e91029490c7425450f46e1f3067 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d0f8443ac52c9e91029490c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:01:14 2019 +0100 vkd3d: Do not crash on NULL views in IASetIndexBuffers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 6 ++++++ tests/d3d12.c | 1 + 2 files changed, 7 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e535f20..9ed768d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3583,6 +3583,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics TRACE("iface %p, view %p.\n", iface, view); + if (!view) + { + WARN("Ignoring NULL index buffer view.\n"); + return; + } + vk_procs = &list->device->vk_procs; switch (view->Format) diff --git a/tests/d3d12.c b/tests/d3d12.c index 5f869d2..173c576 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4492,6 +4492,7 @@ static void test_draw_indexed_instanced(void) ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, NULL); ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect);

1 0

Józef Kucia : vkd3d: Update command list to ID3D12GraphicsCommandList1.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: vkd3d Branch: master Commit: f1bfb1305e6f934474719acef2c12e0d00f6e7c8 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f1bfb1305e6f934474719ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:01:15 2019 +0100 vkd3d: Update command list to ID3D12GraphicsCommandList1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_d3d12.idl | 55 ++++++++ libs/vkd3d/command.c | 310 +++++++++++++++++++++++++++------------------ libs/vkd3d/device.c | 4 +- libs/vkd3d/vkd3d_private.h | 2 +- 4 files changed, 242 insertions(+), 129 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=f1bfb1305e6f9344747…

1 0

Józef Kucia : vkd3d: Validate image views before creating framebuffers.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: vkd3d Branch: master Commit: a844d8f0a8dfcf1059748c6c34025a83bd5ced60 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=a844d8f0a8dfcf1059748c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:01:13 2019 +0100 vkd3d: Validate image views before creating framebuffers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4999280..e535f20 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1858,6 +1858,7 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l struct VkFramebufferCreateInfo fb_desc; VkFramebuffer vk_framebuffer; size_t start_idx = 0; + unsigned int i; VkResult vr; if (list->current_framebuffer != VK_NULL_HANDLE) @@ -1866,6 +1867,15 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l if (!list->state->u.graphics.rt_idx) ++start_idx; + for (i = 0; i < list->state->u.graphics.attachment_count; ++i) + { + if (!list->views[start_idx + i]) + { + FIXME("Invalid attachment %u.\n", i); + return false; + } + } + fb_desc.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO; fb_desc.pNext = NULL; fb_desc.flags = 0;

1 0

Józef Kucia : vkd3d: Add more formats.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: vkd3d Branch: master Commit: 3629787aad4dd5ac6e8c10c5665d5c8a1d02911f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3629787aad4dd5ac6e8c10c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:01:11 2019 +0100 vkd3d: Add more formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 16 ++++++++++++++++ libs/vkd3d/utils.c | 7 +++++++ 2 files changed, 23 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f197c93..c1a80c0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1648,6 +1648,22 @@ static void vkd3d_set_view_swizzle_for_format(VkComponentMapping *components, FIXME("Alpha swizzle is not supported.\n"); } } + + if (format->dxgi_format == DXGI_FORMAT_B8G8R8X8_UNORM + || format->dxgi_format == DXGI_FORMAT_B8G8R8X8_UNORM_SRGB) + { + if (allowed_swizzle) + { + components->r = VK_COMPONENT_SWIZZLE_R; + components->g = VK_COMPONENT_SWIZZLE_G; + components->b = VK_COMPONENT_SWIZZLE_B; + components->a = VK_COMPONENT_SWIZZLE_ONE; + } + else + { + FIXME("B8G8R8X8 swizzle is not supported.\n"); + } + } } struct vkd3d_texture_view_desc diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index 1c10450..e8ebd2c 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -43,7 +43,9 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R32G32_FLOAT, VK_FORMAT_R32G32_SFLOAT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32_UINT, VK_FORMAT_R32G32_UINT, 8, 1, 1, 1, COLOR}, {DXGI_FORMAT_R32G32_SINT, VK_FORMAT_R32G32_SINT, 8, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R10G10B10A2_UNORM, VK_FORMAT_A2B10G10R10_UNORM_PACK32, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_R10G10B10A2_UINT, VK_FORMAT_A2B10G10R10_UINT_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R11G11B10_FLOAT, VK_FORMAT_B10G11R11_UFLOAT_PACK32, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_TYPELESS, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, {DXGI_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8_UNORM, 2, 1, 1, 1, COLOR}, @@ -81,8 +83,11 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_R8_SINT, VK_FORMAT_R8_SINT, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_A8_UNORM, VK_FORMAT_R8_UNORM, 1, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_B8G8R8X8_TYPELESS, VK_FORMAT_B8G8R8A8_UNORM, 4, 1, 1, 1, COLOR}, + {DXGI_FORMAT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, 4, 1, 1, 1, COLOR}, {DXGI_FORMAT_BC1_TYPELESS, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, {DXGI_FORMAT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, 1, 4, 4, 8, COLOR}, {DXGI_FORMAT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, 1, 4, 4, 8, COLOR}, @@ -98,8 +103,10 @@ static const struct vkd3d_format vkd3d_formats[] = {DXGI_FORMAT_BC5_TYPELESS, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC5_UNORM, VK_FORMAT_BC5_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC5_SNORM, VK_FORMAT_BC5_SNORM_BLOCK, 1, 4, 4, 16, COLOR}, + {DXGI_FORMAT_BC6H_TYPELESS, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC6H_UF16, VK_FORMAT_BC6H_UFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC6H_SF16, VK_FORMAT_BC6H_SFLOAT_BLOCK, 1, 4, 4, 16, COLOR}, + {DXGI_FORMAT_BC7_TYPELESS, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC7_UNORM, VK_FORMAT_BC7_UNORM_BLOCK, 1, 4, 4, 16, COLOR}, {DXGI_FORMAT_BC7_UNORM_SRGB, VK_FORMAT_BC7_SRGB_BLOCK, 1, 4, 4, 16, COLOR}, };

1 0

Józef Kucia : vkd3d: Allow more memory types for custom heaps.
by Alexandre Julliard March 7, 2019

March 7, 2019

Module: vkd3d Branch: master Commit: fd48757d25936c33c53e7464fd1853e3bc8a41ef URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd48757d25936c33c53e746… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 7 11:01:12 2019 +0100 vkd3d: Allow more memory types for custom heaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index c1a80c0..1d13be5 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -24,7 +24,7 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { const VkPhysicalDeviceMemoryProperties *memory_info = &device->memory_properties; - VkMemoryPropertyFlags flags[2]; + VkMemoryPropertyFlags flags[3]; unsigned int i, j, count = 0; switch (heap_properties->Type) @@ -37,13 +37,18 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; break; + case D3D12_HEAP_TYPE_READBACK: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + case D3D12_HEAP_TYPE_CUSTOM: FIXME("Custom heaps not supported yet.\n"); - /* fall-through */ - case D3D12_HEAP_TYPE_READBACK: flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; break; default:

1 0

Paul Gofman : ntdll: Return STATUS_PENDING from NtWriteFile() for async write with regular file.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 56f34c7489cb463981e987a59aee9f8780fef7cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=56f34c7489cb463981e987a5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 5 15:16:46 2019 +0300 ntdll: Return STATUS_PENDING from NtWriteFile() for async write with regular file. This matches Vista+ behaviour. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42982 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 11 ++++++----- dlls/ntdll/tests/file.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ffedbeb..7ecde56 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1199,7 +1199,7 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, int result, unix_handle, needs_close; unsigned int options; struct io_timeouts timeouts; - NTSTATUS status; + NTSTATUS status, ret_status; ULONG total = 0; enum server_fd_type type; ULONG_PTR cvalue = apc ? 0 : (ULONG_PTR)apc_user; @@ -1221,6 +1221,8 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, } if (status && status != STATUS_BAD_DEVICE_TYPE) return status; + async_write = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); + if (!virtual_check_buffer_for_read( buffer, length )) { status = STATUS_INVALID_USER_BUFFER; @@ -1230,8 +1232,6 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, if (status == STATUS_BAD_DEVICE_TYPE) return server_write_file( hFile, hEvent, apc, apc_user, io_status, buffer, length, offset, key ); - async_write = !(options & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)); - if (type == FD_TYPE_FILE) { if (async_write && @@ -1409,9 +1409,10 @@ err: if (status != STATUS_PENDING && hEvent) NtResetEvent( hEvent, NULL ); } - if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total, FALSE ); + ret_status = async_write && type == FD_TYPE_FILE && status == STATUS_SUCCESS ? STATUS_PENDING : status; + if (send_completion) NTDLL_AddCompletion( hFile, cvalue, status, total, ret_status == STATUS_PENDING ); - return status; + return ret_status; } diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 75166fe..a23c3ed 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -619,7 +619,7 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); - todo_wine ok( status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + ok( status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, "wrong status %x.\n", status ); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); @@ -726,7 +726,7 @@ static void read_file_test(void) ResetEvent(event); status = pNtWriteFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - todo_wine ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING + ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, "Wrong status %x.\n", status); ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); @@ -3474,7 +3474,7 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); - todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); @@ -3504,7 +3504,7 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); - todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); @@ -3530,7 +3530,7 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); - todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); @@ -4367,7 +4367,7 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); - todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { @@ -4583,7 +4583,7 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); - todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { @@ -4626,7 +4626,7 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); - todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) {

1 0

Paul Gofman : ntdll/tests: Mark sync NtWriteFile() result for async regular file as broken.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 53c0eef15f78a48105d38c9ffb936323bb962594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53c0eef15f78a48105d38c9f… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Mar 5 15:16:45 2019 +0300 ntdll/tests: Mark sync NtWriteFile() result for async regular file as broken. Vista+ always return async status. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 3320cce..75166fe 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -619,7 +619,8 @@ static void read_file_test(void) offset.QuadPart = 0; ResetEvent( event ); status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); - ok( status == STATUS_SUCCESS || status == STATUS_PENDING, "wrong status %x\n", status ); + todo_wine ok( status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "wrong status %x.\n", status ); if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); @@ -725,7 +726,8 @@ static void read_file_test(void) ResetEvent(event); status = pNtWriteFile(handle, event, apc, &apc_count, &iosb, aligned_buffer, sizeof(aligned_buffer), &offset, NULL); - ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING || status == STATUS_SUCCESS, + todo_wine ok(status == STATUS_END_OF_FILE || status == STATUS_PENDING + || broken(status == STATUS_SUCCESS) /* before Vista */, "Wrong status %x.\n", status); ok(U(iosb).Status == STATUS_SUCCESS, "Wrong status %x.\n", U(iosb).Status); ok(iosb.Information == sizeof(aligned_buffer), "Wrong info %lu.\n", iosb.Information); @@ -3472,6 +3474,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3490,8 +3494,6 @@ static void test_file_completion_information(void) ok(key == 0xdeadbeef, "expected 0xdeadbeef, got %lx\n", key); ok(pov == &ov, "expected %p, got %p\n", &ov, pov); } - else - win_skip("WriteFile never returned TRUE\n"); info.Flags = FILE_SKIP_COMPLETION_PORT_ON_SUCCESS; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); @@ -3502,6 +3504,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3516,8 +3520,6 @@ static void test_file_completion_information(void) ok(!ret, "GetQueuedCompletionStatus succeeded\n"); ok(pov == NULL, "expected NULL, got %p\n", pov); } - else - win_skip("WriteFile never returned TRUE\n"); info.Flags = 0; status = pNtSetInformationFile(h, &io, &info, sizeof(info), FileIoCompletionNotificationInformation); @@ -3528,6 +3530,8 @@ static void test_file_completion_information(void) { SetLastError(0xdeadbeef); ret = WriteFile(h, buf, sizeof(buf), &num_bytes, &ov); + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* Before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (ret || GetLastError() != ERROR_IO_PENDING) break; ret = GetOverlappedResult(h, &ov, &num_bytes, TRUE); ok(ret, "GetOverlappedResult failed, error %u\n", GetLastError()); @@ -3544,8 +3548,6 @@ static void test_file_completion_information(void) ok(!ret, "GetQueuedCompletionStatus succeeded\n"); ok(pov == NULL, "expected NULL, got %p\n", pov); } - else - win_skip("WriteFile never returned TRUE\n"); CloseHandle(port); CloseHandle(h); @@ -4365,7 +4367,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = 0; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, contents, sizeof(contents), &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4580,7 +4583,8 @@ static void test_read_write(void) iob.Information = -1; offset.QuadPart = (LONGLONG)-1 /* FILE_WRITE_TO_END_OF_FILE */; status = pNtWriteFile(hfile, 0, NULL, NULL, &iob, "DCBA", 4, &offset, NULL); - ok(status == STATUS_PENDING || status == STATUS_SUCCESS /* before Vista */, "expected STATUS_PENDING or STATUS_SUCCESS, got %#x\n", status); + todo_wine ok(status == STATUS_PENDING || broken(status == STATUS_SUCCESS) /* before Vista */, + "expected STATUS_PENDING, got %#x.\n", status); if (status == STATUS_PENDING) { ret = WaitForSingleObject(hfile, 3000); @@ -4622,10 +4626,10 @@ static void test_read_write(void) bytes = 0; SetLastError(0xdeadbeef); ret = WriteFile(hfile, "ABCD", 4, &bytes, &ovl); - /* WriteFile return value depends on Windows version and testing it is not practical */ + todo_wine ok((!ret && GetLastError() == ERROR_IO_PENDING) || broken(ret) /* before Vista */, + "Unexpected result %#x, GetLastError() %u.\n", ret, GetLastError()); if (!ret) { - ok(GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %d\n", GetLastError()); ok(bytes == 0, "bytes %u\n", bytes); ret = WaitForSingleObject(hfile, 3000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject error %d\n", ret);

1 0

Matteo Bruni : d3d9: Return failure in CheckDeviceFormat() for unsupported adapter formats.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: bd7a48c25114983f53c2c05299444e982f5a5490 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7a48c25114983f53c2c052… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 5 18:47:21 2019 +0100 d3d9: Return failure in CheckDeviceFormat() for unsupported adapter formats. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46579 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index eab114d..c507991 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -255,10 +255,11 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, TRACE("iface %p, adapter %u, device_type %#x, adapter_format %#x, usage %#x, resource_type %#x, format %#x.\n", iface, adapter, device_type, adapter_format, usage, resource_type, format); - if (!adapter_format) + if (adapter_format != D3DFMT_X8R8G8B8 && adapter_format != D3DFMT_R5G6B5 + && adapter_format != D3DFMT_X1R5G5B5) { WARN("Invalid adapter format.\n"); - return D3DERR_INVALIDCALL; + return adapter_format ? D3DERR_NOTAVAILABLE : D3DERR_INVALIDCALL; } bind_flags = wined3d_bind_flags_from_d3d9_usage(usage);

1 0

Matteo Bruni : d3d9/tests: Add more tests for D3DUSAGE_AUTOGENMIPMAP expected failures.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: cc3d8ec63f23ce8d8d4441b9f04d008acebc4f88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc3d8ec63f23ce8d8d4441b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Mar 5 18:47:22 2019 +0100 d3d9/tests: Add more tests for D3DUSAGE_AUTOGENMIPMAP expected failures. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 7d8b4fd..b7e34b0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -7319,6 +7319,10 @@ static void test_mipmap_gen(void) for (i = 0; i < ARRAY_SIZE(formats); ++i) { + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, + D3DUSAGE_DYNAMIC | D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, formats[i]); if (SUCCEEDED(hr)) @@ -7326,6 +7330,10 @@ static void test_mipmap_gen(void) /* i.e. there is no difference between the D3D_OK and the * D3DOK_NOAUTOGEN cases. */ hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, + formats[i], D3DPOOL_SYSTEMMEM, &texture, 0); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 64, 64, 0, D3DUSAGE_AUTOGENMIPMAP, formats[i], D3DPOOL_DEFAULT, &texture, 0); ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); count = IDirect3DTexture9_GetLevelCount(texture);

1 0

Józef Kucia : d3d12/tests: Add test for swapchain refcounts.
by Alexandre Julliard March 6, 2019

March 6, 2019

Module: wine Branch: master Commit: 41065034334b430553054228634131d3c9e52e71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41065034334b430553054228… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 6 14:19:51 2019 +0100 d3d12/tests: Add test for swapchain refcounts. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/tests/d3d12.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 16e5c4b..205f13f 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -149,6 +149,13 @@ static void print_adapter_info(void) adapter_desc.VendorId, adapter_desc.DeviceId); } +static ULONG get_refcount(void *iface) +{ + IUnknown *unknown = iface; + IUnknown_AddRef(unknown); + return IUnknown_Release(unknown); +} + #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOOL supported) { @@ -896,7 +903,6 @@ static void test_swapchain_draw(void) window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); - set_viewport(&context.viewport, 0.0f, 0.0f, rect.right, rect.bottom, 0.0f, 1.0f); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -951,6 +957,74 @@ static void test_swapchain_draw(void) destroy_test_context(&context); } +static void test_swapchain_refcount(void) +{ + const unsigned int buffer_count = 4; + struct test_context_desc desc; + struct test_context context; + IDXGISwapChain3 *swapchain; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + desc.no_pipeline = TRUE; + if (!init_test_context(&context, &desc)) + return; + + window = create_window(WS_VISIBLE); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain = create_swapchain(&context, window, buffer_count, DXGI_FORMAT_B8G8R8A8_UNORM, rect.right, rect.bottom); + + for (i = 0; i < buffer_count; ++i) + { + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount); + ID3D12Resource_Release(context.render_target[i]); + context.render_target[i] = NULL; + } + refcount = get_refcount(swapchain); + ok(refcount == 1, "Got refcount %u.\n", refcount); + + refcount = IDXGISwapChain3_AddRef(swapchain); + ok(refcount == 2, "Got refcount %u.\n", refcount); + hr = IDXGISwapChain3_GetBuffer(swapchain, 0, &IID_ID3D12Resource, (void **)&context.render_target[0]); + ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr); + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + refcount = ID3D12Resource_AddRef(context.render_target[0]); + ok(refcount == 2, "Got refcount %u.\n", refcount); + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + hr = IDXGISwapChain3_GetBuffer(swapchain, 1, &IID_ID3D12Resource, (void **)&context.render_target[1]); + ok(hr == S_OK, "Failed to get swapchain buffer, hr %#x.\n", hr); + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + ID3D12Resource_Release(context.render_target[0]); + ID3D12Resource_Release(context.render_target[0]); + context.render_target[0] = NULL; + refcount = get_refcount(swapchain); + todo_wine ok(refcount == 3, "Got refcount %u.\n", refcount); + + refcount = IDXGISwapChain3_Release(swapchain); + todo_wine ok(refcount == 2, "Got refcount %u.\n", refcount); + ID3D12Resource_Release(context.render_target[1]); + context.render_target[1] = NULL; + refcount = get_refcount(swapchain); + ok(refcount == 1, "Got refcount %u.\n", refcount); + + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + static void test_swapchain_size_mismatch(void) { static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; @@ -1192,6 +1266,7 @@ START_TEST(d3d12) test_interfaces(); test_draw(); test_swapchain_draw(); + test_swapchain_refcount(); test_swapchain_size_mismatch(); test_swapchain_backbuffer_index(); }

1 0