October 2018 - Wine-devel - list.winehq.org

[PATCH vkd3d 2/7] vkd3d: Downgrade FIXME() in d3d12_command_list_IASetIndexBuffer().
by Józef Kucia 08 Oct '18

08 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> An app calls IASetIndexBuffer() with DXGI_FORMAT_UNKNOWN. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5a2baef8a7da..017e6ac9a69d 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3554,7 +3554,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetIndexBuffer(ID3D12Graphics index_type = VK_INDEX_TYPE_UINT32; break; default: - FIXME("Unhandled format %#x.\n", view->Format); + WARN("Invalid index format %#x.\n", view->Format); return; } -- 2.18.0

2 1

[PATCH vkd3d 7/7] tests: Add test for creating tons of command queues.
by Józef Kucia 08 Oct '18

08 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Mainly to show that those are not strictly linked to HW queues. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 73f4da96686a..f40aded6ca98 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1529,9 +1529,11 @@ static void test_create_command_list(void) static void test_create_command_queue(void) { + ID3D12CommandQueue* direct_queues[32], *compute_queues[32]; D3D12_COMMAND_QUEUE_DESC desc, result_desc; ID3D12Device *device, *tmp_device; ID3D12CommandQueue *queue; + unsigned int i; ULONG refcount; HRESULT hr; @@ -1584,6 +1586,24 @@ static void test_create_command_queue(void) refcount = ID3D12CommandQueue_Release(queue); ok(!refcount, "ID3D12CommandQueue has %u references left.\n", (unsigned int)refcount); + desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + for (i = 0; i < ARRAY_SIZE(direct_queues); ++i) + { + hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&direct_queues[i]); + ok(hr == S_OK, "Failed to create direct command queue %u, hr %#x.\n", hr, i); + } + desc.Type = D3D12_COMMAND_LIST_TYPE_COMPUTE; + for (i = 0; i < ARRAY_SIZE(compute_queues); ++i) + { + hr = ID3D12Device_CreateCommandQueue(device, &desc, &IID_ID3D12CommandQueue, (void **)&compute_queues[i]); + ok(hr == S_OK, "Failed to create compute command queue %u, hr %#x.\n", hr, i); + } + + for (i = 0; i < ARRAY_SIZE(direct_queues); ++i) + ID3D12CommandQueue_Release(direct_queues[i]); + for (i = 0; i < ARRAY_SIZE(compute_queues); ++i) + ID3D12CommandQueue_Release(compute_queues[i]); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -- 2.18.0

2 1

[PATCH vkd3d 5/7] vkd3d: Implement D3D12_FEATURE_SHADER_MODEL.
by Józef Kucia 08 Oct '18

