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

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 1a182b5901589db06803d2d6f8ad6d820b80e19b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a182b5901589db06803d2d6f… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Tue May 24 22:40:04 2016 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index edf277c..8ac99b6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-05-03 21:19+0300\n" +"PO-Revision-Date: 2016-05-24 22:38+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -7629,7 +7629,7 @@ msgstr "Kopijuoti failus iš:" #: setupapi.rc:34 msgid "Type the path where the file is located, and then click OK." -msgstr "Įveskite kelią iki failo, o tada spauskite Gerai." +msgstr "Įrašykite kelią iki failo, o tada spauskite Gerai." #: shdoclc.rc:42 msgid "F&orward" @@ -11557,6 +11557,15 @@ msgid "" " REG [operation] /?\n" "\n" msgstr "" +"Naudojimas:\n" +" REG [operacija] [parametrai]\n" +"\n" +"Palaikomos operacijos:\n" +" ADD | DELETE | QUERY\n" +"\n" +"Pagalbai apie specifinę operaciją, įrašykite:\n" +" REG [operacija] /?\n" +"\n" #: reg.rc:36 msgid "" @@ -11657,24 +11666,20 @@ msgid "Search complete. Number of matches found: %1!d!\n" msgstr "Paieška baigta. Rasta atitikimų: %1!d!\n" #: reg.rc:61 -#, fuzzy -#| msgid "reg: Invalid key name\n" msgid "reg: Invalid syntax. " -msgstr "reg: Netinkamas rakto vardas\n" +msgstr "reg: Netinkama sintaksė. " #: reg.rc:62 -#, fuzzy -#| msgid "uninstaller: Invalid option [%1]\n" msgid "reg: Invalid option [%1]. " -msgstr "šalinimo programa: Netinkamas parametras [%1]\n" +msgstr "reg: Netinkamas parametras [%1]. " #: reg.rc:63 msgid "Type \"REG /?\" for help.\n" -msgstr "" +msgstr "Pagalbai įrašykite „REG /?“.\n" #: reg.rc:64 msgid "Type \"REG %1 /?\" for help.\n" -msgstr "" +msgstr "Pagalbai įrašykite „REG %1 /?“.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Henri Verbeet : d3d11: Introduce a helper function to allocate arrays.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: c27b83ec07b9cb82438404a20342ed45c744b20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c27b83ec07b9cb82438404a20… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:45 2016 +0200 d3d11: Introduce a helper function to allocate arrays. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 7 +++++++ dlls/d3d11/inputlayout.c | 3 +-- dlls/d3d11/shader.c | 3 +-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index b3638c3..77079bd 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -79,6 +79,13 @@ HRESULT d3d_set_private_data(struct wined3d_private_store *store, HRESULT d3d_set_private_data_interface(struct wined3d_private_store *store, REFGUID guid, const IUnknown *object) DECLSPEC_HIDDEN; +static inline void *d3d11_calloc(SIZE_T count, SIZE_T size) +{ + if (count > ~(SIZE_T)0 / size) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); +} + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index d481dd2..69ef985 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -54,8 +54,7 @@ static HRESULT d3d11_input_layout_to_wined3d_declaration(const D3D11_INPUT_ELEME return E_FAIL; } - *wined3d_elements = HeapAlloc(GetProcessHeap(), 0, element_count * sizeof(**wined3d_elements)); - if (!*wined3d_elements) + if (!(*wined3d_elements = d3d11_calloc(element_count, sizeof(**wined3d_elements)))) { ERR("Failed to allocate wined3d vertex element array memory.\n"); HeapFree(GetProcessHeap(), 0, is.elements); diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index a88c8ce..b1c4f28 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -121,8 +121,7 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d return E_INVALIDARG; } - e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); - if (!e) + if (!(e = d3d11_calloc(count, sizeof(*e)))) { ERR("Failed to allocate input signature memory.\n"); return E_OUTOFMEMORY;

1 0

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

May 25, 2016

