August 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11/tests: Add initial test for required formats.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: ea8dd85ba9a1f6ac5be1e90efa455fabcb5907d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea8dd85ba9a1f6ac5be1e90ef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:25 2016 +0200 d3d11/tests: Add initial test for required formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 101 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 0760917..e412c634 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -10247,6 +10247,106 @@ static void test_line_antialiasing_blending(void) release_test_context(&test_context); } +struct format_support +{ + DXGI_FORMAT format; + D3D_FEATURE_LEVEL fl_required; + D3D_FEATURE_LEVEL fl_optional; +}; + +static void check_format_support(const unsigned int *format_support, D3D_FEATURE_LEVEL feature_level, + const struct format_support *formats, unsigned int format_count, unsigned int feature_flag, + const char *feature_name) +{ + unsigned int i; + + for (i = 0; i < format_count; ++i) + { + DXGI_FORMAT format = formats[i].format; + unsigned int supported = format_support[format] & feature_flag; + + if (formats[i].fl_required <= feature_level) + { + ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); + continue; + } + + if (formats[i].fl_optional <= feature_level) + continue; + + ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", + format, feature_name, feature_level, format_support[format]); + } +} + +static void test_required_format_support(void) +{ + unsigned int format_support[DXGI_FORMAT_B4G4R4A4_UNORM + 1]; + ID3D11Device *device; + DXGI_FORMAT format; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct format_support index_buffers[] = + { + {DXGI_FORMAT_R32_UINT, D3D_FEATURE_LEVEL_9_2}, + {DXGI_FORMAT_R16_UINT, D3D_FEATURE_LEVEL_9_1}, + }; + + static const struct format_support display[] = + { + {DXGI_FORMAT_R8G8B8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_B8G8R8A8_UNORM_SRGB, D3D_FEATURE_LEVEL_9_1}, + {DXGI_FORMAT_R16G16B16A16_FLOAT, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R10G10B10A2_UNORM, D3D_FEATURE_LEVEL_10_0}, + {DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM, D3D_FEATURE_LEVEL_11_0, D3D_FEATURE_LEVEL_10_0}, + }; + + for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) + { + D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; + struct device_desc device_desc; + + device_desc.feature_level = &feature_level; + device_desc.flags = 0; + if (!(device = create_device(&device_desc))) + { + skip("Failed to create device for feature level %#x.\n", feature_level); + continue; + } + + memset(format_support, 0, sizeof(format_support)); + for (format = DXGI_FORMAT_UNKNOWN; format <= DXGI_FORMAT_B4G4R4A4_UNORM; ++format) + { + hr = ID3D11Device_CheckFormatSupport(device, format, &format_support[format]); + todo_wine ok(hr == S_OK || (hr == E_FAIL && !format_support[format]), + "Got unexpected result for format %#x: hr %#x, format_support %#x.\n", + format, hr, format_support[format]); + } + if (hr == E_NOTIMPL) + { + skip("CheckFormatSupport not implemented.\n"); + ID3D11Device_Release(device); + continue; + } + + check_format_support(format_support, feature_level, + index_buffers, sizeof(index_buffers) / sizeof(*index_buffers), + D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER, "index buffer"); + + check_format_support(format_support, feature_level, + display, sizeof(display) / sizeof(*display), + D3D11_FORMAT_SUPPORT_DISPLAY, "display"); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + } +} + START_TEST(d3d11) { test_create_device(); @@ -10303,4 +10403,5 @@ START_TEST(d3d11) test_index_buffer_offset(); test_face_culling(); test_line_antialiasing_blending(); + test_required_format_support(); }

1 0

Józef Kucia : d3d11: Add support for feature level 9 shaders.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 74eace2a379da2f80df51af12bcc5d77404ff192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74eace2a379da2f80df51af12… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:28 2016 +0200 d3d11: Add support for feature level 9 shaders. 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/d3d11_private.h | 1 + dlls/d3d11/shader.c | 90 +++++++++++++++++++++++++++++++++++++++------- dlls/d3d11/tests/d3d11.c | 10 ++---- 3 files changed, 82 insertions(+), 19 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e9837cc..4af0faa 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -45,6 +45,7 @@ #define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') #define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define TAG_SHEX MAKE_TAG('S', 'H', 'E', 'X') +#define TAG_AON9 MAKE_TAG('A', 'o', 'n', '9') struct d3d_device; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 9f618e4..dab2b9b 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -24,47 +24,113 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *ctx) +struct aon9_header { - struct wined3d_shader_desc *desc = ctx; + DWORD chunk_size; + DWORD shader_version; + DWORD unknown; + DWORD byte_code_offset; +}; + +struct shader_handler_context +{ + D3D_FEATURE_LEVEL feature_level; + struct wined3d_shader_desc *desc; +}; + +static HRESULT shdr_handler(const char *data, DWORD data_size, DWORD tag, void *context) +{ + const struct shader_handler_context *ctx = context; + struct wined3d_shader_desc *desc = ctx->desc; HRESULT hr; switch (tag) { case TAG_ISGN: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + TRACE("Skipping shader input signature on feature level %#x.\n", ctx->feature_level); + break; + } if (FAILED(hr = shader_parse_signature(data, data_size, &desc->input_signature))) return hr; break; case TAG_OSGN: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + TRACE("Skipping shader output signature on feature level %#x.\n", ctx->feature_level); + break; + } if (FAILED(hr = shader_parse_signature(data, data_size, &desc->output_signature))) return hr; break; case TAG_SHDR: case TAG_SHEX: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + TRACE("Skipping SM4+ shader code on feature level %#x.\n", ctx->feature_level); + break; + } if (desc->byte_code) - FIXME("Multiple SHDR/SHEX chunks.\n"); + FIXME("Multiple shader code chunks.\n"); desc->byte_code = (const DWORD *)data; break; + case TAG_AON9: + if (ctx->feature_level <= D3D_FEATURE_LEVEL_9_3) + { + const struct aon9_header *header = (const struct aon9_header *)data; + unsigned int unknown_dword_count; + const char *byte_code; + + if (data_size < sizeof(*header)) + { + WARN("Invalid Aon9 data size %#x.\n", data_size); + return E_FAIL; + } + byte_code = data + header->byte_code_offset; + unknown_dword_count = (header->byte_code_offset - sizeof(*header)) / sizeof(DWORD); + + if (data_size - 2 * sizeof(DWORD) < header->byte_code_offset) + { + WARN("Invalid byte code offset %#x (size %#x).\n", header->byte_code_offset, data_size); + return E_FAIL; + } + FIXME("Skipping %u unknown DWORDs.\n", unknown_dword_count); + + if (desc->byte_code) + FIXME("Multiple shader code chunks.\n"); + desc->byte_code = (const DWORD *)byte_code; + TRACE("Feature level 9 shader version 0%08x, 0%08x.\n", header->shader_version, *desc->byte_code); + } + else + { + TRACE("Skipping feature level 9 shader code on feature level %#x.\n", ctx->feature_level); + break; + } + break; + default: - FIXME("Unhandled chunk %s\n", debugstr_an((const char *)&tag, 4)); + FIXME("Unhandled chunk %s.\n", debugstr_an((const char *)&tag, 4)); break; } return S_OK; } -static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct wined3d_shader_desc *desc) +static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, struct wined3d_shader_desc *desc, + D3D_FEATURE_LEVEL feature_level) { + struct shader_handler_context ctx = {feature_level, desc}; HRESULT hr; desc->byte_code = NULL; memset(&desc->input_signature, 0, sizeof(desc->input_signature)); memset(&desc->output_signature, 0, sizeof(desc->output_signature)); - hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, desc); + hr = parse_dxbc(dxbc, dxbc_length, shdr_handler, &ctx); if (!desc->byte_code) hr = E_INVALIDARG; @@ -431,7 +497,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -637,7 +703,7 @@ static HRESULT d3d11_hull_shader_init(struct d3d11_hull_shader *shader, struct d wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -824,7 +890,7 @@ static HRESULT d3d11_domain_shader_init(struct d3d11_domain_shader *shader, stru wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -1115,7 +1181,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -1432,7 +1498,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); @@ -1636,7 +1702,7 @@ static HRESULT d3d11_compute_shader_init(struct d3d11_compute_shader *shader, st wined3d_mutex_lock(); wined3d_private_store_init(&shader->private_store); - if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc))) + if (FAILED(hr = shader_extract_from_dxbc(byte_code, byte_code_length, &desc, device->feature_level))) { WARN("Failed to extract shader, hr %#x.\n", hr); wined3d_private_store_cleanup(&shader->private_store); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 05f7917..07a3066 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3717,7 +3717,6 @@ static void test_create_shader(void) for (i = 0; i < sizeof(d3d11_feature_levels) / sizeof(*d3d11_feature_levels); ++i) { D3D_FEATURE_LEVEL feature_level = d3d11_feature_levels[i]; - BOOL todo = feature_level <= D3D_FEATURE_LEVEL_9_3; struct device_desc device_desc; device_desc.feature_level = &feature_level; @@ -3730,20 +3729,17 @@ static void test_create_shader(void) /* level_9 shaders */ hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_0, sizeof(ps_4_0_level_9_0), NULL, &ps); - todo_wine_if(todo) - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_0 shader, hr %#x, feature level %#x.\n", hr, feature_level); if (SUCCEEDED(hr)) ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_1, sizeof(ps_4_0_level_9_1), NULL, &ps); - todo_wine_if(todo) - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_1 shader, hr %#x, feature level %#x.\n", hr, feature_level); if (SUCCEEDED(hr)) ID3D11PixelShader_Release(ps); hr = ID3D11Device_CreatePixelShader(device, ps_4_0_level_9_3, sizeof(ps_4_0_level_9_3), NULL, &ps); - todo_wine_if(todo) - ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); + ok(SUCCEEDED(hr), "Failed to create ps_4_0_level_9_3 shader, hr %#x, feature level %#x.\n", hr, feature_level); if (SUCCEEDED(hr)) ID3D11PixelShader_Release(ps);

1 0

Józef Kucia : wined3d: Add few missing formats.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 4323924b2de57d1c04cf8ecdd2957519fbd7a551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4323924b2de57d1c04cf8ecdd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Aug 11 12:57:24 2016 +0200 wined3d: Add few missing formats. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 12 ++++++++++++ dlls/dxgi/utils.c | 12 ++++++++++++ dlls/wined3d/utils.c | 4 ++++ include/wine/wined3d.h | 4 ++++ 4 files changed, 32 insertions(+) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 36cad41..370858e 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -139,10 +139,14 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_D3D_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + WINE_D3D_TO_STR(DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); + WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_TYPELESS); + WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_UF16); + WINE_D3D_TO_STR(DXGI_FORMAT_BC6H_SF16); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_D3D_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); @@ -255,10 +259,14 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM; case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; + case WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM: return DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM; case WINED3DFMT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_TYPELESS; case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; + case WINED3DFMT_BC6H_TYPELESS: return DXGI_FORMAT_BC6H_TYPELESS; + case WINED3DFMT_BC6H_UF16: return DXGI_FORMAT_BC6H_UF16; + case WINED3DFMT_BC6H_SF16: return DXGI_FORMAT_BC6H_SF16; case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; @@ -361,10 +369,14 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B5G5R5A1_UNORM: return WINED3DFMT_B5G5R5A1_UNORM; case DXGI_FORMAT_B8G8R8A8_UNORM: return WINED3DFMT_B8G8R8A8_UNORM; case DXGI_FORMAT_B8G8R8X8_UNORM: return WINED3DFMT_B8G8R8X8_UNORM; + case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: return WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM; case DXGI_FORMAT_B8G8R8A8_TYPELESS: return WINED3DFMT_B8G8R8A8_TYPELESS; case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; + case DXGI_FORMAT_BC6H_TYPELESS: return WINED3DFMT_BC6H_TYPELESS; + case DXGI_FORMAT_BC6H_UF16: return WINED3DFMT_BC6H_UF16; + case DXGI_FORMAT_BC6H_SF16: return WINED3DFMT_BC6H_SF16; case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index 9371de1..b9be4a5 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -137,10 +137,14 @@ const char *debug_dxgi_format(DXGI_FORMAT format) WINE_DXGI_TO_STR(DXGI_FORMAT_B5G5R5A1_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM); + WINE_DXGI_TO_STR(DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8A8_UNORM_SRGB); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_B8G8R8X8_UNORM_SRGB); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_TYPELESS); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_UF16); + WINE_DXGI_TO_STR(DXGI_FORMAT_BC6H_SF16); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_TYPELESS); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM); WINE_DXGI_TO_STR(DXGI_FORMAT_BC7_UNORM_SRGB); @@ -245,10 +249,14 @@ DXGI_FORMAT dxgi_format_from_wined3dformat(enum wined3d_format_id format) case WINED3DFMT_B5G5R5A1_UNORM: return DXGI_FORMAT_B5G5R5A1_UNORM; case WINED3DFMT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; case WINED3DFMT_B8G8R8X8_UNORM: return DXGI_FORMAT_B8G8R8X8_UNORM; + case WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM: return DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM; case WINED3DFMT_B8G8R8A8_TYPELESS: return DXGI_FORMAT_B8G8R8A8_TYPELESS; case WINED3DFMT_B8G8R8A8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; case WINED3DFMT_B8G8R8X8_TYPELESS: return DXGI_FORMAT_B8G8R8X8_TYPELESS; case WINED3DFMT_B8G8R8X8_UNORM_SRGB: return DXGI_FORMAT_B8G8R8X8_UNORM_SRGB; + case WINED3DFMT_BC6H_TYPELESS: return DXGI_FORMAT_BC6H_TYPELESS; + case WINED3DFMT_BC6H_UF16: return DXGI_FORMAT_BC6H_UF16; + case WINED3DFMT_BC6H_SF16: return DXGI_FORMAT_BC6H_SF16; case WINED3DFMT_BC7_TYPELESS: return DXGI_FORMAT_BC7_TYPELESS; case WINED3DFMT_BC7_UNORM: return DXGI_FORMAT_BC7_UNORM; case WINED3DFMT_BC7_UNORM_SRGB: return DXGI_FORMAT_BC7_UNORM_SRGB; @@ -351,10 +359,14 @@ enum wined3d_format_id wined3dformat_from_dxgi_format(DXGI_FORMAT format) case DXGI_FORMAT_B5G5R5A1_UNORM: return WINED3DFMT_B5G5R5A1_UNORM; case DXGI_FORMAT_B8G8R8A8_UNORM: return WINED3DFMT_B8G8R8A8_UNORM; case DXGI_FORMAT_B8G8R8X8_UNORM: return WINED3DFMT_B8G8R8X8_UNORM; + case DXGI_FORMAT_R10G10B10_XR_BIAS_A2_UNORM: return WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM; case DXGI_FORMAT_B8G8R8A8_TYPELESS: return WINED3DFMT_B8G8R8A8_TYPELESS; case DXGI_FORMAT_B8G8R8A8_UNORM_SRGB: return WINED3DFMT_B8G8R8A8_UNORM_SRGB; case DXGI_FORMAT_B8G8R8X8_TYPELESS: return WINED3DFMT_B8G8R8X8_TYPELESS; case DXGI_FORMAT_B8G8R8X8_UNORM_SRGB: return WINED3DFMT_B8G8R8X8_UNORM_SRGB; + case DXGI_FORMAT_BC6H_TYPELESS: return WINED3DFMT_BC6H_TYPELESS; + case DXGI_FORMAT_BC6H_UF16: return WINED3DFMT_BC6H_UF16; + case DXGI_FORMAT_BC6H_SF16: return WINED3DFMT_BC6H_SF16; case DXGI_FORMAT_BC7_TYPELESS: return WINED3DFMT_BC7_TYPELESS; case DXGI_FORMAT_BC7_UNORM: return WINED3DFMT_BC7_UNORM; case DXGI_FORMAT_BC7_UNORM_SRGB: return WINED3DFMT_BC7_UNORM_SRGB; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 31d5014..f02220c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3671,6 +3671,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_R10G10B10A2_UNORM); FMT_TO_STR(WINED3DFMT_R10G10B10A2_UINT); FMT_TO_STR(WINED3DFMT_R10G10B10A2_SNORM); + FMT_TO_STR(WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM); FMT_TO_STR(WINED3DFMT_R11G11B10_FLOAT); FMT_TO_STR(WINED3DFMT_R8G8B8A8_TYPELESS); FMT_TO_STR(WINED3DFMT_R8G8B8A8_UNORM); @@ -3738,6 +3739,9 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM_SRGB); FMT_TO_STR(WINED3DFMT_B8G8R8X8_TYPELESS); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM_SRGB); + FMT_TO_STR(WINED3DFMT_BC6H_TYPELESS); + FMT_TO_STR(WINED3DFMT_BC6H_UF16); + FMT_TO_STR(WINED3DFMT_BC6H_SF16); FMT_TO_STR(WINED3DFMT_BC7_TYPELESS); FMT_TO_STR(WINED3DFMT_BC7_UNORM); FMT_TO_STR(WINED3DFMT_BC7_UNORM_SRGB); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1e50020..1c9b262 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -151,6 +151,7 @@ enum wined3d_format_id WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_SNORM, + WINED3DFMT_R10G10B10_XR_BIAS_A2_UNORM, WINED3DFMT_R11G11B10_FLOAT, WINED3DFMT_R8G8B8A8_TYPELESS, WINED3DFMT_R8G8B8A8_UNORM, @@ -218,6 +219,9 @@ enum wined3d_format_id WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, WINED3DFMT_B8G8R8X8_UNORM_SRGB, + WINED3DFMT_BC6H_TYPELESS, + WINED3DFMT_BC6H_UF16, + WINED3DFMT_BC6H_SF16, WINED3DFMT_BC7_TYPELESS, WINED3DFMT_BC7_UNORM, WINED3DFMT_BC7_UNORM_SRGB,