08 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index f91c0d96bf96..6feb5154937a 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1804,9 +1804,32 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return S_OK; } + case D3D12_FEATURE_SHADER_MODEL: + { + D3D12_FEATURE_DATA_SHADER_MODEL *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + + TRACE("Request shader model%#x.\n", data->HighestShaderModel); + + data->HighestShaderModel = D3D_SHADER_MODEL_5_1; + return S_OK; + } + case D3D12_FEATURE_ROOT_SIGNATURE: { D3D12_FEATURE_DATA_ROOT_SIGNATURE *data = feature_data; + + if (feature_data_size != sizeof(*data)) + { + WARN("Invalid size %u.\n", feature_data_size); + return E_INVALIDARG; + } + FIXME("Root signature version 1_1 not supported yet.\n"); data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; return S_OK; -- 2.18.0

2 2

[PATCH vkd3d 3/7] vkd3d: Ignore D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.
by Józef Kucia 08 Oct '18

08 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 017e6ac9a69d..55fa93347808 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2910,6 +2910,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_IASetPrimitiveTopology(ID3D12Gr TRACE("iface %p, topology %#x.\n", iface, topology); + if (topology == D3D_PRIMITIVE_TOPOLOGY_UNDEFINED) + { + WARN("Ignoring D3D_PRIMITIVE_TOPOLOGY_UNDEFINED.\n"); + return; + } + list->primitive_topology = vk_topology_from_d3d12_topology(topology); d3d12_command_list_invalidate_current_pipeline(list); } -- 2.18.0

2 1

[PATCH 7/7] d2d1: Check the context error state on entering d2d_device_context_DrawGlyphRun().
by Henri Verbeet 08 Oct '18

08 Oct '18

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 1e420514a80..ff5caac5d8c 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1355,6 +1355,9 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext TRACE("iface %p, baseline_origin %s, glyph_run %p, brush %p, measuring_mode %#x.\n", iface, debug_d2d_point_2f(&baseline_origin), glyph_run, brush, measuring_mode); + if (FAILED(context->error.code)) + return; + rendering_params = context->text_rendering_params ? context->text_rendering_params : context->default_text_rendering_params; -- 2.11.0

1 0

[PATCH 5/7] d3d10core/tests: Add depth bias clamp tests.
by Henri Verbeet 08 Oct '18

08 Oct '18

From: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 198 ++++++++++++++++++++++----------------- 1 file changed, 111 insertions(+), 87 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 158a3e39d97..9c6ff961f91 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -14975,6 +14975,15 @@ static void test_stream_output_vs(void) release_test_context(&test_context); } +static float clamp_depth_bias(float bias, float clamp) +{ + if (clamp > 0.0f) + return min(bias, clamp); + if (clamp < 0.0f) + return max(bias, clamp); + return bias; +} + static void test_depth_bias(void) { struct vec3 vertices[] = @@ -14988,14 +14997,14 @@ static void test_depth_bias(void) D3D10_RASTERIZER_DESC rasterizer_desc; struct swapchain_desc swapchain_desc; D3D10_TEXTURE2D_DESC texture_desc; - double m, r, bias, depth, data; + double m, bias, depth, data; struct resource_readback rb; ID3D10DepthStencilView *dsv; unsigned int expected_value; + unsigned int x, y, i, j, k; ID3D10RasterizerState *rs; ID3D10Texture2D *texture; unsigned int format_idx; - unsigned int x, y, i, j; unsigned int shift = 0; ID3D10Device *device; float *depth_values; @@ -15022,6 +15031,10 @@ static void test_depth_bias(void) -10000, -1000, -100, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 50, 100, 200, 500, 1000, 10000, }; + static const float bias_clamp_tests[] = + { + 0.0f, -1e-5f, 1e-5f, + }; static const float quad_slopes[] = { 0.0f, 0.5f, 1.0f @@ -15114,63 +15127,69 @@ static void test_depth_bias(void) for (j = 0; j < ARRAY_SIZE(bias_tests); ++j) { rasterizer_desc.DepthBias = bias_tests[j]; - ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); - ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D10Device_RSSetState(device, rs); - ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); - draw_quad(&test_context); - switch (format) + + for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { - case DXGI_FORMAT_D32_FLOAT: - bias = rasterizer_desc.DepthBias * pow(2.0f, quads[i].exponent - 23.0f); - depth = min(max(0.0f, quads[i].z + bias), 1.0f); + rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; + ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D10Device_RSSetState(device, rs); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + draw_quad(&test_context); + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + bias = rasterizer_desc.DepthBias * pow(2.0f, quads[i].exponent - 23.0f); + bias = clamp_depth_bias(bias, rasterizer_desc.DepthBiasClamp); + depth = min(max(0.0f, quads[i].z + bias), 1.0f); - check_texture_float(texture, depth, 2); - break; - case DXGI_FORMAT_D24_UNORM_S8_UINT: - r = 1.0f / 16777215.0f; - bias = rasterizer_desc.DepthBias * r; - depth = min(max(0.0f, quads[i].z + bias), 1.0f); + check_texture_float(texture, depth, 2); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + bias = clamp_depth_bias(rasterizer_desc.DepthBias / 16777215.0f, + rasterizer_desc.DepthBiasClamp); + depth = min(max(0.0f, quads[i].z + bias), 1.0f); - get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 16777215.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) { - u32 = get_readback_data(&rb, x, y, sizeof(*u32)); - u32_value = *u32 >> shift; - ok(abs(u32_value - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); + expected_value = depth * 16777215.0f + 0.5f; + for (x = 0; x < texture_desc.Width; ++x) + { + u32 = get_readback_data(&rb, x, y, sizeof(*u32)); + u32_value = *u32 >> shift; + ok(abs(u32_value - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + u32_value, u32_value / 16777215.0f, + expected_value, expected_value / 16777215.0f); + } } - } - release_resource_readback(&rb); - break; - case DXGI_FORMAT_D16_UNORM: - r = 1.0f / 65535.0f; - bias = rasterizer_desc.DepthBias * r; - depth = min(max(0.0f, quads[i].z + bias), 1.0f); + release_resource_readback(&rb); + break; + case DXGI_FORMAT_D16_UNORM: + bias = clamp_depth_bias(rasterizer_desc.DepthBias / 65535.0f, + rasterizer_desc.DepthBiasClamp); + depth = min(max(0.0f, quads[i].z + bias), 1.0f); - get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) - { - expected_value = depth * 65535.0f + 0.5f; - for (x = 0; x < texture_desc.Width; ++x) + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) { - u16 = get_readback_data(&rb, x, y, sizeof(*u16)); - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + expected_value = depth * 65535.0f + 0.5f; + for (x = 0; x < texture_desc.Width; ++x) + { + u16 = get_readback_data(&rb, x, y, sizeof(*u16)); + ok(abs(*u16 - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + } } - } - release_resource_readback(&rb); - break; - default: - break; + release_resource_readback(&rb); + break; + default: + break; + } + ID3D10RasterizerState_Release(rs); } - ID3D10RasterizerState_Release(rs); } } @@ -15212,47 +15231,52 @@ static void test_depth_bias(void) for (j = 0; j < ARRAY_SIZE(slope_scaled_bias_tests); ++j) { rasterizer_desc.SlopeScaledDepthBias = slope_scaled_bias_tests[j]; - ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); - ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); - ID3D10Device_RSSetState(device, rs); - ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); - draw_quad(&test_context); - - m = quad_slopes[i] / texture_desc.Height; - bias = rasterizer_desc.SlopeScaledDepthBias * m; - get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + + for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { - depth = min(max(0.0f, depth_values[y] + bias), 1.0f); - switch (format) + rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; + ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D10Device_RSSetState(device, rs); + ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0); + draw_quad(&test_context); + + m = quad_slopes[i] / texture_desc.Height; + bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) { - case DXGI_FORMAT_D32_FLOAT: - data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), - "Got depth %.8e, expected %.8e.\n", data, depth); - break; - case DXGI_FORMAT_D24_UNORM_S8_UINT: - u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); - u32_value = *u32 >> shift; - expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - u32_value, u32_value / 16777215.0f, - expected_value, expected_value / 16777215.0f); - break; - case DXGI_FORMAT_D16_UNORM: - u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); - expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, - "Got value %#x (%.8e), expected %#x (%.8e).\n", - *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); - break; - default: - break; + depth = min(max(0.0f, depth_values[y] + bias), 1.0f); + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + data = get_readback_float(&rb, 0, y); + ok(compare_float(data, depth, 64), + "Got depth %.8e, expected %.8e.\n", data, depth); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); + u32_value = *u32 >> shift; + expected_value = depth * 16777215.0f + 0.5f; + ok(abs(u32_value - expected_value) <= 3, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + u32_value, u32_value / 16777215.0f, + expected_value, expected_value / 16777215.0f); + break; + case DXGI_FORMAT_D16_UNORM: + u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); + expected_value = depth * 65535.0f + 0.5f; + ok(abs(*u16 - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + break; + default: + break; + } } + release_resource_readback(&rb); + ID3D10RasterizerState_Release(rs); } - release_resource_readback(&rb); - ID3D10RasterizerState_Release(rs); } } -- 2.11.0