Module: wine Branch: master Commit: b1665527af5d7b7c402597412cf14b59fbcddd61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1665527af5d7b7c402597412… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:43 2016 +0200 d3d11: Validate offsets and sizes in shader_parse_signature() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/shader.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3d11/utils.c | 4 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 41fd89d..b3638c3 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -85,9 +85,9 @@ 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) +static inline BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { - return data_size - offset >= size; + return !count || (data_size - offset) / count >= size; } void skip_dword_unknown(const char **ptr, unsigned int count) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/shader.c b/dlls/d3d11/shader.c index f8647ff..a88c8ce 100644 --- a/dlls/d3d11/shader.c +++ b/dlls/d3d11/shader.c @@ -78,6 +78,25 @@ static HRESULT shader_extract_from_dxbc(const void *dxbc, SIZE_T dxbc_length, st return hr; } +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); + + if (len == max_len) + return NULL; + + return data + offset; +} + HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) { struct wined3d_shader_signature_element *e; @@ -85,11 +104,23 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d unsigned int i; DWORD count; + if (!require_space(0, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid data size %#x.\n", data_size); + return E_INVALIDARG; + } + read_dword(&ptr, &count); TRACE("%u elements\n", count); skip_dword_unknown(&ptr, 1); + if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) + { + WARN("Invalid count %#x (data size %#x).\n", count, data_size); + return E_INVALIDARG; + } + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); if (!e) { @@ -102,7 +133,12 @@ HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d UINT name_offset; read_dword(&ptr, &name_offset); - e[i].semantic_name = data + name_offset; + if (!(e[i].semantic_name = shader_get_string(data, data_size, name_offset))) + { + WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); + HeapFree(GetProcessHeap(), 0, e); + return E_INVALIDARG; + } read_dword(&ptr, &e[i].semantic_idx); read_dword(&ptr, &e[i].sysval_semantic); read_dword(&ptr, &e[i].component_type); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 25e22f9..7b08d13 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -751,7 +751,7 @@ 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)) + 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; @@ -762,7 +762,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); - if (!require_space(chunk_ptr - data, chunk_size, data_size)) + if (!require_space(chunk_ptr - data, 1, 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;

1 0

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

May 25, 2016

Module: wine Branch: master Commit: 81cb13af7ac9438a50c7a7dd5bcbb6898edf49d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cb13af7ac9438a50c7a7dd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 25 14:07:56 2016 +0200 jscript: Added RegExp.multiline 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 23ed990..be9f8d8 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -290,8 +290,10 @@ static HRESULT RegExp_set_ignoreCase(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_ static HRESULT RegExp_get_multiline(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_MULTILINE)); + return S_OK; } static HRESULT RegExp_set_multiline(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 5cab586..48f65bc 100644 --- a/dlls/jscript/tests/regexp.js +++ b/dlls/jscript/tests/regexp.js @@ -662,9 +662,14 @@ 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); re = /x/i; ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); re = new RegExp("xxx", "gi"); ok(re.ignoreCase === true, "re.ignoreCase = " + re.ignoreCase); +ok(re.multiline === false, "re.multiline = " + re.multiline); +re = /x/mg; +ok(re.multiline === true, "re.multiline = " + re.multiline); reportSuccess();

1 0

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

May 25, 2016

Module: wine Branch: master Commit: 2ad46661e71fa37c4c370a168d8db627fca38b2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ad46661e71fa37c4c370a168… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:23 2016 +0200 d3d10core/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/d3d10core/tests/device.c | 96 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f4ad5fd..ebd3325 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6727,6 +6727,101 @@ static void test_shader_stage_input_output_matching(void) release_test_context(&test_context); } +static void test_sm4_if_instruction(void) +{ + struct d3d10core_test_context test_context; + ID3D10PixelShader *ps_if_nz, *ps_if_z; + ID3D10Device *device; + unsigned int bits[4]; + DWORD expected_color; + ID3D10Buffer *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)) + return; + + device = test_context.device; + + hr = ID3D10Device_CreatePixelShader(device, ps_if_nz_code, sizeof(ps_if_nz_code), &ps_if_nz); + ok(SUCCEEDED(hr), "Failed to create if_nz pixel shader, hr %#x.\n", hr); + hr = ID3D10Device_CreatePixelShader(device, ps_if_z_code, sizeof(ps_if_z_code), &ps_if_z); + ok(SUCCEEDED(hr), "Failed to create if_z pixel shader, hr %#x.\n", hr); + + cb = create_buffer(device, D3D10_BIND_CONSTANT_BUFFER, sizeof(bits), NULL); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &cb); + + for (i = 0; i < sizeof(bit_patterns) / sizeof(*bit_patterns); ++i) + { + *bits = bit_patterns[i]; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)cb, 0, NULL, bits, 0, 0); + + ID3D10Device_PSSetShader(device, ps_if_nz); + expected_color = *bits ? 0xff00ff00 : 0xff0000ff; + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, expected_color, 0); + + ID3D10Device_PSSetShader(device, ps_if_z); + expected_color = *bits ? 0xff0000ff : 0xff00ff00; + draw_quad(&test_context); + check_texture_color(test_context.backbuffer, expected_color, 0); + } + + ID3D10Buffer_Release(cb); + ID3D10PixelShader_Release(ps_if_z); + ID3D10PixelShader_Release(ps_if_nz); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -6765,4 +6860,5 @@ START_TEST(device) test_clear_depth_stencil_view(); test_draw_depth_only(); test_shader_stage_input_output_matching(); + test_sm4_if_instruction(); }

