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

Józef Kucia : wined3d: Recognize aoffimmi shader instruction modifier.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 31713e39b528d98bb02d15624c4f827c44acdf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=31713e39b528d98bb02d15624… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:50 2016 +0100 wined3d: Recognize aoffimmi shader instruction modifier. The aoffimmi stands for address offset by immediate integer. 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/shader.c | 3 +++ dlls/wined3d/shader_sm1.c | 1 + dlls/wined3d/shader_sm4.c | 36 +++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 11 +++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 88c064c..17611dd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2091,6 +2091,9 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } } + if (wined3d_shader_instruction_has_texel_offset(&ins)) + shader_addline(&buffer, "(%d,%d,%d)", ins.texel_offset.u, ins.texel_offset.v, ins.texel_offset.w); + for (i = 0; i < ins.dst_count; ++i) { shader_dump_ins_modifiers(&buffer, &ins.dst[i]); diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 8c48d19..718effa 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -735,6 +735,7 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi ins->dst = &priv->dst_param; ins->src_count = opcode_info->param_count - opcode_info->dst_count; ins->src = priv->src_param; + memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; *ptr += shader_skip_opcode(priv, opcode_info, opcode_token); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index a741f66..9cf74a5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -26,6 +26,14 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_MODIFIER (0x1u << 31) +#define WINED3D_SM4_MODIFIER_AOFFIMMI 0x1 +#define WINED3D_SM4_AOFFIMMI_U_SHIFT 9 +#define WINED3D_SM4_AOFFIMMI_U_MASK (0xfu << WINED3D_SM4_AOFFIMMI_U_SHIFT) +#define WINED3D_SM4_AOFFIMMI_V_SHIFT 13 +#define WINED3D_SM4_AOFFIMMI_V_MASK (0xfu << WINED3D_SM4_AOFFIMMI_V_SHIFT) +#define WINED3D_SM4_AOFFIMMI_W_SHIFT 17 +#define WINED3D_SM4_AOFFIMMI_W_MASK (0xfu << WINED3D_SM4_AOFFIMMI_W_SHIFT) + #define WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT 24 #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) @@ -853,14 +861,40 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->dst = priv->dst_param; ins->src_count = strlen(opcode_info->src_info); ins->src = priv->src_param; + memset(&ins->texel_offset, 0, sizeof(ins->texel_offset)); p = *ptr; *ptr += len; if (opcode_token & WINED3D_SM4_INSTRUCTION_MODIFIER) { + static const DWORD recognized_bits = WINED3D_SM4_MODIFIER_AOFFIMMI + | WINED3D_SM4_AOFFIMMI_U_MASK + | WINED3D_SM4_AOFFIMMI_V_MASK + | WINED3D_SM4_AOFFIMMI_W_MASK; DWORD modifier = *p++; - FIXME("Skipping modifier 0x%08x.\n", modifier); + /* Bit fields are used for sign extension */ + struct + { + int u : 4; + int v : 4; + int w : 4; + } + aoffimmi; + + if (modifier & ~recognized_bits) + { + FIXME("Skipping modifier 0x%08x.\n", modifier); + } + else + { + aoffimmi.u = (modifier & WINED3D_SM4_AOFFIMMI_U_MASK) >> WINED3D_SM4_AOFFIMMI_U_SHIFT; + aoffimmi.v = (modifier & WINED3D_SM4_AOFFIMMI_V_MASK) >> WINED3D_SM4_AOFFIMMI_V_SHIFT; + aoffimmi.w = (modifier & WINED3D_SM4_AOFFIMMI_W_MASK) >> WINED3D_SM4_AOFFIMMI_W_SHIFT; + ins->texel_offset.u = aoffimmi.u; + ins->texel_offset.v = aoffimmi.v; + ins->texel_offset.w = aoffimmi.w; + } } if (opcode == WINED3D_SM4_OP_SHADER_DATA) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2c2dc84..61cc3a3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -801,6 +801,11 @@ struct wined3d_shader_register_semantic enum wined3d_sysval_semantic sysval_semantic; }; +struct wined3d_shader_texel_offset +{ + signed char u, v, w; +}; + struct wined3d_shader_instruction { const struct wined3d_shader_context *ctx; @@ -812,6 +817,7 @@ struct wined3d_shader_instruction const struct wined3d_shader_dst_param *dst; UINT src_count; const struct wined3d_shader_src_param *src; + struct wined3d_shader_texel_offset texel_offset; union { struct wined3d_shader_semantic semantic; @@ -824,6 +830,11 @@ struct wined3d_shader_instruction } declaration; }; +static inline BOOL wined3d_shader_instruction_has_texel_offset(const struct wined3d_shader_instruction *ins) +{ + return ins->texel_offset.u || ins->texel_offset.v || ins->texel_offset.w; +} + struct wined3d_shader_attribute { enum wined3d_decl_usage usage;

1 0

Huw Davies : gdi32/tests: Add tests for EMF PolyPolyline record creation.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: a36b4a6abbd0ea7847e44d386b35e646b015b3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=a36b4a6abbd0ea7847e44d386… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 9 11:17:05 2016 +0000 gdi32/tests: Add tests for EMF PolyPolyline record creation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index a90c533..5b3bd9f 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1371,6 +1371,59 @@ static const unsigned char EMF_BEZIER_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_POLYPOLYLINE_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x61, 0x01, 0x00, 0x00, 0xc2, 0x02, 0x00, 0x00, + 0x7a, 0xd4, 0x13, 0x00, 0xe8, 0x44, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x84, 0x01, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xa1, 0x05, 0x00, 0x00, 0x47, 0x03, 0x00, 0x00, + 0xfc, 0x01, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xc0, 0xc1, 0x07, 0x00, + 0x2c, 0x84, 0x04, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x5a, 0x00, 0x00, 0x00, + 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x14, 0x00, + 0x5a, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x14, 0x00, 0x64, 0x00, 0xc8, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x07, 0x00, 0x00, 0x00, 0x48, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0xc8, 0x00, 0x00, 0x00, + 0x00, 0x90, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0xf4, 0x01, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -3492,6 +3545,60 @@ static void test_emf_GetPath(void) DeleteEnhMetaFile(hemf); } +static void test_emf_PolyPolyline(void) +{ + HDC hdcMetafile; + HENHMETAFILE hemf; + POINT pts[4] = {{10, 20}, {100, 200}, {0x9000,300}, {400, 500}}; + DWORD counts[2]; + BOOL ret; + + SetLastError(0xdeadbeef); + hdcMetafile = CreateEnhMetaFileA(GetDC(0), NULL, NULL, NULL); + ok(hdcMetafile != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + ret = PolyPolyline(hdcMetafile, NULL, NULL, 0); + ok( !ret, "PolyPolyline\n" ); + + SetLastError( 0xdeadbeef ); + counts[0] = 0; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + counts[0] = 1; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + counts[0] = 2; + counts[1] = 1; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( !ret, "PolyPolyline\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "gle %d\n", GetLastError() ); + + counts[0] = 2; + counts[1] = 2; + ret = PolyPolyline(hdcMetafile, pts, counts, 2); + ok( ret, "PolyPolyline\n" ); + + hemf = CloseEnhMetaFile(hdcMetafile); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if(compare_emf_bits(hemf, EMF_POLYPOLYLINE_BITS, sizeof(EMF_POLYPOLYLINE_BITS), + "emf_PolyPolyline", FALSE) != 0) + { + dump_emf_bits(hemf, "emf_PolyPolyline"); + dump_emf_records(hemf, "emf_PolyPolyline"); + } + + DeleteEnhMetaFile(hemf); +} + START_TEST(metafile) { init_function_pointers(); @@ -3506,6 +3613,7 @@ START_TEST(metafile) test_emf_clipping(); test_emf_polybezier(); test_emf_GetPath(); + test_emf_PolyPolyline(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

André Hentschel : winemaker: Markup fixes in German translation.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 154d024f8db9017ddf9ca28f0022554ac919eb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=154d024f8db9017ddf9ca28f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 8 21:51:10 2016 +0100 winemaker: Markup fixes in German translation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 83 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=154d024f8db9017ddf9ca…

1 0

Józef Kucia : wined3d: Extend shader_glsl_gen_sample_code() to support offsets.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: cd9b1812754126284bc319d155d4f20f947a5b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9b1812754126284bc319d15… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:51 2016 +0100 wined3d: Extend shader_glsl_gen_sample_code() to support offsets. 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 | 121 ++++++++++++++++++++++++++++++--------------- 1 file changed, 82 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cd9b1812754126284bc31…

1 0

Patrick Armstrong : bcrypt: Make BCryptHashData behave more like Windows with empty input.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: ce3921df33a5c90b7a9dd365fd58cc6712e59470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3921df33a5c90b7a9dd365f… Author: Patrick Armstrong <pat(a)triplefox.com> Date: Tue Mar 8 20:42:45 2016 -0800 bcrypt: Make BCryptHashData behave more like Windows with empty input. 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 | 2 +- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 957efdd..c919c1d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -632,7 +632,7 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s TRACE( "%p, %p, %u, %08x\n", handle, input, size, flags ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; - if (!input) return STATUS_INVALID_PARAMETER; + if (!input) return STATUS_SUCCESS; return hash_update( hash, input, size ); } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index bcb287b..f1f0002 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -165,6 +165,9 @@ static void test_sha1(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -238,6 +241,9 @@ static void test_sha256(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -311,6 +317,9 @@ static void test_sha384(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -385,6 +394,9 @@ static void test_sha512(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -458,6 +470,9 @@ static void test_md5(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Józef Kucia : wined3d: Implement aoffimmi modifier for SM4 sample instructions in GLSL backend.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: ab09deac3bb5e2ddaddba979d4945355ef360940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab09deac3bb5e2ddaddba979d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:53 2016 +0100 wined3d: Implement aoffimmi modifier for SM4 sample instructions in GLSL backend. 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 732288a..85244c8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4460,6 +4460,8 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) flags |= WINED3D_GLSL_SAMPLE_GRAD; if (ins->handler_idx == WINED3DSIH_SAMPLE_LOD) flags |= WINED3D_GLSL_SAMPLE_LOD; + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; resource_idx = ins->src[1].reg.idx[0].offset; sampler_idx = ins->src[2].reg.idx[0].offset; @@ -4492,7 +4494,7 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, resource_idx, sampler_idx); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - dx_param_str, dy_param_str, lod_param_str, NULL, "%s", coord_param.param_str); + dx_param_str, dy_param_str, lod_param_str, &ins->texel_offset, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Józef Kucia : wined3d: Implement aoffimmi modifier for SM4 ld instruction in GLSL backend.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 36c67c8a44e6fe7c2f5088e08e94cfbafcf697d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c67c8a44e6fe7c2f5088e08… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Mar 8 17:46:52 2016 +0100 wined3d: Implement aoffimmi modifier for SM4 ld instruction in GLSL backend. 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 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ab4a511..732288a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4433,15 +4433,18 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; unsigned int sampler_bind_idx; + DWORD flags = WINED3D_GLSL_SAMPLE_LOAD; - shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, WINED3D_GLSL_SAMPLE_LOAD, - &sample_function); + if (wined3d_shader_instruction_has_texel_offset(ins)) + flags |= WINED3D_GLSL_SAMPLE_OFFSET; + + shader_glsl_get_sample_function(ins->ctx, ins->src[1].reg.idx[0].offset, flags, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_bind_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT); shader_glsl_gen_sample_code(ins, sampler_bind_idx, &sample_function, ins->src[1].swizzle, - NULL, NULL, lod_param.param_str, NULL, "%s", coord_param.param_str); + NULL, NULL, lod_param.param_str, &ins->texel_offset, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

Vincent Povirk : mscoree: Restore previous domain whenever we set it.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 4dec065e2bf635bf15fe0c1db6afb9186d9250c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dec065e2bf635bf15fe0c1db… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 8 15:49:26 2016 -0600 mscoree: Restore previous domain whenever we set it. Unmanaged APIs could be called directly or indirectly by managed code in any domain, and we could create problems by not restoring the old one. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 103 ++++++++++++++++++++++++++++++----------- dlls/mscoree/metahost.c | 4 ++ dlls/mscoree/mscoree_private.h | 4 +- 3 files changed, 82 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4dec065e2bf635bf15fe0…

1 0

Michael Stefaniuc : wined3d: Use SetRect() instead of open coding it.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: b3790bf8033e7f1ec507288fac2a2290e4053442 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3790bf8033e7f1ec507288fa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Mar 8 11:52:22 2016 +0100 wined3d: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 16 ++++------------ dlls/wined3d/surface.c | 5 +---- dlls/wined3d/swapchain.c | 6 ++---- dlls/wined3d/texture.c | 5 +---- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f094752..ff16c9d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3975,23 +3975,15 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } - src_rect.left = src_box->left; - src_rect.top = src_box->top; - src_rect.right = src_box->right; - src_rect.bottom = src_box->bottom; + SetRect(&src_rect, src_box->left, src_box->top, src_box->right, src_box->bottom); } else { - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = src_surface->resource.width; - src_rect.bottom = src_surface->resource.height; + SetRect(&src_rect, 0, 0, src_surface->resource.width, src_surface->resource.height); } - dst_rect.left = dst_x; - dst_rect.top = dst_y; - dst_rect.right = dst_x + (src_rect.right - src_rect.left); - dst_rect.bottom = dst_y + (src_rect.bottom - src_rect.top); + SetRect(&dst_rect, dst_x, dst_y, dst_x + (src_rect.right - src_rect.left), + dst_y + (src_rect.bottom - src_rect.top)); if (FAILED(hr = wined3d_surface_blt(dst_surface, &dst_rect, src_surface, &src_rect, 0, NULL, WINED3D_TEXF_POINT))) WARN("Failed to blit, hr %#x.\n", hr); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 814d4ab..c7545e0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1444,10 +1444,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P if (!src_rect) { - r.left = 0; - r.top = 0; - r.right = src_surface->resource.width; - r.bottom = src_surface->resource.height; + SetRect(&r, 0, 0, src_surface->resource.width, src_surface->resource.height); src_rect = &r; } else if (src_rect->left < 0 || src_rect->left >= src_rect->right diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 299a47a..9f3a36b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -545,10 +545,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT } else { - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = swapchain->desc.backbuffer_width; - src_rect.bottom = swapchain->desc.backbuffer_height; + SetRect(&src_rect, 0, 0, swapchain->desc.backbuffer_width, + swapchain->desc.backbuffer_height); } if (dst_rect_in) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 71ce472..3ac6f43 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -880,10 +880,7 @@ static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_reso struct wined3d_const_bo_address addr; RECT src_rect; - src_rect.left = 0; - src_rect.top = 0; - src_rect.right = surface->resource.width; - src_rect.bottom = surface->resource.height; + SetRect(&src_rect, 0, 0, surface->resource.width, surface->resource.height); addr.buffer_object = 0; addr.addr = data->data;

1 0

Nikolay Sivov : dwrite: Remove flag marking system collections.
by Alexandre Julliard March 9, 2016

March 9, 2016

Module: wine Branch: master Commit: 42de7a468cd76693f0b3dc0be0a239bc5497a80c URL: http://source.winehq.org/git/wine.git/?a=commit;h=42de7a468cd76693f0b3dc0be… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 22:46:54 2016 +0300 dwrite: Remove flag marking system collections. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 40 ++++++++++++++++++++++++++++++++++------ 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5d29038..0c04d56 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -125,7 +125,6 @@ struct dwrite_fontcollection { struct dwrite_fontfamily_data **family_data; UINT32 family_count; UINT32 family_alloc; - BOOL is_system; }; struct dwrite_fontfamily { @@ -1967,7 +1966,7 @@ BOOL is_system_collection(IDWriteFontCollection *collection) return IDWriteFontCollection_QueryInterface(collection, &IID_issystemcollection, (void**)&obj) == S_OK; } -static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) +static HRESULT WINAPI dwritesystemfontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface); TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); @@ -1983,12 +1982,31 @@ static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection1 *obj = NULL; - if (This->is_system && IsEqualIID(riid, &IID_issystemcollection)) + if (IsEqualIID(riid, &IID_issystemcollection)) return S_OK; return E_NOINTERFACE; } +static HRESULT WINAPI dwritefontcollection_QueryInterface(IDWriteFontCollection1 *iface, REFIID riid, void **obj) +{ + struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IDWriteFontCollection1) || + IsEqualIID(riid, &IID_IDWriteFontCollection) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IDWriteFontCollection1_AddRef(iface); + return S_OK; + } + + *obj = NULL; + + return E_NOINTERFACE; +} + static ULONG WINAPI dwritefontcollection_AddRef(IDWriteFontCollection1 *iface) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection1(iface); @@ -2165,6 +2183,18 @@ static const IDWriteFontCollection1Vtbl fontcollectionvtbl = { dwritefontcollection1_GetFontFamily }; +static const IDWriteFontCollection1Vtbl systemfontcollectionvtbl = { + dwritesystemfontcollection_QueryInterface, + dwritefontcollection_AddRef, + dwritefontcollection_Release, + dwritefontcollection_GetFontFamilyCount, + dwritefontcollection_GetFontFamily, + dwritefontcollection_FindFamilyName, + dwritefontcollection_GetFontFromFontFace, + dwritefontcollection1_GetFontSet, + dwritefontcollection1_GetFontFamily +}; + static HRESULT fontfamily_add_font(struct dwrite_fontfamily_data *family_data, struct dwrite_font_data *font_data) { if (family_data->font_count + 1 >= family_data->font_alloc) { @@ -2213,12 +2243,10 @@ static HRESULT fontcollection_add_family(struct dwrite_fontcollection *collectio static HRESULT init_font_collection(struct dwrite_fontcollection *collection, BOOL is_system) { - collection->IDWriteFontCollection1_iface.lpVtbl = &fontcollectionvtbl; + collection->IDWriteFontCollection1_iface.lpVtbl = is_system ? &systemfontcollectionvtbl : &fontcollectionvtbl; collection->ref = 1; collection->family_count = 0; collection->family_alloc = is_system ? 30 : 5; - collection->is_system = is_system; - collection->family_data = heap_alloc(sizeof(*collection->family_data) * collection->family_alloc); if (!collection->family_data) return E_OUTOFMEMORY;

1 0