1 0

[PATCH 3/7] wined3d: Add GPU information for NVIDIA GeForce GT 720.
by Henri Verbeet 08 Oct '18

08 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 6941459a8cd..b62c86a8d0c 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1714,6 +1714,7 @@ cards_nvidia_mesa[] = {"NV117", CARD_NVIDIA_GEFORCE_GTX750}, /* Kepler */ {"NV108", CARD_NVIDIA_GEFORCE_GT740M}, + {"NV106", CARD_NVIDIA_GEFORCE_GT720}, {"NVF1", CARD_NVIDIA_GEFORCE_GTX780TI}, {"NVF0", CARD_NVIDIA_GEFORCE_GTX780}, {"NVE6", CARD_NVIDIA_GEFORCE_GTX770M}, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fb67fe4a512..f4aabb53917 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -283,6 +283,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX675MX, "NVIDIA GeForce GTX 675MX", DRIVER_NVIDIA_GEFORCE8, 4096}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX690, "NVIDIA GeForce GTX 690", DRIVER_NVIDIA_GEFORCE8, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT720, "NVIDIA GeForce GT 720", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730, "NVIDIA GeForce GT 730", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT730M, "NVIDIA GeForce GT 730M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT740M, "NVIDIA GeForce GT 740M", DRIVER_NVIDIA_GEFORCE8, 2048}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ccb7130460a..20e626cd433 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2386,6 +2386,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX675MX = 0x11a7, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, CARD_NVIDIA_GEFORCE_GTX690 = 0x1188, + CARD_NVIDIA_GEFORCE_GT720 = 0x128b, CARD_NVIDIA_GEFORCE_GT730 = 0x1287, CARD_NVIDIA_GEFORCE_GT730M = 0x0fe1, CARD_NVIDIA_GEFORCE_GT740M = 0x1292, -- 2.11.0

