wine-devel January 2019

wine-devel@winehq.org

68 participants
552 discussions

[PATCH 4/8] d3d10core/tests: Fix crashes with debug layer enabled.
by Józef Kucia 24 Jan '19

24 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 74 +++++++++++++++++++------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 06b9a160eed3..7b0d2fb87758 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2825,8 +2825,11 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Buffer.ElementOffset = 0; U(rtv_desc).Buffer.ElementWidth = 64; - hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (!enable_debug_layer) + { + hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview); @@ -5173,6 +5176,7 @@ float4 main(float4 color : COLOR) : SV_TARGET } ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv); + count = 0; ID3D10Device_RSGetScissorRects(device, &count, NULL); ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); @@ -8567,16 +8571,19 @@ static void test_private_data(void) ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - size = 0xdeadbabe; - hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - ok(size == 0, "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (!enable_debug_layer) + { + hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + } hr = ID3D10Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -10271,23 +10278,27 @@ static void test_check_multisample_quality_levels(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); todo_wine ok(quality_levels == 0xdeadbeef, "Got unexpected quality_levels %u.\n", quality_levels); + if (!enable_debug_layer) + { + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } + quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &quality_levels); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); @@ -11022,15 +11033,11 @@ static void test_clear_render_target_view_2d(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearRenderTargetView(device, NULL, green); check_texture_color(texture, expected_color, 1); } - else - { - win_skip("D3D11 is not available.\n"); - } ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); @@ -11140,13 +11147,11 @@ static void test_clear_depth_stencil_view(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0); check_texture_color(depth_texture, 0x00000000, 0); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearDepthStencilView(device, NULL, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0xff); check_texture_color(depth_texture, 0x00000000, 0); } - else - win_skip("D3D11 is not available, skipping test.\n"); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0xff); todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); @@ -14335,10 +14340,13 @@ static void test_render_target_device_mismatch(void) rtv = (ID3D10RenderTargetView *)0xdeadbeef; ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); ok(!rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); - ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); - ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10RenderTargetView_Release(rtv); + if (!enable_debug_layer) + { + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10RenderTargetView_Release(rtv); + } rtv = NULL; ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); @@ -17385,7 +17393,7 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D10Device_RSSetViewports(device, 2, vp); - count = ARRAY_SIZE(vp); + count = enable_debug_layer ? ARRAY_SIZE(vp) - 1 : ARRAY_SIZE(vp); ID3D10Device_RSGetViewports(device, &count, vp); ok(count == 2, "Unexpected viewport count %d.\n", count); @@ -17467,6 +17475,9 @@ static void test_multiple_viewports(void) SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + if (enable_debug_layer) + goto done; + /* Viewport count exceeding maximum value. */ ID3D10Device_RSSetViewports(device, 1, vp); @@ -17488,6 +17499,7 @@ static void test_multiple_viewports(void) ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); +done: ID3D10RasterizerState_Release(rasterizer_state); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture); -- 2.19.2

3 2

[PATCH 3/8] d3d10core/tests: Add option to enable debug layer.
by Józef Kucia 24 Jan '19

24 Jan '19

Some tests crash with the debug layer enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 54edf5059293..06b9a160eed3 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -34,6 +34,7 @@ #define BITS_1_0 0x3f800000 static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; @@ -1093,20 +1094,24 @@ static IDXGIAdapter *create_adapter(void) static ID3D10Device *create_device(void) { + unsigned int flags = 0; IDXGIAdapter *adapter; ID3D10Device *device; HRESULT hr; + if (enable_debug_layer) + flags |= D3D10_CREATE_DEVICE_DEBUG; + adapter = create_adapter(); - hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device); + hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, flags, D3D10_SDK_VERSION, &device); if (adapter) IDXGIAdapter_Release(adapter); if (SUCCEEDED(hr)) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, flags, D3D10_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, flags, D3D10_SDK_VERSION, &device))) return device; return NULL; @@ -17878,7 +17883,9 @@ START_TEST(d3d10core) argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); -- 2.19.2

3 2

[PATCH 2/8] d3d10core/tests: Add test for sample_c_lz instruction.
by Józef Kucia 24 Jan '19

24 Jan '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 224 +++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index d4efad9d7df8..54edf5059293 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -8016,6 +8016,229 @@ static void test_depth_stencil_sampling(void) release_test_context(&test_context); } +static void test_sample_c_lz(void) +{ + struct d3d10core_test_context test_context; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D10_DEPTH_STENCIL_VIEW_DESC dsv_desc; + ID3D10Texture2D *texture, *rt_texture; + D3D10_TEXTURE2D_DESC texture_desc; + D3D10_SAMPLER_DESC sampler_desc; + ID3D10ShaderResourceView *srv; + ID3D10DepthStencilView *dsv; + ID3D10RenderTargetView *rtv; + ID3D10SamplerState *sampler; + struct vec4 ps_constant; + ID3D10PixelShader *ps; + ID3D10Device *device; + ID3D10Buffer *cb; + unsigned int i; + HRESULT hr; + RECT rect; + + static const float clear_color[] = {0.5f, 0.5f, 0.5f, 0.5f}; + static const DWORD ps_cube_code[] = + { +#if 0 + TextureCube t; + SamplerComparisonState s; + + float ref; + float face; + + float4 main(float4 position : SV_Position) : SV_Target + { + float2 p; + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + + float3 coord; + switch ((uint)face) + { + case 0: + coord = float3(1.0f, p.x, p.y); + break; + case 1: + coord = float3(-1.0f, p.x, p.y); + break; + case 2: + coord = float3(p.x, 1.0f, p.y); + break; + case 3: + coord = float3(p.x, -1.0f, p.y); + break; + case 4: + coord = float3(p.x, p.y, 1.0f); + break; + case 5: + default: + coord = float3(p.x, p.y, -1.0f); + break; + } + + return t.SampleCmpLevelZero(s, coord, ref); + } +#endif + 0x43425844, 0x6a84fc2d, 0x0a599d2f, 0xf7e42c22, 0x1c880369, 0x00000001, 0x00000324, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000288, 0x00000040, + 0x000000a2, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300085a, 0x00106000, 0x00000000, + 0x04003058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0600001c, 0x00100012, 0x00000000, + 0x0020801a, 0x00000000, 0x00000000, 0x0300004c, 0x0010000a, 0x00000000, 0x03000006, 0x00004001, + 0x00000000, 0x05000036, 0x00100012, 0x00000000, 0x00004001, 0x3f800000, 0x0a000038, 0x00100062, + 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x00000000, 0x3acccccd, 0x3b088889, 0x00000000, + 0x01000002, 0x03000006, 0x00004001, 0x00000001, 0x05000036, 0x00100012, 0x00000000, 0x00004001, + 0xbf800000, 0x0a000038, 0x00100062, 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x00000000, + 0x3acccccd, 0x3b088889, 0x00000000, 0x01000002, 0x03000006, 0x00004001, 0x00000002, 0x0a000038, + 0x00100052, 0x00000000, 0x00101106, 0x00000000, 0x00004002, 0x3acccccd, 0x00000000, 0x3b088889, + 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x3f800000, 0x01000002, 0x03000006, + 0x00004001, 0x00000003, 0x0a000038, 0x00100052, 0x00000000, 0x00101106, 0x00000000, 0x00004002, + 0x3acccccd, 0x00000000, 0x3b088889, 0x00000000, 0x05000036, 0x00100022, 0x00000000, 0x00004001, + 0xbf800000, 0x01000002, 0x03000006, 0x00004001, 0x00000004, 0x0a000038, 0x00100032, 0x00000000, + 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, 0x05000036, + 0x00100042, 0x00000000, 0x00004001, 0x3f800000, 0x01000002, 0x0100000a, 0x0a000038, 0x00100032, + 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x3acccccd, 0x3b088889, 0x00000000, 0x00000000, + 0x05000036, 0x00100042, 0x00000000, 0x00004001, 0xbf800000, 0x01000002, 0x01000017, 0x0c000047, + 0x00100012, 0x00000000, 0x00100246, 0x00000000, 0x00107006, 0x00000000, 0x00106000, 0x00000000, + 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, + 0x0100003e, + }; + static const float depth_values[] = {1.0f, 0.0f, 0.5f, 0.6f, 0.4f, 0.1f}; + static const struct + { + unsigned int layer; + float d_ref; + float expected; + } + tests[] = + { + {0, 0.5f, 0.0f}, + {1, 0.5f, 1.0f}, + {2, 0.5f, 0.0f}, + {3, 0.5f, 0.0f}, + {4, 0.5f, 1.0f}, + {5, 0.5f, 1.0f}, + + {0, 0.0f, 0.0f}, + {1, 0.0f, 0.0f}, + {2, 0.0f, 0.0f}, + {3, 0.0f, 0.0f}, + {4, 0.0f, 0.0f}, + {5, 0.0f, 0.0f}, + + {0, 1.0f, 0.0f}, + {1, 1.0f, 1.0f}, + {2, 1.0f, 1.0f}, + {3, 1.0f, 1.0f}, + {4, 1.0f, 1.0f}, + {5, 1.0f, 1.0f}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + sampler_desc.Filter = D3D10_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR; + sampler_desc.AddressU = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressV = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.AddressW = D3D10_TEXTURE_ADDRESS_CLAMP; + sampler_desc.MipLODBias = 0.0f; + sampler_desc.MaxAnisotropy = 0; + sampler_desc.ComparisonFunc = D3D10_COMPARISON_GREATER; + sampler_desc.BorderColor[0] = 0.0f; + sampler_desc.BorderColor[1] = 0.0f; + sampler_desc.BorderColor[2] = 0.0f; + sampler_desc.BorderColor[3] = 0.0f; + sampler_desc.MinLOD = 0.0f; + sampler_desc.MaxLOD = 10.0f; + hr = ID3D10Device_CreateSamplerState(device, &sampler_desc, &sampler); + ok(hr == S_OK, "Failed to create sampler state, hr %#x.\n", hr); + + ID3D10Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = DXGI_FORMAT_R32_FLOAT; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &rt_texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)rt_texture, NULL, &rtv); + ok(hr == S_OK, "Failed to create rendertarget view, hr %#x.\n", hr); + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + + memset(&ps_constant, 0, sizeof(ps_constant)); + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(ps_constant), &ps_constant); + + /* 2D array texture */ + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.MipLevels = 2; + texture_desc.ArraySize = ARRAY_SIZE(depth_values); + texture_desc.Format = DXGI_FORMAT_R32_TYPELESS; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE | D3D10_BIND_DEPTH_STENCIL; + texture_desc.MiscFlags = D3D10_RESOURCE_MISC_TEXTURECUBE; + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(depth_values); ++i) + { + dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; + dsv_desc.ViewDimension = D3D10_DSV_DIMENSION_TEXTURE2DARRAY; + U(dsv_desc).Texture2DArray.MipSlice = 0; + U(dsv_desc).Texture2DArray.FirstArraySlice = i; + U(dsv_desc).Texture2DArray.ArraySize = 1; + + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsv); + ok(hr == S_OK, "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, depth_values[i], 0); + ID3D10DepthStencilView_Release(dsv); + + U(dsv_desc).Texture2DArray.MipSlice = 1; + hr = ID3D10Device_CreateDepthStencilView(device, (ID3D10Resource *)texture, &dsv_desc, &dsv); + ok(hr == S_OK, "Failed to create depth stencil view, hr %#x.\n", hr); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + ID3D10DepthStencilView_Release(dsv); + } + + srv_desc.Format = DXGI_FORMAT_R32_FLOAT; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURECUBE; + U(srv_desc).TextureCube.MostDetailedMip = 0; + U(srv_desc).TextureCube.MipLevels = ~0u; + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, &srv_desc, &srv); + ok(hr == S_OK, "Failed to create shader resource view, hr %#x.\n", hr); + + hr = ID3D10Device_CreatePixelShader(device, ps_cube_code, sizeof(ps_cube_code), &ps); + ok(hr == S_OK, "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + ID3D10Device_PSSetSamplers(device, 0, 1, &sampler); + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + ps_constant.x = tests[i].d_ref; + ps_constant.y = tests[i].layer; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, + NULL, &ps_constant, 0, 0); + ID3D10Device_ClearRenderTargetView(device, rtv, clear_color); + draw_quad(&test_context); + /* Avoid testing values affected by seamless cube map filtering. */ + SetRect(&rect, 100, 100, 540, 380); + check_texture_sub_resource_float(rt_texture, 0, &rect, tests[i].expected, 2); + } + + ID3D10Texture2D_Release(texture); + ID3D10ShaderResourceView_Release(srv); + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + ID3D10RenderTargetView_Release(rtv); + ID3D10SamplerState_Release(sampler); + ID3D10Texture2D_Release(rt_texture); + release_test_context(&test_context); +} + static void test_multiple_render_targets(void) { ID3D10RenderTargetView *rtv[4], *tmp_rtv[4]; @@ -17697,6 +17920,7 @@ START_TEST(d3d10core) queue_test(test_texture); queue_test(test_cube_maps); queue_test(test_depth_stencil_sampling); + queue_test(test_sample_c_lz); queue_test(test_multiple_render_targets); queue_test(test_private_data); queue_test(test_state_refcounting); -- 2.19.2

3 2

[PATCH 1/8] d3d9: Validate surface parameter in d3d9_device_ColorFill().
by Józef Kucia 24 Jan '19

24 Jan '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46482 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d9/device.c | 3 +++ dlls/d3d9/tests/visual.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a26d943fa309..067ea2bdc2d2 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1757,6 +1757,9 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, TRACE("iface %p, surface %p, rect %p, color 0x%08x.\n", iface, surface, rect, color); + if (!surface) + return D3DERR_INVALIDCALL; + wined3d_mutex_lock(); if (FAILED(wined3d_texture_get_sub_resource_desc(surface_impl->wined3d_texture, diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index fb7c3e4ea4ab..27400d09fe6b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1529,6 +1529,9 @@ static void color_fill_test(void) goto done; } + hr = IDirect3DDevice9_ColorFill(device, NULL, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); + /* Test ColorFill on a the backbuffer (should pass) */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &surface); ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); -- 2.19.2

3 2

[PATCH 1/5] wined3d: Remove stateblock handling from wined3d_device_set_shader_resource_view().
by Zebediah Figura 24 Jan '19

24 Jan '19

It cannot be called while recording a stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c90cbdbe10..a399d24065 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2291,15 +2291,14 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic return; } - prev = device->update_state->shader_resource_view[type][idx]; + prev = device->state.shader_resource_view[type][idx]; if (view == prev) return; if (view) wined3d_shader_resource_view_incref(view); - device->update_state->shader_resource_view[type][idx] = view; - if (!device->recording) - wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); + device->state.shader_resource_view[type][idx] = view; + wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); if (prev) wined3d_shader_resource_view_decref(prev); } -- 2.17.1