1 0

Aaryaman Vasishta : d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D.
by Alexandre Julliard Aug. 12, 2016

Aug. 12, 2016

Module: wine Branch: master Commit: 3987417688a5e5e9c2d38b79683e55bfeb726679 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3987417688a5e5e9c2d38b796… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Wed Aug 10 21:25:02 2016 +0530 d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/device.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index a8d646b..57fd7c0 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -213,7 +213,7 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID { IDirectDraw *ddraw; IDirectDrawSurface *surface; - IDirect3DDevice2 *d3d_device2; + IDirect3DDevice2 *d3d_device2 = NULL; DDSURFACEDESC desc; HRESULT hr; @@ -223,9 +223,6 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID IDirect3DRM_AddRef(device->d3drm); IDirect3DDevice_AddRef(d3d_device); - if (device->ddraw) - return D3DRMERR_BADOBJECT; - /* Fetch render target and get width/height from there */ if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirectDrawSurface, (void **)&surface))) { @@ -237,16 +234,26 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID return hr; } + if (device->ddraw) + { + if (d3d_device2) + IDirectDrawSurface_Release(surface); + return D3DRMERR_BADOBJECT; + } + desc.dwSize = sizeof(desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); - IDirectDrawSurface_Release(surface); if (FAILED(hr)) + { + IDirectDrawSurface_Release(surface); return hr; + } device->ddraw = ddraw; device->width = desc.dwWidth; device->height = desc.dwHeight; device->device = d3d_device; + device->render_target = surface; return hr; }