1 0

[PATCH 2/7] wined3d: Also default to OpenGL core contexts on NVIDIA GPUs.
by Henri Verbeet 08 Oct '18

08 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 22 ++-------------------- dlls/wined3d/wined3d_main.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2f2d09db794..6941459a8cd 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4178,22 +4178,6 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } -static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD flags) -{ - const char *gl_vendor, *gl_renderer; - - if (wined3d_settings.explicit_gl_version) - return wined3d_settings.max_gl_version; - - gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); - gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); - if (!gl_vendor || !gl_renderer - || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) - return MAKEDWORD_VERSION(1, 0); - - return wined3d_settings.max_gl_version; -} - static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { wined3d_adapter_gl_create_context, @@ -4209,7 +4193,6 @@ BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_crea }; struct wined3d_gl_info *gl_info = &adapter->gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - DWORD max_gl_version; unsigned int i; TRACE("adapter %p, wined3d_creation_flags %#x.\n", adapter, wined3d_creation_flags); @@ -4245,16 +4228,15 @@ BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, DWORD wined3d_crea return FALSE; } - max_gl_version = get_max_gl_version(gl_info, wined3d_creation_flags); for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) { - if (supported_gl_versions[i] <= max_gl_version) + if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) break; } if (i == ARRAY_SIZE(supported_gl_versions)) { ERR_(winediag)("Requested invalid GL version %u.%u.\n", - max_gl_version >> 16, max_gl_version & 0xffff); + wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); i = ARRAY_SIZE(supported_gl_versions) - 1; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 3537a4884fe..ca83d0ae0d9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -73,7 +73,6 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, struct wined3d_settings wined3d_settings = { TRUE, /* Multithreaded CS by default. */ - FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(4, 4), /* Default to OpenGL 4.4 */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ @@ -217,7 +216,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) { ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", tmpvalue >> 16, tmpvalue & 0xffff); - wined3d_settings.explicit_gl_version = TRUE; wined3d_settings.max_gl_version = tmpvalue; } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b5e3c79d4fc..ccb7130460a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -374,7 +374,6 @@ static inline void wined3d_pause(void) struct wined3d_settings { unsigned int cs_multithreaded; - BOOL explicit_gl_version; DWORD max_gl_version; BOOL use_glsl; int offscreen_rendering_mode; -- 2.11.0

1 0

[PATCH 1/7] d2d1: Do not release the "dxgi_target" interface on d2d_bitmap_render_target_init() error paths.
by Henri Verbeet 08 Oct '18

08 Oct '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap_render_target.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 836fa567e70..11c37882fce 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -794,6 +794,10 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta return hr; } + /* Note that we should be a little careful with the "dxgi_target" + * reference we get here. Because the object is aggregated, releasing the + * interface in any error paths below would end up calling + * d2d_bitmap_render_target_Release(). */ if (FAILED(hr = IUnknown_QueryInterface(render_target->dxgi_inner, &IID_ID2D1RenderTarget, (void **)&render_target->dxgi_target))) { @@ -816,7 +820,6 @@ HRESULT d2d_bitmap_render_target_init(struct d2d_bitmap_render_target *render_ta if (FAILED(hr)) { WARN("Failed to create target bitmap, hr %#x.\n", hr); - ID2D1RenderTarget_Release(render_target->dxgi_target); IUnknown_Release(render_target->dxgi_inner); return hr; } -- 2.11.0

1 0

[PATCH] wincodecs/icoformat: Improve input data validation on decoder initialization.
by Nikolay Sivov 08 Oct '18

08 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45942 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/windowscodecs/icoformat.c | 34 ++- dlls/windowscodecs/tests/icoformat.c | 324 +++++++++++++++++---------- 2 files changed, 232 insertions(+), 126 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 5e38ee0d0f..dc08fd5576 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -511,6 +511,9 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p LARGE_INTEGER seek; HRESULT hr; ULONG bytesread; + STATSTG statstg; + unsigned int i; + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); EnterCriticalSection(&This->lock); @@ -527,14 +530,41 @@ static HRESULT WINAPI IcoDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p hr = IStream_Read(pIStream, &This->header, sizeof(ICONHEADER), &bytesread); if (FAILED(hr)) goto end; - if (bytesread != sizeof(ICONHEADER) || - This->header.idReserved != 0 || + + if (bytesread != sizeof(ICONHEADER)) + { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + + if (This->header.idReserved != 0 || This->header.idType != 1) { hr = E_FAIL; goto end; } + hr = IStream_Stat(pIStream, &statstg, STATFLAG_NONAME); + if (FAILED(hr)) + { + WARN("Stat() failed, hr %#x.\n", hr); + goto end; + } + + for (i = 0; i < This->header.idCount; i++) + { + ICONDIRENTRY direntry; + + hr = IStream_Read(pIStream, &direntry, sizeof(direntry), &bytesread); + if (FAILED(hr)) goto end; + + if (bytesread != sizeof(direntry) || (direntry.dwDIBSize + direntry.dwDIBOffset > statstg.cbSize.QuadPart)) + { + hr = WINCODEC_ERR_BADIMAGE; + goto end; + } + } + This->initialized = TRUE; This->stream = pIStream; IStream_AddRef(pIStream); diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index c53739dbd6..9324b59a6c 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -26,148 +26,224 @@ #include "wincodec.h" #include "wine/test.h" -static unsigned char testico_bad_icondirentry_size[] = { - /* ICONDIR */ - 0, 0, /* reserved */ - 1, 0, /* type */ - 1, 0, /* count */ +#include "pshpack1.h" + +struct ICONHEADER +{ + WORD idReserved; + WORD idType; + WORD idCount; +}; + +struct ICONDIRENTRY +{ + BYTE bWidth; + BYTE bHeight; + BYTE bColorCount; + BYTE bReserved; + WORD wPlanes; + WORD wBitCount; + DWORD dwDIBSize; + DWORD dwDIBOffset; +}; + +struct test_ico +{ + struct ICONHEADER header; + struct ICONDIRENTRY direntry; + BITMAPINFOHEADER bmi; + unsigned char data[512]; +}; + +static const struct test_ico ico_1 = +{ + /* ICONHEADER */ + { + 0, /* reserved */ + 1, /* type */ + 1, /* count */ + }, /* ICONDIRENTRY */ - 2, /* width */ - 2, /* height */ - 2, /* colorCount */ - 0, /* reserved */ - 1,0, /* planes */ - 8,0, /* bitCount */ - (40+2*4+16*16+16*4) & 0xFF,((40+2*4+16*16+16*4) >> 8) & 0xFF,0,0, /* bytesInRes */ - 22,0,0,0, /* imageOffset */ + { + 2, /* width */ + 2, /* height */ + 2, /* color count */ + 0, /* reserved */ + 1, /* planes */ + 8, /* bitcount*/ + 40 + 2*4 + 16 * 16 + 16 * 4, /* data size */ + 22 /* data offset */ + }, /* BITMAPINFOHEADER */ - 40,0,0,0, /* header size */ - 16,0,0,0, /* width */ - 2*16,0,0,0, /* height (XOR+AND rows) */ - 1,0, /* planes */ - 8,0, /* bit count */ - 0,0,0,0, /* compression */ - 0,0,0,0, /* sizeImage */ - 0,0,0,0, /* x pels per meter */ - 0,0,0,0, /* y pels per meter */ - 2,0,0,0, /* clrUsed */ - 0,0,0,0, /* clrImportant */ - /* palette */ - 0,0,0,0, - 0xFF,0xFF,0xFF,0, - /* XOR mask */ - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, - 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, - 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, - 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, - 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, - /* AND mask */ - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0, - 0,0,0,0 + { + sizeof(BITMAPINFOHEADER), /* header size */ + 16, /* width */ + 2*16, /* height (XOR+AND rows) */ + 1, /* planes */ + 8, /* bit count */ + 0, /* compression */ + 0, /* sizeImage */ + 0, /* x pels per meter */ + 0, /* y pels per meter */ + 2, /* clrUsed */ + 0, /* clrImportant */ + }, + { + /* palette */ + 0,0,0,0, + 0xFF,0xFF,0xFF,0, + /* XOR mask */ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,1,0,0,0,0,0,0,0,0,0,0,0,1,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0, + 0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0, + 0,0,0,0,1,0,1,0,1,0,1,0,0,0,0,0, + 0,0,0,0,0,1,0,0,0,1,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + /* AND mask */ + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0, + 0,0,0,0 + } }; -static void test_bad_icondirentry_size(void) +#include "poppack.h" + +static IWICStream *create_stream(void) { - IWICBitmapDecoder *decoder; IWICImagingFactory *factory; + IWICStream *stream; HRESULT hr; - IWICStream *icostream; - IWICBitmapFrameDecode *framedecode = NULL; - hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICImagingFactory, (void**)&factory); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - if (FAILED(hr)) return; + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, &IID_IWICImagingFactory, (void **)&factory); + ok(hr == S_OK, "Failed to create imaging factory, hr %#x.\n", hr); + if (FAILED(hr)) + return NULL; + + hr = IWICImagingFactory_CreateStream(factory, &stream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + IWICImagingFactory_Release(factory); - hr = IWICImagingFactory_CreateStream(factory, &icostream); - ok(hr == S_OK, "CreateStream failed, hr=%x\n", hr); - if (SUCCEEDED(hr)) + return stream; +} + +#define test_ico_data(a, b, c, d, e) test_ico_data_(a, b, c, d, e, 0, __LINE__) +#define test_ico_data_todo(a, b, c, d, e) test_ico_data_(a, b, c, d, e, 1, __LINE__) +static void test_ico_data_(void *data, DWORD data_size, UINT expected_width, UINT expected_height, HRESULT init, int todo, unsigned int line) +{ + IWICBitmapFrameDecode *framedecode; + IWICBitmapSource *thumbnail; + IWICBitmapDecoder *decoder; + UINT width, height; + IWICStream *stream; + HRESULT hr; + + stream = create_stream(); + + hr = IWICStream_InitializeFromMemory(stream, data, data_size); + ok(hr == S_OK, "InitializeFromMemory failed, hr %#x.\n", hr); + + hr = CoCreateInstance(&CLSID_WICIcoDecoder, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICBitmapDecoder, (void **)&decoder); + ok(hr == S_OK, "Failed to create ICO decoder, hr %#x.\n", hr); + + hr = IWICBitmapDecoder_Initialize(decoder, (IStream *)stream, WICDecodeMetadataCacheOnDemand); +todo_wine_if(todo) + ok_(__FILE__, line)(hr == init, "Unexpected return value hr %#x.\n", hr); + + if (FAILED(hr)) { - hr = IWICStream_InitializeFromMemory(icostream, testico_bad_icondirentry_size, - sizeof(testico_bad_icondirentry_size)); - ok(hr == S_OK, "InitializeFromMemory failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) - { - hr = CoCreateInstance(&CLSID_WICIcoDecoder, NULL, CLSCTX_INPROC_SERVER, - &IID_IWICBitmapDecoder, (void**)&decoder); - ok(hr == S_OK, "CoCreateInstance failed, hr=%x\n", hr); - } - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)icostream, - WICDecodeMetadataCacheOnDemand); - ok(hr == S_OK, "Initialize failed, hr=%x\n", hr); - - if (SUCCEEDED(hr)) - { - hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); - ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); - } - - if (SUCCEEDED(hr)) - { - UINT width, height; - IWICBitmapSource *thumbnail; - - width = height = 0; - hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); - ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); - ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); - - hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); - ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); - if (hr == S_OK) - { - width = height = 0; - hr = IWICBitmapSource_GetSize(thumbnail, &width, &height); - ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); - ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); - IWICBitmapSource_Release(thumbnail); - } - IWICBitmapFrameDecode_Release(framedecode); - } - - IWICBitmapDecoder_Release(decoder); - } - - IWICStream_Release(icostream); + IWICStream_Release(stream); + IWICBitmapDecoder_Release(decoder); + return; } - IWICImagingFactory_Release(factory); + hr = IWICBitmapDecoder_GetFrame(decoder, 0, &framedecode); + ok(hr == S_OK, "GetFrame failed, hr=%x\n", hr); + + width = height = 0; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); + ok(hr == S_OK, "Failed to get frame size, hr %#x.\n", hr); + ok(width == expected_width && height == expected_height, "Unexpected frame size %ux%u.\n", width, height); + + hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); + ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); + if (hr == S_OK) + { + width = height = 0; + hr = IWICBitmapSource_GetSize(thumbnail, &width, &height); + ok(hr == S_OK, "Failed to get thumbnail size, hr %#x.\n", hr); + ok(width == expected_width && height == expected_height, "Unexpected thumbnail size %ux%u.\n", width, height); + IWICBitmapSource_Release(thumbnail); + } + + IWICBitmapFrameDecode_Release(framedecode); + + IWICBitmapDecoder_Release(decoder); + IWICStream_Release(stream); +} + +static void test_decoder(void) +{ + struct test_ico ico; + + /* Icon size specified in ICONDIRENTRY does not match bitmap header. */ + ico = ico_1; + ico.direntry.bWidth = 2; + ico.direntry.bHeight = 2; + test_ico_data(&ico, sizeof(ico), 16, 16, S_OK); + + /* Invalid DIRENTRY data size/offset. */ + ico = ico_1; + ico.direntry.dwDIBOffset = sizeof(ico); + test_ico_data(&ico, sizeof(ico), 0, 0, WINCODEC_ERR_BADIMAGE); + + ico = ico_1; + ico.direntry.dwDIBSize = sizeof(ico); + test_ico_data(&ico, sizeof(ico), 0, 0, WINCODEC_ERR_BADIMAGE); + + /* Header fields validation. */ + ico = ico_1; + ico.header.idReserved = 1; + test_ico_data_todo(&ico, sizeof(ico), 16, 16, S_OK); + ico.header.idReserved = 0; + ico.header.idType = 100; + test_ico_data_todo(&ico, sizeof(ico), 16, 16, S_OK); + + /* Premature end of data. */ + ico = ico_1; + test_ico_data(&ico, sizeof(ico.header) - 1, 0, 0, WINCODEC_ERR_STREAMREAD); + test_ico_data(&ico, sizeof(ico.header) + sizeof(ico.direntry) - 1, 0, 0, WINCODEC_ERR_BADIMAGE); } START_TEST(icoformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - test_bad_icondirentry_size(); + test_decoder(); CoUninitialize(); } -- 2.19.0

2 2