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

Józef Kucia : d3d10core/tests: Introduce d3d10core_test_context for visual tests.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 67ba537f7777c0caf292b9331d9d2cfdffd2afbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=67ba537f7777c0caf292b9331… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:48 2016 +0100 d3d10core/tests: Introduce d3d10core_test_context for visual tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 493 ++++++++++++++---------------------------- 1 file changed, 157 insertions(+), 336 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67ba537f7777c0caf292b…

1 0

Patrick Armstrong : bcrypt: Implement support for HMAC.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 630f5e97b12c1bc934e44a632d30e9129651bb06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630f5e97b12c1bc934e44a632… Author: Patrick Armstrong <pat(a)triplefox.com> Date: Thu Mar 10 19:33:40 2016 -0800 bcrypt: Implement support for HMAC. Signed-off-by: Patrick Armstrong <pat(a)oldpatricka.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 177 ++++++++++++++++++++++++++++++++++++++++++--- dlls/bcrypt/tests/bcrypt.c | 166 ++++++++++++++++++++++++++++++++++++++++-- include/bcrypt.h | 1 + 3 files changed, 330 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=630f5e97b12c1bc934e44…

1 0

Józef Kucia : d3d10core/tests: Introduce draw_quad().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 69433d23199b7fab6b35c6daef3af8dc7995d8ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=69433d23199b7fab6b35c6dae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:49 2016 +0100 d3d10core/tests: Introduce draw_quad(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 440 ++++++++++-------------------------------- 1 file changed, 106 insertions(+), 334 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69433d23199b7fab6b35c…

1 0

Józef Kucia : wined3d: Improve ERR() message in shader_glsl_get_sample_function().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 4c355b1eb5fc5a2b849140b06079755702c26231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c355b1eb5fc5a2b849140b06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:47 2016 +0100 wined3d: Improve ERR() message in shader_glsl_get_sample_function(). 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/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2970a95..136bd55 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2743,7 +2743,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { static const DWORD texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; if (flags & ~texel_fetch_flags) - ERR("Unexpected flags for texelFetch %#x.\n", flags & ~texel_fetch_flags); + ERR("Unexpected flags %#x for texelFetch.\n", flags & ~texel_fetch_flags); base = "texelFetch"; type_part = "";

1 0

Matteo Bruni : d3d11/tests: Test creating SM4 shaders on feature level 9.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 1c8983bf75b16f9b82eae72a13e6d5052a14ad0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8983bf75b16f9b82eae72a1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:24 2016 +0100 d3d11/tests: Test creating SM4 shaders on feature level 9. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 133 +++++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 321fc2c..c42286a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2031,86 +2031,97 @@ static void test_create_shader(void) ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x, feature level %#x.\n", hr, feature_level); - if (feature_level < D3D_FEATURE_LEVEL_10_0) - { - refcount = ID3D11Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - continue; - } - - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), NULL, &vs); - ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11VertexShader_GetDevice(vs, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11VertexShader_QueryInterface(vs, &IID_ID3D10VertexShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Vertex shader should implement ID3D10VertexShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11VertexShader_Release(vs); - ok(!refcount, "Vertex shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11VertexShader_GetDevice(vs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11VertexShader_QueryInterface(vs, &IID_ID3D10VertexShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Vertex shader should implement ID3D10VertexShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11VertexShader_Release(vs); + ok(!refcount, "Vertex shader has %u references left.\n", refcount); + } /* pixel shader */ - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11PixelShader_GetDevice(ps, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11PixelShader_QueryInterface(ps, &IID_ID3D10PixelShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Pixel shader should implement ID3D10PixelShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11PixelShader_Release(ps); - ok(!refcount, "Pixel shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11PixelShader_GetDevice(ps, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11PixelShader_QueryInterface(ps, &IID_ID3D10PixelShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Pixel shader should implement ID3D10PixelShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11PixelShader_Release(ps); + ok(!refcount, "Pixel shader has %u references left.\n", refcount); + } /* geometry shader */ - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreateGeometryShader(device, gs_4_0, sizeof(gs_4_0), NULL, &gs); - ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x.\n", hr); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 geometry shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11GeometryShader_GetDevice(gs, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11GeometryShader_QueryInterface(gs, &IID_ID3D10GeometryShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Geometry shader should implement ID3D10GeometryShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11GeometryShader_Release(gs); - ok(!refcount, "Geometry shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11GeometryShader_GetDevice(gs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11GeometryShader_QueryInterface(gs, &IID_ID3D10GeometryShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Geometry shader should implement ID3D10GeometryShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11GeometryShader_Release(gs); + ok(!refcount, "Geometry shader has %u references left.\n", refcount); + } refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_unmap() and wined3d_volume_unmap().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: beb8986e48ad0cbdcea62c8b8c5d38ae63f683f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb8986e48ad0cbdcea62c8b8… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Mar 9 16:21:58 2016 +0100 wined3d: Merge wined3d_surface_unmap() and wined3d_volume_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/volume.c | 2 ++ dlls/d3d9/volume.c | 2 ++ dlls/wined3d/surface.c | 51 ------------------------------ dlls/wined3d/texture.c | 70 +++++++++++++++++++++++++++++++++--------- dlls/wined3d/volume.c | 30 ------------------ dlls/wined3d/wined3d_private.h | 2 -- 6 files changed, 59 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=beb8986e48ad0cbdcea62…

1 0

Nikolay Sivov : ole32/tests: A test to show data cache QI problems.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: a411ef99fcee102dfb1a5426af2f9f6697643a67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a411ef99fcee102dfb1a5426a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 10 10:33:31 2016 +0300 ole32/tests: A test to show data cache QI problems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/ole2.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 2167f66..d58105c 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1505,13 +1505,11 @@ static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void static ULONG WINAPI Unknown_AddRef(IUnknown *iface) { - ok(0, "unexpected AddRef\n"); return 2; } static ULONG WINAPI Unknown_Release(IUnknown *iface) { - ok(0, "unexpected Release\n"); return 1; } @@ -1528,7 +1526,9 @@ static void test_data_cache(void) { HRESULT hr; IOleCache2 *pOleCache; + IOleCache *olecache; IStorage *pStorage; + IUnknown *unk; IPersistStorage *pPS; IViewObject *pViewObject; IOleCacheControl *pOleCacheControl; @@ -1601,9 +1601,32 @@ static void test_data_cache(void) todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&pOleCache); + hr = CreateDataCache(&unknown, &CLSID_NULL, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(unk != (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk != (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); + IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); + + hr = CreateDataCache(NULL, &CLSID_NULL, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache, (void**)&olecache); ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IUnknown_QueryInterface(unk, &IID_IOleCache2, (void**)&pOleCache); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(unk == (IUnknown*)olecache, "got %p, expected %p\n", olecache, unk); + ok(unk == (IUnknown*)pOleCache, "got %p, expected %p\n", pOleCache, unk); +} IOleCache2_Release(pOleCache); + IOleCache_Release(olecache); + IUnknown_Release(unk); /* Test with new data */

1 0

Matteo Bruni : d3d11: Only accept shader versions supported by the feature level of the device.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: ca3963b674433703816de861495af913c9579886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca3963b674433703816de8614… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:21 2016 +0100 d3d11: Only accept shader versions supported by the feature level of the device. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/shader.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index 0e277fc..06e4b8c 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -361,6 +361,27 @@ static const struct wined3d_parent_ops d3d_vertex_shader_wined3d_parent_ops = d3d_vertex_shader_wined3d_object_destroyed, }; +static unsigned int d3d_sm_from_feature_level(D3D_FEATURE_LEVEL feature_level) +{ + switch (feature_level) + { + case D3D_FEATURE_LEVEL_11_1: + case D3D_FEATURE_LEVEL_11_0: + return 5; + case D3D_FEATURE_LEVEL_10_1: + case D3D_FEATURE_LEVEL_10_0: + return 4; + case D3D_FEATURE_LEVEL_9_3: + return 3; + case D3D_FEATURE_LEVEL_9_2: + case D3D_FEATURE_LEVEL_9_1: + return 2; + default: + ERR("Unexpected feature_level %#x.\n", feature_level); + } + return 0; +} + static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d3d_device *device, const void *byte_code, SIZE_T byte_code_length) { @@ -389,7 +410,7 @@ static HRESULT d3d_vertex_shader_init(struct d3d_vertex_shader *shader, struct d desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_vs(device->wined3d_device, &desc, shader, &d3d_vertex_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -708,7 +729,7 @@ static HRESULT d3d_geometry_shader_init(struct d3d_geometry_shader *shader, stru desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_gs(device->wined3d_device, &desc, shader, &d3d_geometry_shader_wined3d_parent_ops, &shader->wined3d_shader); @@ -1034,7 +1055,7 @@ static HRESULT d3d_pixel_shader_init(struct d3d_pixel_shader *shader, struct d3d desc.byte_code = shader_info.shader_code; desc.input_signature = &input_signature; desc.output_signature = &output_signature; - desc.max_version = 4; + desc.max_version = d3d_sm_from_feature_level(device->feature_level); hr = wined3d_shader_create_ps(device->wined3d_device, &desc, shader, &d3d_pixel_shader_wined3d_parent_ops, &shader->wined3d_shader);

1 0

Matteo Bruni : d3d11: Implement device_GetFeatureLevel().
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: 1e77bb01db6ae8c79125de90c983696e5e301e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e77bb01db6ae8c79125de90c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:20 2016 +0100 d3d11: Implement device_GetFeatureLevel(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 4 ++-- dlls/d3d11/d3d11_main.c | 4 ++++ dlls/d3d11/d3d11_private.h | 2 ++ dlls/d3d11/device.c | 12 ++++++++---- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index f67896e..7eba447 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -82,7 +82,7 @@ static void test_create_device(void) } feature_level = ID3D10Device1_GetFeatureLevel(device); - ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); ID3D10Device1_Release(device); @@ -165,7 +165,7 @@ static void test_create_device(void) ok(!refcount, "Swapchain has %u references left.\n", refcount); feature_level = ID3D10Device1_GetFeatureLevel(device); - ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + todo_wine ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); refcount = ID3D10Device1_Release(device); diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index afc161f..e3ef209 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -104,6 +104,8 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *device, D3D_FEATURE_LEVEL feature_level) { + struct d3d_device *d3d_device = device; + TRACE("id %#x, device %p, feature_level %u.\n", id, device, feature_level); if (id != DXGI_DEVICE_LAYER_D3D10_DEVICE) @@ -111,6 +113,8 @@ static void WINAPI layer_set_feature_level(enum dxgi_device_layer_id id, void *d WARN("Unknown layer id %#x.\n", id); return; } + + d3d_device->feature_level = feature_level; } HRESULT WINAPI D3D11CoreRegisterLayers(void) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a501a13..072afb4 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -394,6 +394,8 @@ struct d3d_device IUnknown *outer_unk; LONG refcount; + D3D_FEATURE_LEVEL feature_level; + struct d3d11_immediate_context immediate_context; struct wined3d_device_parent device_parent; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8b7d2f8..6ec154f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2536,9 +2536,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_SetPrivateDataInterface(ID3D11Devi static D3D_FEATURE_LEVEL STDMETHODCALLTYPE d3d11_device_GetFeatureLevel(ID3D11Device *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D11Device(iface); + + TRACE("iface %p.\n", iface); - return D3D_FEATURE_LEVEL_10_0; + return device->feature_level; } static UINT STDMETHODCALLTYPE d3d11_device_GetCreationFlags(ID3D11Device *iface) @@ -4557,9 +4559,11 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D10Device1 *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p.\n", iface); - return D3D10_FEATURE_LEVEL_10_1; + return device->feature_level; } static const struct ID3D10Device1Vtbl d3d10_device1_vtbl =

1 0

Huw Davies : riched20: Set the base embedding level for RTL paragraphs.
by Alexandre Julliard March 11, 2016

March 11, 2016

Module: wine Branch: master Commit: a2c57a2a8aafb9211323a4b4a40d5e9d6af53f60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c57a2a8aafb9211323a4b4a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 10 11:59:42 2016 +0000 riched20: Set the base embedding level for RTL paragraphs. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/wrap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index e8575fdb..49a62ce 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -746,6 +746,11 @@ static HRESULT itemize_para( ME_Context *c, ME_DisplayItem *p ) assert( p->type == diParagraph ); + if (para->pFmt->dwMask & PFM_RTLPARA && para->pFmt->wEffects & PFE_RTLPARA) + state.uBidiLevel = 1; + + TRACE( "Base embedding level %d\n", state.uBidiLevel ); + while (1) { hr = ScriptItemize( para->text->szData, para->text->nLen, items_passed, &control,

1 0