January 2017 - Wine-commits

Henri Verbeet : wined3d: Check buffer-> map_ptr to determine if the buffer object is mapped.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: b924ccb6998cfb008ae4cb536b16390bf1c6c45b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b924ccb6998cfb008ae4cb536… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 27 11:36:35 2017 +0100 wined3d: Check buffer->map_ptr to determine if the buffer object is mapped. Instead of trying to replicate the wined3d_buffer_map() logic in wined3d_buffer_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5303d09..b31394b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1158,7 +1158,7 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) return; } - if (!(buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) && buffer->buffer_object) + if (buffer->map_ptr) { struct wined3d_device *device = buffer->resource.device; const struct wined3d_gl_info *gl_info;

1 0

Daniel Lehman : msvcrt: Implement nan.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 09e4fc834dce082b4a69792b55a4b2418e2ac8d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09e4fc834dce082b4a69792b5… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 27 12:38:02 2017 +0100 msvcrt: Implement nan. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 6 +++--- dlls/msvcr120/msvcr120.spec | 6 +++--- dlls/msvcr120_app/msvcr120_app.spec | 6 +++--- dlls/msvcrt/math.c | 17 +++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +++--- 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 6a31197..8ff4c58 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -288,9 +288,9 @@ @ cdecl lroundl(double) ucrtbase.lroundl @ cdecl modf(double ptr) ucrtbase.modf @ cdecl -arch=arm,x86_64 modff(float ptr) ucrtbase.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) ucrtbase.nan +@ cdecl nanf(str) ucrtbase.nanf +@ cdecl nanl(str) ucrtbase.nanl @ cdecl nearbyint(double) ucrtbase.nearbyint @ cdecl nearbyintf(float) ucrtbase.nearbyintf @ cdecl nearbyintl(double) ucrtbase.nearbyintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a6eb80d..fa9eef3 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2293,9 +2293,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 15f42f0..1b6e5a8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1956,9 +1956,9 @@ @ cdecl memset(ptr long long) msvcr120.memset @ cdecl modf(double ptr) msvcr120.modf @ cdecl -arch=arm,x86_64 modff(float ptr) msvcr120.modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) msvcr120.nan +@ cdecl nanf(str) msvcr120.nanf +@ cdecl nanl(str) msvcr120.nanl @ cdecl nearbyint(double) msvcr120.nearbyint @ cdecl nearbyintf(float) msvcr120.nearbyintf @ cdecl nearbyintl(double) msvcr120.nearbyintl diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 6880d6c..55e2efc 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2901,3 +2901,20 @@ LDOUBLE CDECL MSVCR120_lgammal(LDOUBLE x) { return MSVCR120_lgamma(x); } + +/********************************************************************* + * nan (MSVCR120.@) + */ +double CDECL MSVCR120_nan(const char *tagp) +{ + /* Windows ignores input (MSDN) */ + return NAN; +} + +/********************************************************************* + * nanf (MSVCR120.@) + */ +float CDECL MSVCR120_nanf(const char *tagp) +{ + return NAN; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4cd3760..800ae8f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2429,9 +2429,9 @@ @ cdecl memset(ptr long long) MSVCRT_memset @ cdecl modf(double ptr) MSVCRT_modf @ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff -@ stub nan -@ stub nanf -@ stub nanl +@ cdecl nan(str) MSVCR120_nan +@ cdecl nanf(str) MSVCR120_nanf +@ cdecl nanl(str) MSVCR120_nan @ cdecl nearbyint(double) MSVCRT_nearbyint @ cdecl nearbyintf(float) MSVCRT_nearbyintf @ cdecl nearbyintl(double) MSVCRT_nearbyint

1 0

Józef Kucia : wined3d: Implement buffer samplers.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 63b8360e4daeb6a1b86be1a400db9c32ad042be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63b8360e4daeb6a1b86be1a40… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:33 2017 +0100 wined3d: Implement buffer samplers. 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 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c6a51c5..968c2a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -59,7 +59,7 @@ static const struct resource_type_info[] = { {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, 1, "Buffer"}, /* WINED3D_SHADER_RESOURCE_BUFFER */ {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ {2, 2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ @@ -2083,6 +2083,10 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shadow_sampler = glsl_is_shadow_sampler(shader, ps_args, entry->resource_idx, entry->sampler_idx); switch (reg_maps->resource_info[entry->resource_idx].type) { + case WINED3D_SHADER_RESOURCE_BUFFER: + sampler_type = "samplerBuffer"; + break; + case WINED3D_SHADER_RESOURCE_TEXTURE_1D: if (shadow_sampler) sampler_type = "sampler1DShadow";

1 0

Józef Kucia : d3d10core/tests: Add test for shader buffer views.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 59ea167fd5e3bde086de202c34323d69db15e77b URL: http://source.winehq.org/git/wine.git/?a=commit;h=59ea167fd5e3bde086de202c3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:34 2017 +0100 d3d10core/tests: Add test for shader buffer views. 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 | 181 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index b148a9c..86d3df3 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -10620,6 +10620,186 @@ static void test_render_target_device_mismatch(void) release_test_context(&test_context); } +static void test_buffer_srv(void) +{ + struct buffer + { + UINT byte_count; + const void *data; + }; + + struct d3d10core_test_context test_context; + D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; + D3D10_SUBRESOURCE_DATA resource_data; + const struct buffer *current_buffer; + ID3D10ShaderResourceView *srv; + D3D10_BUFFER_DESC buffer_desc; + struct resource_readback rb; + ID3D10Buffer *cb, *buffer; + ID3D10PixelShader *ps; + ID3D10Device *device; + unsigned int i, x, y; + struct vec4 cb_size; + DWORD color; + HRESULT hr; + + static const DWORD ps_float4_code[] = + { +#if 0 + Buffer<float4> b; + + float2 size; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + int2 coords; + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + coords = int2(p.x * size.x, p.y * size.y); + return b.Load(coords.y * size.x + coords.x); + } +#endif + 0x43425844, 0xf10ea650, 0x311f5c38, 0x3a888b7f, 0x58230334, 0x00000001, 0x000001a0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000104, 0x00000040, + 0x00000041, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x08000038, 0x00100032, 0x00000000, 0x00101516, 0x00000000, 0x00208516, + 0x00000000, 0x00000000, 0x0a000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, + 0x3b088889, 0x3acccccd, 0x00000000, 0x00000000, 0x05000043, 0x00100032, 0x00000000, 0x00100046, + 0x00000000, 0x0a000032, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x0010001a, 0x00000000, 0x0500001b, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x0700002d, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + }; + static const DWORD rgba16[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const DWORD rgba4[] = + { + 0xffffffff, 0xff0000ff, + 0xff000000, 0xff00ff00, + }; + static const struct buffer rgba16_buffer = {sizeof(rgba16), &rgba16}; + static const struct buffer rgba4_buffer = {sizeof(rgba4), &rgba4}; + static const DWORD rgba4_colors[] = + { + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + }; + static const DWORD zero_colors[16] = {0}; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + + static const struct test + { + const struct buffer *buffer; + DXGI_FORMAT srv_format; + UINT srv_first_element; + UINT srv_element_count; + struct vec2 size; + const DWORD *expected_colors; + } + tests[] = + { + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, {4.0f, 4.0f}, rgba16}, + {&rgba4_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba4_colors}, + {NULL, 0, 0, 0, {2.0f, 2.0f}, zero_colors}, + }; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(cb_size), NULL); + + hr = ID3D10Device_CreatePixelShader(device, ps_float4_code, sizeof(ps_float4_code), &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D10Device_PSSetShader(device, ps); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + srv = NULL; + buffer = NULL; + current_buffer = NULL; + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + + if (current_buffer != test->buffer) + { + if (buffer) + ID3D10Buffer_Release(buffer); + if (srv) + ID3D10ShaderResourceView_Release(srv); + + current_buffer = test->buffer; + if (current_buffer) + { + buffer_desc.ByteWidth = current_buffer->byte_count; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + resource_data.pSysMem = current_buffer->data; + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); + ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#x.\n", i, hr); + + srv_desc.Format = test->srv_format; + srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = test->srv_first_element; + U(srv_desc).Buffer.ElementWidth = test->srv_element_count; + hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)buffer, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + buffer = NULL; + srv = NULL; + } + + ID3D10Device_PSSetShaderResources(device, 0, 1, &srv); + } + + cb_size.x = test->size.x; + cb_size.y = test->size.y; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, &cb_size, 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, red); + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 4; ++y) + { + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); + ok(compare_color(color, test->expected_colors[y * 4 + x], 1), + "Test %u: Got unexpected color 0x%08x at (%u, %u).\n", i, color, x, y); + } + } + release_resource_readback(&rb); + } + if (srv) + ID3D10ShaderResourceView_Release(srv); + if (buffer) + ID3D10Buffer_Release(buffer); + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -10680,4 +10860,5 @@ START_TEST(device) test_sm4_ret_instruction(); test_primitive_restart(); test_render_target_device_mismatch(); + test_buffer_srv(); }

1 0

Józef Kucia : d3d11/tests: Add test for shader buffer views.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 5a14dd0c665872d1727f0e0b6e603944bd0c6d88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a14dd0c665872d1727f0e0b6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:35 2017 +0100 d3d11/tests: Add test for shader buffer views. 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 | 185 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 184 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ed1401a..c906121 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -8517,7 +8517,6 @@ static void test_clear_render_target_view(void) win_skip("Skipping broken test on WARP.\n"); } - ID3D11RenderTargetView_Release(srgb_rtv); ID3D11RenderTargetView_Release(rtv); ID3D11Texture2D_Release(texture); @@ -13014,6 +13013,189 @@ static void test_render_target_device_mismatch(void) release_test_context(&test_context); } +static void test_buffer_srv(void) +{ + struct buffer + { + UINT byte_count; + const void *data; + }; + + D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; + struct d3d11_test_context test_context; + D3D11_SUBRESOURCE_DATA resource_data; + const struct buffer *current_buffer; + ID3D11ShaderResourceView *srv; + D3D11_BUFFER_DESC buffer_desc; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11Buffer *cb, *buffer; + ID3D11PixelShader *ps; + ID3D11Device *device; + unsigned int i, x, y; + struct vec4 cb_size; + DWORD color; + HRESULT hr; + + static const DWORD ps_float4_code[] = + { +#if 0 + Buffer<float4> b; + + float2 size; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + float2 p; + int2 coords; + p.x = position.x / 640.0f; + p.y = position.y / 480.0f; + coords = int2(p.x * size.x, p.y * size.y); + return b.Load(coords.y * size.x + coords.x); + } +#endif + 0x43425844, 0xf10ea650, 0x311f5c38, 0x3a888b7f, 0x58230334, 0x00000001, 0x000001a0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000104, 0x00000040, + 0x00000041, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x04000858, 0x00107000, 0x00000000, + 0x00005555, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x02000068, 0x00000001, 0x08000038, 0x00100032, 0x00000000, 0x00101516, 0x00000000, 0x00208516, + 0x00000000, 0x00000000, 0x0a000038, 0x00100032, 0x00000000, 0x00100046, 0x00000000, 0x00004002, + 0x3b088889, 0x3acccccd, 0x00000000, 0x00000000, 0x05000043, 0x00100032, 0x00000000, 0x00100046, + 0x00000000, 0x0a000032, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, 0x0020800a, 0x00000000, + 0x00000000, 0x0010001a, 0x00000000, 0x0500001b, 0x00100012, 0x00000000, 0x0010000a, 0x00000000, + 0x0700002d, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x00107e46, 0x00000000, 0x0100003e, + }; + static const DWORD rgba16[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + static const DWORD rgba4[] = + { + 0xffffffff, 0xff0000ff, + 0xff000000, 0xff00ff00, + }; + static const struct buffer rgba16_buffer = {sizeof(rgba16), &rgba16}; + static const struct buffer rgba4_buffer = {sizeof(rgba4), &rgba4}; + static const DWORD rgba4_colors[] = + { + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xffffffff, 0xffffffff, 0xff0000ff, 0xff0000ff, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + 0xff000000, 0xff000000, 0xff00ff00, 0xff00ff00, + }; + static const DWORD zero_colors[16] = {0}; + static const float red[] = {1.0f, 0.0f, 0.0f, 0.5f}; + + static const struct test + { + const struct buffer *buffer; + DXGI_FORMAT srv_format; + UINT srv_first_element; + UINT srv_element_count; + struct vec2 size; + const DWORD *expected_colors; + } + tests[] = + { + {&rgba16_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 16, {4.0f, 4.0f}, rgba16}, + {&rgba4_buffer, DXGI_FORMAT_R8G8B8A8_UNORM, 0, 4, {2.0f, 2.0f}, rgba4_colors}, + {NULL, 0, 0, 0, {2.0f, 2.0f}, zero_colors}, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(cb_size), NULL); + + hr = ID3D11Device_CreatePixelShader(device, ps_float4_code, sizeof(ps_float4_code), NULL, &ps); + ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + + ID3D11DeviceContext_PSSetShader(context, ps, NULL, 0); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + srv = NULL; + buffer = NULL; + current_buffer = NULL; + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + + if (current_buffer != test->buffer) + { + if (buffer) + ID3D11Buffer_Release(buffer); + if (srv) + ID3D11ShaderResourceView_Release(srv); + + current_buffer = test->buffer; + if (current_buffer) + { + buffer_desc.ByteWidth = current_buffer->byte_count; + buffer_desc.Usage = D3D11_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D11_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + buffer_desc.StructureByteStride = 0; + resource_data.SysMemPitch = 0; + resource_data.SysMemSlicePitch = 0; + resource_data.pSysMem = current_buffer->data; + hr = ID3D11Device_CreateBuffer(device, &buffer_desc, &resource_data, &buffer); + ok(SUCCEEDED(hr), "Test %u: Failed to create buffer, hr %#x.\n", i, hr); + + srv_desc.Format = test->srv_format; + srv_desc.ViewDimension = D3D11_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.FirstElement = test->srv_first_element; + U(srv_desc).Buffer.NumElements = test->srv_element_count; + hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)buffer, &srv_desc, &srv); + ok(SUCCEEDED(hr), "Test %u: Failed to create shader resource view, hr %#x.\n", i, hr); + } + else + { + buffer = NULL; + srv = NULL; + } + + ID3D11DeviceContext_PSSetShaderResources(context, 0, 1, &srv); + } + + cb_size.x = test->size.x; + cb_size.y = test->size.y; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, &cb_size, 0, 0); + + ID3D11DeviceContext_ClearRenderTargetView(context, test_context.backbuffer_rtv, red); + draw_quad(&test_context); + + get_texture_readback(test_context.backbuffer, 0, &rb); + for (y = 0; y < 4; ++y) + { + for (x = 0; x < 4; ++x) + { + color = get_readback_color(&rb, 80 + x * 160, 60 + y * 120); + ok(compare_color(color, test->expected_colors[y * 4 + x], 1), + "Test %u: Got unexpected color 0x%08x at (%u, %u).\n", i, color, x, y); + } + } + release_resource_readback(&rb); + } + if (srv) + ID3D11ShaderResourceView_Release(srv); + if (buffer) + ID3D11Buffer_Release(buffer); + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -13084,4 +13266,5 @@ START_TEST(d3d11) test_primitive_restart(); test_sm5_bufinfo_instruction(); test_render_target_device_mismatch(); + test_buffer_srv(); }

1 0

Józef Kucia : d3d10core/tests: Skip stencil SRV test when SRV creation fails.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: f1c7834f7be0949647be0864aa2de512c86501e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1c7834f7be0949647be0864a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:36 2017 +0100 d3d10core/tests: Skip stencil SRV test when SRV creation fails. 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 86d3df3..2d5115f 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6310,6 +6310,14 @@ static void test_depth_stencil_sampling(void) srv_desc.Format = tests[i].stencil_view_format; hr = ID3D10Device_CreateShaderResourceView(device, (ID3D10Resource *)texture, &srv_desc, &stencil_srv); + if (hr == E_OUTOFMEMORY) + { + skip("Could not create SRV for format %#x.\n", srv_desc.Format); + ID3D10DepthStencilView_Release(dsv); + ID3D10ShaderResourceView_Release(depth_srv); + ID3D10Texture2D_Release(texture); + continue; + } ok(SUCCEEDED(hr), "Failed to create stencil shader resource view for format %#x, hr %#x.\n", srv_desc.Format, hr);

1 0

Józef Kucia : d3d11/tests: Skip stencil SRV test when SRV creation fails.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 1798864ee29ec9580675294815ae76bae48dc6d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1798864ee29ec958067529481… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 26 13:07:37 2017 +0100 d3d11/tests: Skip stencil SRV test when SRV creation fails. 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index c906121..99270d2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6624,6 +6624,14 @@ static void test_depth_stencil_sampling(void) srv_desc.Format = tests[i].stencil_view_format; hr = ID3D11Device_CreateShaderResourceView(device, (ID3D11Resource *)texture, &srv_desc, &stencil_srv); + if (hr == E_OUTOFMEMORY) + { + skip("Could not create SRV for format %#x.\n", srv_desc.Format); + ID3D11DepthStencilView_Release(dsv); + ID3D11ShaderResourceView_Release(depth_srv); + ID3D11Texture2D_Release(texture); + continue; + } ok(SUCCEEDED(hr), "Failed to create stencil shader resource view for format %#x, hr %#x.\n", srv_desc.Format, hr);

1 0

Bruno Jesus : d3d8/tests: Fix copy&paste issue in compare_mode (cppcheck).
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 5090c22e40232fb79a6ef977ce302f42303c77ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5090c22e40232fb79a6ef977c… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Jan 27 02:58:06 2017 -0200 d3d8/tests: Fix copy&paste issue in compare_mode (cppcheck). Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 28c6af3..87d2433 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1281,7 +1281,7 @@ static int compare_mode(const void *a, const void *b) const struct mode *mode_a = a; const struct mode *mode_b = b; unsigned int w = mode_a->w - mode_b->w; - unsigned int h = mode_b->h - mode_b->h; + unsigned int h = mode_a->h - mode_b->h; return abs(w) >= abs(h) ? -w : -h; }

1 0

Nikolay Sivov : comctl32/syslink: Don't use exported StrCmpNIW().
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: a0e73a1fb32a0a20ed5ed97df6e837046c1ce697 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0e73a1fb32a0a20ed5ed97df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 27 16:49:04 2017 +0300 comctl32/syslink: Don't use exported StrCmpNIW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 39 ++++++++------------------------------- 1 file changed, 8 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 08e5230..339c728 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -42,8 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(syslink); -INT WINAPI StrCmpNIW(LPCWSTR,LPCWSTR,INT); - typedef struct { int nChars; @@ -99,11 +97,6 @@ typedef struct BOOL IgnoreReturn; /* (infoPtr->Style & LWS_IGNORERETURN) on creation */ } SYSLINK_INFO; -static const WCHAR SL_LINKOPEN[] = { '<','a', 0 }; -static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"',0 }; -static const WCHAR SL_ID[] = { 'i','d','=','\"',0 }; -static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>',0 }; - /* Control configuration constants */ #define SL_LEFTMARGIN (0) @@ -176,32 +169,16 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) } /*********************************************************************** - * SYSLINK_StrCmpNIW - * Wrapper for StrCmpNIW to ensure 'len' is not too big. - */ -static INT SYSLINK_StrCmpNIW (LPCWSTR str, LPCWSTR comp, INT len) -{ - INT i; - - for(i = 0; i < len; i++) - { - if(!str[i]) - { - len = i + 1; - break; - } - } - - return StrCmpNIW(str, comp, len); -} - -/*********************************************************************** * SYSLINK_ParseText * Parses the window text string and creates a document. Returns the * number of document items created. */ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { + static const WCHAR SL_LINKOPEN[] = { '<','a' }; + static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"' }; + static const WCHAR SL_ID[] = { 'i','d','=','\"' }; + static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>' }; LPCWSTR current, textstart = NULL, linktext = NULL, firsttag = NULL; int taglen = 0, textlen = 0, linklen = 0, docitems = 0; PDOC_ITEM Last = NULL; @@ -215,7 +192,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { if(*current == '<') { - if(!SYSLINK_StrCmpNIW(current, SL_LINKOPEN, 2) && (CurrentType == slText)) + if(!strncmpiW(current, SL_LINKOPEN, sizeof(SL_LINKOPEN)/sizeof(SL_LINKOPEN[0])) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -243,14 +220,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) CheckParameter: /* compare the current position with all known parameters */ - if(!SYSLINK_StrCmpNIW(tmp, SL_HREF, 6)) + if(!strncmpiW(tmp, SL_HREF, sizeof(SL_HREF)/sizeof(SL_HREF[0]))) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!SYSLINK_StrCmpNIW(tmp, SL_ID, 4)) + else if(!strncmpiW(tmp, SL_ID, sizeof(SL_ID)/sizeof(SL_ID[0]))) { taglen += 4; ValidParam = TRUE; @@ -324,7 +301,7 @@ CheckParameter: } } } - else if(!SYSLINK_StrCmpNIW(current, SL_LINKCLOSE, 4) && (CurrentType == slLink) && firsttag) + else if(!strncmpiW(current, SL_LINKCLOSE, sizeof(SL_LINKCLOSE)/sizeof(SL_LINKCLOSE[0])) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart)

1 0

Huw Davies : ntprint: PSetupCreateMonitorInfo() takes two arguments, the second is a server name.
by Alexandre Julliard 27 Jan '17

27 Jan '17

Module: wine Branch: master Commit: 152b24015308286441399f9fc2be57213c762c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=152b24015308286441399f9fc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 27 16:33:13 2017 +0000 ntprint: PSetupCreateMonitorInfo() takes two arguments, the second is a server name. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntprint/ntprint.c | 14 ++++---------- dlls/ntprint/ntprint.spec | 2 +- dlls/ntprint/tests/ntprint.c | 23 +++++++++++++++-------- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index b6d77b3..75a8e00 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -65,18 +65,13 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) * */ -HANDLE WINAPI PSetupCreateMonitorInfo(LPVOID unknown1, LPVOID unknown2,LPVOID unknown3) +HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) { monitorinfo_t * mi=NULL; DWORD needed; DWORD res; - TRACE("(%p, %p, %p)\n", unknown1, unknown2, unknown3); - - if ((unknown2 != NULL) || (unknown3 != NULL)) { - FIXME("got unknown parameter: (%p, %p, %p)\n", unknown1, unknown2, unknown3); - return NULL; - } + TRACE("(%d, %s)\n", unknown1, debugstr_w(server)); mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t)); if (!mi) { @@ -85,15 +80,14 @@ HANDLE WINAPI PSetupCreateMonitorInfo(LPVOID unknown1, LPVOID unknown2,LPVOID u } /* Get the needed size for all Monitors */ - res = EnumMonitorsW(NULL, 2, NULL, 0, &needed, &mi->installed); + res = EnumMonitorsW(server, 2, NULL, 0, &needed, &mi->installed); if (!res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { mi->mi2 = HeapAlloc(GetProcessHeap(), 0, needed); - res = EnumMonitorsW(NULL, 2, (LPBYTE) mi->mi2, needed, &needed, &mi->installed); + res = EnumMonitorsW(server, 2, (LPBYTE) mi->mi2, needed, &needed, &mi->installed); } if (!res) { HeapFree(GetProcessHeap(), 0, mi); - /* FIXME: SetLastError() needed? */ return NULL; } diff --git a/dlls/ntprint/ntprint.spec b/dlls/ntprint/ntprint.spec index 8869776..04e85fe 100644 --- a/dlls/ntprint/ntprint.spec +++ b/dlls/ntprint/ntprint.spec @@ -2,7 +2,7 @@ @ stub PSetupAssociateICMProfiles @ stub PSetupBuildDriversFromPath @ stub PSetupCreateDrvSetupPage -@ stdcall PSetupCreateMonitorInfo(long ptr ptr) +@ stdcall PSetupCreateMonitorInfo(long wstr) @ stub PSetupCreatePrinterDeviceInfoList @ stub PSetupDestroyDriverInfo3 @ stdcall PSetupDestroyMonitorInfo(long) diff --git a/dlls/ntprint/tests/ntprint.c b/dlls/ntprint/tests/ntprint.c index e0bc01e..1710220 100644 --- a/dlls/ntprint/tests/ntprint.c +++ b/dlls/ntprint/tests/ntprint.c @@ -32,7 +32,7 @@ /* ##### */ static HMODULE hdll; -static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(LPVOID, LPVOID, LPVOID); +static HANDLE (WINAPI *pPSetupCreateMonitorInfo)(DWORD, const WCHAR *); static VOID (WINAPI *pPSetupDestroyMonitorInfo)(HANDLE); static BOOL (WINAPI *pPSetupEnumMonitor)(HANDLE, DWORD, LPWSTR, LPDWORD); @@ -66,10 +66,12 @@ static LPCSTR load_functions(void) static void test_PSetupCreateMonitorInfo(VOID) { HANDLE mi; - BYTE buffer[1024] ; + WCHAR buffer[1024] = {'\\','\\'}; + UINT len = sizeof(buffer) / sizeof(buffer[0]) - 2; + GetComputerNameW(buffer + 2, &len); SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + mi = pPSetupCreateMonitorInfo(0, NULL); if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { win_skip("The service 'Spooler' is required for many tests\n"); return; @@ -77,13 +79,18 @@ static void test_PSetupCreateMonitorInfo(VOID) ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); - - memset(buffer, 0, sizeof(buffer)); SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(buffer, NULL, NULL); + mi = pPSetupCreateMonitorInfo(0, buffer); ok( mi != NULL, "got %p with %u (expected '!= NULL')\n", mi, GetLastError()); if (mi) pPSetupDestroyMonitorInfo(mi); + SetLastError(0xdeadbeef); + mi = pPSetupCreateMonitorInfo(0, buffer + 1); + todo_wine { + ok( mi == NULL, "got %p\n", mi ); + ok( GetLastError() == ERROR_INVALID_NAME, "got %d\n", GetLastError() ); + } + if (mi) pPSetupDestroyMonitorInfo(mi); } /* ########################### */ @@ -99,7 +106,7 @@ static void test_PSetupDestroyMonitorInfo(VOID) trace("returned with %u\n", GetLastError()); SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + mi = pPSetupCreateMonitorInfo(0, NULL); if (!mi && (GetLastError() == RPC_S_SERVER_UNAVAILABLE)) { win_skip("The service 'Spooler' is required for many tests\n"); return; @@ -134,7 +141,7 @@ static void test_PSetupEnumMonitor(VOID) DWORD index=0; SetLastError(0xdeadbeef); - mi = pPSetupCreateMonitorInfo(NULL, NULL, NULL); + mi = pPSetupCreateMonitorInfo(0, NULL); if (!mi) { skip("PSetupCreateMonitorInfo\n"); return;

1 0