1 0

Bruno Jesus : odbc32: Upgrade a WARN into ERR when the library is not found.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: dca0e38d82c737cd8aeab63e08cf1990d05d9671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca0e38d82c737cd8aeab63e0… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Aug 9 18:06:47 2016 -0300 odbc32: Upgrade a WARN into ERR when the library is not found. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index d7ebf10..aca0792 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -520,7 +520,7 @@ static BOOL ODBC_LoadDriverManager(void) return TRUE; } failed: - WARN("failed to open library %s: %s\n", debugstr_a(s), error); + ERR_(winediag)("failed to open library %s: %s\n", debugstr_a(s), error); nErrorType = ERROR_LIBRARY_NOT_FOUND; return FALSE; }

1 0

Hugh McMaster : server: Get and set the console pop-up color attributes.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: f592f931b2fe0eead1e136f7a087babc7efe23ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=f592f931b2fe0eead1e136f7a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Aug 10 10:01:57 2016 +0000 server: Get and set the console pop-up color attributes. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 24 +++++++++++++----------- programs/wineconsole/wineconsole.c | 3 ++- server/console.c | 9 ++++++++- server/protocol.def | 23 +++++++++++++---------- server/request.h | 34 ++++++++++++++++++---------------- server/trace.c | 2 ++ 6 files changed, 56 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f592f931b2fe0eead1e13…

