wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Józef Kucia : d3d10core/tests: Test creating 2D array textures.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: a0d54ccf619a6ec7ac21773014c5781c26e83043 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0d54ccf619a6ec7ac2177301… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:38 2016 +0200 d3d10core/tests: Test creating 2D array textures. 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/d3d10core/tests/device.c | 78 +++++++++++++++++++++++++++++-------------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 13df12b..f9a17f4 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -562,37 +562,63 @@ static void test_create_texture2d(void) static const struct { DXGI_FORMAT format; + UINT array_size; D3D10_BIND_FLAG bind_flags; + UINT misc_flags; BOOL succeeds; BOOL todo; } tests[] = { - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32B32A32_TYPELESS, D3D10_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_R32G32B32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16G16B16A16_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32G32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R32G8X24_TYPELESS, D3D10_BIND_DEPTH_STENCIL, TRUE, TRUE}, - {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R10G10B10A2_TYPELESS, D3D10_BIND_RENDER_TARGET, TRUE, FALSE}, - {DXGI_FORMAT_R32_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_VERTEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_INDEX_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_CONSTANT_BUFFER, FALSE, TRUE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R24G8_TYPELESS, D3D10_BIND_DEPTH_STENCIL, TRUE, FALSE}, - {DXGI_FORMAT_R8G8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8_TYPELESS, D3D10_BIND_SHADER_RESOURCE, TRUE, FALSE}, - {DXGI_FORMAT_R8G8B8A8_UNORM, D3D11_BIND_DEPTH_STENCIL, FALSE, FALSE}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, - {DXGI_FORMAT_D32_FLOAT, D3D11_BIND_RENDER_TARGET, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 5, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 6, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 7, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 10, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 12, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 0, D3D10_BIND_RENDER_TARGET, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 9, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_R32G32B32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16G16B16A16_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32G8X24_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R10G10B10A2_TYPELESS, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 0, D3D10_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, + FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, + {DXGI_FORMAT_D32_FLOAT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE}, }; if (!(device = create_device())) @@ -698,8 +724,10 @@ static void test_create_texture2d(void) desc.SampleDesc.Count = 1; for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) { + desc.ArraySize = tests[i].array_size; desc.Format = tests[i].format; desc.BindFlags = tests[i].bind_flags; + desc.MiscFlags = tests[i].misc_flags; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, (ID3D10Texture2D **)&texture); todo_wine_if(tests[i].todo)

1 0

