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

Henri Verbeet : d3d10: Validate offsets in parse_fx10_object() (AFL).
by Alexandre Julliard May 26, 2016

May 26, 2016

Module: wine Branch: master Commit: 2594f58eb0e8db888ff4c341989583e98aaf3e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2594f58eb0e8db888ff4c3419… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 25 20:04:03 2016 +0200 d3d10: Validate offsets in parse_fx10_object() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 87 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 65 insertions(+), 22 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2085d93..378f23f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -244,7 +244,7 @@ static const struct d3d10_effect_state_storage_info d3d10_effect_state_storage_i {D3D10_SVT_SAMPLER, sizeof(default_sampler_desc), &default_sampler_desc }, }; -static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, char **s) +static BOOL fx10_get_string(const char *data, size_t data_size, DWORD offset, const char **s, size_t *l) { size_t len, max_len; @@ -258,20 +258,40 @@ static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, c if (!(len = strnlen(data + offset, max_len))) { *s = NULL; + *l = 0; return TRUE; } if (len == max_len) return FALSE; - ++len; + *s = data + offset; + *l = ++len; + + return TRUE; +} + +static BOOL fx10_copy_string(const char *data, size_t data_size, DWORD offset, char **s) +{ + const char *p; + size_t len; + + if (!fx10_get_string(data, data_size, offset, &p, &len)) + return FALSE; + + if (!p) + { + *s = NULL; + return TRUE; + } + if (!(*s = HeapAlloc(GetProcessHeap(), 0, len))) { ERR("Failed to allocate string memory.\n"); return FALSE; } - memcpy(*s, data + offset, len); + memcpy(*s, p, len); return TRUE; } @@ -302,21 +322,13 @@ static BOOL copy_name(const char *ptr, char **name) static const char *shader_get_string(const char *data, size_t data_size, DWORD offset) { - size_t len, max_len; - - if (offset >= data_size) - { - WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); - return NULL; - } - - max_len = data_size - offset; - len = strnlen(data + offset, max_len); + const char *s; + size_t l; - if (len == max_len) + if (!fx10_get_string(data, data_size, offset, &s, &l)) return NULL; - return data + offset; + return l ? s : ""; } static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct d3d10_effect_shader_signature *s) @@ -1268,7 +1280,8 @@ static BOOL parse_fx10_state_group(const char **ptr, const char *data, return TRUE; } -static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr, const char *data) +static HRESULT parse_fx10_object(const char *data, size_t data_size, + const char **ptr, struct d3d10_effect_object *o) { ID3D10EffectVariable *variable = &null_variable.ID3D10EffectVariable_iface; const char *data_ptr = NULL; @@ -1278,6 +1291,14 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr struct d3d10_effect *effect = o->pass->technique->effect; ID3D10Effect *e = &effect->ID3D10Effect_iface; DWORD tmp, variable_idx = 0; + const char *name; + size_t name_len; + + if (!require_space(*ptr - data, 4, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#lx (data size %#lx).\n", (long)(*ptr - data), (long)data_size); + return E_FAIL; + } read_dword(ptr, &o->type); TRACE("Effect object is of type %#x.\n", o->type); @@ -1345,19 +1366,36 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr case D3D10_EOO_PARSED_OBJECT: /* This is a local object, we've parsed in parse_fx10_local_object. */ - TRACE("Variable name %s.\n", debugstr_a(data + offset)); + if (!fx10_get_string(data, data_size, offset, &name, &name_len)) + { + WARN("Failed to get variable name.\n"); + return E_FAIL; + } + TRACE("Variable name %s.\n", debugstr_a(name)); - variable = e->lpVtbl->GetVariableByName(e, data + offset); + variable = e->lpVtbl->GetVariableByName(e, name); break; case D3D10_EOO_PARSED_OBJECT_INDEX: /* This is a local object, we've parsed in parse_fx10_local_object, which has an array index. */ + if (offset >= data_size || !require_space(offset, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } data_ptr = data + offset; read_dword(&data_ptr, &offset); read_dword(&data_ptr, &variable_idx); - TRACE("Variable name %s[%u].\n", debugstr_a(data + offset), variable_idx); - variable = e->lpVtbl->GetVariableByName(e, data + offset); + if (!fx10_get_string(data, data_size, offset, &name, &name_len)) + { + WARN("Failed to get variable name.\n"); + return E_FAIL; + } + + TRACE("Variable name %s[%u].\n", debugstr_a(name), variable_idx); + + variable = e->lpVtbl->GetVariableByName(e, name); break; case D3D10_EOO_ANONYMOUS_SHADER: @@ -1370,6 +1408,11 @@ static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr return E_FAIL; } + if (offset >= data_size || !require_space(offset, 1, sizeof(DWORD), data_size)) + { + WARN("Invalid offset %#x (data size %#lx).\n", offset, (long)data_size); + return E_FAIL; + } data_ptr = data + offset; read_dword(&data_ptr, &offset); TRACE("Effect object starts at offset %#x.\n", offset); @@ -1527,8 +1570,8 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, o->pass = p; - hr = parse_fx10_object(o, ptr, data); - if (FAILED(hr)) return hr; + if (FAILED(hr = parse_fx10_object(data, data_size, ptr, o))) + return hr; } return hr;

1 0

Jacek Caban : jscript: Added non-zero timezone offset tests.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: b5aeb661b9297a6ee6047335f42543936f593525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5aeb661b9297a6ee6047335f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:08:21 2016 +0200 jscript: Added non-zero timezone offset tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/api.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e5e6350..ca6131b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -2098,6 +2098,8 @@ ok(Date.parse("Jan 20 2009 UTC") === 1232409600000, "Date.parse(\"Jan 20 2009 UT ok(Date.parse("Jan 20 2009 GMT") === 1232409600000, "Date.parse(\"Jan 20 2009 GMT\") = " + Date.parse("Jan 20 2009 GMT")); ok(Date.parse("Jan 20 2009 UTC-0") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC-0\") = " + Date.parse("Jan 20 2009 UTC-0")); ok(Date.parse("Jan 20 2009 UTC+0000") === 1232409600000, "Date.parse(\"Jan 20 2009 UTC+0000\") = " + Date.parse("Jan 20 2009 UTC+0000")); +ok(Date.parse("Jan 20 2009 UTC-1") === 1232413200000, "Date.parse(\"Jan 20 2009 UTC-1\") = " + Date.parse("Jan 20 2009 UTC-1")); +ok(Date.parse("Jan 20 2009 UTC+1") === 1232406000000, "Date.parse(\"Jan 20 2009 UTC+1\") = " + Date.parse("Jan 20 2009 UTC+1")); ok(Date.parse("Ju 13 79 UTC") === 300672000000, "Date.parse(\"Ju 13 79 UTC\") = " + Date.parse("Ju 13 79 UTC")); ok(Date.parse("12Au91 UTC") === 681955200000, "Date.parse(\"12Au91 UTC\") = " + Date.parse("12Au91 UTC")); ok(Date.parse("7/02/17 UTC") === -1656806400000, "Date.parse(\"7/02/17 UTC\") = " + Date.parse("7/02/17 UTC"));

1 0

Jacek Caban : jscript: Removed obsolete FIXME comments in tests and add relevant tests.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: a8b5dc84bd98662ddfe4d8b50c4c558bbdf0c22f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b5dc84bd98662ddfe4d8b50… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:08:15 2016 +0200 jscript: Removed obsolete FIXME comments in tests and add relevant tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/lang.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index a9f95f8..ee30836 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -208,10 +208,13 @@ function argumentsTest() { return 1; }); } -/* FIXME: It seems that when function is called as an expression, instance object arguments is not set. - * We currently always set it in Wine. */ + argumentsTest(); +(function callAsExprTest() { + ok(callAsExprTest.arguments === null, "callAsExprTest.arguments = " + callAsExprTest.arguments); +})(1,2); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;");

1 0

Alistair Leslie-Hughes : d3d11/tests: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: ce0837964d10ea844f7db89c8a13acaa35120622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce0837964d10ea844f7db89c8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:06:45 2016 +0000 d3d11/tests: Added DXGI_FORMAT_R16_TYPELESS D3D11_BIND_DEPTH_STENCIL test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 85ec201..73d411c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1001,6 +1001,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE},

1 0

Hadrien Boizard : mshtml/tests: Use todo_wine_if() in tests.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: c0505097f9fe71e8e78ba0c4f989acfff330d768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0505097f9fe71e8e78ba0c4f… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Fri May 20 19:15:06 2016 +0200 mshtml/tests: Use todo_wine_if() in tests. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 904322e..5079dc9 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -5830,9 +5830,7 @@ static void test_download(DWORD flags) if(!(flags & DWL_FROM_HISTORY)) todo_wine CHECK_CALLED(OnChanged_1012); todo_wine CHECK_CALLED(Exec_HTTPEQUIV); - if(!(flags & DWL_REFRESH)) - todo_wine CHECK_CALLED(Exec_SETTITLE); - else + todo_wine_if(!(flags & DWL_REFRESH)) CHECK_CALLED(Exec_SETTITLE); } if(!is_js) {

1 0

Henri Verbeet : d3d11: Validate offsets and sizes in parse_dxbc() (AFL).
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: e5a4da38eb159dbe2708f525cffc4c2abd8c53ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a4da38eb159dbe2708f525c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:41 2016 +0200 d3d11: Validate offsets and sizes in parse_dxbc() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 5 +++++ dlls/d3d11/utils.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index c52e3e4..41fd89d 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -85,6 +85,11 @@ static inline void read_dword(const char **ptr, DWORD *d) *ptr += sizeof(*d); } +static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +{ + return data_size - offset >= size; +} + void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; HRESULT parse_dxbc(const char *data, SIZE_T data_size, diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 6473722..25e22f9 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -751,11 +751,23 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&ptr, &chunk_offset); TRACE("chunk %u at offset %#x\n", i, chunk_offset); + if (chunk_offset >= data_size || !require_space(chunk_offset, 2 * sizeof(DWORD), data_size)) + { + WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + return E_FAIL; + } + chunk_ptr = data + chunk_offset; read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); + if (!require_space(chunk_ptr - data, chunk_size, data_size)) + { + WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); + return E_FAIL; + } + hr = chunk_handler(chunk_ptr, chunk_size, chunk_tag, ctx); if (FAILED(hr)) break; }

