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

André Hentschel : mshtml/tests: Allow ParseUrl to clear buffer on Win10.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 56e06d3f2e511c8eee677341489089612768d127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56e06d3f2e511c8eee6773414… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:50:21 2016 +0200 mshtml/tests: Allow ParseUrl to clear buffer on Win10. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/protocol.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index f9803df..6376f3f 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -720,7 +720,9 @@ static void test_about_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, about_blank_url, PARSE_DOMAIN, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK || hres == E_FAIL, "ParseUrl failed: %08x\n", hres); - ok(buf[0] == '?', "buf changed\n"); + ok(buf[0] == '?' || buf[0] == '\0' /* Win10 */, + "Expected buf to be unchanged or empty, got %s\n", + wine_dbgstr_w(buf)); ok(size == sizeof(about_blank_url)/sizeof(WCHAR) || size == sizeof(buf)/sizeof(buf[0]), /* IE8 */ "size=%d\n", size);

1 0

Piotr Caban : msvcp60/tests: Remove unneeded casts.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 2d4aac74089789107abe56c2685c54ee17d0e330 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4aac74089789107abe56c26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jun 23 10:24:13 2016 +0200 msvcp60/tests: Remove unneeded casts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp60/tests/ios.c | 8 ++++---- dlls/msvcp60/tests/string.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp60/tests/ios.c b/dlls/msvcp60/tests/ios.c index f121604..a79d51b 100644 --- a/dlls/msvcp60/tests/ios.c +++ b/dlls/msvcp60/tests/ios.c @@ -1435,7 +1435,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &ss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &ss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); @@ -1460,7 +1460,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wss.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wss.base.base1, &tpos); ok(tests[i].telloff_ss == tpos.off, "wrong offset, expected = %ld found = %ld\n", tests[i].telloff_ss, tpos.off); ok(rpos == &tpos, "wrong return fpos, expected = %p found = %p\n", rpos, &tpos); @@ -1488,7 +1488,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_char_seekg_fpos, &fs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_char_tellg, &fs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); @@ -1511,7 +1511,7 @@ static void test_istream_tellg(void) if (tests[i].seekoff != -1) /* to test without seek */ call_func2_ptr_fpos(p_basic_istream_wchar_seekg_fpos, &wfs.base.base1, spos); - rpos = (fpos_int *)call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); + rpos = call_func2(p_basic_istream_wchar_tellg, &wfs.base.base1, &tpos); ok(tests[i].tellpos == tpos.pos, "wrong filepos, expected = %s found = %s\n", debugstr_longlong(tests[i].tellpos), debugstr_longlong(tpos.pos)); diff --git a/dlls/msvcp60/tests/string.c b/dlls/msvcp60/tests/string.c index 2cbf025..f61ad4a 100644 --- a/dlls/msvcp60/tests/string.c +++ b/dlls/msvcp60/tests/string.c @@ -377,9 +377,9 @@ static void test_basic_string_char_swap(void) { strcpy(atmp1, "qwerty"); call_func3(p_basic_string_char_ctor_cstr_alloc, &str1, atmp1, &fake_allocator); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_char_swap, &str1, &str1); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_char_dtor, &str1); /* str1 allocated, str2 local */ @@ -388,11 +388,11 @@ static void test_basic_string_char_swap(void) { call_func3(p_basic_string_char_ctor_cstr_alloc, &str1, atmp1, &fake_allocator); call_func3(p_basic_string_char_ctor_cstr_alloc, &str2, atmp2, &fake_allocator); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_char_swap, &str1, &str2); - ok(strcmp(atmp1, (const char *) call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(strcmp(atmp2, (const char *) call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(strcmp(atmp1, call_func1(p_basic_string_char_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(strcmp(atmp2, call_func1(p_basic_string_char_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_char_dtor, &str1); call_func1(p_basic_string_char_dtor, &str2); } @@ -580,8 +580,8 @@ static void test_basic_string_char_replace(void) { ret = call_func4(p_basic_string_char_replace_cstr, &str, tests[i].off, tests[i].len, tests[i].replace); ok(ret == &str, "str = %p ret = %p\n", ret, &str); - ok(strcmp(tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", - tests[i].ret, (const char *) call_func1(p_basic_string_char_cstr, ret)); + ok(strcmp(tests[i].ret, call_func1(p_basic_string_char_cstr, ret)) == 0, "str = %s ret = %s\n", + tests[i].ret, (const char*)call_func1(p_basic_string_char_cstr, ret)); call_func1(p_basic_string_char_dtor, &str); } @@ -667,9 +667,9 @@ static void test_basic_string_wchar_swap(void) { mbstowcs(wtmp1, "qwerty", 32); call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, wtmp1, &fake_allocator); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func2(p_basic_string_wchar_swap, &str1, &str1); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); call_func1(p_basic_string_wchar_dtor, &str1); /* str1 allocated, str2 local */ @@ -678,11 +678,11 @@ static void test_basic_string_wchar_swap(void) { call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str1, wtmp1, &fake_allocator); call_func3(p_basic_string_wchar_ctor_cstr_alloc, &str2, wtmp2, &fake_allocator); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func2(p_basic_string_wchar_swap, &str1, &str2); - ok(wcscmp(wtmp1, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); - ok(wcscmp(wtmp2, (const wchar_t *) call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); + ok(wcscmp(wtmp1, call_func1(p_basic_string_wchar_cstr, &str1)) == 0, "Invalid value of str1\n"); + ok(wcscmp(wtmp2, call_func1(p_basic_string_wchar_cstr, &str2)) == 0, "Invalid value of str2\n"); call_func1(p_basic_string_wchar_dtor, &str1); call_func1(p_basic_string_wchar_dtor, &str2); }

1 0

Andrey Gusev : riched20/tests: Fix a typo in ok() messages.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 355a2162469e5efd6c622a4ebb7a73ab2f063c01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=355a2162469e5efd6c622a4eb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:28:57 2016 +0300 riched20/tests: Fix a typo in ok() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 92af700..200ce53 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -8123,7 +8123,7 @@ static void test_reset_default_para_fmt( void ) SendMessageA( richedit, WM_CUT, 0, 0 ); SendMessageA( richedit, EM_GETPARAFORMAT, 0, (LPARAM)&fmt ); - ok( fmt.wAlignment == def_align, "got %d exppect %d\n", fmt.wAlignment, def_align ); + ok( fmt.wAlignment == def_align, "got %d expect %d\n", fmt.wAlignment, def_align ); DestroyWindow( richedit ); } @@ -8290,7 +8290,7 @@ static void test_alignment_style(void) SendMessageW(richedit, WM_CUT, 0, 0); SendMessageW(richedit, EM_GETPARAFORMAT, 0, (LPARAM)&pf); - ok(pf.wAlignment == align_mask[i], "got %d exppect %d\n", pf.wAlignment, align_mask[i]); + ok(pf.wAlignment == align_mask[i], "got %d expect %d\n", pf.wAlignment, align_mask[i]); DestroyWindow(richedit); }

1 0

André Hentschel : advapi32/tests: Allow Win8+ flags for Admins ACE.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 4464793e601c541587c199d45ccaee721e4f02cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4464793e601c541587c199d45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:36:27 2016 +0200 advapi32/tests: Allow Win8+ flags for Admins ACE. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index eebd163..cf104ab 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4023,7 +4023,8 @@ static void test_GetNamedSecurityInfoA(void) flags = ((ACE_HEADER *)ace)->AceFlags; ok(flags == 0x0 || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */ - || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)), /* win7 */ + || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) /* win7 */ + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE)), /* win8+ */ "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS);

1 0

Andrey Gusev : setupapi/tests: Fix a typo in comment.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 3e8d4e31030e33817071a0aa1a71e4896723803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8d4e31030e33817071a0aa1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:34:59 2016 +0300 setupapi/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index d12d683..5015e31 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -656,7 +656,7 @@ static void test_inffilelist(void) ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); - /* now check the buffer content of a vaild call + /* now check the buffer contents of a valid call */ *ptr = 0; expected = 3 + strlen(inffile) + strlen(inffile2);

1 0

Iván Matellanes : msvcirt: Set the error flag in writepad without locking.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 3be6ac0d338f6908ca5cbd2e10fc0fb87238e618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be6ac0d338f6908ca5cbd2e1… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jun 23 10:46:59 2016 +0100 msvcirt: Set the error flag in writepad without locking. writepad() is always called between opfx() and osfx(), so the ios object is already locked. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 666c44c..5f44854 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2572,22 +2572,22 @@ ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char /* left of the padding */ if (base->flags & (FLAGS_left|FLAGS_internal)) { if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (!(base->flags & FLAGS_internal)) if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } /* add padding to fill the width */ for (i = len1 + len2; i < base->width; i++) if (streambuf_sputc(base->sb, base->fill) == EOF) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; /* right of the padding */ if ((base->flags & (FLAGS_left|FLAGS_internal)) != FLAGS_left) { if (!(base->flags & (FLAGS_left|FLAGS_internal))) if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } return this; }

1 0

Józef Kucia : wined3d: Fix sample_d for array textures.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 0afcd1aeb3768b28ef234088abb71a112078b04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0afcd1aeb3768b28ef234088a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:08:01 2016 +0200 wined3d: Fix sample_d for array textures. 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 | 51 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d22798f..c6b3c1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -65,7 +65,8 @@ struct glsl_src_param struct glsl_sample_function { struct wined3d_string_buffer *name; - DWORD coord_mask; + unsigned int coord_mask; + unsigned int deriv_mask; enum wined3d_data_type data_type; BOOL output_single_component; unsigned int offset_size; @@ -2803,24 +2804,23 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context static const struct { unsigned int coord_size; - unsigned int offset_size; const char *type_part; } resource_types[] = { - {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 0, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ - {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - {2, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - {3, 3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - {3, 0, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - {2, 1, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - {3, 2, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - {3, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + {0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ + {1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + {2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + {3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + {3, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + {3, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ }; - struct shader_glsl_ctx_priv *priv = ctx->backend_data; enum wined3d_shader_resource_type resource_type = ctx->reg_maps->resource_info[resource_idx].type; + struct shader_glsl_ctx_priv *priv = ctx->backend_data; const struct wined3d_gl_info *gl_info = ctx->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; @@ -2831,7 +2831,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; BOOL offset = flags & WINED3D_GLSL_SAMPLE_OFFSET; const char *base = "texture", *type_part = "", *suffix = ""; - unsigned int coord_size; + unsigned int coord_size, deriv_size; + BOOL array; sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; @@ -2840,6 +2841,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } + array = resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY + || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; /* Note that there's no such thing as a projected cube texture. */ if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) @@ -2875,21 +2878,19 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context type_part = ""; } - sample_function->offset_size = offset ? resource_types[resource_type].offset_size : 0; - if (offset && !sample_function->offset_size) - { - FIXME("Offset not supported for resource type %#x.\n", resource_type); - offset = FALSE; - } - sample_function->name = string_buffer_get(priv->string_buffers); string_buffer_sprintf(sample_function->name, "%s%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", offset ? "Offset" : "", suffix); coord_size = resource_types[resource_type].coord_size; + deriv_size = coord_size; if (shadow) ++coord_size; + if (array) + --deriv_size; + sample_function->offset_size = offset ? deriv_size : 0; sample_function->coord_mask = (1u << coord_size) - 1; + sample_function->deriv_mask = (1u << deriv_size) - 1; sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); } @@ -4464,8 +4465,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, WINED3D_GLSL_SAMPLE_GRAD, &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[2], sample_function.coord_mask, &dx_param); - shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dy_param); + shader_glsl_add_src_param(ins, &ins->src[2], sample_function.deriv_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.deriv_mask, &dy_param); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, swizzle, dx_param.param_str, dy_param.param_str, NULL, NULL, "%s", coord_param.param_str); @@ -4641,8 +4642,8 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) lod_param_str = lod_param.param_str; break; case WINED3DSIH_SAMPLE_GRAD: - shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dx_param); - shader_glsl_add_src_param(ins, &ins->src[4], sample_function.coord_mask, &dy_param); + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.deriv_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[4], sample_function.deriv_mask, &dy_param); dx_param_str = dx_param.param_str; dy_param_str = dy_param.param_str; break;

1 0

Józef Kucia : wined3d: Recognize SM4 dcl_indexableTemp opcode.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 944ebf3dd880b16c5c27f1a49b0f322cf537c5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944ebf3dd880b16c5c27f1a49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:08:00 2016 +0200 wined3d: Recognize SM4 dcl_indexableTemp 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 | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2e070fb..5a0cdba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5232,6 +5232,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3aa9626..d22798f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8567,6 +8567,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e9a4a84..700b7c1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ "dcl_indexableTemp", /* WINED3DSIH_DCL_INPUT */ "dcl_input", /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", @@ -2205,6 +2206,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } shader_addline(&buffer, "}"); } + else if (ins.handler_idx == WINED3DSIH_DCL_INDEXABLE_TEMP) + { + shader_addline(&buffer, "%s x[%u][%u], %u", shader_opcode_names[ins.handler_idx], + ins.declaration.indexable_temp.register_idx, + ins.declaration.indexable_temp.register_size, + ins.declaration.indexable_temp.component_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS) { shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b17140d..c90c2d4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -199,6 +199,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT = 0x65, WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, + WINED3D_SM4_OP_DCL_INDEXABLE_TEMP = 0x69, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM5_OP_HS_DECLS = 0x71, @@ -576,6 +577,15 @@ static void shader_sm4_read_dcl_input_ps_siv(struct wined3d_shader_instruction * ins->declaration.register_semantic.sysval_semantic = *tokens; } +static void shader_sm4_read_dcl_indexable_temp(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + ins->declaration.indexable_temp.register_idx = *tokens++; + ins->declaration.indexable_temp.register_size = *tokens++; + ins->declaration.indexable_temp.component_count = *tokens; +} + static void shader_sm4_read_dcl_global_flags(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -776,6 +786,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_declaration_register_semantic}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", "", shader_sm4_read_declaration_count}, + {WINED3D_SM4_OP_DCL_INDEXABLE_TEMP, WINED3DSIH_DCL_INDEXABLE_TEMP, "", "", + shader_sm4_read_dcl_indexable_temp}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f89573c..8fb6f4d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -577,6 +577,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, + WINED3DSIH_DCL_INDEXABLE_TEMP, WINED3DSIH_DCL_INPUT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_PRIMITIVE, @@ -895,6 +896,13 @@ struct wined3d_shader_src_param enum wined3d_shader_src_modifier modifiers; }; +struct wined3d_shader_indexable_temp +{ + unsigned int register_idx; + unsigned int register_size; + unsigned int component_count; +}; + struct wined3d_shader_semantic { enum wined3d_decl_usage usage; @@ -968,6 +976,7 @@ struct wined3d_shader_instruction enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; + struct wined3d_shader_indexable_temp indexable_temp; } declaration; };

1 0

Józef Kucia : wined3d: Recognize SM4 indexable temporary registers.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: 50c090dc15e658c445f33e373cc074c60bf26e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c090dc15e658c445f33e373… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:59 2016 +0200 wined3d: Recognize SM4 indexable temporary registers. 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 | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1085fda..e9a4a84 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1771,6 +1771,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vThreadIDInGroupFlattened"); break; + case WINED3DSPR_IDXTEMP: + shader_addline(buffer, "x"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8961dc5..b17140d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -239,6 +239,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_INDEXABLE_TEMP = 0x3, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_RESOURCE = 0x7, @@ -828,7 +829,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_INDEXABLE_TEMP */ WINED3DSPR_IDXTEMP, /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, /* UNKNOWN */ ~0u, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce094ca..f89573c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -392,6 +392,7 @@ enum wined3d_shader_register_type WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX, + WINED3DSPR_IDXTEMP, }; enum wined3d_data_type

1 0

Andrey Gusev : kernel32/tests: Fix a typo in skip() message.
by Alexandre Julliard June 23, 2016

June 23, 2016

Module: wine Branch: master Commit: e1a42658672d7c632821ae46dac09fef241d86d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a42658672d7c632821ae46d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:31:03 2016 +0300 kernel32/tests: Fix a typo in skip() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f42e7ec..4f472db 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4717,7 +4717,7 @@ static void test_GetSystemPreferredUILanguages(void) size_buffer = max(size_id, size_name); if(!size_buffer) { - skip("No vaild buffer size\n"); + skip("No valid buffer size\n"); return; }

1 0