April 2017 - Wine-commits - list.winehq.org

Nikolay Sivov : d2d1: Use render target transform in bitmap text rendering mode.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: b7125b67906d25fe22c6ea63ea7211f239f006e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7125b67906d25fe22c6ea63e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:20 2017 +0300 d2d1: Use render target transform in bitmap text rendering mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index c773fdf..8b1dfb7 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -25,6 +25,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); #define INITIAL_CLIP_STACK_SIZE 4 +static const D2D1_MATRIX_3X2_F identity = +{ + 1.0f, 0.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, +}; + struct d2d_draw_text_layout_ctx { ID2D1Brush *brush; @@ -1060,6 +1067,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush, float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode) { + D2D1_MATRIX_3X2_F prev_transform, *transform; ID2D1RectangleGeometry *geometry = NULL; ID2D1BitmapBrush *opacity_brush = NULL; D2D1_BITMAP_PROPERTIES bitmap_desc; @@ -1082,8 +1090,9 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta return; } - hr = IDWriteFactory_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, ppd, NULL, - rendering_mode, measuring_mode, baseline_origin.x, baseline_origin.y, &analysis); + hr = IDWriteFactory_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, ppd, + (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode, + baseline_origin.x, baseline_origin.y, &analysis); IDWriteFactory_Release(dwrite_factory); if (FAILED(hr)) { @@ -1159,8 +1168,12 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta goto done; } + transform = &render_target->drawing_state.transform; + prev_transform = *transform; + *transform = identity; d2d_rt_fill_geometry(render_target, unsafe_impl_from_ID2D1Geometry((ID2D1Geometry *)geometry), unsafe_impl_from_ID2D1Brush(brush), unsafe_impl_from_ID2D1Brush((ID2D1Brush *)opacity_brush)); + *transform = prev_transform; done: if (geometry) @@ -2409,12 +2422,6 @@ static HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_t { 1.0f, -1.0f}, }; static const UINT16 indices[] = {0, 1, 2, 2, 1, 3}; - static const D2D1_MATRIX_3X2_F identity = - { - 1.0f, 0.0f, - 0.0f, 1.0f, - 0.0f, 0.0f, - }; float dpi_x, dpi_y; dpi_x = desc->dpiX;

1 0