3 11

[PATCH 1/6] d3dx9/tests: Expect plain render target creation to work.
by Matteo Bruni 24 Jan '19

24 Jan '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/tests/surface.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 6cb1ddb73ce..b7c52a28b0f 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -847,21 +847,24 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) /* non-lockable render target */ hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &newsurf, NULL); - if (SUCCEEDED(hr)) { - hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); - - IDirect3DSurface9_Release(newsurf); - } else skip("Failed to create render target surface\n"); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); + IDirect3DSurface9_Release(newsurf); /* non-lockable multisampled render target */ hr = IDirect3DDevice9_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, 0, FALSE, &newsurf, NULL); - if (SUCCEEDED(hr)) { + if (SUCCEEDED(hr)) + { hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); - ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x\n", hr, D3D_OK); + ok(hr == D3D_OK, "Unexpected hr %#x.\n", hr); IDirect3DSurface9_Release(newsurf); - } else skip("Failed to create multisampled render target.\n"); + } + else + { + skip("Failed to create multisampled render target.\n"); + } hr = IDirect3DDevice9_GetRenderTarget(device, 0, &newsurf); ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget returned %#x, expected %#x.\n", hr, D3D_OK); -- 2.19.2

3 11

[PATCH 2/2] wbemprox: Add Win32_NetworkAdapter Description property.
by Piotr Caban 24 Jan '19