1 0

Alistair Leslie-Hughes : d3d10core/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: 73d0328be76cf86a4e339bc4ad26eaab6eacf7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d0328be76cf86a4e339bc4a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:06:57 2016 +0000 d3d10core/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/d3d10core/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f768773..f4ad5fd 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -712,6 +712,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D10_BIND_RENDER_TARGET, 0, FALSE, FALSE},

1 0

Alistair Leslie-Hughes : wined3d: Support missing WINED3DUSAGE flags to debug_d3dusage.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 77e1037e003c32b789263d852bdd7ecee8af77a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e1037e003c32b789263d852… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed May 25 06:06:08 2016 +0000 wined3d: Support missing WINED3DUSAGE flags to debug_d3dusage. 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/wined3d/utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5c781cd..f85fcc9 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3603,7 +3603,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) const char *debug_d3dusage(DWORD usage) { - char buf[333]; + char buf[552]; buf[0] = '\0'; #define WINED3DUSAGE_TO_STR(u) if (usage & u) { strcat(buf, " | "#u); usage &= ~u; } @@ -3617,7 +3617,14 @@ const char *debug_d3dusage(DWORD usage) WINED3DUSAGE_TO_STR(WINED3DUSAGE_NPATCHES); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DYNAMIC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_AUTOGENMIPMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICTED_CONTENT); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_RESTRICT_SHARED_RESOURCE); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTAPI); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_LEGACY_CUBEMAP); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_TEXTURE); + WINED3DUSAGE_TO_STR(WINED3DUSAGE_OWNDC); WINED3DUSAGE_TO_STR(WINED3DUSAGE_STATICDECL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_OVERLAY); #undef WINED3DUSAGE_TO_STR

1 0

Józef Kucia : wined3d: Ignore flags for conditional SM 1-3 instructions explicitly.
by Alexandre Julliard May 25, 2016

May 25, 2016

Module: wine Branch: master Commit: 3ab205ef949a99a275e37b1c5b47d181c8040fb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab205ef949a99a275e37b1c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed May 25 10:51:18 2016 +0200 wined3d: Ignore flags for conditional SM 1-3 instructions explicitly. This is to make sure that a regression is not introduced when the SM4+ _nz/_z modifiers are implemented for these instructions. 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_sm1.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/wined3d/shader_sm1.c b/dlls/wined3d/shader_sm1.c index 54312d4..2a1f4a4 100644 --- a/dlls/wined3d/shader_sm1.c +++ b/dlls/wined3d/shader_sm1.c @@ -708,6 +708,19 @@ static void shader_sm1_read_comment(const DWORD **ptr) } } +static void shader_sm1_validate_instruction(struct wined3d_shader_instruction *ins) +{ + if (ins->handler_idx == WINED3DSIH_BREAKP || ins->handler_idx == WINED3DSIH_IF) + { + if (ins->flags) + { + FIXME("Ignoring unexpected instruction flags %#x for %s.\n", + ins->flags, debug_d3dshaderinstructionhandler(ins->handler_idx)); + ins->flags = 0; + } + } +} + static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wined3d_shader_instruction *ins) { const struct wined3d_sm1_opcode_info *opcode_info; @@ -775,6 +788,8 @@ static void shader_sm1_read_instruction(void *data, const DWORD **ptr, struct wi shader_sm1_read_src_param(priv, &p, &priv->src_param[i], &priv->src_rel_addr[i]); } } + + shader_sm1_validate_instruction(ins); } static BOOL shader_sm1_is_end(void *data, const DWORD **ptr)