Józef Kucia : d3d11/tests: Add more tests for texture data initialization.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 9b6430927a8a8a508973bf97d23d7d3c57eb2132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6430927a8a8a508973bf97d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:37 2016 +0200 d3d11/tests: Add more tests for texture data initialization. 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/d3d11/tests/d3d11.c | 72 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f758583..30bda07 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -5262,13 +5262,13 @@ done: ok(!refcount, "Device has %u references left.\n", refcount); } -static void test_multisample_init(void) +static void test_texture_data_init(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d11_test_context test_context; ID3D11DeviceContext *context; D3D11_TEXTURE2D_DESC desc; - ID3D11Texture2D *multi; + ID3D11Texture2D *texture; ID3D11Device *device; UINT count = 0; HRESULT hr; @@ -5279,37 +5279,81 @@ static void test_multisample_init(void) device = test_context.device; context = test_context.immediate_context; + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = 0; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D11Texture2D_Release(texture); + + desc.ArraySize = 4; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D11Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D11Texture2D_Release(texture); + hr = ID3D11Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); if (!count) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); - goto done; + release_test_context(&test_context); + return; } ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, white); - desc.Width = 640; - desc.Height = 480; - desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 2; desc.SampleDesc.Quality = 0; - desc.Usage = D3D11_USAGE_DEFAULT; desc.BindFlags = D3D11_BIND_RENDER_TARGET; - desc.CPUAccessFlags = 0; - desc.MiscFlags = 0; - hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &multi); + hr = ID3D11Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); ID3D11DeviceContext_ResolveSubresource(context, (ID3D11Resource *)test_context.backbuffer, 0, - (ID3D11Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + (ID3D11Resource *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - ID3D11Texture2D_Release(multi); -done: + ID3D11Texture2D_Release(texture); + release_test_context(&test_context); } @@ -6232,7 +6276,7 @@ START_TEST(d3d11) test_update_subresource(); test_copy_subresource_region(); test_resource_map(); - test_multisample_init(); + test_texture_data_init(); test_check_multisample_quality_levels(); test_swapchain_flip(); test_clear_render_target_view();

1 0

Józef Kucia : d3d10core/tests: Add more tests for texture data initialization.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: b3b4a943dd86c52fa997bf8cdb02d9243ac219c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3b4a943dd86c52fa997bf8cd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:36 2016 +0200 d3d10core/tests: Add more tests for texture data initialization. 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/d3d10core/tests/device.c | 72 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 58 insertions(+), 14 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 3783da5..13df12b 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -5330,12 +5330,12 @@ static void test_copy_subresource_region(void) release_test_context(&test_context); } -static void test_multisample_init(void) +static void test_texture_data_init(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; struct d3d10core_test_context test_context; D3D10_TEXTURE2D_DESC desc; - ID3D10Texture2D *multi; + ID3D10Texture2D *texture; ID3D10Device *device; UINT count = 0; HRESULT hr; @@ -5345,37 +5345,81 @@ static void test_multisample_init(void) device = test_context.device; + desc.Width = 640; + desc.Height = 480; + desc.MipLevels = 1; + desc.ArraySize = 1; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.Usage = D3D10_USAGE_DEFAULT; + desc.BindFlags = 0; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D10Texture2D_Release(texture); + + desc.ArraySize = 4; + + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D24_UNORM_S8_UINT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_color(texture, 0x00000000, 0); + ID3D10Texture2D_Release(texture); + + desc.Format = DXGI_FORMAT_D32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + check_texture_float(texture, 0.0f, 0); + ID3D10Texture2D_Release(texture); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &count); ok(SUCCEEDED(hr), "Failed to get quality levels, hr %#x.\n", hr); if (!count) { skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping tests.\n"); - goto done; + release_test_context(&test_context); + return; } ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); - desc.Width = 640; - desc.Height = 480; - desc.MipLevels = 1; desc.ArraySize = 1; desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; desc.SampleDesc.Count = 2; desc.SampleDesc.Quality = 0; - desc.Usage = D3D10_USAGE_DEFAULT; desc.BindFlags = D3D10_BIND_RENDER_TARGET; - desc.CPUAccessFlags = 0; - desc.MiscFlags = 0; - hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &multi); + hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); ID3D10Device_ResolveSubresource(device, (ID3D10Resource *)test_context.backbuffer, 0, - (ID3D10Resource *)multi, 0, DXGI_FORMAT_R8G8B8A8_UNORM); + (ID3D10Resource *)texture, 0, DXGI_FORMAT_R8G8B8A8_UNORM); todo_wine check_texture_color(test_context.backbuffer, 0x00000000, 0); - ID3D10Texture2D_Release(multi); -done: + ID3D10Texture2D_Release(texture); + release_test_context(&test_context); } @@ -6287,7 +6331,7 @@ START_TEST(device) test_fragment_coords(); test_update_subresource(); test_copy_subresource_region(); - test_multisample_init(); + test_texture_data_init(); test_check_multisample_quality_levels(); test_cb_relative_addressing(); test_swapchain_flip();

1 0

Józef Kucia : d3d11: Partially implement OMSetRenderTargetsAndUnorderedAccessViews().
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: 6d05587bafe0dce338ec5811ff5b910abebb50cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d05587bafe0dce338ec5811f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:35 2016 +0200 d3d11: Partially implement OMSetRenderTargetsAndUnorderedAccessViews(). 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/d3d11/device.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f0bb52e..569d397 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -602,10 +602,16 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetRenderTargetsAndUnord { FIXME("iface %p, render_target_view_count %u, render_target_views %p, depth_stencil_view %p, " "unordered_access_view_start_slot %u, unordered_access_view_count %u, unordered_access_views %p, " - "initial_counts %p stub!\n", + "initial_counts %p partial-stub!\n", iface, render_target_view_count, render_target_views, depth_stencil_view, unordered_access_view_start_slot, unordered_access_view_count, unordered_access_views, initial_counts); + + if (render_target_view_count != D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL) + { + d3d11_immediate_context_OMSetRenderTargets(iface, render_target_view_count, render_target_views, + depth_stencil_view); + } } static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11DeviceContext *iface,

1 0

Józef Kucia : include: Add D3D11_KEEP_* constants.
by Alexandre Julliard 11 Apr '16

11 Apr '16

Module: wine Branch: master Commit: d8ebf2efed676be6bbe196b662ea3777e03e730b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ebf2efed676be6bbe196b66… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 8 13:26:34 2016 +0200 include: Add D3D11_KEEP_* constants. 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/d3d11.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d11.idl b/include/d3d11.idl index 805a557..b49d6f4 100644 --- a/include/d3d11.idl +++ b/include/d3d11.idl @@ -103,6 +103,9 @@ const INT D3D11_VIEWPORT_BOUNDS_MIN = -32768; const UINT D3D11_VIEWPORT_AND_SCISSORRECT_MAX_INDEX = 15; const UINT D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; +const UINT D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL = 0xffffffff; +const UINT D3D11_KEEP_UNORDERED_ACCESS_VIEWS = 0xffffffff; + const UINT D3D11_SHADER_MAJOR_VERSION = 5; const UINT D3D11_SHADER_MAX_INSTANCES = 65535; const UINT D3D11_SHADER_MAX_INTERFACES = 253;

1 0

Nikolay Sivov : user32: Limit broadcast messages to system and registered ones.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: ad7cb436571ec66ae7a5687568fca2f5318c7e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad7cb436571ec66ae7a568756… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 17:46:18 2016 +0300 user32: Limit broadcast messages to system and registered ones. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 10 ++++++++-- dlls/user32/tests/msg.c | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 9e0ce05..94d7a84 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3232,6 +3232,10 @@ static LRESULT send_inter_thread_callback( HWND hwnd, UINT msg, WPARAM wp, LPARA return send_inter_thread_message( info, result ); } +static BOOL is_message_broadcastable(UINT msg) +{ + return msg < WM_USER || msg >= 0xc000; +} /*********************************************************************** * send_message @@ -3246,7 +3250,8 @@ static BOOL send_message( struct send_message_info *info, DWORD_PTR *res_ptr, BO if (is_broadcast(info->hwnd)) { - EnumWindows( broadcast_message_callback, (LPARAM)info ); + if (is_message_broadcastable( info->msg )) + EnumWindows( broadcast_message_callback, (LPARAM)info ); if (res_ptr) *res_ptr = 1; return TRUE; } @@ -3659,7 +3664,8 @@ BOOL WINAPI PostMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) if (is_broadcast(hwnd)) { - EnumWindows( broadcast_message_callback, (LPARAM)&info ); + if (is_message_broadcastable( info.msg )) + EnumWindows( broadcast_message_callback, (LPARAM)&info ); return TRUE; } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 3c5914e..d2059a8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14047,7 +14047,6 @@ static void test_broadcast(void) } else { - todo_wine ok(!ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); } @@ -14064,7 +14063,6 @@ static void test_broadcast(void) } else { - todo_wine ok(!ret, "%d: got %d, error %d\n", i, ret, GetLastError()); } @@ -14082,7 +14080,6 @@ static void test_broadcast(void) } else { - todo_wine ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_lparam, GetLastError()); } @@ -14102,7 +14099,6 @@ static void test_broadcast(void) } else { - todo_wine ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_lparam, GetLastError()); }

1 0

Nikolay Sivov : user32/tests: Message filtering tests for broadcast messages.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: d154c8424df1e7ca6b585eca14fff3578c82cc59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d154c8424df1e7ca6b585eca1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 17:46:17 2016 +0300 user32/tests: Message filtering tests for broadcast messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 97bf443..3c5914e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13991,6 +13991,127 @@ static void test_PostMessage(void) flush_events(); } +static LPARAM g_broadcast_lparam; +static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + if (wParam == 0xbaadbeef) + g_broadcast_lparam = wParam; + else + g_broadcast_lparam = 0; + + return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); +} + +static void test_broadcast(void) +{ + static const UINT messages[] = + { + WM_USER-1, + WM_USER, + WM_USER+1, + 0xc000-1, + 0xc000, /* lowest possible atom returned by RegisterWindowMessage */ + 0xffff, + }; + WNDPROC oldproc; + unsigned int i; + HWND hwnd; + + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); + ok(hwnd != NULL, "got %p\n", hwnd); + + oldproc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)broadcast_test_proc); + SetWindowLongPtrA(hwnd, GWLP_USERDATA, (LONG_PTR)oldproc); + + for (i = 0; i < sizeof(messages)/sizeof(messages[0]); i++) + { + BOOL ret; + MSG msg; + + flush_events(); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + ; + + /* post, broadcast */ + ret = PostMessageA(HWND_BROADCAST, messages[i], 0, 0); + ok(ret, "%d: got %d, error %d\n", i, ret, GetLastError()); + + memset(&msg, 0xab, sizeof(msg)); + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); + } + else + { + todo_wine + ok(!ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + } + + /* post, topmost */ + ret = PostMessageA(HWND_TOPMOST, messages[i], 0, 0); + ok(ret, "%d: got %d, error %d\n", i, ret, GetLastError()); + + memset(&msg, 0xab, sizeof(msg)); + ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); + } + else + { + todo_wine + ok(!ret, "%d: got %d, error %d\n", i, ret, GetLastError()); + } + + /* send, broadcast */ + g_broadcast_lparam = 0xdead; + ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); + if (!ret && GetLastError() == ERROR_TIMEOUT) + win_skip("broadcasting test %d, timeout\n", i); + else + { + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + else + { + todo_wine + ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + } + + /* send, topmost */ + g_broadcast_lparam = 0xdead; + ret = SendMessageTimeoutA(HWND_TOPMOST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); + if (!ret && GetLastError() == ERROR_TIMEOUT) + win_skip("broadcasting test %d, timeout\n", i); + else + { + if (messages[i] < WM_USER || messages[i] >= 0xc000) + { + ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + else + { + todo_wine + ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_lparam, GetLastError()); + } + } + } + + DestroyWindow(hwnd); +} + static const struct { DWORD exp, broken; @@ -15642,6 +15763,7 @@ START_TEST(msg) test_SetFocus(); test_SetParent(); test_PostMessage(); + test_broadcast(); test_ShowWindow(); test_PeekMessage(); test_PeekMessage2();

1 0

Michael Müller : kernel32: Implement GetFinalPathNameByHandle.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 6e12aba9c7f0fef8d2b1b7202ad778c399e6e862 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e12aba9c7f0fef8d2b1b7202… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Apr 7 10:28:52 2016 -0500 kernel32: Implement GetFinalPathNameByHandle. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-file-l1-1-0.spec | 4 +- .../api-ms-win-core-file-l1-2-0.spec | 4 +- .../api-ms-win-core-file-l1-2-1.spec | 4 +- dlls/kernel32/file.c | 211 +++++++++++++++++++++ dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/tests/file.c | 40 ++++ dlls/kernelbase/kernelbase.spec | 4 +- 7 files changed, 261 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6e12aba9c7f0fef8d2b1b…

1 0

Nikolay Sivov : comctl32/listview: Handle DPA_SetPtr() failure (Coverity).
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: f5ca9b91046f43410934ddf872bf4504cd9e9fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5ca9b91046f43410934ddf87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 8 16:56:40 2016 +0300 comctl32/listview: Handle DPA_SetPtr() failure (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b467b36..758b640 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3123,7 +3123,11 @@ static RANGES ranges_clone(RANGES ranges) RANGE *newrng = Alloc(sizeof(RANGE)); if (!newrng) goto fail; *newrng = *((RANGE*)DPA_GetPtr(ranges->hdpa, i)); - DPA_SetPtr(clone->hdpa, i, newrng); + if (!DPA_SetPtr(clone->hdpa, i, newrng)) + { + Free(newrng); + goto fail; + } } return clone;

1 0

Michael Stefaniuc : comctl32/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 87bc2aa60776b89e6a120fb65e6035dc9734822f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87bc2aa60776b89e6a120fb65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 8 13:38:03 2016 +0200 comctl32/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/animate.c | 5 +- dlls/comctl32/tests/listview.c | 132 ++++++++++++----------------------------- dlls/comctl32/tests/monthcal.c | 2 +- dlls/comctl32/tests/progress.c | 7 +-- 4 files changed, 42 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87bc2aa60776b89e6a120…

1 0

← Newer
1
...
56
57
58
59
60
61
62
...
75
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 April 2016