wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

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 : 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/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 : 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 : 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

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

Nikolay Sivov : dwrite: Use user transform when rendering individual glyphs.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 1809ff900486016fb6f99a4e12b8846a1024fc2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1809ff900486016fb6f99a4e1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:19 2017 +0300 dwrite: Use user transform when rendering individual glyphs. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/freetype.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 2c34851..2a926d7 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -691,9 +691,8 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) embolden_glyph(glyph_copy, bitmap->emsize); - if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) - pFT_Glyph_Transform(glyph_copy, &m, NULL); - + /* Includes oblique and user transform. */ + pFT_Glyph_Transform(glyph_copy, &m, NULL); pFT_Glyph_Get_CBox(glyph_copy, FT_GLYPH_BBOX_PIXELS, &bbox); pFT_Done_Glyph(glyph_copy); } @@ -851,8 +850,8 @@ BOOL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) if (simulations & DWRITE_FONT_SIMULATIONS_BOLD) embolden_glyph(glyph_copy, bitmap->emsize); - if (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE) - pFT_Glyph_Transform(glyph_copy, &m, NULL); + /* Includes oblique and user transform. */ + pFT_Glyph_Transform(glyph_copy, &m, NULL); glyph = glyph_copy; } }

1 0

Nikolay Sivov : dwrite: Use scaled font size in glyph run analysis.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: b66f187e2407151554d52abb753ae800bbc98d8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66f187e2407151554d52abb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:18 2017 +0300 dwrite: Use scaled font size in glyph run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 27f5040..096c7f3 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -170,7 +170,6 @@ struct dwrite_glyphrunanalysis { DWRITE_TEXTURE_TYPE texture_type; /* derived from rendering mode specified on creation */ DWRITE_GLYPH_RUN run; /* glyphAdvances and glyphOffsets are not used */ DWRITE_MATRIX m; - FLOAT ppdip; UINT16 *glyphs; D2D_POINT_2F *origins; @@ -4820,7 +4819,7 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface; - glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; + glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) glyph_bitmap.m = &analysis->m; @@ -4912,7 +4911,7 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis) memset(&glyph_bitmap, 0, sizeof(glyph_bitmap)); glyph_bitmap.fontface = fontface; - glyph_bitmap.emsize = analysis->run.fontEmSize * analysis->ppdip; + glyph_bitmap.emsize = analysis->run.fontEmSize; glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode); glyph_bitmap.type = analysis->texture_type; if (analysis->flags & RUNANALYSIS_USE_TRANSFORM) @@ -5140,9 +5139,9 @@ HRESULT create_glyphrunanalysis(const struct glyphrunanalysis_desc *desc, IDWrit analysis->flags = 0; analysis->bitmap = NULL; analysis->max_glyph_bitmap_size = 0; - analysis->ppdip = desc->ppdip; SetRectEmpty(&analysis->bounds); analysis->run = *desc->run; + analysis->run.fontEmSize *= desc->ppdip; IDWriteFontFace_AddRef(analysis->run.fontFace); analysis->glyphs = heap_alloc(desc->run->glyphCount * sizeof(*analysis->glyphs)); analysis->origins = heap_alloc(desc->run->glyphCount * sizeof(*analysis->origins));

1 0

Nikolay Sivov : dwrite: Use transformed glyph origins in glyph run analysis.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: da697572dca0663fd010cc78db342328757f54ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=da697572dca0663fd010cc78d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 4 13:13:17 2017 +0300 dwrite: Use transformed glyph origins in glyph run analysis. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 207 +++++++++++++++++------------------------------------ 1 file changed, 64 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da697572dca0663fd010c…

1 0

Daniel Lehman : ucrtbase: Add _iswblank_l.
by Alexandre Julliard 04 Apr '17

04 Apr '17

Module: wine Branch: master Commit: 111637a3c6905ccebdbbc97abbe335078348e587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=111637a3c6905ccebdbbc97ab… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 3 13:25:26 2017 -0700 ucrtbase: Add _iswblank_l. 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-string-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 6 files changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec index fe3ae54..0f30b05 100644 --- a/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec +++ b/dlls/api-ms-win-crt-string-l1-1-0/api-ms-win-crt-string-l1-1-0.spec @@ -21,7 +21,7 @@ @ cdecl _isupper_l(long ptr) ucrtbase._isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) ucrtbase._iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) ucrtbase._iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -113,7 +113,7 @@ @ cdecl iswalnum(long) ucrtbase.iswalnum @ cdecl iswalpha(long) ucrtbase.iswalpha @ cdecl iswascii(long) ucrtbase.iswascii -@ stub iswblank +@ cdecl iswblank(long) ucrtbase.iswblank @ cdecl iswcntrl(long) ucrtbase.iswcntrl @ cdecl iswctype(long long) ucrtbase.iswctype @ cdecl iswdigit(long) ucrtbase.iswdigit diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 1701c4a..d73a603 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1369,7 +1369,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -2228,7 +2228,7 @@ @ cdecl iswalnum(long) MSVCRT_iswalnum @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii -@ stub iswblank +@ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl @ cdecl iswctype(long long) ntdll.iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 023aa00..942d212 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1234,7 +1234,7 @@ @ cdecl _isupper_l(long ptr) msvcr120._isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) msvcr120._iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) msvcr120._iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -1891,7 +1891,7 @@ @ cdecl iswalnum(long) msvcr120.iswalnum @ cdecl iswalpha(long) msvcr120.iswalpha @ cdecl iswascii(long) msvcr120.iswascii -@ stub iswblank +@ cdecl iswblank(long) msvcr120.iswblank @ cdecl iswcntrl(long) msvcr120.iswcntrl @ cdecl iswctype(long long) msvcr120.iswctype @ cdecl iswdigit(long) msvcr120.iswdigit diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 89c4152..a3429ea 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1866,6 +1866,22 @@ INT CDECL MSVCRT__iswctype_l( MSVCRT_wchar_t wc, MSVCRT_wctype_t type, MSVCRT__l } /********************************************************************* + * _iswblank_l (MSVCRT.@) + */ +INT CDECL MSVCRT__iswblank_l( MSVCRT_wchar_t wc, MSVCRT__locale_t locale ) +{ + return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, locale ); +} + +/********************************************************************* + * iswblank (MSVCRT.@) + */ +INT CDECL MSVCRT_iswblank( MSVCRT_wchar_t wc ) +{ + return wc == '\t' || MSVCRT__iswctype_l( wc, MSVCRT__BLANK, NULL ); +} + +/********************************************************************* * wcscpy_s (MSVCRT.@) */ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 5a1f8dc..213700f 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -90,6 +90,8 @@ static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); static int (CDECL *p__isblank_l)(int,_locale_t); static int (CDECL *p__iswctype_l)(int,int,_locale_t); +static int (CDECL *p_iswblank)(int); +static int (CDECL *p__iswblank_l)(wint_t,_locale_t); static void test__initialize_onexit_table(void) { @@ -388,6 +390,8 @@ static BOOL init(void) p_isblank = (void*)GetProcAddress(module, "isblank"); p__isblank_l = (void*)GetProcAddress(module, "_isblank_l"); p__iswctype_l = (void*)GetProcAddress(module, "_iswctype_l"); + p_iswblank = (void*)GetProcAddress(module, "iswblank"); + p__iswblank_l = (void*)GetProcAddress(module, "_iswblank_l"); return TRUE; } @@ -493,9 +497,13 @@ static void test_isblank(void) todo_wine ok(!p__iswctype_l(c, _BLANK, NULL), "tab shouldn't be blank\n"); else ok(p__iswctype_l(c, _BLANK, NULL), "%d should be blank\n", c); + ok(p_iswblank(c), "%d should be blank\n", c); + ok(p__iswblank_l(c, NULL), "%d should be blank\n", c); } else { todo_wine_if(c == 0xa0) { ok(!p__iswctype_l(c, _BLANK, NULL), "%d shouldn't be blank\n", c); + ok(!p_iswblank(c), "%d shouldn't be blank\n", c); + ok(!p__iswblank_l(c, NULL), "%d shouldn't be blank\n", c); } } } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 9c0b807..79ba494 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -508,7 +508,7 @@ @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @ stub _iswalnum_l @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l -@ stub _iswblank_l +@ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l @ stub _iswcntrl_l @ stub _iswcsym_l @ stub _iswcsymf_l @@ -2362,7 +2362,7 @@ @ cdecl iswalnum(long) MSVCRT_iswalnum @ cdecl iswalpha(long) ntdll.iswalpha @ cdecl iswascii(long) MSVCRT_iswascii -@ stub iswblank +@ cdecl iswblank(long) MSVCRT_iswblank @ cdecl iswcntrl(long) MSVCRT_iswcntrl @ cdecl iswctype(long long) ntdll.iswctype @ cdecl iswdigit(long) MSVCRT_iswdigit

1 0

← Newer
1
...
66
67
68
69
70
71
72
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017