Józef Kucia : wined3d: Recognize SM5 ibfe opcode.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 132b3d4dce0fc37cb4178797b3e8b43e1bba40ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=132b3d4dce0fc37cb4178797b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:53 2017 +0200 wined3d: Recognize SM5 ibfe opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4eb603f..446d649 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5131,6 +5131,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_HS_JOIN_PHASE */ NULL, /* WINED3DSIH_IADD */ NULL, + /* WINED3DSIH_IBFE */ NULL, /* WINED3DSIH_IEQ */ NULL, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 20a2208..d36d99c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9963,6 +9963,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_HS_JOIN_PHASE */ NULL, /* WINED3DSIH_IADD */ shader_glsl_binop, + /* WINED3DSIH_IBFE */ NULL, /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ab8d85c..e96c15f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -151,6 +151,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_HS_FORK_PHASE */ "hs_fork_phase", /* WINED3DSIH_HS_JOIN_PHASE */ "hs_join_phase", /* WINED3DSIH_IADD */ "iadd", + /* WINED3DSIH_IBFE */ "ibfe", /* WINED3DSIH_IEQ */ "ieq", /* WINED3DSIH_IF */ "if", /* WINED3DSIH_IFC */ "ifc", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 770ef18..3e8b1f2 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -240,6 +240,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_FIRSTBIT_LO = 0x88, WINED3D_SM5_OP_FIRSTBIT_SHI = 0x89, WINED3D_SM5_OP_UBFE = 0x8a, + WINED3D_SM5_OP_IBFE = 0x8b, WINED3D_SM5_OP_BFI = 0x8c, WINED3D_SM5_OP_BFREV = 0x8d, WINED3D_SM5_OP_SWAPC = 0x8e, @@ -974,6 +975,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_FIRSTBIT_LO, WINED3DSIH_FIRSTBIT_LO, "u", "u"}, {WINED3D_SM5_OP_FIRSTBIT_SHI, WINED3DSIH_FIRSTBIT_SHI, "u", "i"}, {WINED3D_SM5_OP_UBFE, WINED3DSIH_UBFE, "u", "iiu"}, + {WINED3D_SM5_OP_IBFE, WINED3DSIH_IBFE, "i", "iii"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "iiuu"}, {WINED3D_SM5_OP_BFREV, WINED3DSIH_BFREV, "u", "u"}, {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0211d8e..4acb94f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -767,6 +767,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_HS_FORK_PHASE, WINED3DSIH_HS_JOIN_PHASE, WINED3DSIH_IADD, + WINED3DSIH_IBFE, WINED3DSIH_IEQ, WINED3DSIH_IF, WINED3DSIH_IFC,

1 0

Józef Kucia : wined3d: Implement SM5 ibfe instruction.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: dfce576bd9cbc9cfce2c2a16cc21b966b1194845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfce576bd9cbc9cfce2c2a16c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:54 2017 +0200 wined3d: Implement SM5 ibfe instruction. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d36d99c..8bb8a27 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4164,6 +4164,7 @@ static void shader_glsl_bitwise_op(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_BFI: instruction = "bitfieldInsert"; break; + case WINED3DSIH_IBFE: instruction = "bitfieldExtract"; break; case WINED3DSIH_UBFE: instruction = "bitfieldExtract"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); @@ -9963,7 +9964,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_HS_FORK_PHASE */ NULL, /* WINED3DSIH_HS_JOIN_PHASE */ NULL, /* WINED3DSIH_IADD */ shader_glsl_binop, - /* WINED3DSIH_IBFE */ NULL, + /* WINED3DSIH_IBFE */ shader_glsl_bitwise_op, /* WINED3DSIH_IEQ */ shader_glsl_relop, /* WINED3DSIH_IF */ shader_glsl_if, /* WINED3DSIH_IFC */ shader_glsl_ifc,

1 0

Józef Kucia : d3d11/tests: Add test for SM5 ibfe instruction.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 65254782d920892376476fd97ada95aa4b1102fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=65254782d920892376476fd97… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:55 2017 +0200 d3d11/tests: Add test for SM5 ibfe instruction. 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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index dbf8324..f8b68f3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11064,6 +11064,24 @@ static void test_uint_shader_instructions(void) 0x0f00008c, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x00208ff6, 0x00000000, 0x00000000, 0x0100003e, }; + static const DWORD ps_ibfe_code[] = + { +#if 0 + ps_5_0 + dcl_globalFlags refactoringAllowed + dcl_constantbuffer cb0[1], immediateIndexed + dcl_output o0.xyzw + ibfe o0.xyzw, cb0[0].xxxx, cb0[0].yyyy, cb0[0].zzzz + ret +#endif + 0x43425844, 0x4b2225f7, 0xd0860f66, 0xe38775bb, 0x6d23d1d2, 0x00000001, 0x000000d4, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000005c, 0x00000050, 0x00000017, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0c00008b, 0x001020f2, 0x00000000, 0x00208006, 0x00000000, 0x00000000, 0x00208556, 0x00000000, + 0x00000000, 0x00208aa6, 0x00000000, 0x00000000, 0x0100003e, + }; static const DWORD ps_ubfe_code[] = { #if 0 @@ -11206,6 +11224,7 @@ static void test_uint_shader_instructions(void) 0x00000000, 0x0600003b, 0x00102052, 0x00000000, 0x00208106, 0x00000000, 0x00000000, 0x0100003e, }; static const struct shader ps_bfi = {ps_bfi_code, sizeof(ps_bfi_code), D3D_FEATURE_LEVEL_11_0}; + static const struct shader ps_ibfe = {ps_ibfe_code, sizeof(ps_ibfe_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_ubfe = {ps_ubfe_code, sizeof(ps_ubfe_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_bfrev = {ps_bfrev_code, sizeof(ps_bfrev_code), D3D_FEATURE_LEVEL_11_0}; static const struct shader ps_bits = {ps_bits_code, sizeof(ps_bits_code), D3D_FEATURE_LEVEL_11_0}; @@ -11241,6 +11260,33 @@ static void test_uint_shader_instructions(void) {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 1}, { 1, 1, 1, 1}}, {&ps_bfi, {~0x1fu, ~0x1fu, ~0u, 2}, { 2, 2, 2, 2}}, + {&ps_ibfe, { 0, 4, 0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ibfe, { 0, 4, 0xffffffff}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ibfe, { 0, 4, 0x7fffffff}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ibfe, { 4, 0, 0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ibfe, { 4, 0, 0xfffffffa}, {0xfffffffa, 0xfffffffa, 0xfffffffa, 0xfffffffa}}, + {&ps_ibfe, { 4, 0, 0x7ffffffc}, {0xfffffffc, 0xfffffffc, 0xfffffffc, 0xfffffffc}}, + {&ps_ibfe, { 4, 4, 0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ibfe, { 4, 4, 0xffffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, { 4, 4, 0xffffff1f}, {0x00000001, 0x00000001, 0x00000001, 0x00000001}}, + {&ps_ibfe, { 4, 4, 0x7fffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {23, 8, 0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ibfe, {23, 8, 0xffffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {23, 8, 0x7fffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {30, 1, 0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ibfe, {30, 1, 0xffffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {30, 1, 0x7fffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {15, 15, 0x7fffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {15, 15, 0x3fffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {15, 15, 0x1fffffff}, {0x00003fff, 0x00003fff, 0x00003fff, 0x00003fff}}, + {&ps_ibfe, {15, 15, 0xffff00ff}, {0xfffffffe, 0xfffffffe, 0xfffffffe, 0xfffffffe}}, + {&ps_ibfe, {16, 15, 0xffffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {16, 15, 0x3fffffff}, {0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}}, + {&ps_ibfe, {20, 15, 0xffffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {31, 31, 0xffffffff}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {31, 31, 0x80000000}, {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}, + {&ps_ibfe, {31, 31, 0x7fffffff}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, + {&ps_ubfe, {0x00000000}, {0x00000000, 0x00000000, 0x00000000, 0x00000000}}, {&ps_ubfe, {0xffffffff}, {0x0000000f, 0x007fffff, 0x0000007f, 0x3fffffff}}, {&ps_ubfe, {0xff000000}, {0x00000000, 0x007f0000, 0x00000000, 0x3f800000}},

1 0

Józef Kucia : d3d11/tests: Add test for stream output buffer stride equal to 0.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: b82a5662739098c6a2ab1de09e0ba438dee3adae URL: http://source.winehq.org/git/wine.git/?a=commit;h=b82a5662739098c6a2ab1de09… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:56 2017 +0200 d3d11/tests: Add test for stream output buffer stride equal to 0. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f8b68f3..2c31490 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -16520,6 +16520,9 @@ static void test_stream_output(void) stride[1] = 1; check_so_desc(device, gs_code, sizeof(gs_code), so_declaration, ARRAY_SIZE(so_declaration), stride, 2, D3D11_SO_NO_RASTERIZED_STREAM); + stride[0] = 0; + check_invalid_so_desc(device, gs_code, sizeof(gs_code), so_declaration, ARRAY_SIZE(so_declaration), + stride, 1, D3D11_SO_NO_RASTERIZED_STREAM); /* Rasterizer stream */ for (i = 0; i < D3D11_SO_STREAM_COUNT; ++i) @@ -16773,6 +16776,9 @@ static void test_fl10_stream_output_desc(void) &stride[1], 1, 0); check_invalid_so_desc(device, gs_code, sizeof(gs_code), so_declaration, ARRAY_SIZE(so_declaration), stride, 2, 0); + stride[0] = 0; + check_invalid_so_desc(device, gs_code, sizeof(gs_code), so_declaration, ARRAY_SIZE(so_declaration), + stride, 1, 0); /* Rasterizer stream */ check_invalid_so_desc(device, gs_code, sizeof(gs_code), so_declaration, ARRAY_SIZE(so_declaration),

1 0

Józef Kucia : d3d11: Improve arguments validation in d3d10_device_CreateGeometryShaderWithStreamOutput ().
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 2661fd4ce7ab54200aa1fae913612292297b4335 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2661fd4ce7ab54200aa1fae91… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:57 2017 +0200 d3d11: Improve arguments validation in d3d10_device_CreateGeometryShaderWithStreamOutput(). 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/device.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 13bfda4..1b7badd 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4928,7 +4928,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp UINT output_stream_decl_count, UINT output_stream_stride, ID3D10GeometryShader **shader) { struct d3d_device *device = impl_from_ID3D10Device(iface); - D3D11_SO_DECLARATION_ENTRY *so_entries; + D3D11_SO_DECLARATION_ENTRY *so_entries = NULL; struct d3d_geometry_shader *object; unsigned int i, stride_count = 1; HRESULT hr; @@ -4938,9 +4938,18 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp iface, byte_code, byte_code_length, output_stream_decls, output_stream_decl_count, output_stream_stride, shader); - if (!(so_entries = d3d11_calloc(output_stream_decl_count, sizeof(*so_entries)))) + if (!output_stream_decl_count && output_stream_stride) + { + WARN("Stride must be 0 when declaration entry count is 0.\n"); + *shader = NULL; + return E_INVALIDARG; + } + + if (output_stream_decl_count + && !(so_entries = d3d11_calloc(output_stream_decl_count, sizeof(*so_entries)))) { ERR("Failed to allocate D3D11 SO declaration array memory.\n"); + *shader = NULL; return E_OUTOFMEMORY; } @@ -4954,14 +4963,26 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp so_entries[i].OutputSlot = output_stream_decls[i].OutputSlot; if (output_stream_decls[i].OutputSlot) - stride_count = 0; + { + stride_count = 0; + if (output_stream_stride) + { + WARN("Stride must be 0 when multiple output slots are used.\n"); + HeapFree(GetProcessHeap(), 0, so_entries); + *shader = NULL; + return E_INVALIDARG; + } + } } hr = d3d_geometry_shader_create(device, byte_code, byte_code_length, so_entries, output_stream_decl_count, &output_stream_stride, stride_count, 0, &object); HeapFree(GetProcessHeap(), 0, so_entries); if (FAILED(hr)) + { + *shader = NULL; return hr; + } *shader = &object->ID3D10GeometryShader_iface;