1 0

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

May 25, 2016

Module: wine Branch: master Commit: 22d52ed59d28340f595660d7cbacca10c6ce8858 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d52ed59d28340f595660d7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:44 2016 +0200 d3d10: Validate offsets and sizes in shader_parse_signature() (AFL). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 4 ++-- dlls/d3d10/effect.c | 38 +++++++++++++++++++++++++++++++++++++- dlls/d3d10/utils.c | 4 ++-- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 0e27dfe..dc41224 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -294,9 +294,9 @@ static inline void write_dword(char **ptr, DWORD d) *ptr += sizeof(d); } -static inline BOOL require_space(size_t offset, size_t size, size_t data_size) +static inline BOOL require_space(size_t offset, size_t count, size_t size, size_t data_size) { - return data_size - offset >= size; + return !count || (data_size - offset) / count >= size; } void skip_dword_unknown(const char *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c7eed1a..df35640 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -267,6 +267,25 @@ static BOOL copy_name(const char *ptr, char **name) return TRUE; } +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); + + if (len == max_len) + return NULL; + + return data + offset; +} + static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct d3d10_effect_shader_signature *s) { D3D10_SIGNATURE_PARAMETER_DESC *e; @@ -274,11 +293,23 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct unsigned int i; DWORD count; + if (!require_space(0, 2, sizeof(DWORD), data_size)) + { + WARN("Invalid data size %#x.\n", data_size); + return E_INVALIDARG; + } + read_dword(&ptr, &count); TRACE("%u elements\n", count); skip_dword_unknown("shader signature", &ptr, 1); + if (!require_space(ptr - data, count, 6 * sizeof(DWORD), data_size)) + { + WARN("Invalid count %#x (data size %#x).\n", count, data_size); + return E_INVALIDARG; + } + e = HeapAlloc(GetProcessHeap(), 0, count * sizeof(*e)); if (!e) { @@ -292,7 +323,12 @@ static HRESULT shader_parse_signature(const char *data, DWORD data_size, struct UINT mask; read_dword(&ptr, &name_offset); - e[i].SemanticName = data + name_offset; + if (!(e[i].SemanticName = shader_get_string(data, data_size, name_offset))) + { + WARN("Invalid name offset %#x (data size %#x).\n", name_offset, data_size); + HeapFree(GetProcessHeap(), 0, e); + return E_INVALIDARG; + } read_dword(&ptr, &e[i].SemanticIndex); read_dword(&ptr, &e[i].SystemValueType); read_dword(&ptr, &e[i].ComponentType); diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 618fdee..be88d5a 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -217,7 +217,7 @@ 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)) + 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; @@ -228,7 +228,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size, read_dword(&chunk_ptr, &chunk_tag); read_dword(&chunk_ptr, &chunk_size); - if (!require_space(chunk_ptr - data, chunk_size, data_size)) + if (!require_space(chunk_ptr - data, 1, 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;

1 0

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

May 25, 2016

Module: wine Branch: master Commit: 994c5618b1e1e5b132e09f0960b3bf2268879817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=994c5618b1e1e5b132e09f096… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 24 19:46:42 2016 +0200 d3d10: 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/d3d10/d3d10_private.h | 5 +++++ dlls/d3d10/utils.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 232399f..0e27dfe 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -294,6 +294,11 @@ static inline void write_dword(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 *location, const char **ptr, unsigned int count) DECLSPEC_HIDDEN; void write_dword_unknown(char **ptr, DWORD d) DECLSPEC_HIDDEN; diff --git a/dlls/d3d10/utils.c b/dlls/d3d10/utils.c index 9ffff13..618fdee 100644 --- a/dlls/d3d10/utils.c +++ b/dlls/d3d10/utils.c @@ -217,11 +217,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