1 0

Michael Stefaniuc : mmdevapi: Another use case for todo_wine_if().
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 4f06fd1490a759824ee27456df07b8103d7d72a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f06fd1490a759824ee27456d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 9 22:28:37 2016 +0200 mmdevapi: Another use case for todo_wine_if(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 749272a..99da296 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -309,19 +309,13 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if(hr == S_OK){ /* The discontinuity is reported here, but is this an old or new packet? */ - if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)){ + todo_wine_if(!(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY)) { /* FIXME: Some drivers fail */ - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); - todo_wine ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); - }else{ ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); - /* Native's position is one period further than what we read. * Perhaps that's precisely the meaning of DATA_DISCONTINUITY: * signal when the position jump left a gap. */ - ok(pos == sum + frames, "Position %u gap %d\n", - (UINT)pos, (UINT)pos - sum); + ok(pos == sum + frames, "Position %u gap %d\n", (UINT)pos, (UINT)pos - sum); } ok(pad == next, "GCP %u vs. BufferSize %u\n", (UINT32)pad, next);

1 0

Huw Davies : riched20: Update the auto url detection after a StreamIn.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: adb43b91922404f76a3952d8be1c2608fe2479ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb43b91922404f76a3952d8b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Aug 11 11:32:04 2016 +0100 riched20: Update the auto url detection after a StreamIn. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 9ec72e2..fb77a67 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1559,8 +1559,9 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!invalidRTF && !inStream.editstream->dwError) { + ME_Cursor start; + from = ME_GetCursorOfs(&editor->pCursors[0]); if (format & SF_RTF) { - from = ME_GetCursorOfs(&editor->pCursors[0]); /* setup the RTF parser */ memset(&parser, 0, sizeof parser); @@ -1662,12 +1663,17 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre style = parser.style; } else if (format & SF_TEXT) + { num_read = ME_StreamInText(editor, format, &inStream, style); + to = ME_GetCursorOfs(&editor->pCursors[0]); + } else ERR("EM_STREAMIN without SF_TEXT or SF_RTF\n"); /* put the cursor at the top */ if (!(format & SFF_SELECTION)) ME_SetSelection(editor, 0, 0); + ME_CursorFromCharOfs(editor, from, &start); + ME_UpdateLinkAttribute(editor, &start, to - from); } /* Restore saved undo mode */