1 0

Józef Kucia : d3d10core/tests: Port stream output tests from d3d11.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: efdf17e7d5834d2158315f730d3c5437d61f5dbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=efdf17e7d5834d2158315f730… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Apr 4 12:35:58 2017 +0200 d3d10core/tests: Port stream output tests from d3d11. 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 | 367 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 367 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=efdf17e7d5834d2158315…

1 0

Jactry Zeng : quartz/tests: Test IFilterGraph2:: RenderFile with multithread.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: b709998f8534023b146461fe5505b80c101240af URL: http://source.winehq.org/git/wine.git/?a=commit;h=b709998f8534023b146461fe5… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Mar 29 21:14:54 2017 +0800 quartz/tests: Test IFilterGraph2::RenderFile with multithread. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 75 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 1089de7..eed7872 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -376,6 +376,80 @@ static void test_render_run(const WCHAR *file) CloseHandle(h); } +static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) +{ + IFilterGraph2 *filter_graph = lParam; + HRESULT hr; + WCHAR mp3file[] = {'t','e','s','t','.','m','p','3',0}; + HANDLE handle; + + handle = CreateFileW(mp3file, 0, 0, NULL, CREATE_ALWAYS, 0, NULL); + if (handle == INVALID_HANDLE_VALUE) + { + skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(mp3file)); + return 1; + } + CloseHandle(handle); + + hr = IFilterGraph2_RenderFile(filter_graph, mp3file, NULL); + todo_wine ok(hr == VFW_E_CANNOT_RENDER || /* xp or older */ + hr == VFW_E_NO_TRANSPORT, /* win7 or newer */ + "Expected 0x%08x or 0x%08x, returned 0x%08x\n", VFW_E_CANNOT_RENDER, VFW_E_NO_TRANSPORT, hr); + + DeleteFileW(mp3file); + return 0; +} + +static void test_render_with_multithread(void) +{ + HRESULT hr; + HMODULE hmod; + static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID rclsid, REFIID riid, void **out); + IClassFactory *classfactory = NULL; + static IGraphBuilder *graph_builder; + static IFilterGraph2 *filter_graph; + HANDLE thread; + + CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + + hmod = LoadLibraryA("quartz.dll"); + if (!hmod) + { + skip("Fail to load quartz.dll.\n"); + return; + } + + pDllGetClassObject = (void*)GetProcAddress(hmod, "DllGetClassObject"); + if (!pDllGetClassObject) + { + skip("Fail to get DllGetClassObject.\n"); + return; + } + + hr = pDllGetClassObject(&CLSID_FilterGraph, &IID_IClassFactory, (void **)&classfactory); + ok(hr == S_OK, "DllGetClassObject failed 0x%08x\n", hr); + if (FAILED(hr)) + { + skip("Can't create IClassFactory 0x%08x.\n", hr); + return; + } + + hr = IClassFactory_CreateInstance(classfactory, NULL, &IID_IUnknown, (LPVOID*)&graph_builder); + ok(hr == S_OK, "IClassFactory_CreateInstance failed 0x%08x\n", hr); + + hr = IGraphBuilder_QueryInterface(graph_builder, &IID_IFilterGraph2, (void**)&filter_graph); + ok(hr == S_OK, "IGraphBuilder_QueryInterface failed 0x%08x\n", hr); + + thread = CreateThread(NULL, 0, call_RenderFile_multithread, filter_graph, 0, NULL); + + WaitForSingleObject(thread, 1000); + IFilterGraph2_Release(filter_graph); + IGraphBuilder_Release(graph_builder); + IClassFactory_Release(classfactory); + CoUninitialize(); + return; +} + static void test_graph_builder(void) { HRESULT hr; @@ -2235,4 +2309,5 @@ START_TEST(filtergraph) test_render_filter_priority(); test_aggregate_filter_graph(); CoUninitialize(); + test_render_with_multithread(); }