24 Jan '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 3 +++ 1 file changed, 3 insertions(+)

2 1

[PATCH 1/2] wbemprox: Add Win32_NetworkAdapter DeviceAdapterID property.
by Piotr Caban 24 Jan '19

24 Jan '19

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)

2 1

[PATCH 1/2] ole32: Implement chained IInitializeSpy support.
by Nikolay Sivov 24 Jan '19

24 Jan '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/compobj.c | 123 +++++++++++++++++++++++++++-------- dlls/ole32/compobj_private.h | 27 +++++++- dlls/ole32/tests/compobj.c | 15 ++--- 3 files changed, 126 insertions(+), 39 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 66b1683d98..c65250442d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1733,6 +1733,19 @@ HWND apartment_getwindow(const struct apartment *apt) return apt->win; } +static void oletls_release_spy_list(struct list *list) +{ + struct init_spy *cursor, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(cursor, cursor2, list, struct init_spy, entry) + { + list_remove(&cursor->entry); + if (cursor->spy) + IInitializeSpy_Release(cursor->spy); + heap_free(cursor); + } +} + static void COM_TlsDestroy(void) { struct oletls *info = NtCurrentTeb()->ReservedForOle; @@ -1741,7 +1754,8 @@ static void COM_TlsDestroy(void) if (info->apt) apartment_release(info->apt); if (info->errorinfo) IErrorInfo_Release(info->errorinfo); if (info->state) IUnknown_Release(info->state); - if (info->spy) IInitializeSpy_Release(info->spy); + oletls_release_spy_list(&info->spies.active); + oletls_release_spy_list(&info->spies.freed); if (info->context_token) IObjContext_Release(info->context_token); HeapFree(GetProcessHeap(), 0, info); NtCurrentTeb()->ReservedForOle = NULL; @@ -1783,6 +1797,7 @@ DWORD WINAPI CoBuildVersion(void) HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cookie) { struct oletls *info = COM_CurrentInfo(); + struct init_spy *entry; HRESULT hr; TRACE("(%p, %p)\n", spy, cookie); @@ -1794,19 +1809,33 @@ HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cook return E_INVALIDARG; } - if (info->spy) + hr = IInitializeSpy_QueryInterface(spy, &IID_IInitializeSpy, (void **)&spy); + if (FAILED(hr)) + return hr; + + if (list_empty(&info->spies.freed)) { - FIXME("Already registered?\n"); - return E_UNEXPECTED; + entry = heap_alloc(sizeof(*entry)); + if (!entry) + { + IInitializeSpy_Release(spy); + return E_OUTOFMEMORY; + } + entry->id = info->spies.next_id++; } - - hr = IInitializeSpy_QueryInterface(spy, &IID_IInitializeSpy, (void **) &info->spy); - if (SUCCEEDED(hr)) + else { - cookie->QuadPart = (DWORD_PTR)spy; - return S_OK; + entry = LIST_ENTRY(list_tail(&info->spies.freed), struct init_spy, entry); + list_remove(&entry->entry); } - return hr; + + entry->spy = spy; + list_add_head(&info->spies.active, &entry->entry); + + cookie->HighPart = GetCurrentThreadId(); + cookie->LowPart = entry->id; + + return S_OK; } /****************************************************************************** @@ -1827,14 +1856,42 @@ HRESULT WINAPI CoRegisterInitializeSpy(IInitializeSpy *spy, ULARGE_INTEGER *cook HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) { struct oletls *info = COM_CurrentInfo(); + struct init_spy *spy; + TRACE("(%s)\n", wine_dbgstr_longlong(cookie.QuadPart)); - if (!info || !info->spy || cookie.QuadPart != (DWORD_PTR)info->spy) + if (!info || list_empty(&info->spies.active)) return E_INVALIDARG; - IInitializeSpy_Release(info->spy); - info->spy = NULL; - return S_OK; + if (cookie.HighPart != GetCurrentThreadId() || cookie.LowPart >= info->spies.next_id) + return E_INVALIDARG; + + LIST_FOR_EACH_ENTRY(spy, &info->spies.active, struct init_spy, entry) + { + if (cookie.LowPart == spy->id) + { + IInitializeSpy_Release(spy->spy); + spy->spy = NULL; + list_remove(&spy->entry); + + /* Move to freed list, unless it was latest item id or last item in the active list. */ + if (spy->id == info->spies.next_id - 1) + info->spies.next_id--; + else if (list_empty(&info->spies.active)) + oletls_release_spy_list(&info->spies.freed); + else + { + list_add_tail(&info->spies.freed, &spy->entry); + spy = NULL; + } + + heap_free(spy); + + return S_OK; + } + } + + return E_INVALIDARG; } HRESULT enter_apartment( struct oletls *info, DWORD model ) @@ -1929,6 +1986,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) { struct oletls *info = COM_CurrentInfo(); + struct init_spy *cursor; HRESULT hr; TRACE("(%p, %x)\n", lpReserved, (int)dwCoInit); @@ -1955,13 +2013,17 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni RunningObjectTableImpl_Initialize(); } - if (info->spy) - IInitializeSpy_PreInitialize(info->spy, dwCoInit, info->inits); + LIST_FOR_EACH_ENTRY(cursor, &info->spies.active, struct init_spy, entry) + { + IInitializeSpy_PreInitialize(cursor->spy, dwCoInit, info->inits); + } hr = enter_apartment( info, dwCoInit ); - if (info->spy) - IInitializeSpy_PostInitialize(info->spy, hr, dwCoInit, info->inits); + LIST_FOR_EACH_ENTRY(cursor, &info->spies.active, struct init_spy, entry) + { + hr = IInitializeSpy_PostInitialize(cursor->spy, hr, dwCoInit, info->inits); + } return hr; } @@ -1985,6 +2047,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) { struct oletls * info = COM_CurrentInfo(); + struct init_spy *cursor; LONG lCOMRefCnt; TRACE("()\n"); @@ -1992,17 +2055,22 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) /* will only happen on OOM */ if (!info) return; - if (info->spy) - IInitializeSpy_PreUninitialize(info->spy, info->inits); + LIST_FOR_EACH_ENTRY(cursor, &info->spies.active, struct init_spy, entry) + { + IInitializeSpy_PreUninitialize(cursor->spy, info->inits); + } /* sanity check */ if (!info->inits) { - ERR("Mismatched CoUninitialize\n"); + ERR("Mismatched CoUninitialize\n"); + + LIST_FOR_EACH_ENTRY(cursor, &info->spies.active, struct init_spy, entry) + { + IInitializeSpy_PostUninitialize(cursor->spy, info->inits); + } - if (info->spy) - IInitializeSpy_PostUninitialize(info->spy, info->inits); - return; + return; } leave_apartment( info ); @@ -2024,8 +2092,11 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) ERR( "CoUninitialize() - not CoInitialized.\n" ); InterlockedExchangeAdd(&s_COMLockCount,1); /* restore the lock count. */ } - if (info->spy) - IInitializeSpy_PostUninitialize(info->spy, info->inits); + + LIST_FOR_EACH_ENTRY(cursor, &info->spies.active, struct init_spy, entry) + { + IInitializeSpy_PostUninitialize(cursor->spy, info->inits); + } } /****************************************************************************** diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 1e564a3de1..1829866bff 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -153,6 +153,20 @@ struct apartment BOOL main; /* is this a main-threaded-apartment? (RO) */ }; +struct init_spy +{ + struct list entry; + IInitializeSpy *spy; + unsigned int id; +}; + +struct spy_chain +{ + struct list active; + struct list freed; + unsigned int next_id; +}; + /* this is what is stored in TEB->ReservedForOle */ struct oletls { @@ -160,7 +174,7 @@ struct oletls IErrorInfo *errorinfo; /* see errorinfo.c */ IUnknown *state; /* see CoSetState */ DWORD apt_mask; /* apartment mask (+0Ch on x86) */ - IInitializeSpy *spy; /* The "SPY" from CoInitializeSpy */ + void *unknown0; /* The "SPY" from CoInitializeSpy */ DWORD inits; /* number of times CoInitializeEx called */ DWORD ole_inits; /* number of times OleInitialize called */ GUID causality_id; /* unique identifier for each COM call */ @@ -171,6 +185,7 @@ struct oletls IUnknown *call_state; /* current call context (+3Ch on x86) */ DWORD unknown2[46]; IUnknown *cancel_object; /* cancel object set by CoSetCancelObject (+F8h on x86) */ + struct spy_chain spies; /* Spies from CoRegisterInitializeSpy */ }; @@ -262,7 +277,15 @@ APARTMENT *apartment_get_current_or_mta(void) DECLSPEC_HIDDEN; static inline struct oletls *COM_CurrentInfo(void) { if (!NtCurrentTeb()->ReservedForOle) - NtCurrentTeb()->ReservedForOle = heap_alloc_zero(sizeof(struct oletls)); + { + struct oletls *oletls = heap_alloc_zero(sizeof(*oletls)); + if (oletls) + { + list_init(&oletls->spies.active); + list_init(&oletls->spies.freed); + } + NtCurrentTeb()->ReservedForOle = oletls; + } return NtCurrentTeb()->ReservedForOle; } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 33a7585365..ec98af0e02 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3363,32 +3363,28 @@ static void test_IInitializeSpy(void) cookie.LowPart = 1; hr = CoRegisterInitializeSpy(&testinitialize, &cookie); ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine { ok(cookie.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie.HighPart, GetCurrentThreadId()); ok(cookie.LowPart == 0, "got wrong low part 0x%x\n", cookie.LowPart); -} + /* register same instance one more time */ cookie1.HighPart = 0; cookie1.LowPart = 0; hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, GetCurrentThreadId()); ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); -} + cookie2.HighPart = 0; cookie2.LowPart = 0; hr = CoRegisterInitializeSpy(&testinitialize, &cookie2); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie2.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie2.HighPart, GetCurrentThreadId()); ok(cookie2.LowPart == 2, "got wrong low part 0x%x\n", cookie2.LowPart); -} + hr = CoRevokeInitializeSpy(cookie1); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = CoRevokeInitializeSpy(cookie1); @@ -3397,21 +3393,18 @@ todo_wine cookie1.HighPart = 0; cookie1.LowPart = 0; hr = CoRegisterInitializeSpy(&testinitialize, &cookie1); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(cookie1.HighPart == GetCurrentThreadId(), "got high part 0x%08x, expected 0x%08x\n", cookie1.HighPart, GetCurrentThreadId()); ok(cookie1.LowPart == 1, "got wrong low part 0x%x\n", cookie1.LowPart); -} + hr = CoRevokeInitializeSpy(cookie); ok(hr == S_OK, "got 0x%08x\n", hr); hr = CoRevokeInitializeSpy(cookie1); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = CoRevokeInitializeSpy(cookie2); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); } -- 2.20.1

3 4

[PATCH] mshtml: Add IDOMCustomEvent interface stub implementation.
by Jacek Caban 24 Jan '19

24 Jan '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 144 +++++++++++++++++++++++++++++++++-- dlls/mshtml/htmlevent.h | 4 +- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/nsiface.idl | 12 +++ dlls/mshtml/tests/events.c | 12 +++ 5 files changed, 168 insertions(+), 6 deletions(-)

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
56
Older →

Jump to page:

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-devel January 2019