1 0

Jacek Caban : jscript: Added RegExp.ignoreCase getter implementation.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 2db16660966cbd736c8dba453fc11e5dc096f75f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2db16660966cbd736c8dba453… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:07:47 2016 +0200 jscript: Added RegExp.ignoreCase getter implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 6 ++++-- dlls/jscript/tests/regexp.js | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 402b527..23ed990 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -276,8 +276,10 @@ static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t va static HRESULT RegExp_get_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + *r = jsval_bool(!!(regexp_from_jsdisp(jsthis)->jsregexp->flags & REG_FOLD)); + return S_OK; } static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 25ec91e..5cab586 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -660,4 +660,11 @@ tmp = new RegExp("abc/", "mgi"); ok(tmp.toString() === "/abc//igm", "(new RegExp(\"abc/\")).toString() = " + tmp.toString()); ok(/abc/.toString(1, false, "3") === "/abc/", "/abc/.toString(1, false, \"3\") = " + /abc/.toString()); +re = /x/; +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); +re = /x/i; +ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); +re = new RegExp("xxx", "gi"); +ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); + reportSuccess();

1 0

Józef Kucia : d3d11/tests: Add test for SM4 if instruction.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 8a345fe334f4700aa346565955250486266a8994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a345fe334f4700aa34656595… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:22 2016 +0200 d3d11/tests: Add test for SM4 if 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 | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 73d411c..e17114e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6876,6 +6876,103 @@ static void test_shader_stage_input_output_matching(void) release_test_context(&test_context); } +static void test_sm4_if_instruction(void) +{ + struct d3d11_test_context test_context; + ID3D11PixelShader *ps_if_nz, *ps_if_z; + ID3D11DeviceContext *context; + ID3D11Device *device; + unsigned int bits[4]; + DWORD expected_color; + ID3D11Buffer *cb; + unsigned int i; + HRESULT hr; + + static const DWORD ps_if_nz_code[] = + { +#if 0 + uint bits; + + float4 main() : SV_TARGET + { + if (bits) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x2a94f6f1, 0xdbe88943, 0x3426a708, 0x09cec990, 0x00000001, 0x00000100, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000088, 0x00000040, 0x00000022, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0404001f, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, + }; + static const DWORD ps_if_z_code[] = + { +#if 0 + uint bits; + + float4 main() : SV_TARGET + { + if (!bits) + return float4(0.0f, 1.0f, 0.0f, 1.0f); + else + return float4(1.0f, 0.0f, 0.0f, 1.0f); + } +#endif + 0x43425844, 0x2e3030ca, 0x94c8610c, 0xdf0c1b1f, 0x80f2ca2c, 0x00000001, 0x00000100, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000088, 0x00000040, 0x00000022, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x0400001f, + 0x0020800a, 0x00000000, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, + 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000012, 0x08000036, 0x001020f2, 0x00000000, + 0x00004002, 0x3f800000, 0x00000000, 0x00000000, 0x3f800000, 0x0100003e, 0x01000015, 0x0100003e, + }; + static unsigned int bit_patterns[] = + { + 0x00000000, 0x00000001, 0x10010001, 0x10000000, 0x80000000, 0xffff0000, 0x0000ffff, 0xffffffff, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + hr = ID3D11Device_CreatePixelShader(device, ps_if_nz_code, sizeof(ps_if_nz_code), NULL, &ps_if_nz); + ok(SUCCEEDED(hr), "Failed to create if_nz pixel shader, hr %#x.\n", hr); + hr = ID3D11Device_CreatePixelShader(device, ps_if_z_code, sizeof(ps_if_z_code), NULL, &ps_if_z); + ok(SUCCEEDED(hr), "Failed to create if_z pixel shader, hr %#x.\n", hr); + + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(bits), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + + for (i = 0; i < sizeof(bit_patterns) / sizeof(*bit_patterns); ++i) + { + *bits = bit_patterns[i]; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, NULL, bits, 0, 0); + + ID3D11DeviceContext_PSSetShader(context, ps_if_nz, NULL, 0); + expected_color = *bits ? 0xff00ff00 : 0xff0000ff; + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, expected_color, 0); + + ID3D11DeviceContext_PSSetShader(context, ps_if_z, NULL, 0); + expected_color = *bits ? 0xff0000ff : 0xff00ff00; + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, expected_color, 0); + } + + ID3D11Buffer_Release(cb); + ID3D11PixelShader_Release(ps_if_z); + ID3D11PixelShader_Release(ps_if_nz); + release_test_context(&test_context); +} + START_TEST(d3d11) { test_create_device(); @@ -6917,4 +7014,5 @@ START_TEST(d3d11) test_cb_relative_addressing(); test_getdc(); test_shader_stage_input_output_matching(); + test_sm4_if_instruction(); }

1 0

Jacek Caban : jscript: Added RegExp.global getter implementation.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: b1773131ac85567e7781ecefc5ff54740fedf774 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1773131ac85567e7781ecefc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:08:03 2016 +0200 jscript: Added RegExp.global getter implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/jsregexp.c | 6 ++++-- dlls/jscript/tests/regexp.js | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index be9f8d8..e4fae22 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -264,8 +264,10 @@ static HRESULT RegExp_set_source(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t va static HRESULT RegExp_get_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t *r) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + *r = jsval_bool(!!(regexp_from_jsdisp(jsthis)->jsregexp->flags & REG_GLOB)); + return S_OK; } static HRESULT RegExp_set_global(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) diff --git a/dlls/jscript/tests/regexp.js b/dlls/jscript/tests/regexp.js index 48f65bc..b200364 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -663,13 +663,18 @@ ok(/abc/.toString(1, false, "3") === "/abc/", "/abc/.toString(1, false, \"3\") = re = /x/; ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); re = /x/i; ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === false, "re.global = " + re.global); re = new RegExp("xxx", "gi"); ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === false, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); re = /x/mg; +ok(re.ignoreCase === false, "re.ignoreCase = " + re.ignoreCase); ok(re.multiline === true, "re.multiline = " + re.multiline); +ok(re.global === true, "re.global = " + re.global); reportSuccess();

1 0

Józef Kucia : wined3d: Handle SM4 breakc instruction modifiers.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 56b22347d208b879679cf4c611b0ffd755eb7036 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56b22347d208b879679cf4c61… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:21 2016 +0200 wined3d: Handle SM4 breakc instruction modifiers. 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 ++- dlls/wined3d/shader.c | 3 ++- dlls/wined3d/shader_sm4.c | 7 ++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 98d179e..898cabf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4207,10 +4207,11 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins) { + const char *condition = (ins->flags == WINED3D_SHADER_CONDITIONAL_OP_NZ) ? "bool" : "!bool"; struct glsl_src_param src_param; shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_0, &src_param); - shader_addline(ins->ctx->buffer, "if (bool(%s)) break;\n", src_param.param_str); + shader_addline(ins->ctx->buffer, "if (%s(%s)) break;\n", condition, src_param.param_str); } static void shader_glsl_label(const struct wined3d_shader_instruction *ins) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b410277..ef2f70b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -2259,7 +2259,8 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe shader_addline(&buffer, "%s", shader_opcode_names[ins.handler_idx]); - if (ins.handler_idx == WINED3DSIH_IF) + if (ins.handler_idx == WINED3DSIH_BREAKP + || ins.handler_idx == WINED3DSIH_IF) { switch (ins.flags) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 96ea274..eb8e4e5 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -381,7 +381,7 @@ static BOOL shader_sm4_read_src_param(struct wined3d_sm4_data *priv, const DWORD static BOOL shader_sm4_read_dst_param(struct wined3d_sm4_data *priv, const DWORD **ptr, enum wined3d_data_type data_type, struct wined3d_shader_dst_param *dst_param); -static void shader_sm4_read_if(struct wined3d_shader_instruction *ins, +static void shader_sm4_read_conditional_op(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) { @@ -618,7 +618,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ADD, WINED3DSIH_ADD, "f", "ff"}, {WINED3D_SM4_OP_AND, WINED3DSIH_AND, "u", "uu"}, {WINED3D_SM4_OP_BREAK, WINED3DSIH_BREAK, "", ""}, - {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, "", "u"}, + {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, "", "u", + shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, {WINED3D_SM4_OP_DERIV_RTY, WINED3DSIH_DSY, "f", "f"}, @@ -639,7 +640,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_GE, WINED3DSIH_GE, "u", "ff"}, {WINED3D_SM4_OP_IADD, WINED3DSIH_IADD, "i", "ii"}, {WINED3D_SM4_OP_IF, WINED3DSIH_IF, "", "u", - shader_sm4_read_if}, + shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "u", "ii"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "u", "ii"}, {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "u", "ii"},

1 0