1 0

Michael Stefaniuc : kernel32/tests: Test HeapReAlloc with size 0.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 14e7febc52a2dc33e65ec85862867149aea0d5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e7febc52a2dc33e65ec8586… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 4 14:52:14 2017 +0200 kernel32/tests: Test HeapReAlloc with size 0. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 2f7edc8..0acf109 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -118,6 +118,13 @@ static void test_heap(void) HeapFree(GetProcessHeap(), 0, mem); mem = HeapAlloc(GetProcessHeap(), 0, ~(SIZE_T)0); ok(mem == NULL, "memory allocated for size ~0\n"); + mem = HeapAlloc(GetProcessHeap(), 0, 17); + msecond = HeapReAlloc(GetProcessHeap(), 0, mem, 0); + ok(msecond != NULL, "HeapReAlloc(0) should have succeeded\n"); + size = HeapSize(GetProcessHeap(), 0, msecond); + ok(size == 0 || broken(size == 1) /* some vista and win7 */, + "HeapSize should have returned 0 instead of %lu\n", size); + HeapFree(GetProcessHeap(), 0, msecond); /* large blocks must be 16-byte aligned */ mem = HeapAlloc(GetProcessHeap(), 0, 512 * 1024);

1 0

Jacek Caban : xmllite/tests: Use reader_value helper in one more place ( Coverity).
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: afaec19469ca072b9abd69b187d441dfdde1fad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afaec19469ca072b9abd69b18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 3 12:31:32 2017 +0200 xmllite/tests: Use reader_value helper in one more place (Coverity). Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/tests/reader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 819f812..72c1fb7 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2580,8 +2580,7 @@ static void test_string_pointers(void) read_node(reader, XmlNodeType_Element); next_attribute(reader); read_value_char(reader, 'm'); - IXmlReader_GetValue(reader, &p, NULL); - ok(!strcmp_wa(p, "yns"), "value = %s\n", wine_dbgstr_w(p)); + p = reader_value(reader, "yns"); read_node(reader, XmlNodeType_Element); ns = reader_namespace(reader, "myns");

1 0