1 0

Michael Stefaniuc : fusion: Avoid using the LPASSEMBLYNAME type.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 8b6fa5c9bab54c32a6fb270442b92c90b2290b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6fa5c9bab54c32a6fb27044… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:53:25 2016 +0200 fusion: Avoid using the LPASSEMBLYNAME type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 2 +- dlls/fusion/tests/asmenum.c | 2 +- dlls/fusion/tests/asmname.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f7a9452..0baea2f 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -727,7 +727,7 @@ done: /****************************************************************** * CreateAssemblyNameObject (FUSION.@) */ -HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, +HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved) { diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index a060529..1dc34a2 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -33,7 +33,7 @@ static HRESULT (WINAPI *pCreateAssemblyEnum)(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved); -static HRESULT (WINAPI *pCreateAssemblyNameObject)(LPASSEMBLYNAME *ppAssemblyNameObj, +static HRESULT (WINAPI *pCreateAssemblyNameObject)(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved); static HRESULT (WINAPI *pGetCachePath)(ASM_CACHE_FLAGS dwCacheFlags, diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index e415c3a9..5fb14a4 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -35,7 +35,7 @@ static CHAR string1[MAX_PATH]; if (lstrcmpA(string1, aString) != 0) \ ok(0, "Expected \"%s\", got \"%s\"\n", aString, string1); -static HRESULT (WINAPI *pCreateAssemblyNameObject)(LPASSEMBLYNAME *ppAssemblyNameObj, +static HRESULT (WINAPI *pCreateAssemblyNameObject)(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR szDllName, LPCWSTR szVersion,

1 0

Michael Stefaniuc : ole32/tests: Avoid casts from COM objects to ifaces.
by Alexandre Julliard Aug. 11, 2016

Aug. 11, 2016

Module: wine Branch: master Commit: 11c67756d2374270d0deeeacc23735cae33488f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c67756d2374270d0deeeacc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:50:49 2016 +0200 ole32/tests: Avoid casts from COM objects to ifaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 13e5220..1a8301e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -192,7 +192,7 @@ static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFO ret->fmtetc_cnt = fmtetc_cnt; ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); - *lplpformatetc = (LPENUMFORMATETC)ret; + *lplpformatetc = &ret->IEnumFORMATETC_iface; return S_OK; } @@ -395,7 +395,7 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_TEXT, TYMED_HGLOBAL); - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; } @@ -451,7 +451,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) InitFormatEtc(obj->fmtetc[7], cf_another, 0xfffff); obj->fmtetc[7].dwAspect = DVASPECT_ICON; - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; }

1 0